Achievements no longer reset between worlds and localizations can be added in the language files. If you start the game in one language, you'll have to restart in another for them to switch, but as this no longer wipes achievements, it shouldn't be a problem :)
Merge branch 'master' of https://github.com/Deadrik/TFCraft
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/Core/TFC_Achievements.java
	src/main/java/TFC/ClientProxy.java
	src/main/java/TFC/CommonProxy.java
	src/main/java/TFC/Handlers/EntityLivingHandler.java
	src/main/java/TFC/TerraFirmaCraft.java