aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-12-20 17:30:21 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-12-20 17:30:21 +1000
commit2a4795f65d98ff60a177d7d6a5552fd687d9f6e8 (patch)
treeb50a63b6acf2a0f4249926b8541c76fef8faac8e /src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
parent214d1caa1f3610d0e7a4f058e5e150ecbc79fd22 (diff)
downloadGT5-Unofficial-2a4795f65d98ff60a177d7d6a5552fd687d9f6e8.tar.gz
GT5-Unofficial-2a4795f65d98ff60a177d7d6a5552fd687d9f6e8.tar.bz2
GT5-Unofficial-2a4795f65d98ff60a177d7d6a5552fd687d9f6e8.zip
+ Added support for GTNH Trinium.
$ Fixed excessive fluid cells being generated. $ Further improve material recycling recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java')
-rw-r--r--src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index 018e0bee82..b6f6dfccdc 100644
--- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -48,7 +48,7 @@ public class Preloader_GT_OreDict {
}
//Mekanism Support - Let's not make Mek Osmium useful in GT anymore.
- if ((((bannedItem != null) && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism"))) || (LoadedMods.Mekanism)) && !LoadedMods.RedTech){
+ if ((((bannedItem != null) && !LoadedMods.RedTech && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism"))) || (LoadedMods.Mekanism)) && !LoadedMods.RedTech){
//Circuits
if (Class.forName("mekanism.common.item.ItemControlCircuit") != null) {
final Class<?> MekCircuit = Class.forName("mekanism.common.item.ItemControlCircuit");