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
@@ -84,7 +84,7 @@ public class ToolDebugCard extends AEBaseItem
 					{
 						int length = 0;
 						
-						HashSet<IGridNode> next = new HashSet();
+						HashSet<IGridNode> next = new HashSet<IGridNode>();
 						next.add( node );
 						
 						int maxLength = 10000;
@@ -92,7 +92,7 @@ public class ToolDebugCard extends AEBaseItem
 						outer: while ( ! next.isEmpty() )
 						{
 							HashSet<IGridNode> current = next;
-							next = new HashSet();
+							next = new HashSet<IGridNode>();
 							
 							for ( IGridNode n : current )
 							{