Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c712f2c0 [1.16] Improve performance of matching ingredients for shapeless recipes (#4694)
ecb4ccd6 Updated Upstream (Bukkit/CraftBukkit) (#4688)
3fc340d8 [Auto] Updated Upstream (CraftBukkit)
f8eaa585 Add support for RanagedEntity API for newer mobs (Fixes #4678)

patches/server/0002-Brand-changes.patch

@@ -44,7 +44,7 @@ index d8d29d14559169f5e8d8b4cf63d8b427b823eb2f..36d05c50db133bca8894ff95b8306fa1
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 26c0ced8c2f1e22092c5d4405b9c6be8ac04cf24..5ec9dd031b1d30e14980b0fa1accb57d35270095 100644
+index e8f52003f33a1c92b14f43276ac7525a4479e70e..e4603d9f74b1b3e9aa1e576c48c2a7e516757d71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -252,7 +252,7 @@ public class Main {

patches/server/0005-Tuinity-Server-Config.patch

@@ -312,7 +312,7 @@ index 36d05c50db133bca8894ff95b8306fa157cab736..182bded1e0201586053463ba0327bb97
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5ec9dd031b1d30e14980b0fa1accb57d35270095..0f4503940abbcf353d07276f3f25e56047dce344 100644
+index e4603d9f74b1b3e9aa1e576c48c2a7e516757d71..27cfaf6acfb0706ac19b4b17865d127ace9964d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -138,6 +138,13 @@ public class Main {