Konicai 84248fa902 Merge remote-tracking branch 'upstream/master' into feature/protocol-3.0 ... # Conflicts: # core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EndermanEntity.java # core/src/main/java/org/geysermc/geyser/inventory/holder/BlockInventoryHolder.java # core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java # core/src/main/java/org/geysermc/geyser/network/GameProtocol.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/ItemRegistryPopulator.java # core/src/main/java/org/geysermc/geyser/session/GeyserSession.java # core/src/main/java/org/geysermc/geyser/text/ChatTypeEntry.java # core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaDisguisedChatTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaPlayerChatTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java # core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java # core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java # gradle/libs.versions.toml		2022-12-14 15:58:17 -05:00
..
src/main	Merge remote-tracking branch 'upstream/master' into feature/protocol-3.0	2022-12-14 15:58:17 -05:00
build.gradle.kts	Initial fabric merger	2022-10-03 21:11:07 +01:00