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

Merge branch 'master' into development

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-24 12:19:24 -05:00
commit 4cf33562c6
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/mekanism/client/ClientProxy.java
View file

@ -68,6 +68,7 @@ import mekanism.common.CommonProxy;
import mekanism.common.EntityBalloon; import mekanism.common.EntityBalloon;
import mekanism.common.EntityObsidianTNT; import mekanism.common.EntityObsidianTNT;
import mekanism.common.EntityRobit; import mekanism.common.EntityRobit;
import mekanism.common.HolidayManager;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.IInvConfiguration; import mekanism.common.IInvConfiguration;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
@ -416,6 +417,8 @@ public class ClientProxy extends CommonProxy
KeyBindingRegistry.registerKeyBinding(new MekanismKeyHandler()); KeyBindingRegistry.registerKeyBinding(new MekanismKeyHandler());
GameRegistry.registerPlayerTracker(new ClientPlayerTracker()); GameRegistry.registerPlayerTracker(new ClientPlayerTracker());
HolidayManager.init();
} }
@Override @Override