Merge branch 'master' into development

This commit is contained in:
Ben Spiers 2014-07-28 17:33:09 +01:00
commit c339ee7a18

View file

@ -1196,7 +1196,7 @@ public final class MekanismUtils
*/ */
public static boolean useIC2() public static boolean useIC2()
{ {
return Mekanism.hooks.IC2APILoaded; return Mekanism.hooks.IC2Loaded;
} }
/** /**