lang, server work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/mooklabs/laputamod/items/VoluciteNecklace.java