fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	items/materials/MaterialType.java
	util/Platform.java
This commit is contained in:
AlgorithmX2
2014-05-06 20:45:38 -05:00
parent 5dbba26930 5bf8e9d7d0
commit 3351af3d4e
43 changed files with 2108 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/features/AEFeature.java
+4 -2
View File
@@ -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
+10
View File
@@ -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
+1 -1
View File
@@ -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;