diff --git a/build.gradle b/build.gradle index 29c8c77d64..dd6635435c 100644 --- a/build.gradle +++ b/build.gradle @@ -88,16 +88,17 @@ dependencies { implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${project.cyclopscore_version}:deobf" } - // Add something like 'evilcraftcompat_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local EvilCraft Compat version. - if(secrets.evilcraftcompat_version_local) { - shadow("org.cyclops.evilcraftcompat:evilcraftcompat-${project.minecraft_version}-neoforge:${secrets.evilcraftcompat_version_local}") { - transitive = false - } - } else { - shadow("org.cyclops.evilcraftcompat:evilcraftcompat-${project.minecraft_version}-neoforge:${project.evilcraftcompat_version}") { - transitive = false - } - } +// TODO: enable +// // Add something like 'evilcraftcompat_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local EvilCraft Compat version. +// if(secrets.evilcraftcompat_version_local) { +// shadow("org.cyclops.evilcraftcompat:evilcraftcompat-${project.minecraft_version}-neoforge:${secrets.evilcraftcompat_version_local}") { +// transitive = false +// } +// } else { +// shadow("org.cyclops.evilcraftcompat:evilcraftcompat-${project.minecraft_version}-neoforge:${project.evilcraftcompat_version}") { +// transitive = false +// } +// } // Project lombok compileOnly 'org.projectlombok:lombok:1.18.30' @@ -116,7 +117,7 @@ minecraft { subsystems { parchment { - minecraftVersion = "${project.minecraft_version}" + minecraftVersion = "${project.parchment_minecraft_version}" mappingsVersion = "${project.parchment_version}" } } diff --git a/gradle.properties b/gradle.properties index e84c909901..4443a6a469 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ mod_id=evilcraft mod_version=1.2.50 -minecraft_version=1.21 -neoforge_version=21.0.43-beta +minecraft_version=1.21.1 +neoforge_version=21.1.2 parchment_version=2024.07.07 -cyclopscore_version=1.19.1-464 +parchment_minecraft_version=1.21 +cyclopscore_version=1.19.10-538 evilcraftcompat_version=1.1.0-57 release_type=release fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44 diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 3cd1c95a4b..ef892876e0 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -18,18 +18,18 @@ An evil mod for Minecraft. [[dependencies.evilcraft]] modId="cyclopscore" type="required" - versionRange="[1.19.1,)" + versionRange="[1.19.10,)" ordering="NONE" side="BOTH" [[dependencies.evilcraft]] modId="neoforge" type="required" - versionRange="[21.0.43-beta,)" + versionRange="[21.1.2,)" ordering="NONE" side="BOTH" [[dependencies.evilcraft]] modId="minecraft" type="required" - versionRange="[1.21,]" + versionRange="[1.21.1,]" ordering="NONE" side="BOTH"