Upstream has released updates that appear to apply and compile correctly
Paper Changes:
415f7ca165 Updated Upstream (Bukkit/CraftBukkit)
37df95b189 refactor: do not import List; use FQN
5c65546f5c rebase
fdef125b19 Expose EntityType#getTranslationKey
4d9b14efa4 Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381)
8c2adf8e9e Add warning to getOfflinePlayers (#6365)
370b60de14 Optimize indirect passenger iteration (#6366)
80836709e7 Fix block drops position losing precision millions of blocks out (#6387)
e942509e73 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)
ce43ce8265 Make EntityUnleashEvent cancellable (#4993)
591cac3685 Configurable item frame map cursor interval (#6385)
e9aa9ce66b Add config migration for named entity death logging option (#6390)
c2f47a76ae Implement Translatable in appropriate places (#6248)
f12a7f57e1 Clear bucket NBT after dispense (#6391)
4dd33cb8b6 [ci skip] Drop "Fix CME on adding a passenger in CreatureSpawnEvent" (#6384)
565cd3306c [ci skip] Add some helper methods to the ObfHelper util class (#6374)
Tuinity Changes:
6fd7e2b376 Update paper
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:
b79bc31 Fix MerchantOffer BuyB Only AssertionError (#6206)
d6c81c8 Don't apply cramming damage to players (#5903)
12942dc Add rate options and timings for sensors and behaviors (#6027)
fc47872 Use mapped names for sensor and behavior timings/config (#6228)
c75a837 Don't expose ASM in API (#6229)
c225bf9 Fix book title and author being improperly serialized as components (#6190)
f25facb Update email & name (DenWav)
44516b1 [ci skip] Put mappings util in a separate class to the stacktrace deobfuscator
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
12dec20 Bump paerweight to 1.1.7
e33ed89 Get short commit ref using a more proper method
7d6147d Remove now unneeded patch due to paperweight 1.1.7
e72fa41 Update task dependency for includeMappings so the new task isn't skipped
0ad5526 Trim whitspace off of git hash (oops)
Tuinity Changes:
e878ba9 Update paper
2bd2849 Bring back fix codec spam patch
