User: rednesto Date: 08 Jun 25 22:44 Revision: 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688 Summary: Merge branch '2024.2' into 2024.3 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=10065&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 4cd5d91c40860f925f517b0c3d6d3621ee6e8586) +++ build.gradle.kts (revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688) @@ -122,7 +122,6 @@ pluginVerifier() } - testLibs(libs.test.mockJdk) testLibs(libs.test.mixin) testLibs(libs.test.spigotapi) testLibs(libs.test.bungeecord) Index: gradle.properties =================================================================== --- gradle.properties (revision 4cd5d91c40860f925f517b0c3d6d3621ee6e8586) +++ gradle.properties (revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688) @@ -23,7 +23,7 @@ ideaVersionName = 2024.3 -coreVersion = 1.8.4 +coreVersion = 1.8.5 # Silences a build-time warning because we are bundling our own kotlin library kotlin.stdlib.default.dependency = false Index: gradle/libs.versions.toml =================================================================== --- gradle/libs.versions.toml (revision 4cd5d91c40860f925f517b0c3d6d3621ee6e8586) +++ gradle/libs.versions.toml (revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688) @@ -57,7 +57,6 @@ fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" } # Testing -test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50" test-mixin = "org.spongepowered:mixin:0.8.5" test-spigotapi = "org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT" test-bungeecord = "net.md-5:bungeecord-api:1.21-R0.3-SNAPSHOT" Index: src/main/resources/META-INF/plugin.xml =================================================================== --- src/main/resources/META-INF/plugin.xml (revision 4cd5d91c40860f925f517b0c3d6d3621ee6e8586) +++ src/main/resources/META-INF/plugin.xml (revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688) @@ -714,6 +714,7 @@ +