From 6eda7a6128d5be890c511bcbb944f6e5fb77274f Mon Sep 17 00:00:00 2001 From: Leclowndu93150 Date: Wed, 12 Jun 2024 22:48:10 +0200 Subject: [PATCH] W.I.P 1.21-RC1 --- build.gradle | 10 +++++++++- gradle.properties | 14 +++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 86e221f..799649d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.107' + id 'net.neoforged.gradle.userdev' version '7.0.142' } version = mod_version @@ -12,6 +12,14 @@ group = mod_group_id repositories { mavenLocal() maven { url 'https://modmaven.dev/' } + maven { + name 'Maven for PR #1076' // https://github.com/neoforged/NeoForge/pull/1076 + url 'https://prmaven.neoforged.net/NeoForge/pr1076' + content { + includeModule('net.neoforged', 'testframework') + includeModule('net.neoforged', 'neoforge') + } + } } base { diff --git a/gradle.properties b/gradle.properties index e5e78fe..985c445 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,24 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. -#org.gradle.jvmargs= +org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.debug=false #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started -neogradle.subsystems.parchment.minecraftVersion=1.20.4 -neogradle.subsystems.parchment.mappingsVersion=2024.04.14 +neogradle.subsystems.parchment.minecraftVersion=1.20.6 +neogradle.subsystems.parchment.mappingsVersion=2024.06.02 # Environment Properties # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge # The Minecraft version must agree with the Neo version to get a valid artifact -minecraft_version=1.20.6 +minecraft_version=1.21-rc1 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.6,1.21) +minecraft_version_range=[1.21,1.22) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=20.6.2-beta +neo_version=21.0.0-alpha.1.21-rc1.20240612.183440 # The Neo version range can use any version of Neo as bounds -neo_version_range=[20.6,) +neo_version_range=[21.0,) # The loader version range can only use the major version of FML as bounds loader_version_range=[2,)