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

Conflicts: src/main/java/appeng/items/tools/powered/ToolMassCannon.java
2014-09-29 00:26:15 -07:00
parent fd18393a8b 72106c877d
commit 5c5aaa21ee
113 changed files with 410 additions and 238 deletions
@@ -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
 		{