Message improvements
Merge branch 'master' of https://github.com/Project-X-MC/Settlements-2.0