Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/xyz/spaceio/hooks/HookSuperiorSkyblock.java