Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-04-16 23:39:03 -05:00
parent 4ee886c6ac f5fc2ba18e
commit f14581edae
6 changed files with 40 additions and 8 deletions
@@ -51,6 +51,7 @@ public class AppEng
 	"after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +

 	// depend on version of forge used for build.
+			"required-after:AppliedEnergistics2-Core;" +
 			"required-after:Forge@[" // require forge.
 			+ net.minecraftforge.common.ForgeVersion.majorVersion + "." // majorVersion
 			+ net.minecraftforge.common.ForgeVersion.minorVersion + "." // minorVersion