1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-27 18:59:05 +00:00
Files
Floodgate/core
Tim203 e28194ed54 Merge remote-tracking branch 'origin/development' into feature/geyser-merge
# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt
#	bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
#	bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java
#	core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
#	core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java
#	core/src/main/java/org/geysermc/floodgate/api/legacy/PropertyGlue.java
#	core/src/main/java/org/geysermc/floodgate/module/CommonModule.java
#	core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
#	core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java
#	core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java
#	core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java
#	core/src/main/java/org/geysermc/floodgate/util/Utils.java
#	spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java
#	velocity/src/main/java/org/geysermc/floodgate/util/VelocitySkinApplier.java
2022-12-30 15:29:19 +01:00
..