Skip to content

Commit

Permalink
Merge branch 'EngineHub:version/7.3.x' into version/7.3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Euphillya authored Dec 10, 2024
2 parents dcc2726 + 8187e67 commit 5f97be1
Show file tree
Hide file tree
Showing 22 changed files with 4,656 additions and 26 deletions.
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ piston = "0.5.10"
autoValue = "1.10.4"
antlr = "4.13.1"

fabric-api = "0.109.0+1.21.3"
fabric-api = "0.110.5+1.21.4"

neogradle = "7.0.171"
neoforge-minecraft = "1.21.3"
neoforge-minecraft = "1.21.4"

sponge-minecraft = "1.21.3"
# https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/spongeapi/
Expand Down Expand Up @@ -88,19 +88,19 @@ rhino = "org.mozilla:rhino-runtime:1.7.13"
jchronic = "com.sk89q:jchronic:0.2.4a"
jlibnoise = "com.sk89q.lib:jlibnoise:1.0.0"

fabric-minecraft = "com.mojang:minecraft:1.21.3"
fabric-loader = "net.fabricmc:fabric-loader:0.16.7"
fabric-permissions-api = "me.lucko:fabric-permissions-api:0.3.1"
fabric-minecraft = "com.mojang:minecraft:1.21.4"
fabric-loader = "net.fabricmc:fabric-loader:0.16.9"
fabric-permissions-api = "me.lucko:fabric-permissions-api:0.3.3"

neoforge = "net.neoforged:neoforge:21.3.40-beta"
neoforge = "net.neoforged:neoforge:21.4.8-beta"

# Mojang-provided libraries, CHECK AGAINST MINECRAFT for versions
guava = "com.google.guava:guava:32.1.3-jre!!"
log4j-bom = "org.apache.logging.log4j:log4j-bom:2.22.1!!"
guava = "com.google.guava:guava:33.3.1-jre!!"
log4j-bom = "org.apache.logging.log4j:log4j-bom:2.24.1!!"
log4j-api.module = "org.apache.logging.log4j:log4j-api"
log4j-core.module = "org.apache.logging.log4j:log4j-core"
gson = "com.google.code.gson:gson:2.10.1!!"
fastutil = "it.unimi.dsi:fastutil:8.5.12!!"
gson = "com.google.code.gson:gson:2.11.0!!"
fastutil = "it.unimi.dsi:fastutil:8.5.15!!"

# Bukkit-provided libraries, CHECK AGAINST SPIGOT for versions
# Note that we need to balance support for older MC versus working at all on newer ones, so the exact versions here
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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").forEach {
listOf("1.20.2", "1.20.4", "1.20.6", "1.21", "1.21.3", "1.21.4").forEach {
include("worldedit-bukkit:adapters:adapter-$it")
}

Expand Down
10 changes: 10 additions & 0 deletions worldedit-bukkit/adapters/adapter-1.21.4/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension

plugins {
id("buildlogic.adapter")
}

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

0 comments on commit 5f97be1

Please sign in to comment.