Merge branch 'development' into 1.8.9

* development:
  Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping
  Fixed Security Desk not invalidating

Conflicts:
	src/main/java/mekanism/common/block/BlockBasic.java
	src/main/java/mekanism/common/multiblock/UpdateProtocol.java
This commit is contained in:
aidancbrady committed 2016-05-22 18:42:56 -04:00
commit c8f3fcaee1
5 files changed
+14 -4

No files matched your search

@@ -850,8 +850,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
super.breakBlock(world, pos, state);
world.removeTileEntity(pos);
}
@Override