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

Conflicts:
	items/materials/MaterialType.java
	util/Platform.java

core/AELog.java

@@ -40,7 +40,10 @@ public class AELog
 
 	public static void grinder(String o)
 	{
-		log( Level.DEBUG, "grinder: " + o );
+		if ( AEConfig.instance.isFeatureEnabled( AEFeature.GrinderLogging ) )
+		{
+			log( Level.DEBUG, "grinder: " + o );
+		}
 	}
 
 	public static void error(Throwable e)

core/Registration.java

@@ -92,12 +92,12 @@ import appeng.hooks.AETrading;
 import appeng.hooks.MeteoriteWorldGen;
 import appeng.hooks.QuartzWorldGen;
 import appeng.hooks.TickHandler;
-import appeng.items.materials.ItemMaterial;
+import appeng.items.materials.ItemMultiMaterial;
 import appeng.items.materials.MaterialType;
 import appeng.items.misc.ItemCrystalSeed;
 import appeng.items.misc.ItemEncodedPattern;
 import appeng.items.parts.ItemFacade;
-import appeng.items.parts.ItemPart;
+import appeng.items.parts.ItemMultiPart;
 import appeng.items.parts.PartType;
 import appeng.items.storage.ItemBasicStorageCell;
 import appeng.items.storage.ItemCreativeStorageCell;
@@ -126,6 +126,8 @@ 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;
@@ -205,7 +207,7 @@ public class Registration
 		Parts parts = appeng.core.Api.instance.parts();
 		Blocks blocks = appeng.core.Api.instance.blocks();
 
-		AEItemDefinition materialItem = (AEFeatureHandler) addFeature( ItemMaterial.class );
+		AEItemDefinition materialItem = (AEFeatureHandler) addFeature( ItemMultiMaterial.class );
 
 		Class materialClass = materials.getClass();
 		for (MaterialType mat : MaterialType.values())
@@ -213,7 +215,7 @@ public class Registration
 			try
 			{
 				Field f = materialClass.getField( "material" + mat.name() );
-				ItemStackSrc is = ((ItemMaterial) materialItem.item()).createMaterial( mat );
+				ItemStackSrc is = ((ItemMultiMaterial) materialItem.item()).createMaterial( mat );
 				if ( is != null )
 					f.set( materials, new DamagedItemDefinition( is ) );
 				else
@@ -226,7 +228,7 @@ public class Registration
 			}
 		}
 
-		AEItemDefinition partItem = (AEFeatureHandler) addFeature( ItemPart.class );
+		AEItemDefinition partItem = (AEFeatureHandler) addFeature( ItemMultiPart.class );
 
 		Class partClass = parts.getClass();
 		for (PartType type : PartType.values())
@@ -237,7 +239,7 @@ public class Registration
 				Enum varients[] = type.getVarients();
 				if ( varients == null )
 				{
-					ItemStackSrc is = ((ItemPart) partItem.item()).createPart( type, null );
+					ItemStackSrc is = ((ItemMultiPart) partItem.item()).createPart( type, null );
 					if ( is != null )
 						f.set( parts, new DamagedItemDefinition( is ) );
 					else
@@ -251,7 +253,7 @@ public class Registration
 
 						for (Enum v : varients)
 						{
-							ItemStackSrc is = ((ItemPart) partItem.item()).createPart( type, v );
+							ItemStackSrc is = ((ItemMultiPart) partItem.item()).createPart( type, v );
 							if ( is != null )
 								def.add( (AEColor) v, is );
 						}
@@ -358,6 +360,12 @@ 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/features/AEFeature.java

@@ -48,9 +48,11 @@ public enum AEFeature
 
 	DuplicateItems("Misc", false), Profiler("Services", false), VersionChecker("Services"), Debug("Misc", false), Creative("Misc"),
 
-	Logging("Misc"), IntegrationLogging("Misc", false), CustomRecipes("Crafting", false), WebsiteRecipes("Misc", false),
+	GrinderLogging("Misc",false), Logging("Misc"), IntegrationLogging("Misc", false), CustomRecipes("Crafting", false), WebsiteRecipes("Misc", false),
 
-	enableFacadeCrafting("Crafting"), inWorldSingularity("Crafting"), inWorldFluix("Crafting"), inWorldPurification("Crafting"), UpdateLogging("Misc", false);
+	enableFacadeCrafting("Crafting"), inWorldSingularity("Crafting"), inWorldFluix("Crafting"), inWorldPurification("Crafting"), UpdateLogging("Misc", false),
+
+	AlphaPass("Rendering"), AlphaMigration("Migration", true);
 
 	String Category;
 	boolean visible = true;

core/features/AEFeatureHandler.java

@@ -49,6 +49,11 @@ public class AEFeatureHandler implements AEItemDefinition
 	{
 		String name = o.getSimpleName();
 
+		if ( name.startsWith( "ItemMultiPart" ) )
+			name = name.replace( "ItemMultiPart", "ItemPart" );
+		else if ( name.startsWith( "ItemMultiMaterial" ) )
+			name = name.replace( "ItemMultiMaterial", "ItemMaterial" );
+
 		if ( subname != null )
 		{
 			// simple hack to allow me to do get nice names for these without
@@ -80,6 +85,11 @@ public class AEFeatureHandler implements AEItemDefinition
 		else
 			i.setCreativeTab( CreativeTab.instance );
 
+		if ( name.equals( "ItemMaterial" ) )
+			name = "ItemMultiMaterial";
+		else if ( name.equals( "ItemPart" ) )
+			name = "ItemMultiPart";
+
 		GameRegistry.registerItem( i, "item." + name );
 	}
 

core/features/registries/GrinderRecipeManager.java

@@ -111,7 +111,7 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 				}
 			}
 
-			log( "Count not find recipe for " + Platform.getItemDisplayName( input ) );
+			log( "Could not find recipe for " + Platform.getItemDisplayName( input ) );
 		}
 
 		return null;