Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tntrololol 2015-05-13 17:32:03 -05:00
commit 24180fd5b1
3 changed files with 19 additions and 3 deletions

View file

@ -80,8 +80,7 @@ public class Core {
TRAchievements.init();
// Multiblock events
MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
FMLCommonHandler.instance().bus()
.register(new MultiblockServerTickHandler());
FMLCommonHandler.instance().bus().register(new MultiblockServerTickHandler());
LogHelper.info("Initialization Complete");
}

View file

@ -1,5 +1,6 @@
package techreborn.compat;
import techreborn.compat.ee3.EmcValues;
import techreborn.compat.waila.CompatModuleWaila;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@ -15,9 +16,15 @@ public class CompatManager {
new CompatModuleWaila().init(event);
LogHelper.info("Waila Compat Loaded");
}
if(Loader.isModLoaded("qmunitylib")){
if(Loader.isModLoaded("qmunitylib"))
{
// Register Multiparts
ModParts.init();
}
if(Loader.isModLoaded("qmunitylib"))
{
// Register Emc Values
EmcValues.init();
}
}
}

View file

@ -0,0 +1,10 @@
package techreborn.compat.ee3;
public class EmcValues {
public static void init()
{
//TODO
}
}