Merge remote-tracking branch 'upstream/rv2' into rv2

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java

src/main/java/appeng/crafting/CraftingJob.java

@@ -52,7 +52,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 	{
 		world = wrapWorld( w );
 		storage = AEApi.instance().storage().createItemList();
-		prophecies = new HashSet();
+		prophecies = new HashSet<IAEItemStack>();
 		original = null;
 		availableCheck = null;
 	}
@@ -72,7 +72,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 		world = wrapWorld( w );
 		output = what.copy();
 		storage = AEApi.instance().storage().createItemList();
-		prophecies = new HashSet();
+		prophecies = new HashSet<IAEItemStack>();
 		this.actionSrc = actionSrc;
 
 		this.callback = callback;
@@ -131,7 +131,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 		public long times = 0;
 	}
 
-	HashMap<String, twoIntegers> opsAndMultiplier = new HashMap();
+	HashMap<String, twoIntegers> opsAndMultiplier = new HashMap<String, twoIntegers>();
 
 	@Override
 	public void run()

src/main/java/appeng/crafting/CraftingTreeNode.java

@@ -30,7 +30,7 @@ public class CraftingTreeNode
 	private IAEItemStack what;
 
 	// what are the crafting patterns for this?
-	private ArrayList<CraftingTreeProcess> nodes = new ArrayList();
+	private ArrayList<CraftingTreeProcess> nodes = new ArrayList<CraftingTreeProcess>();
 
 	boolean canEmit = false;
 	boolean cannotUse = false;
@@ -95,7 +95,7 @@ public class CraftingTreeNode
 	{
 		job.handlePausing();
 
-		List<IAEItemStack> thingsUsed = new LinkedList();
+		List<IAEItemStack> thingsUsed = new LinkedList<IAEItemStack>();
 
 		what.setStackSize( l );
 		if ( slot >= 0 && parent != null && parent.details.isCraftable() )

src/main/java/appeng/crafting/CraftingTreeProcess.java

@@ -36,7 +36,7 @@ public class CraftingTreeProcess
 	private long bytes = 0;
 	final private int depth;
 
-	Map<CraftingTreeNode, Long> nodes = new HashMap();
+	Map<CraftingTreeNode, Long> nodes = new HashMap<CraftingTreeNode, Long>();
 	public boolean possible = true;
 
 	public CraftingTreeProcess(ICraftingGrid cc, CraftingJob job, ICraftingPatternDetails details, CraftingTreeNode craftingTreeNode, int depth, World world) {

src/main/java/appeng/crafting/CraftingWatcher.java

@@ -49,17 +49,17 @@ public class CraftingWatcher implements ICraftingWatcher
 	}
 
 	CraftingGridCache gsc;
-	ICraftingWatcherHost myObject;
-	HashSet<IAEStack> myInterests = new HashSet();
+	ICraftingWatcherHost host;
+	HashSet<IAEStack> myInterests = new HashSet<IAEStack>();
 
 	public CraftingWatcher(CraftingGridCache cache, ICraftingWatcherHost host) {
 		gsc = cache;
-		myObject = host;
+		this.host = host;
 	}
 
 	public ICraftingWatcherHost getHost()
 	{
-		return myObject;
+		return host;
 	}
 
 	@Override