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

Fixes #2415: Renaming remaining items/blocks.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-03 23:06:57 +02:00
parent ac0f32b21f
commit 9b51d54403
53 changed files with 696 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/materials/ItemMultiItem.java → src/main/java/appeng/items/materials/ItemMaterial.java
+4 -4
View File
@@ -67,15 +67,15 @@ import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
public final class ItemMultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule
public final class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule
{
public static ItemMultiItem instance;
public static ItemMaterial instance;
private static final int KILO_SCALAR = 1024;
private final Map<Integer, MaterialType> dmgToMaterial = new HashMap<>();
public ItemMultiItem()
public ItemMaterial()
{
this.setHasSubtypes( true );
instance = this;
@@ -253,7 +253,7 @@ public final class ItemMultiItem extends AEBaseItem implements IStorageComponent
@Override
public String getUnlocalizedName( final ItemStack is )
{
return "item.appliedenergistics2.multi_material." + this.nameOf( is );
return "item.appliedenergistics2.material." + this.nameOf( is );
}
@Override