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
@@ -170,7 +170,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
 	}

 	boolean breaking = false;
-	LinkedList<IAEItemStack> Buffer = new LinkedList();
+	LinkedList<IAEItemStack> Buffer = new LinkedList<IAEItemStack>();
 	BaseActionSource mySrc = new MachineSource( this );

 	@Override