Merge remote-tracking branch 'origin/master'

Conflicts:
	src/voxelion/game/client/ClientApp.java
	src/voxelion/modder/Entity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/voxelion/game/client/ClientApp.java
	src/voxelion/game/client/world/LoadedChunksControl.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 09f9265b278ee3f619c2b0c628468ef333c0e874.