Update Paper to MC 1.12-pre5

2017-05-20 23:41:39 -05:00
parent 7ff16c0197
commit c1d0b4b4c6
56 changed files with 356 additions and 380 deletions
--- a/scripts/upstreamMerge.sh
+++ b/scripts/upstreamMerge.sh
@@ -17,7 +17,7 @@ update Bukkit
 update CraftBukkit
 update Spigot

-if [[ "$2" = "all" ]] ; then
+if [[ "$2" = "all" || "$2" = "a" ]] ; then
 	update BuildData
 	update Paperclip
 fi