mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge remote-tracking branch 'upstream/1.11' into 1.12
This commit is contained in:
commit
5bcdb2b2be
23 files changed
+170
-150
No files matched your search
@@ -785,15 +785,15 @@ public class Mekanism
|
||||
addEntities();
|
||||
|
||||
//Integrate with Waila
|
||||
FMLInterModComms.sendMessage("Waila", "register", "mekanism.common.integration.WailaDataProvider.register");
|
||||
FMLInterModComms.sendMessage(MekanismHooks.WAILA_MOD_ID, "register", "mekanism.common.integration.WailaDataProvider.register");
|
||||
|
||||
//Integrate with OpenComputers
|
||||
if(Loader.isModLoaded("OpenComputers"))
|
||||
if(Loader.isModLoaded(MekanismHooks.OPENCOMPUTERS_MOD_ID))
|
||||
{
|
||||
hooks.loadOCDrivers();
|
||||
}
|
||||
|
||||
if(Loader.isModLoaded("appliedenergistics2"))
|
||||
if(Loader.isModLoaded(MekanismHooks.APPLIED_ENERGISTICS_2_MOD_ID))
|
||||
{
|
||||
hooks.registerAE2P2P();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user