Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more

patches/api/0020-Add-API-for-Villager-resetOffers.patch

@@ -1,30 +0,0 @@
-From 013e7bc6e20e097f054a3b76f9d6a3aa49d2f256 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 7 Oct 2019 00:15:28 -0500
-Subject: [PATCH] Add API for Villager#resetOffers()
-
----
- src/main/java/org/bukkit/entity/Villager.java | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index e0a3285b..32b8c4f2 100644
---- a/src/main/java/org/bukkit/entity/Villager.java
-+++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {
-      */
-     public void wakeup();
- 
-+    // Purpur start
-+    /**
-+     * Reset this villager's trade offers
-+     */
-+    public void resetOffers();
-+    // Purpur end
-+
-     /**
-      * Represents Villager type, usually corresponding to what biome they spawn
-      * in.
--- 
-2.24.0
-