diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 02:51:38 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 02:51:38 +1000 |
| commit | 6e946c6cc26665c97dad880dec2b5604f0104a28 (patch) | |
| tree | d967abd48d2cb7659fbe1fcc9f9bcd4f68ef6863 /src/Java/gtPlusPlus/preloader | |
| parent | 4d15336cfb84a61d7609d75c683f21ea084f47bb (diff) | |
| parent | ab4b246c65795d612d35a8ace09acfe53e4580b4 (diff) | |
| download | GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.tar.gz GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.tar.bz2 GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.zip | |
Merge remote-tracking branch 'remotes/origin/VersionBump'
# Conflicts:
# src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
# src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
# src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
Diffstat (limited to 'src/Java/gtPlusPlus/preloader')
| -rw-r--r-- | src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index c3a1f23f53..2dcbe46056 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import gregtech.common.items.GT_MetaGenerated_Item_01; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -145,6 +146,7 @@ public class Preloader_GT_OreDict { } } catch (final Throwable e) { + if (CORE.ConfigSwitches.showHiddenNEIItems) { FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictionary."); if (bannedItem != null){ FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of %s", ItemUtils.getModId(bannedItem)); @@ -160,6 +162,7 @@ public class Preloader_GT_OreDict { h.printStackTrace(); } } + } //FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage()); } return false; |