From ffa80c1300150d7a17e05f61718b556ada71dc65 Mon Sep 17 00:00:00 2001 From: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:18:05 -0600 Subject: [PATCH 1/2] Make the dust > dye recipes shaped (#1171) --- .../dreammaster/scripts/ScriptGregtech.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java index 50cc4b673..1293421ad 100644 --- 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", From 48a92f16e2043fd6e38acd68af71e6865be6cf80 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 21 Jan 2025 17:43:46 +0100 Subject: [PATCH 2/2] update --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f80db5d27..87546dbf1 100644 --- 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,7 +10,7 @@ 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 } @@ -18,7 +18,7 @@ dependencies { 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 }