From dddb1e459157b68ad48dbc283d22b4d6822b8efc Mon Sep 17 00:00:00 2001 From: Samsuik Date: Fri, 28 Mar 2025 21:03:37 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper-Archive@3cb8529 Add flag to simplify remote item matching logic --- gradle.properties | 2 +- scripts/upstreamCommit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b988e96..4ce4c2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.samsuik.sakura version=1.21.1-R0.1-SNAPSHOT mcVersion=1.21.1 -paperRef=b48403bd69f534ffd43fe2afb4e8e1f1ffa95fe1 +paperRef=3cb8529bdbeeec9ff51df2c94e93dbe7e41bb811 org.gradle.jvmargs=-Xmx2G org.gradle.vfs.watch=false diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index 44cd386..5f9196b 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -10,7 +10,7 @@ set -e PS1="$" -paper=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PaperMC/Paper/compare/$1...$2 | jq -r '.commits[] | "PaperMC/Paper@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"') +paper=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PaperMC/Paper-Archive/compare/$1...$2 | jq -r '.commits[] | "PaperMC/Paper-Archive@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"') updated="" logsuffix=""