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
@@ -249,11 +249,11 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 	{
 		if ( proxy.isActive() && channel == StorageChannel.ITEMS )
 		{
-			List<IMEInventoryHandler> Handler = new ArrayList( 1 );
+			List<IMEInventoryHandler> Handler = new ArrayList<IMEInventoryHandler>( 1 );
 			Handler.add( myHandler );
 			return Handler;
 		}
-		return new ArrayList();
+		return new ArrayList<IMEInventoryHandler>();
 	}

 	@Override