Merge branch 'version/7.3.x'

Author: me4502

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,7 +21,7 @@ body:
   attributes:
     label: Platform Version
     description: |
-      The version of the platform you are on, i.e. Spigot, Paper, Fabric, or Forge.
+      The version of the platform you are on, i.e. Spigot, Paper, Fabric, or NeoForge.
       Please ensure you are running up-to-date software before making a bug report.
       Old versions or hybrids will receive little to no support.
     placeholder: e.g. git-Spigot-21fe707-e1ebe52, git-Paper-463, Fabric 0.7.1, Forge 35.1.37

CHANGELOG.txt

@@ -2,6 +2,10 @@
 - Added support for 1.21.4
 - Improved a few translation lines relating to URLs and newlines
 - Fixed issues relating to block entities in generated features and structures
+- Added support for pale oak tree variants in the tree commands
+- [Paper] Fixed loading extra jars from the WorldEdit folder with Paper's remapping
+- [NeoForge] Fixed NeoForge's platform name listing "Forge" instead of "NeoForge"
+- [Fabric] Worked around an error caused by other mods bundling old versions of the Fabric Permissions API that are incompatible with MC 1.21.4
 
 7.3.9
 - Added support for 1.21.3

README.md

@@ -8,7 +8,7 @@
 * Use it in creative, survival in single player or on your server.
 * Use it on your Minecraft server to fix griefing and mistakes.
 
-Java Edition required. WorldEdit is compatible with Forge, Fabric, Bukkit, Spigot, Paper, and Sponge.
+Java Edition required. WorldEdit is compatible with NeoForge, Fabric, Bukkit, Spigot, Paper, and Sponge.
 
 ## Download WorldEdit
 

build-logic/src/main/kotlin/buildlogic.platform.gradle.kts

@@ -53,7 +53,7 @@ afterEvaluate {
         if (includeClasspath) {
             attributes["Class-Path"] = listOf("truezip", "truevfs", "js")
                 .map { "$it.jar" }
-                .flatMap { listOf(it, "WorldEdit/$it") }
+                .flatMap { listOf(it, "WorldEdit/$it", "../$it", "../WorldEdit/$it") }
                 .joinToString(separator = " ")
         }
         attributes.putAll(extraAttributes)

gradle/libs.versions.toml

@@ -15,10 +15,10 @@ fabric-api = "0.110.5+1.21.4"
 neogradle = "7.0.171"
 neoforge-minecraft = "1.21.4"
 
-sponge-minecraft = "1.21.3"
+sponge-minecraft = "1.21.4"
 # https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/spongeapi/
-sponge-api = "13.0.0-20241025.155029-3"
-sponge-api-major = "13"
+sponge-api = "14.0.0-20241229.134205-2"
+sponge-api-major = "14"
 
 # https://parchmentmc.org/docs/getting-started; note that we use older MC versions some times which is OK
 parchment-minecraft = "1.21"
@@ -32,8 +32,8 @@ minimumAsm = "9.7"
 minimumJdependency = "2.10"
 minimumTinyRemapper = "0.8.11"
 
-lang-worldeditBase = "7.3.9"
-lang-version = "1642"
+lang-worldeditBase = "7.3.10"
+lang-version = "1707"
 
 [libraries]
 neogradle-neoform = { module = "net.neoforged.gradle:neoform", version.ref = "neogradle" }
@@ -75,8 +75,7 @@ mockito-junit-jupiter.module = "org.mockito:mockito-junit-jupiter"
 
 commonsCli = "commons-cli:commons-cli:1.4"
 
-spigot = "org.spigotmc:spigot-api:1.20.2-R0.1-20231205.164257-71"
-paperApi = "io.papermc.paper:paper-api:1.20.2-R0.1-20231203.034718-122"
+paperApi = "io.papermc.paper:paper-api:1.21.4-R0.1-20250118.134032-116"
 paperLib = "io.papermc:paperlib:1.0.8"
 
 dummypermscompat = "com.sk89q:dummypermscompat:1.10"

settings.gradle.kts

@@ -71,7 +71,7 @@ includeBuild("build-logic")
 
 include("worldedit-libs")
 
-listOf("1.20.2", "1.20.4", "1.20.6", "1.21", "1.21.3", "1.21.4").forEach {
+listOf("1.21.3", "1.21.4").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }