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 17:07:13 +08:00
commit bf04c53415
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/Mekanism.java
View file

@ -104,6 +104,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import rebelkeithy.mods.metallurgy.api.IOreInfo;
import rebelkeithy.mods.metallurgy.api.MetallurgyAPI;
import thermalexpansion.api.crafting.CraftingManagers;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
@ -1070,6 +1071,7 @@ public class Mekanism
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
logger.setParent(FMLLog.getLogger());
File config = event.getSuggestedConfigurationFile();
//Set the mod's configuration