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

Merge branch 'dev/2.0.0' into 2/network

Browse Source 
# 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
This commit is contained in:
Andrew Steinborn
2020-12-02 01:24:39 -05:00
parent 2f9bda99fb 50614af637
commit cb4202fe78
15 changed files with 146 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -24,7 +24,7 @@ allprojects {
junitVersion = '5.7.0'
slf4jVersion = '1.7.30'
log4jVersion = '2.13.3'
nettyVersion = '4.1.53.Final'
nettyVersion = '4.1.54.Final'
guavaVersion = '30.0-jre'
checkerFrameworkVersion = '3.6.1'
configurateVersion = '4.0.0-SNAPSHOT'
@@ -55,9 +55,9 @@ allprojects {
url 'https://oss.sonatype.org/content/groups/public/'
}
// Brigadier
// Velocity repo
maven {
url "https://libraries.minecraft.net"
url "https://nexus.velocitypowered.com/repository/maven-public/"
}
}