aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-06-04 20:31:28 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-06-04 20:31:28 +0200
commite42ddd911a60fd58e1c5908b2206ad6afc1a9f96 (patch)
treeb9da75675f440cd264e0d91a58a8fd1bb9d5795b /src/main/java/gregtech/api/util
parentd0247a5d73dc5074dba989b8ff6560a9023eebfb (diff)
parent7eb176f3a2334246229c6fc556c806e5f6a1ff03 (diff)
downloadGT5-Unofficial-e42ddd911a60fd58e1c5908b2206ad6afc1a9f96.tar.gz
GT5-Unofficial-e42ddd911a60fd58e1c5908b2206ad6afc1a9f96.tar.bz2
GT5-Unofficial-e42ddd911a60fd58e1c5908b2206ad6afc1a9f96.zip
Merge branch 'ChemistryUpdate' of https://github.com/JohannesGaessler/GT5-Unofficial into ChemistryUpdate
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java2
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);