mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove now unnecessary scripts and update upstreamMerge.sh

Browse source
This commit is contained in:
Kyle Wood 2021-06-15 01:42:57 -05:00
parent 34269f8a39
commit c8ecb664c6
No known key found for this signature in database
GPG key ID: 86AF5613ACA30CC5
14 changed files with 2 additions and 891 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/upstreamMerge.sh
View file

@ -30,11 +30,11 @@ update Spigot
if [[ "$2" = "all" || "$2" = "a" ]] ; then
update BuildData
update Paperclip
fi
if [ "$updated" == "1" ]; then
echo "Rebuilding patches without filtering to improve apply ability"
cd "$basedir"
scripts/rebuildPatches.sh "$basedir" nofilter 1>/dev/null|| exit 1
./gradlew applyPatches -Dpaperweight.debug=true || exit 1
./gradlew rebuildPatches || exit 1
fi
)