Andrew Steinborn 02f0ed7ff0 Merge branch 'dev/3.0.0' into dev/5.0.0 ... # Conflicts: # api/build.gradle.kts # gradle.properties # proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java		2023-05-14 02:52:09 -04:00
..
src	Merge branch 'dev/3.0.0' into dev/5.0.0	2023-05-14 02:52:09 -04:00
build.gradle.kts	Upgradle to v8.1 and remove now-redundant warnings (#1001)	2023-04-19 17:43:25 -04:00