Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
73fc9666 Fix per-world settings not reloading (#4756)
94c99a8d Fix NPE thrown when converting MerchantRecipe from Bukkit to NMS (#4755)
072faf2a Fix minor issue with JavaDoc breaking doc deploys
This commit is contained in:
BillyGalbreath
2020-11-11 23:27:30 -06:00
parent b85092b2bf
commit 5796ff9f94
80 changed files with 287 additions and 314 deletions

File diff suppressed because it is too large Load Diff