diff --git a/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java b/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java index 55fb669a4..6946738bd 100755 --- a/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java @@ -25,11 +25,11 @@ public class ContainerNetworkTransmitter extends ContainerBase { if (slot != null && slot.getHasStack()) { stack = slot.getStack(); - if (index == 0) { - if (!mergeItemStack(stack, 1, inventorySlots.size(), false)) { + if (index <= 1) { + if (!mergeItemStack(stack, 2, inventorySlots.size(), false)) { return null; } - } else if (!mergeItemStack(stack, 0, 1, false)) { + } else if (!mergeItemStack(stack, 0, 2, false)) { return null; } diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 2a9d699f7..bd15f6707 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -373,7 +373,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void sendStorageToClient() { - for (EntityPlayer player : worldObj.playerEntities) { + for (EntityPlayer player : worldObj.getMinecraftServer().getPlayerList().getPlayerList()) { if (isWatchingGrid(player)) { sendStorageToClient((EntityPlayerMP) player); } @@ -387,7 +387,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void sendStorageDeltaToClient(ItemStack stack, int delta) { - for (EntityPlayer player : worldObj.playerEntities) { + for (EntityPlayer player : worldObj.getMinecraftServer().getPlayerList().getPlayerList()) { if (isWatchingGrid(player)) { RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), (EntityPlayerMP) player); } diff --git a/src/main/resources/assets/refinedstorage/textures/items/interdimension_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/interdimension_upgrade.png new file mode 100755 index 000000000..df8e37dda Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/interdimension_upgrade.png differ