Andrew Steinborn 5bd7b66bda Merge branch 'dev/1.1.0' into dev/2.0.0 ... # Conflicts: # build.gradle # native/src/main/java/com/velocitypowered/natives/compression/Java11VelocityCompressor.java		2020-11-17 04:49:32 -05:00
..
src	Merge branch 'dev/1.1.0' into dev/2.0.0	2020-11-17 04:49:32 -05:00
build.gradle	Try and explicitly specify Java 8 in the modules.	2020-11-06 18:52:00 -05:00