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

Merge branch 'master' into universal-wires

Browse source
This commit is contained in:
Calclavia 2013-12-01 13:58:18 +08:00
commit 4804f8f335
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

@ -1088,9 +1088,7 @@ public class Mekanism
GasRegistry.register(new Gas("oxygen")).registerFluid();
Mekanism.proxy.preInit();
registerOreDict();
MinecraftForge.EVENT_BUS.register(hooks);
//Register infuses
@ -1135,6 +1133,8 @@ public class Mekanism
addRecipes();
addEntities();
registerOreDict();
//Packet registrations
PacketHandler.registerPacket(PacketRobit.class);
PacketHandler.registerPacket(PacketTransmitterUpdate.class);