Merge branch 'master' into dev

GTNewHorizons · Jan 21, 2025 · 34cec0a · 34cec0a
2 parents 35b582e + 48a92f1
commit 34cec0a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.83:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.87:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
@@ -10,15 +10,15 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.26:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.27:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
     compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.3:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.4:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
     compileOnly("com.github.GTNewHorizons:amunra:0.8.0:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java
@@ -575,22 +575,22 @@ public void loadRecipes() {
                 getModItem(BiomesOPlenty.ID, "moss", 1, 0, missing),
                 getModItem(BiomesOPlenty.ID, "moss", 1, 0, missing),
                 getModItem(BiomesOPlenty.ID, "moss", 1, 0, missing));
-        addShapelessRecipe(ItemList.Color_03.get(1L), "dyeBrown");
-        addShapelessRecipe(ItemList.Color_07.get(1L), "dyeLightGray");
-        addShapelessRecipe(ItemList.Color_11.get(1L), "dyeYellow");
-        addShapelessRecipe(ItemList.Color_15.get(1L), "dyeWhite");
-        addShapelessRecipe(ItemList.Color_04.get(1L), "dyeBlue");
-        addShapelessRecipe(ItemList.Color_08.get(1L), "dyeGray");
-        addShapelessRecipe(ItemList.Color_10.get(1L), "dyeLime");
-        addShapelessRecipe(ItemList.Color_14.get(1L), "dyeOrange");
-        addShapelessRecipe(ItemList.Color_01.get(1L), "dyeRed");
-        addShapelessRecipe(ItemList.Color_05.get(1L), "dyePurple");
-        addShapelessRecipe(ItemList.Color_09.get(1L), "dyePink");
-        addShapelessRecipe(ItemList.Color_13.get(1L), "dyeMagenta");
-        addShapelessRecipe(ItemList.Color_00.get(1L), "dyeBlack");
-        addShapelessRecipe(ItemList.Color_02.get(1L), "dyeGreen");
-        addShapelessRecipe(ItemList.Color_06.get(1L), "dyeCyan");
-        addShapelessRecipe(ItemList.Color_12.get(1L), "dyeLightBlue");
+        addShapedRecipe(ItemList.Color_03.get(1L), null, null, null, "dyeBrown", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_07.get(1L), null, null, null, "dyeLightGray", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_11.get(1L), null, null, null, "dyeYellow", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_15.get(1L), null, null, null, "dyeWhite", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_04.get(1L), null, null, null, "dyeBlue", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_08.get(1L), null, null, null, "dyeGray", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_10.get(1L), null, null, null, "dyeLime", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_14.get(1L), null, null, null, "dyeOrange", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_01.get(1L), null, null, null, "dyeRed", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_05.get(1L), null, null, null, "dyePurple", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_09.get(1L), null, null, null, "dyePink", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_13.get(1L), null, null, null, "dyeMagenta", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_00.get(1L), null, null, null, "dyeBlack", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_02.get(1L), null, null, null, "dyeGreen", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_06.get(1L), null, null, null, "dyeCyan", null, null, null, null, null);
+        addShapedRecipe(ItemList.Color_12.get(1L), null, null, null, "dyeLightBlue", null, null, null, null, null);
         addShapelessRecipe(
                 getModItem(StructureLib.ID, "item.structurelib.constructableTrigger", 1, 0, missing),
                 "dyeBlue",