feefe6f Merge branch 'master' into dev

Conflicts:

bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/util/ProtocolSupportUtil.java

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java

bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java

bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java

common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java

velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java

velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java