Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy.
Merge pull request #1936 from adudney/5.0.x

5.0.x Forge deprecation fixes
Merge branch '5.0.x' into 6.0.x

Conflicts:
	common/buildcraft/BuildCraftEnergy.java
Merge branch '6.0.x' into 6.1.x