Merge branch '1.20.1' of https://github.com/iouter/GregTech-Modern into 1.20.1

Author: iouter

.github/workflows/build-on-push.yml

@@ -0,0 +1,39 @@
+name: build-on-push
+
+on:
+  pull_request:
+    paths: ['src/**', '**.gradle', 'gradle.properties', 'gradlew**', 'gradle/**']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_ACTION_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
+      GITHUB_RUN_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build
+        uses: gradle/[email protected]
+        with:
+          arguments: build
+          
+      - name: Upload Artifact
+        uses: actions/[email protected]
+        with:
+          name: build output
+          path: build/libs/*
+          retention-days: 30

CHANGELOG.md

@@ -1,17 +1,6 @@
 # ChangeLog
 
-Version: 1.1.3.a
-
-### ADDITIONS:
-- added Creative Chest, Creative Tank
+Version: 1.1.3.b
 
 ### FIXES:
-- fixed crashes related to KubeJS recipe loading
-- fixed ore block maceration not working
-- fixed high tier tools (duranium, neutronium) not working
-- fixed electric furnace / multismelter recipes not working
-- fixed transformers always having 1A storage
-
-### CHANGES:
-- replaced Tungstensteel coils with RTM-Alloy coils 
-- updated Russian translation
+- fixed processing array being unable to form

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.1.3.a
+mod_version = 1.1.3.b
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

src/generated/resources/assets/gtceu/compass/nodes/generation/andesite.json

@@ -117,7 +117,7 @@
   ],
   "page": "gtceu:generation/andesite",
   "position": [
-    -50,
+    -100,
     100
   ],
   "pre_nodes": [

src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/basalt",
   "position": [
-    -50,
-    50
+    -100,
+    150
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/deepslate",
   "position": [
-    -150,
-    100
+    -200,
+    150
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/diorite",
   "position": [
-    -200,
-    150
+    -150,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/endstone",
   "position": [
-    -200,
-    100
+    -50,
+    50
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/granite",
   "position": [
-    -150,
-    150
+    -200,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/gravel",
   "position": [
-    -50,
-    150
+    -100,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"