tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan Brady 2013-12-21 21:06:48 -05:00
commit 96fdb4d168
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/mekanism/common/Mekanism.java
View file

@ -1232,8 +1232,6 @@ public class Mekanism
//Register to receive subscribed events
MinecraftForge.EVENT_BUS.register(this);
new MultipartMekanism();
//Set up VoiceServerManager
if(voiceServerEnabled)
{
@ -1253,7 +1251,9 @@ public class Mekanism
addEntities();
registerOreDict();
new MultipartMekanism();
//Packet registrations
PacketHandler.registerPacket(PacketRobit.class);
PacketHandler.registerPacket(PacketTransmitterUpdate.class);