Merge branch 'master' into 1.7.10
Conflicts: common/mekanism/common/PacketHandler.java
This commit is contained in:
commit
3b5438a064
1 changed files with 0 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue