Merge branch '1.20.1' into 1.20.1

Author: Yefancy

CHANGELOG.md

@@ -1,10 +1,6 @@
 # ChangeLog
 
-Version: 1.1.1.a
+Version: 1.1.2.a
 
 ### FIXES:
-
-- fixed the processing array overclocking past its maximum input energy
-- fixed a crash when hard redstone recipes are enabled
-- removed duplicate fluid drilling rig recipes
-- fixed the ore prospector showing aluminium for most ores
+- fixed crash when opening a GUI with many slots

gradle.properties

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

settings.gradle

@@ -43,7 +43,7 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def ldLibVersion = "1.0.22.b"
+        def ldLibVersion = "1.0.23.a"
         def mixinextrasVersion = "0.2.0"
         def shimmerVersion = "0.2.2"
 

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

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

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

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

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

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

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

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/endstone",
   "position": [
-    -150,
-    50
+    -200,
+    150
   ],
   "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": [
-    -200,
-    50
+    -150,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

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

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