diff options
| author | JohannesGaessler <johannesg@balance.gg> | 2017-06-01 10:22:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 10:22:10 +0200 |
| commit | 7eb176f3a2334246229c6fc556c806e5f6a1ff03 (patch) | |
| tree | 5ae4926dc018b68734b38a7e3b6a7c7579a9bc51 /src/main/java/gregtech/api/util | |
| parent | 3c45c2accb08c37016ccd3f3217c09d18beb3326 (diff) | |
| parent | 9a69e1978db321e8f1462dd982c5a199911ca334 (diff) | |
| download | GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.tar.gz GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.tar.bz2 GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.zip | |
Merge branch 'unstable' into ChemistryUpdate
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -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); |