Merge branch 'master' into development

This commit is contained in:
Aidan Brady 2014-08-07 12:21:11 -04:00
commit 008afaf359

View file

@ -161,7 +161,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "7.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:ForgeMultipart;after:BuildCraftAPI|power;after:BuildCraftAPI|tools;after:BuildCraftAPI|transport;after:IC2API;after:CoFHAPI|energy;after:ComputerCraft;after:Galacticraft API;" +
"after:MineFactoryReloaded;after:MetallurgyCore;after:EnderIO;after:ExtraUtilities;after:Railcraft")
"after:MineFactoryReloaded;after:MetallurgyCore;after:EnderIO;after:ExtraUtilities;after:Railcraft;after:Forestry")
public class Mekanism
{
/** Mekanism Packet Pipeline */