Commit Graph

2 Commits

Author SHA1 Message Date
BillyGalbreath
519ac08d10 Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2f0e0a6d Backport feature search improvement from 1.17 (Fixes #2312) (#4771)
b6d9d634 Add API for quit reason
2020-11-14 19:06:39 -06:00
BillyGalbreath
5796ff9f94 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
2020-11-11 23:27:30 -06:00