Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
This commit is contained in:
Aidan C. Brady committed 2014-08-24 09:51:12 -04:00
commit 775e1fbd6d
4 files changed
+24 -11

No files matched your search

@@ -19,11 +19,15 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork
public int mainX;
public int mainY;
public int mainZ;
public boolean receivedCoords;
public boolean prevPower;
public void setMainLocation(int x, int y, int z)
{
receivedCoords = true;
if(!worldObj.isRemote)
{
mainX = x;
@@ -99,6 +103,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork
mainY = nbtTags.getInteger("mainY");
mainZ = nbtTags.getInteger("mainZ");
prevPower = nbtTags.getBoolean("prevPower");
receivedCoords = nbtTags.getBoolean("receivedCoords");
}
@Override
@@ -110,6 +115,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork
nbtTags.setInteger("mainY", mainY);
nbtTags.setInteger("mainZ", mainZ);
nbtTags.setBoolean("prevPower", prevPower);
nbtTags.setBoolean("receivedCoords", receivedCoords);
}
@Override