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

Recommit update changes that were seemingly lost in a rebase-pull.

Browse source
This commit is contained in:
Ben Spiers 2014-06-27 19:42:26 +01:00
parent d9b6a48d33
commit 589d5f420f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,5 +1,5 @@
minecraft_version=1.7.2
forge_version=10.12.2.1147
minecraft_version=1.7.10
forge_version=10.13.0.1152
FMP_version=1.1.0.288
CCLIB_version=1.1.1.88
NEI_version=1.0.1

2
src/main/java/mekanism/client/render/RenderTickHandler.java
View file

@ -81,7 +81,7 @@ public class RenderTickHandler
{
ItemStack stack = player.getEquipmentInSlot(3);
ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int x = scaledresolution.getScaledWidth();
int y = scaledresolution.getScaledHeight();

2
src/main/java/mekanism/common/voice/VoiceConnection.java
View file

@ -198,6 +198,6 @@ public class VoiceConnection extends Thread
public EntityPlayerMP getPlayer()
{
return server.getConfigurationManager().getPlayerForUsername(username);
return server.getConfigurationManager().func_152612_a(username); //TODO getPlayerForUsername
}
}