aboutsummaryrefslogtreecommitdiffhomepage
path: root/work
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2020-05-28 12:22:45 +0100
committerShane Freeder <[email protected]>2020-05-28 12:22:50 +0100
commitc3c005c947e8595dcf9a8fa765ffad41c22099c7 (patch)
treeb6e142805c5ae874ad41a45a1a416672d0a230aa /work
parentb0b54e4ef351f86f0fd856b664328a023908e234 (diff)
downloadPaper-c3c005c947e8595dcf9a8fa765ffad41c22099c7.tar.gz
Paper-c3c005c947e8595dcf9a8fa765ffad41c22099c7.zip
Updated Upstream (Bukkit/CraftBukkit) (Fixes #3443)
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 Bukkit Changes: d6db2839 #497: Add Material#getCraftingRemainingItem() to get item left behind after crafting 1c2eaf96 SPIGOT-5748: Add instant effect potion break to the Effect enum CraftBukkit Changes: aae46f82 #665: Add test for Material#getCraftingRemainingItem() cfeef75c SPIGOT-5749: ItemMeta serializing to YAML not saving black colour code eb1b19d9 SPIGOT-5748: Add instant effect potion break to the Effect enum
Diffstat (limited to 'work')
m---------work/Bukkit0
m---------work/CraftBukkit10
2 files changed, 5 insertions, 5 deletions
diff --git a/work/Bukkit b/work/Bukkit
-Subproject ffc8e4caa484af8f3e4ec2647e546ec0f2b6e95
+Subproject d6db283966d16725450e506b1d43be39a217342
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject d07a78b1f3aa79945600e5e07d5a457909480b4
+Subproject aae46f82eab8ae0bd855d94209083df2144818e