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

Fix some pesky bugs and crashes

Browse source
This commit is contained in:
Aidan Brady 2013-12-03 16:56:03 -05:00
parent 54fa437cb1
commit afe85f9215
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/client/gui/GuiElectricChest.java
View file

@ -96,7 +96,7 @@ public class GuiElectricChest extends GuiContainer
int xAxis = (mouseX - (width - xSize) / 2); int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2); int yAxis = (mouseY - (height - ySize) / 2);
fontRenderer.drawString(tileEntity.getInvName(), 8, 6, 0x404040); fontRenderer.drawString(MekanismUtils.localize("tile.MachineBlock.ElectricChest.name"), 8, 6, 0x404040);
fontRenderer.drawString(getLocked() ? EnumColor.DARK_RED + "Locked" : EnumColor.BRIGHT_GREEN + "Unlocked", 97, 137, 0x404040); fontRenderer.drawString(getLocked() ? EnumColor.DARK_RED + "Locked" : EnumColor.BRIGHT_GREEN + "Unlocked", 97, 137, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);

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

@ -682,6 +682,9 @@ public class Mekanism
OreDictionary.registerOre("oreOsmium", new ItemStack(OreBlock, 1, 0)); OreDictionary.registerOre("oreOsmium", new ItemStack(OreBlock, 1, 0));
OreDictionary.registerOre("oreCopper", new ItemStack(OreBlock, 1, 1)); OreDictionary.registerOre("oreCopper", new ItemStack(OreBlock, 1, 1));
OreDictionary.registerOre("oreTin", new ItemStack(OreBlock, 1, 2)); OreDictionary.registerOre("oreTin", new ItemStack(OreBlock, 1, 2));
//MC stuff
OreDictionary.registerOre("oreCoal", new ItemStack(Block.oreCoal));
} }
/** /**

2
resources/assets/mekanism/lang/en_US.lang
View file

@ -396,5 +396,5 @@ text.tesla.success=Linked tesla successfully
//Gui text //Gui text
gui.heatGenerator.fuel=Fuel gui.heatGenerator.fuel=Fuel
gui.solarGenerator.sun=Sun gui.solarGenerator.sun=Sun
gui.bioGenerator.biofuel=BioFuel gui.bioGenerator.bioFuel=BioFuel
gui.electrolyticSeparator.dump=Dump gui.electrolyticSeparator.dump=Dump