Merge branch 'master' into development

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
This commit is contained in:
Aidan C. Brady 2015-02-16 18:13:03 -05:00
commit cb2e38ec61

View file

@ -188,7 +188,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
if(!(facing == clientFacing || worldObj.isRemote))
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
markDirty();
clientFacing = facing;
}
}