Skip to content

Conversation

@Konicai
Copy link
Member

@Konicai Konicai commented Aug 16, 2022

This is the result of merging 1.19.1 into master and then resolving merge conflicts. IntelliJ's commit dialogue was an absolute mess, not using it resulted in a much simpler diff.

I accepted the src/test/resources/login_registry.nbt from feat/1.19.1

@Camotoy Camotoy merged commit 42f6be3 into GeyserMC:master Aug 16, 2022
@Konicai Konicai deleted the fix-1.19.1 branch May 12, 2023 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants