Added client translation to achievements
cCompositeChat message type is now formatted
Simplified cacti conditions
Fixed a cactus Y position issue
Update Player.cpp
Update CompositeChat.h
Merge branch 'master' into achievementtranslate

Conflicts:
	src/Entities/Player.cpp
Merge pull request #1013 from mc-server/achievementtranslate

Proper achievement informing