Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-06-11 00:44:00 -05:00
parent 70fe6b4bae 4f4dbc4307
commit 734663f521
19 changed files with 605 additions and 274 deletions
@@ -13,6 +13,8 @@ import appeng.api.storage.data.IItemList;
 import appeng.util.InventoryAdaptor;
 import appeng.util.item.AEItemStack;

+import com.google.common.collect.ImmutableList;
+
 public class IMEAdaptor extends InventoryAdaptor
 {

@@ -44,7 +46,7 @@ public class IMEAdaptor extends InventoryAdaptor

 		IAEItemStack out = null;

-		for (IAEItemStack req : getList().findFuzzy( reqFilter, fuzzyMode ))
+		for (IAEItemStack req : ImmutableList.copyOf( getList().findFuzzy( reqFilter, fuzzyMode ) ))
 		{
 			if ( req != null )
 			{