OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-03-30 03:09:20 +02:00
Code Issues Projects Releases Packages Wiki Activity
GeyserMC/bootstrap/standalone
History
onebeastchris 42f135f85b Merge remote-tracking branch 'upstream/master' into feature/configurate 
# Conflicts:
#	bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java
#	bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/CreativeItemRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/resources/mappings
2025-02-27 19:31:05 +01:00
..
src/main Merge remote-tracking branch 'upstream/master' into feature/configurate 2025-02-27 19:31:05 +01:00
build.gradle.kts Merge remote-tracking branch 'upstream/master' into feature/configurate 2025-02-27 19:31:05 +01:00