3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-24 23:30:22 +01:00
Geyser/bootstrap
Tim203 c16c66b860
Merge remote-tracking branch 'origin/master' into floodgate-2.0
# Conflicts:
#	connector/pom.xml
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
#	connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
2021-02-25 02:28:48 +01:00
..
bungeecord Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-02-01 12:02:49 +01:00
spigot Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-02-25 02:28:48 +01:00
sponge [ci skip] Fixed if spacing (#1941) 2021-02-16 20:09:18 -05:00
standalone Fix up some SpotBugs suggestions (#1911) 2021-02-16 16:25:46 -05:00
velocity Send message to Java if command is Bedrock-only (#1834) 2021-01-16 22:18:13 -05:00
pom.xml Update Sponge repository (#1890) 2021-02-04 00:51:11 +00:00