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

…to 1.20.1

.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"

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

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

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

@@ -118,7 +118,7 @@
   "page": "gtceu:generation/red_sand",
   "position": [
     -150,
-    50
+    150
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

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

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

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

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

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

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

src/generated/resources/assets/gtceu/compass/nodes/machines/crate.json

@@ -14,7 +14,7 @@
   ],
   "page": "gtceu:machines/crate",
   "position": [
-    -400,
+    -350,
     350
   ],
   "section": "gtceu:machines"

src/generated/resources/assets/gtceu/compass/nodes/machines/creative_chest.json

@@ -8,7 +8,7 @@
   ],
   "page": "gtceu:machines/creative_chest",
   "position": [
-    -150,
+    -100,
     300
   ],
   "section": "gtceu:machines"

src/generated/resources/assets/gtceu/compass/nodes/machines/creative_energy.json

@@ -8,7 +8,7 @@
   ],
   "page": "gtceu:machines/creative_energy",
   "position": [
-    -250,
+    -200,
     300
   ],
   "section": "gtceu:machines"

src/generated/resources/assets/gtceu/compass/nodes/machines/creative_tank.json

@@ -8,7 +8,7 @@
   ],
   "page": "gtceu:machines/creative_tank",
   "position": [
-    -200,
+    -150,
     300
   ],
   "section": "gtceu:machines"

src/generated/resources/assets/gtceu/compass/nodes/machines/drum.json

@@ -15,7 +15,7 @@
   ],
   "page": "gtceu:machines/drum",
   "position": [
-    -350,
+    -300,
     350
   ],
   "section": "gtceu:machines"

src/generated/resources/assets/gtceu/compass/nodes/machines/item_collector.json

@@ -0,0 +1,18 @@
+{
+  "button_texture": {
+    "type": "item",
+    "res": "gtceu:lv_item_collector"
+  },
+  "items": [
+    "gtceu:lv_item_collector",
+    "gtceu:mv_item_collector",
+    "gtceu:hv_item_collector",
+    "gtceu:ev_item_collector"
+  ],
+  "page": "gtceu:machines/item_collector",
+  "position": [
+    -250,
+    300
+  ],
+  "section": "gtceu:machines"
+}

src/generated/resources/assets/gtceu/compass/nodes/machines/super_chest.json

@@ -20,7 +20,7 @@
   ],
   "page": "gtceu:machines/super_chest",
   "position": [
-    -100,
+    -50,
     300
   ],
   "section": "gtceu:machines"

src/generated/resources/assets/gtceu/compass/nodes/machines/super_tank.json

@@ -20,8 +20,8 @@
   ],
   "page": "gtceu:machines/super_tank",
   "position": [
-    -50,
-    300
+    -400,
+    350
   ],
   "section": "gtceu:machines"
 }

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -162,6 +162,7 @@
   "block.gtceu.ev_input_hatch": "ɥɔʇɐH ʇnduI ΛƎϛ§",
   "block.gtceu.ev_input_hatch_4x": "ɥɔʇɐH ʇnduI ǝןdnɹpɐnὉ ΛƎϛ§",
   "block.gtceu.ev_input_hatch_9x": "ɥɔʇɐH ʇnduI ǝןdnuoN ΛƎϛ§",
+  "block.gtceu.ev_item_collector": "ɹ§III ɹoʇɔǝןןoƆ ɯǝʇI pǝɔuɐʌpⱯϛ§",
   "block.gtceu.ev_item_passthrough_hatch": "ɥɔʇɐH ɥbnoɹɥʇssɐԀ ɯǝʇI ΛƎϛ§",
   "block.gtceu.ev_lapotronic_battery": "ɹoʇıɔɐdɐƆ ɔıuoɹʇodɐꞀ ΛƎ",
   "block.gtceu.ev_large_miner": "ɹ§III ɹǝuıW ǝbɹɐꞀ pǝɔuɐʌpⱯϛ§",
@@ -267,6 +268,7 @@
   "block.gtceu.hv_hermetic_casing": "III buısɐƆ ɔıʇǝɯɹǝH",
   "block.gtceu.hv_input_bus": "snᗺ ʇnduI ΛH9§",
   "block.gtceu.hv_input_hatch": "ɥɔʇɐH ʇnduI ΛH9§",
