diff options
| author | Teteros <Teteros@openmailbox.org> | 2016-02-29 03:29:04 +0000 |
|---|---|---|
| committer | Teteros <Teteros@openmailbox.org> | 2016-02-29 03:32:40 +0000 |
| commit | cd3357c73f21e06d38320322c367fcff37591994 (patch) | |
| tree | ff3a8f762f5af40a517e50f2055247acc8edae9a /src/main/java/gregtech/common/tileentities | |
| parent | 51bf5d55d62a62bfd2060e64c0b291e7f89dc466 (diff) | |
| download | GT5-Unofficial-cd3357c73f21e06d38320322c367fcff37591994.tar.gz GT5-Unofficial-cd3357c73f21e06d38320322c367fcff37591994.tar.bz2 GT5-Unofficial-cd3357c73f21e06d38320322c367fcff37591994.zip | |
Omit already applied fixes
This reverts commit d415df7ea26c0424abf8df9797fb1c4467c62d12.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 10d045d515..c49fe6fe05 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -244,7 +244,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity if (tierOverclock() == 2) { return mStartEnergy < 160000000 ? 2 : 1; } - return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1; + return mStartEnergy < 160000000 ? 4 : mStartEnergy > 320000000 ? 2 : 1; } @Override diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index 0ae5a783f8..a05ca2baf4 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -136,7 +136,6 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach } if (this.mItemStack != null) { this.mInventory[2] = this.mItemStack.copy(); - this.mInventory[2].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount); } else { this.mInventory[2] = null; } @@ -165,12 +164,12 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return aIndex==1; + return true; } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return aIndex==0&&(mInventory[0]==null||GT_Utility.areStacksEqual(this.mInventory[0], aStack)); + return true; } @Override |