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
@@ -43,6 +43,8 @@ import appeng.parts.reporting.PartTerminal;

 public enum PartType
 {
+	InvalidType(-1, AEFeature.Core, null),
+
 	CableGlass(0, AEFeature.Core, PartCableGlass.class),

 	CableCovered(20, AEFeature.Core, PartCableCovered.class),