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

core/Registration.java

@@ -127,8 +127,6 @@ import appeng.me.cache.SecurityCache;
 import appeng.me.cache.SpatialPylonCache;
 import appeng.me.cache.TickManagerCache;
 import appeng.me.storage.AEExternalHandler;
-import appeng.migration.OldItemMaterial;
-import appeng.migration.OldItemPart;
 import appeng.parts.PartPlacement;
 import appeng.recipes.AEItemResolver;
 import appeng.recipes.RecipeHandler;
@@ -365,12 +363,6 @@ public class Registration
 		items.itemFacade = addFeature( ItemFacade.class );
 		items.itemCrystalSeed = addFeature( ItemCrystalSeed.class );
 
-		if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaMigration ) )
-		{
-			GameRegistry.registerItem( new OldItemMaterial(), "item.ItemMaterial" );
-			GameRegistry.registerItem( new OldItemPart(), "item.ItemPart" );
-		}
-
 		addFeature( ToolEraser.class );
 		addFeature( ToolMeteoritePlacer.class );
 		addFeature( ToolDebugCard.class );

core/WorldSettings.java

@@ -238,6 +238,14 @@ public class WorldSettings extends Configuration
 		return null;
 	}
 
+	public int getNextOrderedValue(String name)
+	{
+		Property p = this.get( "orderedValues", name, 0 );
+		int myValue = p.getInt();
+		p.set( myValue + 1 );
+		return myValue;
+	}
+
 	public int getPlayerID(String username)
 	{
 		ConfigCategory playerList = this.getCategory( "players" );