From a2cec66a81f7e4a12576e8022a745748e18bced0 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 12 Dec 2014 14:09:32 +0800 Subject: [PATCH] #1384 Disabling one side of machines disables the opposite side as well. --- ReleaseNotes.txt | 1 + resources/assets/enderio/lang/en_US.lang | 2 ++ .../java/crazypants/enderio/machine/AbstractMachineEntity.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6e02ad10..f910e8ec 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -45,6 +45,7 @@ Bugs - #1366 Powered Spawner doesn't remain active when chunk loaded - #1373 Fluid Tank accepts fluid regardless of configuration - #1383 Travel Anchor crash +- #1384 Disabling one side of machines disables the opposite side as well. - RF Tools not charging in Killer Joe until he has attacked something diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index fa10c6ac..2d065282 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -266,6 +266,8 @@ tile.blockCapBank.activated.name=Capacitor Bank tile.blockCapBank.vibrant.name=Vibrant Capacitor Bank tile.blockCapBank.tooltip.detailed.line1=Multi-block energy storage. tile.blockCapBank.tooltip.detailed.line2=Can charge RF powered items. +tile.blockCapBank.tooltip.detailed.line3=Shift-R-Click on a face with an empty hand +tile.blockCapBank.tooltip.detailed.line4=to change information display tile.blockCapBank.tooltipPrefix=Contains diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index aa625c59..3000b768 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -491,7 +491,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi int tSlot = targetSlots[i]; ItemStack targetStack = target.getStackInSlot(tSlot); if(targetStack != null && target.canExtractItem(i, targetStack, side.getOpposite().ordinal())) { - int res = ItemUtil.doInsertItem(this, targetStack, side.getOpposite()); + int res = ItemUtil.doInsertItem(this, targetStack, side); if(res > 0) { targetStack = targetStack.copy(); targetStack.stackSize -= res;