AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-01-02 20:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

update paper and paperweight

Browse Source
This commit is contained in:
Jason Penilla 2024-12-21 01:06:32 -08:00
parent 02b90eff99
commit cf2774c33d
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
9 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,7 +7,7 @@ build
/run /run
/fork-server/build.gradle.kts /fork-server/build.gradle.kts
/fork-server/src/vanilla /fork-server/src/minecraft
/paper-server /paper-server
/fork-api/build.gradle.kts /fork-api/build.gradle.kts
/paper-api /paper-api

2
build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
paperweight { paperweight {
upstreams.paper { upstreams.paper {
ref = "6e0c8776e67219ddc8e4e61364c8203d924fd23f" ref = "1dc6ad1df07e018ee68d95464022285f27fff916"
patchFile { patchFile {
path = "paper-server/build.gradle.kts" path = "paper-server/build.gradle.kts"

4
fork-api/build.gradle.kts.patch
View File

@ -19,7 +19,7 @@
} }
} }
} }
@@ -169,7 +_,7 @@ @@ -174,7 +_,7 @@
tasks.withType<Javadoc> { tasks.withType<Javadoc> {
val options = options as StandardJavadocDocletOptions val options = options as StandardJavadocDocletOptions
@ -28,7 +28,7 @@
options.use() options.use()
options.isDocFilesSubDirs = true options.isDocFilesSubDirs = true
options.links( options.links(
@@ -207,11 +_,11 @@ @@ -212,11 +_,11 @@
} }
// workaround for https://github.com/gradle/gradle/issues/4046 // workaround for https://github.com/gradle/gradle/issues/4046

0
fork-server/vanilla-patches/features/0001-feature-patch.patch → fork-server/minecraft-patches/features/0001-feature-patch.patch
View File

0
fork-server/vanilla-patches/sources/com/google/common/annotations/Beta.java.patch → fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch
View File

0
fork-server/vanilla-patches/sources/net/minecraft/BlockUtil.java.patch → fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch
View File

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
gradlew vendored
View File

@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

2
paperweight

@ -1 +1 @@
Subproject commit 1dc821a295e27845c9b666361993c666e741d600 Subproject commit e8ebbf2449eb294705d370d9485b26091c21f91b