MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Merge branch 'dev/1.1.0' into future/1.16-velocity-1.1.0

Browse Source 
# Conflicts:
#	proxy/build.gradle
This commit is contained in:
Andrew Steinborn
2020-06-21 13:40:19 -04:00
parent d1a5d8dd82 ab9115178b
commit 91743aaa9d
37 changed files with 462 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/build.gradle
View File

@@ -48,7 +48,7 @@ dependencies {
compile "io.netty:netty-handler:${nettyVersion}"
compile "io.netty:netty-transport-native-epoll:${nettyVersion}"
compile "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64"
compile "io.netty:netty-transport-native-kqueue:${nettyVersion}:osx-x86_64"
compile "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-aarch64"
compile "io.netty:netty-resolver-dns:${nettyVersion}"
compile "org.apache.logging.log4j:log4j-api:${log4jVersion}"