Upstream has released updates that appear to apply and compile correctly
Paper Changes:
d985976 Add config for mobs immune to default effects (#4835)
Tuinity Changes:
ea43797 Fix portalling from the overworld above y 255
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
6fd9275 Fix Bossbar updating (closes#6061) (#6076)
Tuinity Changes:
a4009b4 Apply paper's reobf mappings patch
a7dcd62 Make getHardCollidingEntities only return hard colliding entities