Merge branch 'master' into scanner

GTNewHorizons · Jan 10, 2025 · 0dfccf9 · 0dfccf9
2 parents 6df5029 + 6345d99
commit 0dfccf9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 37 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,16 +1,16 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.61:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.63:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.6.1:dev")
 
     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.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.16:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.18:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java
@@ -925,7 +925,7 @@ public void loadRecipes() {
                         'g',
                         getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 11, missing),
                         'h',
-                        getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 11, missing),
+                        ItemList.OreDrill2.get(1L),
                         'i',
                         getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 11, missing)));
         EnderConstructorRecipesHandler.registerRecipe(

diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
@@ -708,28 +708,6 @@ public void loadRecipes() {
                 "itemCasingAnyIron",
                 "batteryAdvanced",
                 "itemCasingAnyIron");
-        addShapedRecipe(
-                getModItem(IndustrialCraft2.ID, "itemScanner", 1, 0, missing),
-                "itemCasingGold",
-                "plateStainlessSteel",
-                "itemCasingGold",
-                "circuitAdvanced",
-                CustomItemList.Display.get(1L),
-                "circuitAdvanced",
-                "cableGt01Gold",
-                "batteryAdvanced",
-                "cableGt01Gold");
-        addShapedRecipe(
-                getModItem(IndustrialCraft2.ID, "itemScannerAdv", 1, 0, missing),
-                "itemCasingTitanium",
-                getModItem(IndustrialCraft2.ID, "itemScanner", 1, wildcard, missing),
-                "itemCasingTitanium",
-                "circuitData",
-                CustomItemList.Display.get(1L),
-                "circuitData",
-                "cableGt01Nichrome",
-                "batteryData",
-                "cableGt01Nichrome");
         addShapedRecipe(
                 getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3, missing),
                 "cableGt01AnyCopper",
@@ -873,17 +851,6 @@ public void loadRecipes() {
                 "itemCasingSteel",
                 "circuitBasic",
                 "itemCasingSteel");
-        addShapedRecipe(
-                getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 11, missing),
-                "circuitElite",
-                getModItem(IndustrialCraft2.ID, "blockElectric", 1, 2, missing),
-                "circuitElite",
-                ItemList.Electric_Motor_IV.get(1L),
-                getModItem(IndustrialCraft2.ID, "blockMachine", 1, 12, missing),
-                ItemList.Electric_Motor_IV.get(1L),
-                ItemList.Robot_Arm_IV.get(1L),
-                getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0, missing),
-                ItemList.Robot_Arm_IV.get(1L));
         addShapedRecipe(
                 getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 1, missing),
                 getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 0, missing),