Merge remote-tracking branch 'origin/master' into abstraction

# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
This commit is contained in:
KennyTV 2020-01-21 16:07:42 +01:00
commit 704f946cf7
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# ViaVersion 2.2.2 - Spigot, Sponge, BungeeCord, Velocity
# ViaVersion 2.2.3 - Spigot, Sponge, BungeeCord, Velocity
[![Build Status](https://travis-ci.com/ViaVersion/ViaVersion.svg?branch=master)](https://travis-ci.com/ViaVersion/ViaVersion)
[![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)

View File

@ -81,7 +81,7 @@ public class ProtocolVersion {
register(v1_14_4 = new ProtocolVersion(498, "1.14.4"));
register(v1_15 = new ProtocolVersion(573, "1.15"));
register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
register(v1_15_2 = new ProtocolVersion(577, "1.15.2"));
register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}