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
@@ -70,7 +70,7 @@ public class NEICraftingHandler implements IOverlayHandler
 								if ( ctSlot.getSlotIndex() == col + row * 3 )
 								{
 									NBTTagList tags = new NBTTagList();
-									List<ItemStack> list = new LinkedList();
+									List<ItemStack> list = new LinkedList<ItemStack>();

 									// prefer pure crystals.
 									for (int x = 0; x < positionedStack.items.length; x++)