Merge remote-tracking branch 'origin/TG-Removal' into dev

GTNewHorizons · Jan 23, 2025 · 3bd0dc2 · 3bd0dc2
2 parents 6d9bd31 + 673fa83
commit 3bd0dc2
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 166 deletions.
diff --git a/src/main/java/com/dreammaster/coremod/DreamClassTransformer.java b/src/main/java/com/dreammaster/coremod/DreamClassTransformer.java
@@ -13,7 +13,6 @@
 import com.dreammaster.coremod.transformers.recipenukers.AdvancedSolarPanelTransformer;
 import com.dreammaster.coremod.transformers.recipenukers.BibliocraftTransformer;
 import com.dreammaster.coremod.transformers.recipenukers.GraviSuiteTransformer;
-import com.dreammaster.coremod.transformers.recipenukers.TravellersGearTransformer;
 
 public class DreamClassTransformer implements IClassTransformer {
 
@@ -27,7 +26,6 @@ public DreamClassTransformer() {
         registerTransformer(new BibliocraftTransformer());
         registerTransformer(new GraviSuiteTransformer());
         registerTransformer(new ItemFocusWardingTransformer());
-        registerTransformer(new TravellersGearTransformer());
     }
 
     private void registerTransformer(IDreamTransformer transformer) {

diff --git a/...ain/java/com/dreammaster/coremod/transformers/recipenukers/TravellersGearTransformer.java b/...ain/java/com/dreammaster/coremod/transformers/recipenukers/TravellersGearTransformer.java
diff --git a/src/main/java/com/dreammaster/scripts/ScriptLoader.java b/src/main/java/com/dreammaster/scripts/ScriptLoader.java
@@ -115,7 +115,6 @@ public static void run() {
                         new ScriptTinkersConstruct(),
                         new ScriptTinkersDefence(),
                         new ScriptTranslocator(),
-                        new ScriptTravellersGear(),
                         new ScriptTwilightForest(),
                         new ScriptWarpTheory(),
                         new ScriptWirelessRedstone(),

diff --git a/src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java b/src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java
diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang
@@ -1407,7 +1407,7 @@ tc.research_text.TalismanfoodtGTNH=Everfull belly
 tc.research_page.TalismanfoodtGTNH=You often find yourself needing to take breaks during marathon researching sessions to satisfy your hunger. Finally you have found a way to get past your need for food.<BR><BR>By infusing a diamond with the essence of hunger, you have created an item that is able to suck the nourishing energy from various food items in your hotbar and store this energy within. It will then automatically replenish your food meter if it is depleted.<BR><BR>This device will only work on simple food items, so foods that invoke effects such as Rotten Flesh and Golden Apples must be consumed normally.
 tc.research_name.DreamcatcherGTNH=Wispy Dreamcatcher
 tc.research_text.DreamcatcherGTNH=Filtered thoughts
-tc.research_name.CrucsoulGTNH=Crucible of Soulst
+tc.research_name.CrucsoulGTNH=Crucible of Souls
 tc.research_text.CrucsoulGTNH=Caution: Keep out of reach of children.
 tc.research_name.ROD_TRANSMUTATION=Transmutative Wand Core
 tc.research_text.ROD_TRANSMUTATION=One thing into another