Merge branch 'master' into '1_5_0'
Zackary Pedersen authored
# Conflicts:
#   RivenWorldServer/src/main/java/com/gamefocal/rivenworld/DedicatedServer.java
#   RivenWorldServer/src/main/java/com/gamefocal/rivenworld/game/world/WorldChunk.java
#   RivenWorldServer/src/main/java/com/gamefocal/rivenworld/service/CommandService.java
#   RivenWorldServer/src/main/java/com/gamefocal/rivenworld/service/ResourceService.java
ddda9858