Merge branch 'development' into 1.8 (gosh darn conflicts)

Conflicts:
	src/api/java/ic2/api/Direction.java
	src/api/java/ic2/api/energy/NodeStats.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
This commit is contained in:
Aidan C. Brady committed 2014-10-17 12:00:39 -04:00
commit 60bf7f5f3d
13 files changed
+123 -124

No files matched your search

@@ -998,20 +998,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
return true;
}
@Override
public void onBlockAdded(World world, int x, int y, int z)
{
TileEntity tileEntity = world.getTileEntity(x, y, z);
if(!world.isRemote)
{
if(tileEntity instanceof TileEntityBasicBlock)
{
((TileEntityBasicBlock)tileEntity).onAdded();
}
}
}
public static enum MachineBlock
{
MACHINE_BLOCK_1,