aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-30 22:33:43 +0200
committerDream-Master <dream-master@gmx.net>2018-09-30 22:33:43 +0200
commitcd5682771feb33b62fa9447d94dc970157485ccf (patch)
tree15cbdce1435d8fc69ff0c8120d12bfa9dd671b67 /src/main/java/gregtech/api/metatileentity/implementations
parent78c27ef770384e2df21aaf390b47c9951c03e058 (diff)
downloadGT5-Unofficial-cd5682771feb33b62fa9447d94dc970157485ccf.tar.gz
GT5-Unofficial-cd5682771feb33b62fa9447d94dc970157485ccf.tar.bz2
GT5-Unofficial-cd5682771feb33b62fa9447d94dc970157485ccf.zip
add circuit assembler recipes also
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
index 07d4a6c54f..a32eb877a5 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
@@ -659,7 +659,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0) != null && getInputAt(1) != null) || (getInputAt(0) == null && getInputAt(1) == null ? getRecipeList().containsInput(aStack) : (getRecipeList().containsInput(aStack) && null != getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[]{aStack, getInputAt(1)} : new ItemStack[]{getInputAt(0), aStack})))));
default:
GT_Recipe_Map gt_recipe_map = getRecipeList();
- if (GT_Recipe_Map.sCircuitAssemblerRecipes == gt_recipe_map) // assemblers IDs
+ if (GT_Recipe_Map.sCircuitAssemblerRecipes == gt_recipe_map || GT_Recipe_Map.sAssemblerRecipes == gt_recipe_map ) // assemblers IDs and circuit assembler IDs
{
if (GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBasic") ||
GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitGood") ||