Merge branch '1.7.10' into development

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
This commit is contained in:
Ben Spiers committed 2014-07-07 15:43:53 +01:00
1 parent 786d399c2c
commit f0ad905c07
10 files changed
+43 -36

No files matched your search

@@ -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);