13
0
geforkt von Mirrors/Paper
Commit graph

9 Commits

Autor SHA1 Nachricht Datum
Aikar
3c57e007e9 Improve upstream merge script to rebuild patches
this will help ensure that upstreams apply as cleanly as it does manually

the filtering makes the patches more fragile, but usually not an issue for small updates.

this will unfilter, apply the cleanest patches, then the next rebuild will
filter out unnecessary changes
2019-04-02 23:20:10 -04:00
Aikar
1ba5ee72ff Clean upstream before merging to ensure clean state 2019-04-02 21:46:32 -04:00
Kyle Wood
fdc7459143 Handle gpg signing better (#1123)
Instead of checking whether it was set previously, setting it to false,
then setting it back to true if it was true before, just use the
command-line argument in git to override the config for that command.
Using a variable makes it pretty painless to do.
2018-05-24 13:41:50 -05:00
Zach Brown
b39f2133a1 Update Paper to MC 1.12-pre5 2017-05-20 23:41:39 -05:00
Zach Brown
2bf8ae3251 Add upstreamMerge script to paper tool 2016-08-19 16:00:59 -05:00
DemonWav
56705f6445 Workaround for OSX not having the realpath command. 2016-04-03 03:35:51 -05:00
DemonWav
ed05173181 Use set -e to handle errors better in the build scripts 2016-04-03 02:23:19 -05:00
DemonWav
aeea23a135 Rebuild patches after we continue from a paper edit. 2016-04-02 18:34:27 -05:00
DemonWav
09812092f9 Cleanup and restructure the project 2016-04-01 22:55:54 -05:00