Revert "Merge remote-tracking branch 'GlowstoneMain/master'"

This reverts commit 2123a5c797062b455d8ebfe981aca55d6aff1c46, reversing
changes made to c3de7cfefe3fbab09647b08feea1a303bdb99724.

Conflicts:
	src/main/java/net/glowstone/GlowWorld.java