diff --git a/buildnumber.txt b/buildnumber.txt index d85559233..528155207 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -3 +5 diff --git a/info.txt b/info.txt index 67415b116..50bbf279a 100644 --- a/info.txt +++ b/info.txt @@ -1,3 +1,4 @@ @ AssemblyLine_v0.0.6.1.jar @ AssemblyLine_v0.0.6.2.jar -* AssemblyLine_v0.0.6.3.jar +@ AssemblyLine_v0.0.6.3.jar +* AssemblyLine_v0.0.6.5.jar diff --git a/src/common/assemblyline/AssemblyLine.java b/src/common/assemblyline/AssemblyLine.java index 3c8a1d5fd..957ca7ac2 100644 --- a/src/common/assemblyline/AssemblyLine.java +++ b/src/common/assemblyline/AssemblyLine.java @@ -67,14 +67,14 @@ public class AssemblyLine @Init public void load(FMLInitializationEvent evt) { - GameRegistry.registerTileEntity(TileEntityConveyorBelt.class, "belt"); - GameRegistry.registerTileEntity(TileEntitySorter.class, "ejector"); - GameRegistry.registerTileEntity(TileEntityManipulator.class, "scop"); + GameRegistry.registerTileEntity(TileEntityConveyorBelt.class, "ConveyorBelt"); + GameRegistry.registerTileEntity(TileEntitySorter.class, "Sorter"); + GameRegistry.registerTileEntity(TileEntityManipulator.class, "Manipulator"); proxy.init(); // Names - LanguageRegistry.addName(new ItemStack(blockConveyorBelt, 1), "Coneveyor Belt"); + LanguageRegistry.addName(new ItemStack(blockConveyorBelt, 1), "Conveyor Belt"); LanguageRegistry.addName(new ItemStack(blockInteraction, 1, MachineType.SORTER.metadata), MachineType.SORTER.name); - LanguageRegistry.addName(new ItemStack(blockInteraction, 1, MachineType.MANIPULATOR.metadata), MachineType.SORTER.name); + LanguageRegistry.addName(new ItemStack(blockInteraction, 1, MachineType.MANIPULATOR.metadata), MachineType.MANIPULATOR.name); LanguageRegistry.addName(new ItemStack(blockInteraction, 1, 8), "FutureBlock"); LanguageRegistry.addName(new ItemStack(blockInteraction, 1, 12), "FutureBlock"); } diff --git a/src/common/assemblyline/machines/ItemBlockMulti.java b/src/common/assemblyline/machines/ItemBlockMulti.java index 0af35d561..aa9e6beb1 100644 --- a/src/common/assemblyline/machines/ItemBlockMulti.java +++ b/src/common/assemblyline/machines/ItemBlockMulti.java @@ -12,6 +12,7 @@ public class ItemBlockMulti extends ItemBlock this.setHasSubtypes(true); } + @Override public String getItemNameIS(ItemStack itemstack) { return MachineType.get(itemstack.getItemDamage()).name;