Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
	src/main/java/mekanism/common/tile/TileEntitySalinationValve.java
	src/main/java/mekanism/common/util/CableUtils.java
This commit is contained in:
Aidan C. Brady committed 2014-08-08 22:11:45 -04:00
commit 3b53614bd2
3 files changed
+7 -11

No files matched your search

@@ -484,7 +484,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock implements I
if(tileEntity != null && tileEntity.isRendering)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity)));
}
}
}