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

Conflicts:
	core/localization/GuiText.java

util/item/AEItemStack.java

@@ -53,7 +53,10 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 
 		def = new AEItemDef();
 		def.item = is.getItem();
-
+		
+		if ( def.item == null )
+			throw new RuntimeException( "This ItemStack is bad, it has a null item." );
+		
 		/*
 		 * Prevent an Item from changing the damage value on me... Either, this or a core mod.
 		 */

util/item/OreHelper.java

@@ -98,7 +98,8 @@ public class OreHelper
 
 				// SUMMON AE STACKS!
 				for (ItemStack is : set)
-					aeset.add( AEItemStack.create( is ) );
+					if ( is.getItem() != null )
+						aeset.add( AEItemStack.create( is ) );
 			}
 		}