Merge branch 'master' into realwingamegui

GTNewHorizons · Jan 2, 2024 · adc0839 · adc0839
2 parents 63e4324 + 0d905b6
commit adc0839
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 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.45.13:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.15:dev")
     api("com.github.GTNewHorizons:Yamcl:0.5.86:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.3:dev")
 
@@ -10,13 +10,13 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.9:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TecTech:5.3.23:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:bartworks:0.9.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:bartworks:0.9.3:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.13-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly("curse.maven:witchery-69673:2234410") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.11.3:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.11.4:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Chisel:2.13.0-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/scripts/ScriptChisel.java b/src/main/java/com/dreammaster/scripts/ScriptChisel.java
@@ -4,8 +4,10 @@
 import static gregtech.api.enums.Mods.Botania;
 import static gregtech.api.enums.Mods.Chisel;
 import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.GalacticraftAmunRa;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.IronChests;
 import static gregtech.api.enums.Mods.Minecraft;
 import static gregtech.api.enums.Mods.Natura;
@@ -42,7 +44,9 @@ public List<String> getDependencies() {
                 Botania.ID,
                 Chisel.ID,
                 EnderIO.ID,
+                GalacticraftAmunRa.ID,
                 GalacticraftCore.ID,
+                IndustrialCraft2.ID,
                 IronChests.ID,
                 Natura.ID,
                 Railcraft.ID,
@@ -284,6 +288,16 @@ public void loadRecipes() {
         ChiselHelper.addVariationFromStack(
                 "basalts",
                 getModItem(ProjectRedExploration.ID, "projectred.exploration.stone", 1, 4, missing));
+        ChiselHelper.addVariationFromStack("basalts", getModItem(IndustrialCraft2.ID, "blockBasalt", 1, 0, missing));
+        ChiselHelper.addVariationFromStack(
+                "basalts",
+                getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1, 0, missing));
+        ChiselHelper.addVariationFromStack(
+                "basalts",
+                getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1, 1, missing));
+        ChiselHelper.addVariationFromStack(
+                "basalts",
+                getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1, 7, missing));
         ChiselHelper.addGroup("redgranite");
         ChiselHelper.addVariationFromStack(
                 "redgranite",