Upstream has released updates that appear to apply and compile correctly
Paper Changes:
020f18aaa6 fix: promote slf4j-api to api scope (#6343)
c815948b6d Fix ITEM_DROPPED stat not working properly (#6331)
9a125eecb8 Fix Incorrectly Typed Goals (#6200)
23e3a0ccb6 Add PlayerSetSpawnEvent (#5690)
00028d57cf call EntityDamageByBlockEvent for campfires (#6244)
9b4a46f704 [ci skip] add vs code files to .gitignore (#5663)
a178fb895e Make hoppers respect inventory max stack size (#4838)
4a2f53c6e8 Add missing DamageCause for EntityDamageByBlockEvent (#6352)
f261419fd5 clone itemstack to return remaining stack (#6353)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
0fc6213f9c Allow skipping writing of comments to server.properties (#6251)
aec9781f52 Fix incorrect colors in ConsoleCommandSender messages with TranslatableComponents (#6287)
9a74e70cc0 fix: boats' bounding boxes must be deflated, not inflated (#6314)
6226208d64 Fix SysoutCatcher when plugins log before initialisation (Fixes#6323)
d239eca9dd Fix writing server.properties with wrong encoding (#6322)
f521a18a17 Updated Upstream (Bukkit/CraftBukkit)
