Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
This commit is contained in:
Aidan C. Brady committed 2014-08-05 17:06:29 -04:00
commit 69874de9d2
10 files changed
+111 -47

No files matched your search

@@ -102,6 +102,7 @@ public class PacketElectricChest implements IMessageHandler<ElectricChestMessage
{
TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj);
tileEntity.locked = message.locked;
player.worldObj.notifyBlocksOfNeighborChange(message.coord4D.xCoord, message.coord4D.yCoord, message.coord4D.zCoord, tileEntity.getBlockType());
}
else {
ItemStack stack = player.getCurrentEquippedItem();