aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts/upstreamMerge.sh
AgeCommit message (Expand)Author
2021-04-09[CI-SKIP] Ignore gitignore when adding files in automationProfessor Bloodstone
2020-04-02Updated Upstream (Bukkit/CraftBukkit)Aikar
2019-04-02Improve upstream merge script to rebuild patchesAikar
2019-04-02Clean upstream before merging to ensure clean stateAikar
2018-05-24Handle gpg signing better (#1123)Kyle Wood
2017-05-20Update Paper to MC 1.12-pre5Zach Brown
2016-08-19Add upstreamMerge script to paper toolZach Brown
2016-04-03Workaround for OSX not having the realpath command.DemonWav
2016-04-03Use `set -e` to handle errors better in the build scriptsDemonWav
2016-04-03Rebuild patches after we continue from a paper edit.DemonWav
2016-04-01Cleanup and restructure the projectDemonWav