MC 1.5 progress
Branch merge

Conflicts:
	mod_EmeraldTools.java