Merge branch '1.7.10' into development

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
This commit is contained in:
Ben Spiers committed 2014-07-07 15:43:53 +01:00
1 parent 786d399c2c
commit f0ad905c07
10 files changed
+43 -36

No files matched your search

@@ -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
}
}