Merge branch '1.12' into feature/solar-panles
Conflicts: build.gradle src/main/java/techreborn/blocks/generator/BlockSolarPanel.java src/main/java/techreborn/blocks/lighting/BlockLamp.java
This commit is contained in:
commit
eab088c094
77 changed files with 948 additions and 967 deletions
|
@ -39,10 +39,12 @@ public class ItemBlockCable extends ItemBlock {
|
|||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int damage) {
|
||||
return damage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack stack) {
|
||||
return super.getUnlocalizedName() + "." + EnumCableType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue