Update Paper to MC 1.12-pre5

2017-05-20 23:41:39 -05:00
parent 8fb32efc40
commit b39f2133a1
46 changed files with 223 additions and 243 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