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
@@ -47,7 +47,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 	public PacketMEInventoryUpdate(final ByteBuf stream) throws IOException {
 		data = null;
 		compressFrame = null;
-		list = new LinkedList();
+		list = new LinkedList<IAEItemStack>();
 		ref = stream.readByte();

 		// int originalBytes = stream.readableBytes();