diff --git a/api b/api index 618463827..5a993490c 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 6184638276293ab83ca63cd4f404590c58931adb +Subproject commit 5a993490cc3fea88b70722a2f088b52f4e5a2e7f diff --git a/core/Registration.java b/core/Registration.java index 1c79a5023..4ed925cc5 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -91,6 +91,7 @@ import appeng.items.parts.PartType; import appeng.items.storage.ItemBasicStorageCell; import appeng.items.storage.ItemCreativeStorageCell; import appeng.items.storage.ItemSpatialStorageCell; +import appeng.items.tools.ToolBiometricCard; import appeng.items.tools.ToolMemoryCard; import appeng.items.tools.ToolNetworkTool; import appeng.items.tools.powered.ToolChargedStaff; @@ -298,6 +299,7 @@ public class Registration items.itemWirelessTerminal = addFeature( ToolWirelessTerminal.class ); items.itemNetworkTool = addFeature( ToolNetworkTool.class ); items.itemPortableCell = addFeature( ToolPortableCell.class ); + items.itemBiometricCard = addFeature( ToolBiometricCard.class ); items.itemFacade = addFeature( ItemFacade.class ); @@ -402,7 +404,8 @@ public class Registration AEApi.instance().partHelper().registerNewLayer( "appeng.api.parts.layers.LayerIPowerEmitter", "buildcraft.api.power.IPowerEmitter" ); AEApi.instance().partHelper().registerNewLayer( "appeng.api.parts.layers.LayerIPowerReceptor", "buildcraft.api.power.IPowerReceptor" ); AEApi.instance().partHelper().registerNewLayer( "appeng.api.parts.layers.LayerIFluidHandler", "net.minecraftforge.fluids.IFluidHandler" ); - AEApi.instance().partHelper().registerNewLayer( "appeng.api.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" ); + AEApi.instance().partHelper() + .registerNewLayer( "appeng.api.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" ); TickRegistry.registerTickHandler( TickHandler.instance, Side.SERVER ); TickRegistry.registerTickHandler( TickHandler.instance, Side.CLIENT ); diff --git a/core/localization/GuiText.java b/core/localization/GuiText.java index 58525e98b..60bac1b3a 100644 --- a/core/localization/GuiText.java +++ b/core/localization/GuiText.java @@ -19,7 +19,7 @@ public enum GuiText NetworkTool, PowerUsageRate, PowerInputRate, Installed, EnergyDrain, - StorageBus, Priority, Security; + StorageBus, Priority, Security, Encoded; String root;