aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-07-18 09:17:34 +1000
committerAlkalus <draknyte1@hotmail.com>2017-07-18 09:17:34 +1000
commitffa3372d83040e393c7d21b0e0e59124fcd8ad06 (patch)
tree3b3cba5bc75047b4b08a3c779ac048a20371e9ce /src/Java/gtPlusPlus/core/item
parent68b0031d3542f26ebbd84e32571b623d391f195c (diff)
downloadGT5-Unofficial-ffa3372d83040e393c7d21b0e0e59124fcd8ad06.tar.gz
GT5-Unofficial-ffa3372d83040e393c7d21b0e0e59124fcd8ad06.tar.bz2
GT5-Unofficial-ffa3372d83040e393c7d21b0e0e59124fcd8ad06.zip
$ Fixes #112.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 77556aff53..4d788e048e 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -562,7 +562,7 @@ public final class ModItems {
tI = new BaseItemMisc("Forest", new short[]{130,164,96}, 64, MiscTypes.MUSHROOM, new String[]{"You Found this on the ground.", "Definitely not sure if it's worth eating."});
//EnderIO Resources
- if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){
+ if ((LoadedMods.EnderIO || LOAD_ALL_CONTENT) && !CORE.GTNH){
Utils.LOG_INFO("EnderIO Found - Loading Resources.");
//Enderio Dusts
itemDustSoularium = ItemUtils.generateSpecialUseDusts("Soularium", "Soularium", Utils.rgbtoHexValue(95,90,54))[0];
@@ -605,7 +605,7 @@ public final class ModItems {
}
//Thaumcraft
- if (LoadedMods.Thaumcraft|| LOAD_ALL_CONTENT){
+ if ((LoadedMods.Thaumcraft|| LOAD_ALL_CONTENT) && !CORE.GTNH){
Utils.LOG_INFO("Thaumcraft Found - Loading Resources.");
//Item Init
try {