mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 12:09:45 +00:00
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:
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);
|
||||
|
||||
Reference in new issue
Block a user