Andrew Steinborn a037ab4956 Merge branch 'dev/3.0.0' into dev/5.0.0 ...

# Conflicts:
#	buildSrc/src/main/kotlin/com/velocitypowered/script/SetManifestImplVersionPlugin.kt
#	proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java
#	proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
#	proxy/src/main/java/com/velocitypowered/proxy/network/ConnectionManager.java
#	proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java

2023-10-27 16:40:54 -04:00

2.6 KiB

Raw Blame History

View Raw