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

2014-04-06 14:12:52 -05:00
parent efa931a7a1 72219780ef
commit ee42c53f89
37 changed files with 578 additions and 285 deletions
@@ -136,7 +136,7 @@ public class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgr

 			if ( enabled )
 			{
-				int newMaterialNum = AEConfig.instance.get( "materials", name, AEConfig.instance.getFreeMaterial() ).getInt();
+				int newMaterialNum = AEConfig.instance.get( "materials", name, AEConfig.instance.getFreeMaterial( mat.ordinal() ) ).getInt();
 				mat.damageValue = newMaterialNum;
 				ItemStackSrc output = new ItemStackSrc( this, newMaterialNum );