diff --git a/build.gradle b/build.gradle index 920ff96..aa2b9ab 100644 --- a/build.gradle +++ b/build.gradle @@ -9,4 +9,3 @@ plugins { id 'net.neoforged.gradle.userdev' version '7.0.145' apply false // id 'net.minecraftforge.gradle' version '[6.0.24,6.2)' apply false // Don't load yet to fix DiffPatch conflict issue between FG and NG } - diff --git a/buildSrc/src/main/groovy/multiloader-loader-common.gradle b/buildSrc/src/main/groovy/multiloader-loader-common.gradle index 6fc2436..36d488f 100644 --- a/buildSrc/src/main/groovy/multiloader-loader-common.gradle +++ b/buildSrc/src/main/groovy/multiloader-loader-common.gradle @@ -13,7 +13,7 @@ neoForge { accessTransformers.add(at.absolutePath) } parchment { - minecraftVersion = parchment_minecraft + minecraftVersion = parchment_minecraft_version mappingsVersion = parchment_version } } diff --git a/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle b/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle index f12fa5c..26285e3 100644 --- a/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle +++ b/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle @@ -8,7 +8,7 @@ dependencies { minecraft "com.mojang:minecraft:${minecraft_version}" mappings loom.layered { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip") + parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip") } modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" diff --git a/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle b/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle index 88981c6..3508f9a 100644 --- a/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle +++ b/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle @@ -46,7 +46,7 @@ minecraft { subsystems { parchment { - minecraftVersion = "${minecraft_version}" + minecraftVersion = "${parchment_minecraft_version}" mappingsVersion = "${parchment_version}" } } diff --git a/gradle.properties b/gradle.properties index 22ce9d5..528c823 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ group=org.cyclops.flopper java_version=21 # Common -minecraft_version=1.21 +minecraft_version=1.21.1 mod_name=Flopper mod_author=rubensworks (aka kroeser) mod_id=flopper @@ -15,22 +15,22 @@ description=The Flopper is an early-game block to move around fluids, just like release_type=release fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44 neo_form_version=1.21-20240613.152323 -parchment_minecraft=1.21 parchment_version=2024.06.23 +parchment_minecraft_version=1.21 curseforge_project_id=290404 modrinth_project_id=aTMAqQMY # Fabric -fabric_version=0.100.1+1.21 +fabric_version=0.102.1+1.21.1 fabric_loader_version=0.15.11 # NeoForge -neoforge_version=21.0.43-beta +neoforge_version=21.1.2 neoforge_loader_version_range=[4,) neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/flopper.json # Forge -forge_version=51.0.21 +forge_version=52.0.3 forge_loader_version_range=[2,) forge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/forge_update/flopper.json @@ -40,5 +40,5 @@ org.gradle.daemon=false org.gradle.caching=true # Dependencies -cyclopscore_version=1.19.9-547 +cyclopscore_version=1.19.11-556 forgeconfigapiport_fabric_version=21.0.1