Merge pull request #296 from GTModpackTeam/move-inb

GTModpackTeam · Sep 16, 2024 · 7f86627 · 7f86627
2 parents e997fcf + 2cf583d
commit 7f86627
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v2.3.0
+- Separate Electric Implosion Compressor changes to [ImplosionNoBomb](https://www.curseforge.com/minecraft/mc-mods/implosionnobomb)
+    - Thanks to @MrKono for his support!!
+
+* * *
+
 # v2.2.14
 ## Ender IO
 - Fix Black Paper

diff --git a/src/main/java/gtexpert/mixins/GTEMixinLoader.java b/src/main/java/gtexpert/mixins/GTEMixinLoader.java
@@ -19,9 +19,7 @@ public class GTEMixinLoader implements ILateMixinLoader {
 
     public static final Map<String, Boolean> modMixinsConfig = Stream.of(
             new AbstractMap.SimpleImmutableEntry<>(Mods.Names.DRACONIC_ADDITIONS,
-                    Mods.DraconicAdditions.isModLoaded()),
-            new AbstractMap.SimpleImmutableEntry<>(Mods.Names.GREGICALITY_MULTIBLOCKS,
-                    Mods.GregicalityMultiblocks.isModLoaded()))
+                    Mods.DraconicAdditions.isModLoaded()))
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
     @Override

diff --git a/src/main/java/gtexpert/mixins/gcym/MetaTileEntityElectricImplosionCompressorMixin.java b/src/main/java/gtexpert/mixins/gcym/MetaTileEntityElectricImplosionCompressorMixin.java
diff --git a/src/main/resources/assets/gtexpert/lang/en_us.lang b/src/main/resources/assets/gtexpert/lang/en_us.lang
@@ -244,7 +244,6 @@ recipemap.draconic_fusion_upgrade.property.1=Preserves upgrade info
 recipemap.draconic_fusion_upgrade.property.2= and stored energy
 recipemap.advanced_chemical_plant.name=Advanced Chemical Plant
 recipemap.large_gas_collector.name=Large Gas Collector
-recipemap.electric_implosion_compressor.name=Electric Implosion Compressor
 recipemap.steam_mixer.name=Steam Mixer
 recipemap.steam_assembler.name=Steam Assembler
 recipemap.steam_circuit_assembler.name=Steam Circuit Assembler

diff --git a/src/main/resources/assets/gtexpert/lang/ja_jp.lang b/src/main/resources/assets/gtexpert/lang/ja_jp.lang
@@ -244,7 +244,6 @@ recipemap.draconic_fusion_upgrade.property.1=アップグレードの状態と
 recipemap.draconic_fusion_upgrade.property.2= 保持されます
 recipemap.advanced_chemical_plant.name=発展型化学プラント
 recipemap.large_gas_collector.name=大型ガス収集機
-recipemap.electric_implosion_compressor.name=電動内破圧縮機
 recipemap.steam_mixer.name=蒸気式ミキサー
 recipemap.steam_assembler.name=蒸気式組立機
 recipemap.steam_circuit_assembler.name=蒸気式回路作成機

diff --git a/src/main/resources/mixins.gtexpert.gcym.json b/src/main/resources/mixins.gtexpert.gcym.json