aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-08-02 08:47:25 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-08-02 08:47:25 +0200
commitb205b9a9bd7e0b19e6d7fb9358f202fc678e9a7b (patch)
treef7246bd73b506f84aedbaf9fa836b0706022b3a6 /src/main/java/gregtech/common/tileentities
parent184774c7f1dfed2ada2d7b804c145409d3c2e26d (diff)
parent60fcf643c961796da32607dd75283b2f9fbb93cd (diff)
downloadGT5-Unofficial-b205b9a9bd7e0b19e6d7fb9358f202fc678e9a7b.tar.gz
GT5-Unofficial-b205b9a9bd7e0b19e6d7fb9358f202fc678e9a7b.tar.bz2
GT5-Unofficial-b205b9a9bd7e0b19e6d7fb9358f202fc678e9a7b.zip
Merge branch 'unstable' into AshRebalance
Conflicts: src/main/java/gregtech/api/enums/Materials.java
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
index 18cd5bd74a..c8f5a4aa8a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
@@ -86,6 +86,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu
}
}
}
+ tInputList.add(mInventory[1]);
ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]);
ArrayList<FluidStack> tFluidList = getStoredFluids();