Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-02-17 14:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cb4202fe78ee7fab5d33aa80041ef7756a6b9f05
Velocity/api
History
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