[Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
4e4cde48 Fix experience reward flag gets lost during MerchantRecipe conversion
This commit is contained in:
Automated
2019-02-24 04:56:46 -05:00
parent 1b583b25a9
commit e52033073a