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/helpers/PatternHelper.java
+4 -4
View File
@@ -79,8 +79,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
ACCEPT, DECLINE, TEST
}
HashSet<TestLookup> failCache = new HashSet();
HashSet<TestLookup> passCache = new HashSet();
HashSet<TestLookup> failCache = new HashSet<TestLookup>();
HashSet<TestLookup> passCache = new HashSet<TestLookup>();
private void markItemAs(int slotIndex, ItemStack i, TestStatus b)
{
@@ -122,8 +122,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
patternItem = is;
pattern = AEItemStack.create( is );
List<IAEItemStack> in = new ArrayList();
List<IAEItemStack> out = new ArrayList();
List<IAEItemStack> in = new ArrayList<IAEItemStack>();
List<IAEItemStack> out = new ArrayList<IAEItemStack>();
for (int x = 0; x < inTag.tagCount(); x++)
{