GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fixed remaining merge issues

Browse source
This commit is contained in:
Tim203 2024-02-25 22:25:44 +01:00
parent a4681ca77c
commit 9748763097
No known key found for this signature in database
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/main/java/org/geysermc/geyser/floodgate/IntegratedFloodgateProvider.java
View file

@ -58,6 +58,7 @@ public class IntegratedFloodgateProvider implements FloodgateProvider {
@Override
public String onClientIntention(GeyserSession session) {
// we don't have to do anything here, it's done in LocalServerChannelWrapper
return null;
}
}

2
gradle/libs.versions.toml
View file

@ -39,7 +39,7 @@ mixin = "0.8.5"
# plugin versions
indra = "3.1.3"
shadow = "7.1.3-SNAPSHOT"
shadow = "8.1.1"
architectury-plugin = "3.4-SNAPSHOT"
architectury-loom = "1.4-SNAPSHOT"
minotaur = "2.8.7"

1
settings.gradle.kts
View file

@ -74,6 +74,7 @@ project(":viaproxy").projectDir = file("bootstrap/viaproxy")
include(":standalone")
project(":standalone").projectDir = file("bootstrap/standalone")
include(":mod")
project(":mod").projectDir = file("bootstrap/mod")
//todo see what's possible with fabric
include(":fabric")