Updated Upstream (Bukkit/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

Bukkit Changes:
eaf05a2a Expand Recipe API to allow multiple Materials per slot

CraftBukkit Changes:
4c219e2a Expand Recipe API to allow multiple Materials per slot
This commit is contained in:
Aikar
2018-08-31 23:53:49 -04:00
parent e82ef9ec05
commit c77b303abe
4 changed files with 5 additions and 5 deletions

2
paper
View File

@@ -82,7 +82,7 @@ case "$1" in
scripts/upstreamMerge.sh "$basedir" "$2"
)
;;
"cu" | "commitup" | "commitupstream" | "upcommit" | "upstreamcommit")
"cu" | "commitup" | "commitupstream" | "upc" | "upcommit" | "upstreamcommit")
(
cd "$basedir"
shift