Skip to content

Updated Upstream (BungeeCord)#805

Merged
electronicboy merged 2 commits into
PaperMC:masterfrom
AnttiMK:ver/1.20
Jun 7, 2023
Merged

Updated Upstream (BungeeCord)#805
electronicboy merged 2 commits into
PaperMC:masterfrom
AnttiMK:ver/1.20

Conversation

@AnttiMK
Copy link
Copy Markdown
Contributor

@AnttiMK AnttiMK commented Jun 7, 2023

Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
68200133 Minecraft 1.20 support

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
68200133 Minecraft 1.20 support
Copy link
Copy Markdown
Member

@NoahvdAa NoahvdAa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ninja'd me by a few minutes :P

Compiles and passes a start smoke test, lgtm

@gre3x
Copy link
Copy Markdown

gre3x commented Jun 7, 2023

Merge conflicts @AnttiMK

@electronicboy electronicboy merged commit 3102433 into PaperMC:master Jun 7, 2023
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.

7 participants