From af90b11ad5cefbf3f513348de62bd76a8f81c2b4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 11 Jun 2022 16:47:36 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9ad94dc Adjust config headers --- gradle.properties | 2 +- scripts/upstreamCommit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 12cebd48f..c232553fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = dfc10448bbddf418fed8d39748cc647009a18136 +paperCommit = 9ad94dcbc4a43a542e685bcfed7418c00fdbcc29 org.gradle.caching = true org.gradle.parallel = true diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index db708ed7c..aa68a6396 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -7,7 +7,7 @@ # flag: --pufferfish HASH - the commit hash to use for comparing commits between pufferfish (pufferfish-gg/Pufferfish/compare/HASH...HEAD) function getCommits() { - curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"...dev/1.19 | jq -r '.commits[] | "'"$1"'@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"' + curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"...HEAD | jq -r '.commits[] | "'"$1"'@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"' } (