1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-27 10:49:13 +00:00
Files
Floodgate/core
Tim203 b759f0b493 Merge remote-tracking branch 'origin/master' into feature/micronaut-inject
# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt
#	bungee/build.gradle.kts
#	core/build.gradle.kts
#	core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java
#	database/mysql/build.gradle.kts
#	spigot/src/main/java/org/geysermc/floodgate/spigot/pluginmessage/SpigotSkinApplier.java
#	spigot/src/main/resources/plugin.yml
2023-05-03 11:26:05 +02:00
..