Merge remote-tracking branch 'upstream/dev/3.0.0' into update
# Conflicts: # proxy/src/main/java/com/velocitypowered/proxy/network/TransportType.java
This commit is contained in:
@@ -3,7 +3,7 @@ configurate3 = "3.7.3"
|
||||
configurate4 = "4.1.2"
|
||||
flare = "2.0.1"
|
||||
log4j = "2.24.1"
|
||||
netty = "4.1.119.Final"
|
||||
netty = "4.2.0.Final"
|
||||
|
||||
[plugins]
|
||||
indra-publishing = "net.kyori.indra.publishing:2.0.6"
|
||||
@@ -55,6 +55,7 @@ netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" }
|
||||
netty-transport-native-epoll = { module = "io.netty:netty-transport-native-epoll", version.ref = "netty" }
|
||||
netty-transport-native-iouring = { module = "io.netty.incubator:netty-incubator-transport-native-io_uring", version = "0.0.25.Final" }
|
||||
netty-transport-native-kqueue = { module = "io.netty:netty-transport-native-kqueue", version.ref = "netty" }
|
||||
netty-transport-native-iouring = { module = "io.netty:netty-transport-native-io_uring", version.ref = "netty" }
|
||||
nightconfig = "com.electronwill.night-config:toml:3.6.7"
|
||||
slf4j = "org.slf4j:slf4j-api:2.0.12"
|
||||
snakeyaml = "org.yaml:snakeyaml:1.33"
|
||||
|
||||
Reference in New Issue
Block a user