diff options
| author | Technus <daniel112092@gmail.com> | 2018-04-15 12:35:33 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2018-04-15 12:35:33 +0200 |
| commit | a50fe06bfcae07d1bf25af784364392cd232d3cd (patch) | |
| tree | 9a8905c62ea4c15102754444f1354845dd3dcf46 /src/main/java/gregtech/common/tileentities/machines/multi | |
| parent | 7971edd3771ea2e0687e65151fb9b3bca90d2609 (diff) | |
| parent | 2b492f360ad5bd1a2f525d101d8fdfa4628c2552 (diff) | |
| download | GT5-Unofficial-a50fe06bfcae07d1bf25af784364392cd232d3cd.tar.gz GT5-Unofficial-a50fe06bfcae07d1bf25af784364392cd232d3cd.tar.bz2 GT5-Unofficial-a50fe06bfcae07d1bf25af784364392cd232d3cd.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 82293cff0a..35b2dcc68e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -427,7 +427,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl EnumChatFormatting.GREEN+tTier+EnumChatFormatting.RESET+ " Discount: "+ EnumChatFormatting.GREEN+(1<<mMult)+EnumChatFormatting.RESET + " x", - "Parallel processing: "+EnumChatFormatting.GREEN+(mInventory[1].stackSize<<mMult)+EnumChatFormatting.RESET + "Parallel processing: "+EnumChatFormatting.GREEN+((mInventory[1] != null) ? (mInventory[1].stackSize<<mMult) : 0)+EnumChatFormatting.RESET }; } |