Merge remote-tracking branch 'upstream/rv2' into rv2

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java

src/main/java/appeng/recipes/GroupIngredient.java

@@ -65,7 +65,7 @@ public class GroupIngredient implements IIngredient
 		if ( isInside )
 			return new ItemStack[0];
 
-		List<ItemStack> out = new LinkedList();
+		List<ItemStack> out = new LinkedList<ItemStack>();
 		isInside = true;
 		try
 		{

src/main/java/appeng/recipes/IngredientSet.java

@@ -52,7 +52,7 @@ public class IngredientSet implements IIngredient
 		if ( isInside )
 			return new ItemStack[0];
 
-		List<ItemStack> out = new LinkedList();
+		List<ItemStack> out = new LinkedList<ItemStack>();
 		out.addAll( items );
 
 		if ( out.size() == 0 )

src/main/java/appeng/recipes/RecipeData.java

@@ -20,6 +20,6 @@ public class RecipeData
 	public boolean exceptions = true;
 	public boolean erroronmissing = true;
 	
-	public Set<String> knownItem = new HashSet();
+	public Set<String> knownItem = new HashSet<String>();
 
 }

src/main/java/appeng/recipes/handlers/Inscribe.java

@@ -39,9 +39,9 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer
 
 	public boolean usePlates = false;
 
-	public static HashSet<ItemStack> plates = new HashSet();
-	public static HashSet<ItemStack> inputs = new HashSet();
-	public static LinkedList<InscriberRecipe> recipes = new LinkedList();
+	public static HashSet<ItemStack> plates = new HashSet<ItemStack>();
+	public static HashSet<ItemStack> inputs = new HashSet<ItemStack>();
+	public static LinkedList<InscriberRecipe> recipes = new LinkedList<InscriberRecipe>();
 
 	IIngredient imprintable;