Andrew Steinborn cb4202fe78 Merge branch 'dev/2.0.0' into 2/network ... # Conflicts: # proxy/src/main/java/com/velocitypowered/proxy/network/serialization/brigadier/ArgumentPropertyRegistry.java # proxy/src/main/java/com/velocitypowered/proxy/network/serialization/brigadier/ModArgumentProperty.java # proxy/src/main/java/com/velocitypowered/proxy/network/serialization/brigadier/ModArgumentPropertySerializer.java		2020-12-02 01:24:39 -05:00
..
src	packets!	2020-11-06 19:40:30 -08:00
build.gradle	Merge branch 'dev/2.0.0' into 2/network	2020-12-02 01:24:39 -05:00