Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@042f15f [ci skip] chore: fix incorrect commit hash in PR builds (#11198)
PaperMC/Paper@4e6a2a1 Check for block type in SculkSensorBlock#canActivate
  • Loading branch information
@kev626
kev626 committed Aug 8, 2024
1 parent bdb56f1 commit 469e5c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ org.gradle.jvmargs="-Xmx4G"
group=gg.pufferfish.pufferfish
version=1.21-R0.1-SNAPSHOT
mcVersion=1.21
paperRef=7e44684a1f1fcce27ae881c78da2b793537a6b05
paperRef=4e6a2a13a3e1f6fa1067a7821d2f018339395533
2 changes: 1 addition & 1 deletion scripts/upstream.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ git add gradle.properties

./gradlew applyPatches || exit_on_error "An error occurred when merging patches!"
./gradlew rebuildPatches || exit_on_error "An error occurred when rebuilding patches!"
./gradlew createReobfPaperclipJar || exit_on_error "An error occurred when building!"
./gradlew createMojmapPaperclipJar || exit_on_error "An error occurred when building!"

scripts/upstreamCommit.sh $oldHash $newHash

Expand Down

0 comments on commit 469e5c1

Please sign in to comment.