fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
This commit is contained in:
Andrew
2014-09-29 00:26:15 -07:00
parent fd18393a8b 72106c877d
commit 5c5aaa21ee
113 changed files with 410 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/crafting/CraftingJob.java
+3 -3
View File
@@ -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()