Merge branch 'development' into 1.8

This commit is contained in:
Aidan C. Brady committed 2014-07-14 17:15:26 -04:00
commit a98bf8bba3
9 files changed
+86 -38

No files matched your search

+1 -1
View File
@@ -167,7 +167,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "8.0.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:MineFactoryReloaded;after:MetallurgyCore;after:EnderIO;after:ExtraUtilities;after:Railcraft")
public class Mekanism
{
/** Mekanism Packet Pipeline */