From 77b833aed3116b30ab65626976dfbed69c4b267d Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 1 Feb 2025 08:13:46 -0600 Subject: [PATCH 1/3] Fix some amunra recipes (#1187) --- src/main/java/com/dreammaster/scripts/ScriptAmunRa.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java index ac4ee15c2..69bb9438a 100644 --- 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"); From d7cc1f3dde412ab4b3b152b7ff39ca9f16b508ad Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 1 Feb 2025 22:54:18 +0100 Subject: [PATCH 2/3] update --- dependencies.gradle | 4 ++-- settings.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index dc87a7cca..137d49a74 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.101: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") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.6:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.8:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } diff --git a/settings.gradle b/settings.gradle index 7a562ea19..9280f4fce 100644 --- 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' } From efece26135231b90a721f775aa9518298a67a541 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:30:35 -0600 Subject: [PATCH 3/3] Add missing dependency to ScriptAvaritiaAddons (#1188) --- src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java index 6e8fae314..8da3941fa 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java @@ -54,6 +54,7 @@ public List getDependencies() { AppliedEnergistics2.ID, AvaritiaAddons.ID, EternalSingularity.ID, + ForbiddenMagic.ID, GregTech.ID, Avaritia.ID, IronChests.ID,