[6886272] Add mending multiplier (#1322)

[f4296d6] Adds option for display name in afk message (#1332)

[ead09e2] Implement NSA-Mandated Spyware

[561164b] Updated Upstream (Pufferfish)

[6d7bb23] Updated Upstream (Paper)

[d6cfa8f] Updated Upstream (Paper)

[68117a4] add portal-wait-time options for player

[3b02c04] Updated Upstream (Paper)

[b842229] reorder spark loader logic to fix a few issues (#1326)

[6319570] sorry, but this really annoys me :3 (#1327)

[74ed018] re-add GUI patch

[2ae3be3] use component directly for player list name

[3325421] Updated Upstream (Paper)

[84da848] Updated Upstream (Paper)

[54656e9] Updated Upstream (Paper)

[21411de] add cherry_log, cherry_wood, bamboo_block to strippables config

[3ef9911] save https://github.com/PaperMC/Paper/pull/9149 from paper pr queue hell

[a54b535] Updated Upstream (Paper)

[c407d78] Updated Upstream (Paper)

[68322ba] Updated Upstream (Paper)

[a495371] [ci-skip] in upstreamCommit script, use new commit if available, otherwise use HEAD

[678eafe] Updated Upstream (Paper)

[74cdbe8] fix lobotomizer patch

[e909778] Updated Upstream (Paper)

[fa5b45f] update permissions in MinecraftCommandPermissionsTest

[96dbac3] [ci-skip] stop needing to specify --paper in upstreamCommit

[f08fba4] [ci-skip] the purpur logo found it's way home

[7ecf2a9] drop vanilla command permission fix since hasPermission(i, bukkitPermission) works as expected now

[27b4c60] add "bukkit.command.xxx.other" permission to all our commands

[9429820] Add environment variable to bypass idle kick permission

[f69b21d] Updated Upstream (Paper)

[f952106] Updated Upstream (Paper & Pufferfish)

[1407eef] Updated Upstream (Paper)

[adc7804] Add environment variable to ignore kick-if-idle value

[4155131] Updated Upstream (Paper)

[285f9f6] Updated Upstream (Paper)

[bd5c4b6] Updated Upstream (Paper)

[7f4822d] [ci-skip] let's try using cache in github actions again

[7cb1f46] Updated Upstream (Paper)

[1924a57] Updated Upstream (Paper)

[f5a789d] Updated Upstream (Paper)

[78a9421] [ci-skip] missed a method call in this patch

[49d9946] [ci-skip] doesn't hurt to update these

[7e014a8] Updated Upstream (Paper)

[4aba25d] [ci-skip] remove TODO.md

[fce57a5] flip default value for boats doing fall damage

[d56f66d] Updated Upstream (Paper)

[893ce2a] add back pufferfish config relocatable patch

[a007769] include pufferfish patches

[2c7bbc0] [ci-skip] correct author on water sensitive patch

[9cda2e7] re-add "abstract horse" attribute logic

[ac3a469] make sniffer health attributes configurable

[7c44967] [ci-skip] remove armor equipable TODO item

[f7801bd] add "use-dismounts-underwater-tag" to fix ridables in water

[7984728] fix player ridable underwater option

[c49163c] [ci-skip] Update build script

[be8f6be] [ci-skip] use class logger without the fqn for SparkProviderSource

[20115a4] Add option to disable scissor damage in liquid (#1295)

[3446481] [ci-skip] clean up TODOs in patches

[427a599] Updated Upstream (Paper)

[abe0fb1] [ci-skip] update todo file

[eb14797] Fix the Optional type server status version being compared to null (#1294)

[ea899ca] make sniffer ridable

[ab3bcc9] Improve JS exec return value handling (#1290)

[09b5d54] Revert "flip some config defaults for vanilla parity"

[5200826] flip some config defaults for vanilla parity

[4715a7e] [ci-skip] add more stuff to todo list

[808b1cb] flip some config defaults for vanilla parity

[95ad375] fix endermen projectile issues