Merge branch 'master' into dev/1.1.0

# Conflicts: # build.gradle
2019-06-30 23:52:22 -04:00
parent 81840abc86 226074a0df
commit 275685f45f
3 changed files with 9 additions and 3 deletions
--- a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
+++ b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
@@ -30,7 +30,7 @@ public enum ProtocolVersion {
  MINECRAFT_1_14(477, "1.14"),
  MINECRAFT_1_14_1(480, "1.14.1"),
  MINECRAFT_1_14_2(485, "1.14.2"),
-  MINECRAFT_1_14_3(489, "1.14.3-pre4");
+  MINECRAFT_1_14_3(490, "1.14.3");

  private final int protocol;
  private final String name;