Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a7cddc4 Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965)
b1f6e26 Fix mobs not burning from summon command (#5961)
4e2f0be Refactor Anti-Xray and make some fixes to it (#5938)
d50cc01 Make gradle take build number from env vars and add git build info (#5890)

patches/server/0001-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f427c6f5adf20f9e1b1fa4ab56041506d8240c92..ec3f43392fc844cd3e327cdf73f6cd3396ae2238 100644
+index 39beb0331282b297f4f3857560d24ce6a616210d..be56806edc040b941514e0010ca7082b70f2c8a8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,8 +30,8 @@ repositories {
@@ -15,7 +15,7 @@ index f427c6f5adf20f9e1b1fa4ab56041506d8240c92..ec3f43392fc844cd3e327cdf73f6cd33
 -    implementation(project(":Paper-API"))
 -    implementation(project(":Paper-MojangAPI"))
 +    implementation(project(":Purpur-API")) // Purpur
-+    implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // Purpur
++    implementation("com.destroystokyo.paper:paper-mojangapi:1.17-R0.1-SNAPSHOT") // Purpur
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -27,20 +27,16 @@ index f427c6f5adf20f9e1b1fa4ab56041506d8240c92..ec3f43392fc844cd3e327cdf73f6cd33
  
      implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
  
-@@ -77,10 +78,11 @@ tasks.jar {
-     manifest {
-         val git = Git(rootProject.layout.projectDirectory.path)
-         val gitHash = git("rev-parse", "HEAD").getText().substring(0, 7)
-+        val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" // Purpur
+@@ -82,7 +83,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Paper-\"$gitHash\"",
+-            "Implementation-Version" to "git-Paper-$implementationVersion",
 +            "Implementation-Version" to "git-Purpur-$implementationVersion", // Purpur
              "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -174,7 +176,7 @@ tasks.test {
+@@ -178,7 +179,7 @@ tasks.test {
  fun TaskContainer.registerRunTask(
      name: String, block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {