Updating to 1.6
Fixing GitHub crap
Merge branch 'master' of https://github.com/ReikaKalseki/GeoStrata

Conflicts:
	Base/CrystalBlock.java