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

2014-09-17 11:25:30 -05:00
parent 4e90cd73f6 2913d71acd
commit 306ee9e036
26 changed files with 606 additions and 838 deletions
@@ -39,7 +39,7 @@ public class ColoredItemDefinition implements AEColoredItemDefinition
 	{
 		ItemStackSrc is = colors[color.ordinal()];

-		if ( comparableItem == null )
+		if ( comparableItem == null || is == null )
 			return false;

 		return comparableItem.getItem() == is.item && comparableItem.getItemDamage() == is.damage;