+  "block.gtceu.hv_item_collector": "ɹ§II ɹoʇɔǝןןoƆ ɯǝʇI pǝɔuɐʌpⱯ9§",
   "block.gtceu.hv_item_passthrough_hatch": "ɥɔʇɐH ɥbnoɹɥʇssɐԀ ɯǝʇI ΛH9§",
   "block.gtceu.hv_laser_engraver": "ɹ§II ɹǝʌɐɹbuƎ ɹǝsɐꞀ pǝɔuɐʌpⱯ9§",
   "block.gtceu.hv_lathe": "ɹ§II ǝɥʇɐꞀ pǝɔuɐʌpⱯ9§",
@@ -554,6 +556,7 @@
   "block.gtceu.lv_hermetic_casing": "I buısɐƆ ɔıʇǝɯɹǝH",
   "block.gtceu.lv_input_bus": "snᗺ ʇnduI ΛꞀㄥ§",
   "block.gtceu.lv_input_hatch": "ɥɔʇɐH ʇnduI ΛꞀㄥ§",
+  "block.gtceu.lv_item_collector": "ɹ§ ɹoʇɔǝןןoƆ ɯǝʇI ɔısɐᗺ",
   "block.gtceu.lv_item_passthrough_hatch": "ɥɔʇɐH ɥbnoɹɥʇssɐԀ ɯǝʇI ΛꞀㄥ§",
   "block.gtceu.lv_laser_engraver": "ɹ§ ɹǝʌɐɹbuƎ ɹǝsɐꞀ ɔısɐᗺ",
   "block.gtceu.lv_lathe": "ɹ§ ǝɥʇɐꞀ ɔısɐᗺ",
@@ -657,6 +660,7 @@
   "block.gtceu.mv_hermetic_casing": "II buısɐƆ ɔıʇǝɯɹǝH",
   "block.gtceu.mv_input_bus": "snᗺ ʇnduI ΛWq§",
   "block.gtceu.mv_input_hatch": "ɥɔʇɐH ʇnduI ΛWq§",
+  "block.gtceu.mv_item_collector": "ɹ§ ɹoʇɔǝןןoƆ ɯǝʇI pǝɔuɐʌpⱯq§",
   "block.gtceu.mv_item_passthrough_hatch": "ɥɔʇɐH ɥbnoɹɥʇssɐԀ ɯǝʇI ΛWq§",
   "block.gtceu.mv_laser_engraver": "ɹ§ ɹǝʌɐɹbuƎ ɹǝsɐꞀ pǝɔuɐʌpⱯq§",
   "block.gtceu.mv_lathe": "ɹ§ ǝɥʇɐꞀ pǝɔuɐʌpⱯq§",
@@ -1516,6 +1520,7 @@
   "compass.node.gtceu.machines/forming_press": "ssǝɹԀ buıɯɹoℲ",
   "compass.node.gtceu.machines/gas_collector": "ɹoʇɔǝןןoƆ sɐ⅁",
   "compass.node.gtceu.machines/gas_turbine": "ǝuıqɹn⟘ sɐ⅁",
+  "compass.node.gtceu.machines/item_collector": "ɹoʇɔǝןןoƆ ɯǝʇI",
   "compass.node.gtceu.machines/laser_engraver": "ɹǝʌɐɹbuƎ ɹǝsɐꞀ",
   "compass.node.gtceu.machines/lathe": "ǝɥʇɐꞀ",
   "compass.node.gtceu.machines/ld_fluid_pipeline": "ǝuıןǝdıԀ pınןℲ pꞀ",
@@ -2023,6 +2028,7 @@
   "cover.voiding.voiding_mode.description.1": "˙ʇunoɯɐ pǝıɟıɔǝds ǝɥʇ oʇ dn 'ɹǝʇןıɟ ǝɥʇ buıɥɔʇɐɯ buıɥʇʎuɐ pıoʌ ןןıʍ ɹ§ʍoןɟɹǝʌO pıoΛǝ§",
   "cover.voiding.voiding_mode.void_any": "buıɥɔʇɐW pıoΛ",
   "cover.voiding.voiding_mode.void_overflow": "ʍoןɟɹǝʌO pıoΛ",
