Merge branch 'master' into 1.7.10

Conflicts:
	common/mekanism/common/PacketHandler.java
This commit is contained in:
Aidan C. Brady 2014-06-26 23:47:43 -04:00
commit 3b5438a064

View file

@ -78,8 +78,6 @@ public class PacketHandler
{
public SimpleNetworkWrapper netHandler = NetworkRegistry.INSTANCE.newSimpleChannel("MEK");
private int packetsRegistered = 0;
public void initialize()
{
netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER);