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

2014-06-04 00:07:57 -05:00
parent 98f0e59b67 f894d48328
commit faad4a6ba2
6 changed files with 55 additions and 33 deletions
@@ -17,6 +17,8 @@ import cpw.mods.fml.relauncher.SideOnly;

 public enum MaterialType
 {
+	InvalidType(-1, AEFeature.Core),
+
 	CertusQuartzCrystal(0, AEFeature.Core, "crystalCertusQuartz"), CertusQuartzCrystalCharged(1, AEFeature.Core, EntityChargedQuartz.class),

 	CertusQuartzDust(2, AEFeature.Core, "dustCertusQuartz"), NetherQuartzDust(3, AEFeature.Core, "dustNetherQuartz"), Flour(4, AEFeature.Flour, "dustWheat"), GoldDust(