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
This commit is contained in:
AlgorithmX2
2014-05-15 21:43:11 -05:00
parent d10e7ee6df 6f96ae6074
commit 8838fc4ba6
16 changed files with 75 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/Registration.java
-8
View File
@@ -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 );