Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5059ada Move log message for named entity deaths into correct location (#6105)
b5be382 Add methods to ProtoWorld for working with BlockStates (#5929)
144e5f7 Add option for logging named entity deaths (#6107)
4aef035 [ci skip] Use Java toolchain for run tasks (#6108)
dafc064 Fix MobEffectArgument#getEffect reobf
648f607 Route sign run_command click events through normal chat logic (#6109)
351a2c3 Drop no longer needed patch (#6115)
bb44da8 Fix cancelling EntityPickupItemEvent for villagers (#6091)

patches/server/0002-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..f88ade92a25cb5eda7abc658551a42318af66ce9 100644
+index bc85e4da98322426f3f4a784fafe1c96eaea00f5..0d971614da332d4715f5a7b3ae822bf28393944d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -36,8 +36,8 @@ repositories {
@@ -25,9 +25,9 @@ index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..f88ade92a25cb5eda7abc658551a4231
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
 +    implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
  
-     implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
+     implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
  
-@@ -88,7 +89,7 @@ tasks.jar {
+@@ -86,7 +87,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",