+  "curios.identifier.gtceu_magnet": "ʇǝubɐW nƎƆ⟘⅁",
   "death.attack.axe": "%s ʎq pǝddoɥɔ uǝǝq sɐɥ %s",
   "death.attack.butchery_knife": "%s ʎq pǝɹǝɥɔʇnq sɐʍ %s",
   "death.attack.buzzsaw": "%s ʎq pǝzznq ʇob %s",
@@ -2272,6 +2278,8 @@
   "gtceu.gui.silktouch.enabled.0": "˙ǝןqɐsıᗡ oʇ ʞɔıןƆ :pǝןqɐuƎ ɥɔno⟘ ʞןıS",
   "gtceu.gui.silktouch.enabled.1": "˙ǝuıɥɔɐɯ ǝןpı uɐ sǝɹınbǝɹ buıɥɔʇıʍSㄥ§",
   "gtceu.gui.sort": "ʇɹoS",
+  "gtceu.gui.title_bar.back": "ʞɔɐᗺ",
+  "gtceu.gui.title_bar.page_switcher": "sǝbɐԀ",
   "gtceu.gui.toggle_view.disabled": ")spınןℲ( ʍǝıΛ ǝןbbo⟘",
   "gtceu.gui.toggle_view.enabled": ")sɯǝʇI( ʍǝıΛ ǝןbbo⟘",
   "gtceu.implosion_compressor": "ɹossǝɹdɯoƆ uoısoןdɯI",
@@ -2556,8 +2564,8 @@
   "gtceu.machine.implosion_compressor.tooltip": "ɯooᗺ ob oʇ ʇuɐʍ noʎ ǝuıɥɔɐW ʎןuo ǝɥ⟘",
   "gtceu.machine.item_bus.export.tooltip": "sʞɔoןqıʇןnW ɹoɟ ʇndʇnO ɯǝʇI",
   "gtceu.machine.item_bus.import.tooltip": "sʞɔoןqıʇןnW ɹoɟ ʇnduI ɯǝʇI",
-  "gtceu.machine.item_collector.gui.collect_range": "sʞɔoןq %s uı ʇɔǝןןoƆ",
-  "gtceu.machine.item_collector.tooltip": "ןɐubıs ǝuoʇspǝᴚ ɐ uǝʌıb uǝɥʍ ɟןǝsʇı punoɹɐ sɯǝʇI sʇɔǝןןoƆ",
+  "gtceu.machine.item_collector.gui.collect_range": "sʞɔoןq %sx%s ɟo ɐǝɹɐ uɐ uıɥʇıʍ ʇɔǝןןoƆ",
+  "gtceu.machine.item_collector.tooltip": "ɟןǝsʇı punoɹɐ sɯǝʇI sʇɔǝןןoƆ",
   "gtceu.machine.iv_alloy_smelter.tooltip": "ɹoʇɐɹbǝʇuI ʎoןןⱯㄥ§",
   "gtceu.machine.iv_arc_furnace.tooltip": "ɹǝʇɐǝH ǝbɹɐɥɔsıᗡㄥ§",
   "gtceu.machine.iv_assembler.tooltip": "ǝןqɐ⟘ buıʇɟɐɹƆ ɐ ⟘ONㄥ§",
@@ -4175,7 +4183,7 @@
   "item.gtceu.uxv_conveyor_module": "ǝןnpoW ɹoʎǝʌuoƆ ΛX∩",
   "item.gtceu.uxv_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ ΛX∩",
   "item.gtceu.uxv_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ ΛX∩",
-  "item.gtceu.uxv_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛH∩",
+  "item.gtceu.uxv_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛX∩",
   "item.gtceu.uxv_field_generator": "ɹoʇɐɹǝuǝ⅁ pןǝıℲ ΛX∩",
   "item.gtceu.uxv_fluid_regulator": "ɹoʇɐןnbǝᴚ pınןℲ ΛX∩",
   "item.gtceu.uxv_robot_arm": "ɯɹⱯ ʇoqoᴚ ΛX∩",