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

2014-08-12 19:21:42 -05:00
parent 6b9441f32a 130f381eb3
commit a3091741ff
22 changed files with 79 additions and 172 deletions
@@ -631,8 +631,11 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
 										{
 											postChange( input[x], machineSrc );
 											ic.setInventorySlotContents( x, is );
-											found = true;
-											continue;
+											if ( is.stackSize == input[x].getStackSize() )
+											{
+												found = true;
+												continue;
+											}
 										}
 									}

@@ -165,7 +165,7 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
 		for (ItemSlot is : adaptor)
 		{
 			CachedItemStack old = memory.get( is.slot );
-			ItemStack newIS = is == null ? null : is.getItemStack();
+			ItemStack newIS = is == null || is.isExtractable == false ? null : is.getItemStack();
 			ItemStack oldIS = old == null ? null : old.itemStack;

 			if ( isDiffrent( newIS, oldIS ) )