Skip to content

Commit 2b54302

Browse files
committed
Merge branch 'version/7.3.x'
2 parents 4726327 + 3b407aa commit 2b54302

File tree

16 files changed

+61
-29
lines changed

16 files changed

+61
-29
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Gradle Build
2-
on: [push, pull_request]
2+
on: [push, pull_request, merge_group]
33

44
jobs:
55
build:

CHANGELOG.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
7.3.11
2+
- Added //mirror as an alias for //flip
3+
- Fixed an issue where tree generation can get incorrect world state, impacting generation
4+
- Fixed masks for biome operations only applying to //setbiome
5+
- Fixed some bugs in the snapshot system
6+
- Fixed CUI packets being sent to clients unnecessarily
7+
- Fixed cone generation with negative heights
8+
- Fixed world height off-by-one discrepancy since change in Minecraft 1.21.3
9+
- Fixed cases where the task executor would not be shut down correctly
10+
- [NeoForge] Fixed legacy blocks failing to load in some instances
11+
112
7.3.10
213
- Added support for 1.21.4
314
- Improved a few translation lines relating to URLs and newlines

gradle/libs.versions.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
4848
# https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
4949
fabric-mixin = "net.fabricmc:sponge-mixin:0.15.3+mixin.0.8.7"
5050

51-
paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.5"
51+
paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.16"
5252

5353
linBus-bom = "org.enginehub.lin-bus:lin-bus-bom:0.2.0"
5454
linBus-common.module = "org.enginehub.lin-bus:lin-bus-common"
@@ -75,7 +75,8 @@ mockito-junit-jupiter.module = "org.mockito:mockito-junit-jupiter"
7575

7676
commonsCli = "commons-cli:commons-cli:1.4"
7777

78-
paperApi = "io.papermc.paper:paper-api:1.21.4-R0.1-20250118.134032-116"
78+
# https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/paper-api/
79+
paperApi = "io.papermc.paper:paper-api:1.21.4-R0.1-20250327.133756-218"
7980
paperLib = "io.papermc:paperlib:1.0.8"
8081

8182
dummypermscompat = "com.sk89q:dummypermscompat:1.10"

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pluginManagement {
99
}
1010
plugins {
1111
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
12-
id("fabric-loom") version "1.8.10"
12+
id("fabric-loom") version "1.10.1"
1313
}
1414
dependencyResolutionManagement {
1515
repositories {

worldedit-bukkit/adapters/adapter-1.21.3/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ plugins {
66

77
dependencies {
88
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
9-
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.3-R0.1-20241025.163321-1")
9+
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.3-R0.1-20250328.155925-87")
1010
}

worldedit-bukkit/adapters/adapter-1.21.4/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ plugins {
66

77
dependencies {
88
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
9-
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.4-R0.1-20241205.222346-7")
9+
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.4-R0.1-20250327.133756-218")
1010
}

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public boolean isBurnable() {
102102
return material.isBurnable();
103103
}
104104

105-
@SuppressWarnings("deprecation")
105+
@SuppressWarnings("removal")
106106
@Override
107107
public boolean isTranslucent() {
108108
return super.isTranslucent() || material.isTransparent();

0 commit comments

Comments
 (0)