OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-23 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity
GeyserMC/bootstrap
History
Tim203 5b317ec595
Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java
#	bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
2020-09-19 14:40:12 +02:00
..
bungeecord Merge remote-tracking branch 'origin/master' into floodgate-2.0 2020-09-19 14:40:12 +02:00
spigot Merge remote-tracking branch 'origin/master' into floodgate-2.0 2020-09-19 14:40:12 +02:00
sponge Relocate Google Common (#1242) 2020-09-02 23:42:53 -04:00
standalone Scoreboard improvements (#1166) 2020-08-28 10:47:52 -05:00
velocity Relocate Google Common (#1242) 2020-09-02 23:42:53 -04:00
pom.xml Change version number to 1.1.0 2020-08-11 19:10:48 +01:00