Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Upstream (Pufferfish) #1575

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Conversation

granny
Copy link
Member

@granny granny commented Aug 6, 2024

Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@c9f4e20 Final 1.20.4 Update
pufferfish-gg/Pufferfish@1f3ad02 Final 1.20.4 update, for realzies
pufferfish-gg/Pufferfish@b1ab664 Enable SIMD on java 21
pufferfish-gg/Pufferfish@0674c2b 1.21 compiles
pufferfish-gg/Pufferfish@98ea973 Fix 1.21 version checkers
pufferfish-gg/Pufferfish@68f859c Fix lambda/tick guard patch
pufferfish-gg/Pufferfish@eaa18d5 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@1d72eea Updated Upstream (Paper)
pufferfish-gg/Pufferfish@1d3c743 Update pufferfish version detector stuff
pufferfish-gg/Pufferfish@5e30963 Fix crash bug
pufferfish-gg/Pufferfish@12571eb Use mojmapped paperclip jar instead (CI only)
pufferfish-gg/Pufferfish@4d16ae0 Drop a patch - moonrise includes it
pufferfish-gg/Pufferfish@52c2d05 Revert "Drop a patch - moonrise includes it"
pufferfish-gg/Pufferfish@bdb56f1 Fix entity interactions with fluids
pufferfish-gg/Pufferfish@469e5c1 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d75961f 1.21.1 Update (Updated Upstream (Paper))

granny added 2 commits August 6, 2024 01:22
Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@c9f4e20 Final 1.20.4 Update
pufferfish-gg/Pufferfish@1f3ad02 Final 1.20.4 update, for realzies
pufferfish-gg/Pufferfish@b1ab664 Enable SIMD on java 21
pufferfish-gg/Pufferfish@0674c2b 1.21 compiles
pufferfish-gg/Pufferfish@98ea973 Fix 1.21 version checkers
pufferfish-gg/Pufferfish@68f859c Fix lambda/tick guard patch
pufferfish-gg/Pufferfish@eaa18d5 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@1d72eea Updated Upstream (Paper)
pufferfish-gg/Pufferfish@1d3c743 Update pufferfish version detector stuff
pufferfish-gg/Pufferfish@5e30963 Fix crash bug
pufferfish-gg/Pufferfish@12571eb Use mojmapped paperclip jar instead (CI only)
@scaik
Copy link

scaik commented Aug 7, 2024

i dont think there is a reason to wait as i didnt see any issues related to pufferfish 1.21 update both in discord and github issues page. everything seems to work flawlessly.

@Roan-V
Copy link
Contributor

Roan-V commented Aug 8, 2024

Exactly the reason for a wait :P
To see if any issues pop up in the meantime.

If it still looks fine after a few days then it will be merged :)

@granny granny changed the base branch from ver/1.21 to ver/1.21.1 August 10, 2024 07:10
@granny
Copy link
Member Author

granny commented Aug 10, 2024

Will be merged into Purpur 1.21.1 builds once those get released

@Potothingi Potothingi mentioned this pull request Aug 11, 2024
4 tasks
@Potothingi
Copy link

pufferfish-gg/Pufferfish@bdb56f1
You must include these changes before merging.

@CyberFlameGO
Copy link
Contributor

If that is required it might also possibly be cool to include pufferfish-gg/Pufferfish@52c2d05 judging from code at face value

@granny
Copy link
Member Author

granny commented Aug 11, 2024

Yes, I will upstream to the most recent pufferfish commit before merging. That's a given.

@CyberFlameGO
Copy link
Contributor

Awesome thanks so much!!!

granny added 2 commits August 15, 2024 13:35
Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@4d16ae0 Drop a patch - moonrise includes it
pufferfish-gg/Pufferfish@52c2d05 Revert "Drop a patch - moonrise includes it"
pufferfish-gg/Pufferfish@bdb56f1 Fix entity interactions with fluids
pufferfish-gg/Pufferfish@469e5c1 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d75961f 1.21.1 Update (Updated Upstream (Paper))
@granny granny merged commit 201e928 into ver/1.21.1 Aug 15, 2024
1 check passed
@granny granny deleted the chore/bring-back-pufferfish branch August 15, 2024 21:07
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.

6 participants