Skip to content

Commit 8e10d23

Browse files
committed
Merge branch 'version/7.3.x'
2 parents 759f364 + e2da7c1 commit 8e10d23

5 files changed

Lines changed: 17 additions & 24 deletions

File tree

CHANGELOG.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
- Fixed the hand, offhand, and pos1 patterns not showing in suggestions
2323
- Changed the legacy mapping system to not automatically load on startup, and instead load on first usage
2424

25+
7.3.19
26+
- General cleanups across codebase
27+
- Final release of the 7.3.x series in preparation for 7.4 release
28+
- [Bukkit] Add a separate Gradle configuration for reobfuscation to better prepare for MC 26.1 support without dropping prior versions
29+
- [Bukkit] Drop 1.21.3 adapters due to resource constraints
30+
- [Bukkit] Tweaked logic to detect Mojang mappings to be more reliable with recent changes to non-mojmapped (Spigot) environments
31+
2532
7.3.18
2633
- Added support for 1.21.11
2734
- Improved rotation of special rail blocks (activator, detector, powered, etc)

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ cuiProtocol = "4.0.2"
1212

1313
errorprone = "2.45.0"
1414

15-
fabric-api = "0.139.5+1.21.11"
15+
fabric-api = "0.141.1+1.21.11"
1616

17-
neogradle = "7.1.11"
17+
neogradle = "7.1.20"
1818
neoforge-minecraft = "1.21.11"
1919

2020
sponge-minecraft = "1.21.11"
2121
# https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/spongeapi/
22-
sponge-api = "18.0.0-20251210.214305-1"
22+
sponge-api = "18.0.0-20260114.133414-3"
2323
sponge-api-major = "18"
2424

2525
# https://parchmentmc.org/docs/getting-started; note that we use older MC versions some times which is OK
@@ -35,8 +35,8 @@ minimumJdependency = "2.10"
3535
minimumTinyRemapper = "0.8.11"
3636

3737
# https://repo.enginehub.org/language-files/com/sk89q/worldedit/worldedit-lang/
38-
lang-worldeditBase = "7.3.18"
39-
lang-version = "2036"
38+
lang-worldeditBase = "7.3.19"
39+
lang-version = "2062"
4040

4141
[libraries]
4242
neogradle-neoform = { module = "net.neoforged.gradle:neoform", version.ref = "neogradle" }
@@ -95,10 +95,10 @@ jchronic = "com.sk89q:jchronic:0.2.4a"
9595
jlibnoise = "com.sk89q.lib:jlibnoise:1.0.0"
9696

9797
fabric-minecraft = "com.mojang:minecraft:1.21.11"
98-
fabric-loader = "net.fabricmc:fabric-loader:0.18.2"
99-
fabric-permissions-api = "me.lucko:fabric-permissions-api:0.5.0"
98+
fabric-loader = "net.fabricmc:fabric-loader:0.18.4"
99+
fabric-permissions-api = "me.lucko:fabric-permissions-api:0.6.1"
100100

101-
neoforge = "net.neoforged:neoforge:21.11.6-beta"
101+
neoforge = "net.neoforged:neoforge:21.11.34-beta"
102102

103103
# Mojang-provided libraries, CHECK AGAINST MINECRAFT for versions
104104
guava = "com.google.guava:guava:33.5.0-jre!!"

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pluginManagement {
2525
}
2626
plugins {
2727
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
28-
id("fabric-loom") version "1.14.4"
28+
id("fabric-loom") version "1.14.7"
2929
}
3030
dependencyResolutionManagement {
3131
repositories {

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,6 @@
100100
*/
101101
public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
102102

103-
// This must be before the Logger is initialized, which fails in 1.8
104-
static {
105-
if (PaperLib.getMinecraftVersion() < 13) {
106-
throw new IllegalStateException(
107-
"""
108-
**********************************************
109-
** This Minecraft version (%s) is not supported by this version of WorldEdit.
110-
** Please download an OLDER version of WorldEdit which does.
111-
**********************************************
112-
""".formatted(Bukkit.getVersion())
113-
);
114-
}
115-
}
116-
117103
private static final Logger LOGGER = LogManagerCompat.getLogger();
118104
public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui";
119105
private static WorldEditPlugin INSTANCE;

worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private FabricPermissionsProvider getInitialPermissionsProvider() {
219219
.map(ModContainer::getMetadata)
220220
.map(ModMetadata::getVersion);
221221

222-
if (version.isPresent() && !VersionPredicate.parse(">=0.5.0").test(version.get())) {
222+
if (version.isPresent() && !VersionPredicate.parse(">=0.6.0").test(version.get())) {
223223
throw new RuntimeException("Fabric permissions version " + version.get() + " is not supported. Please update Fabric Permissions API");
224224
}
225225

0 commit comments

Comments
 (0)