Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/configurate

This commit is contained in:
Camotoy 2024-06-24 16:31:43 -04:00
commit 528de86340
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
157 changed files with 3138 additions and 1837 deletions

View file

@ -12,10 +12,10 @@ guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge
gson-runtime = "2.10.1"
websocket = "1.5.1"
protocol = "3.0.0.Beta2-20240606.172607-7"
protocol = "3.0.0.Beta2-20240616.144648-10"
raknet = "1.0.0.CR3-20240416.144209-1"
mcauthlib = "e5b0bcc"
mcprotocollib = "1.20.6-2-20240520.030045-8"
mcprotocollib = "1.21-20240616.154144-5"
adventure = "4.14.0"
adventure-platform = "4.3.0"
junit = "5.9.2"
@ -25,17 +25,17 @@ jline = "3.21.0"
terminalconsoleappender = "1.2.0"
folia = "1.19.4-R0.1-SNAPSHOT"
viaversion = "4.9.2"
adapters = "1.12-SNAPSHOT"
adapters = "1.13-SNAPSHOT"
commodore = "2.2"
bungeecord = "a7c6ede"
velocity = "3.3.0-SNAPSHOT"
viaproxy = "3.2.1"
fabric-minecraft = "1.20.5"
fabric-loader = "0.15.10"
fabric-api = "0.97.6+1.20.5"
fabric-loader = "0.15.11"
fabric-api = "0.100.1+1.21"
fabric-permissions = "0.2-SNAPSHOT"
neoforge-minecraft = "20.5.0-beta"
neoforge-minecraft = "21.0.0-beta"
mixin = "0.8.5"
minecraft = "1.21"
# plugin versions
indra = "3.1.3"
@ -44,7 +44,7 @@ architectury-plugin = "3.4-SNAPSHOT"
architectury-loom = "1.6-SNAPSHOT"
minotaur = "2.8.7"
lombok = "8.4"
blossom = "1.2.0"
blossom = "2.1.0"
[libraries]
base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }
@ -96,8 +96,9 @@ paper-mojangapi = { group = "io.papermc.paper", name = "paper-mojangapi", versio
mixin = { group = "org.spongepowered", name = "mixin", version.ref = "mixin" }
minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
# Check these on https://modmuss50.me/fabric.html
fabric-minecraft = { group = "com.mojang", name = "minecraft", version.ref = "fabric-minecraft" }
fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" }
fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
fabric-permissions = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fabric-permissions" }