Merge branch 'master' into BatchEFR_Recipes2

GTNewHorizons · Feb 2, 2025 · 0957ac3 · 0957ac3
2 parents 4b06784 + efece26
commit 0957ac3
Show file tree

Hide file tree

Showing 4 changed files with 4 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.51.103:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.108:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32'
 }
 
 
diff --git a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java
@@ -95,7 +95,7 @@ public void loadRecipes() {
         final Block machines4 = GameRegistry.findBlock(GalacticraftAmunRa.ID, "tile.machines4");
         final Block msBoosters1 = GameRegistry.findBlock(GalacticraftAmunRa.ID, "tile.msBoosters1");
         final Block airLockFrame = GameRegistry.findBlock(GalacticraftCore.ID, "tile.airLockFrame");
-        final Block machineFrames = GameRegistry.findBlock(GTNHIntergalactic.ID, "machineframes");
+        final Block machineFrames = GameRegistry.findBlock(GTNHIntergalactic.ID, "gassiphoncasing");
 
         final Item baseItem = GameRegistry.findItem(GalacticraftAmunRa.ID, "item.baseItem");
         final Item basicItem = GameRegistry.findItem(GalacticraftCore.ID, "item.basicItem");

diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java
@@ -54,6 +54,7 @@ public List<String> getDependencies() {
                 AppliedEnergistics2.ID,
                 AvaritiaAddons.ID,
                 EternalSingularity.ID,
+                ForbiddenMagic.ID,
                 GregTech.ID,
                 Avaritia.ID,
                 IronChests.ID,