tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a crash and wire names

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-02 17:11:39 -05:00
parent 57caab2062
commit 57ffc071cf
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/mekanism/common/Mekanism.java
View file

@ -1193,12 +1193,14 @@ public class Mekanism
if(overrideUERatios)
{
Compatibility.BC3_RATIO = (float)FROM_BC;
Compatibility.TO_BC_RATIO = (float)TO_BC;
Compatibility.IC2_RATIO = (float)FROM_IC2;
Compatibility.TO_IC2_RATIO = (float)TO_IC2;
Compatibility.TE_RATIO = (float)FROM_TE;
Compatibility.TO_TE_RATIO = (float)TO_TE;
try {
Compatibility.BC3_RATIO = (float)FROM_BC;
Compatibility.TO_BC_RATIO = (float)TO_BC;
Compatibility.IC2_RATIO = (float)FROM_IC2;
Compatibility.TO_IC2_RATIO = (float)TO_IC2;
Compatibility.TE_RATIO = (float)FROM_TE;
Compatibility.TO_TE_RATIO = (float)TO_TE;
} catch(Exception e) {}
}
System.out.println("[Mekanism] Hooking complete.");

2
common/mekanism/induction/common/wire/ItemPartWire.java
View file

@ -48,7 +48,7 @@ public class ItemPartWire extends JItemMultiPart
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
return "tile.Wire." + EnumWireMaterial.values()[itemStack.getItemDamage()].getName();
return "tile.Wire." + EnumWireMaterial.values()[itemStack.getItemDamage()].getName() + "Wire";
}
@Override