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

..

fabric

Merge remote-tracking branch 'upstream/master' into feature/configurate

2025-02-27 19:31:05 +01:00

neoforge

Add this file too

2024-11-18 20:50:51 -05:00

src/main

Merge remote-tracking branch 'upstream/master' into feature/configurate

2025-02-27 19:31:05 +01:00

build.gradle.kts

Gradle: avoid cross-configuration and enable configuration-on-demand (#5012)

2024-09-03 00:54:50 -04:00