1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-03-21 06:28:53 +01:00
GeyserMC/bootstrap/mod
Tim203 79a2b22541
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
# Conflicts:
#	bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
#	gradle.properties
#	gradle/libs.versions.toml
2025-02-24 14:09:17 +01:00
..
fabric Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2025-02-24 14:09:17 +01:00
neoforge Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2025-02-24 14:09:17 +01:00
src/main Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2025-02-24 14:09:17 +01:00
build.gradle.kts Gradle: avoid cross-configuration and enable configuration-on-demand () 2024-09-03 00:54:50 -04:00