diff options
author | Techlone <techlone.mc@gmail.com> | 2017-06-04 21:30:51 +0500 |
---|---|---|
committer | Techlone <techlone.mc@gmail.com> | 2017-06-04 21:30:51 +0500 |
commit | dbd2f5800886a36dbe4528aabfb2b30f1e7b0908 (patch) | |
tree | bb297a5498fe57f75aedf33e4f3f77f8bb89a202 /src/main/java/gregtech/api/util/GT_ModHandler.java | |
parent | 4f6bdedf963842c74bf1cf59f77ead8ad66b48bc (diff) | |
parent | 30de32fb07bdc82ec7dc79fd698ba0a1ab6b06f6 (diff) | |
download | GT5-Unofficial-dbd2f5800886a36dbe4528aabfb2b30f1e7b0908.tar.gz GT5-Unofficial-dbd2f5800886a36dbe4528aabfb2b30f1e7b0908.tar.bz2 GT5-Unofficial-dbd2f5800886a36dbe4528aabfb2b30f1e7b0908.zip |
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_ModHandler.java')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 62c8714807..daa1b67069 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -682,8 +682,8 @@ public class GT_ModHandler { for (ItemStack tStack : ((IRecipeInput) tRecipe.getKey()).getInputs()) { if (GT_Utility.isStackValid(tStack)) { if (aAddGTRecipe && (aGTRecipeMap.findRecipe(null, false, Long.MAX_VALUE, null, tStack) == null)) { + try{ if (aExcludeGTIC2Items && ((tStack.getUnlocalizedName().contains("gt.metaitem.01") || tStack.getUnlocalizedName().contains("gt.blockores") || tStack.getUnlocalizedName().contains("ic2.itemCrushed") || tStack.getUnlocalizedName().contains("ic2.itemPurifiedCrushed")))) continue; - try{ switch (aGTRecipeMap.mUnlocalizedName) { case "gt.recipe.macerator": aGTRecipeMap.addRecipe(true, new ItemStack[]{GT_Utility.copyAmount(((IRecipeInput) tRecipe.getKey()).getAmount(), tStack)}, (ItemStack[]) ((RecipeOutput) tRecipe.getValue()).items.toArray(), null, null, null, null, 300, 2, 0); |