Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@20c131b [ci skip] Add forums to readme (#7286)
PaperMC/Paper@55a1756 Fix saving configs with more long comments (#7248)
Pufferfish Changes:
pufferfish-gg/Pufferfish@bb3bdb9 Adjust mob spawn count calculation as paper slightly changed how this works
Upstream has released updates that appear to apply and compile correctly
Pufferfish Changes:
pufferfish-gg/Pufferfish@e535b1b Change goal selector from a disable to a throttle to improve vanilla parity