Update deps and bump min Neo version to 21.0.110-beta

Author: pupnewfster

build.gradle

@@ -20,12 +20,12 @@ plugins {
     id('eclipse')
     id('idea')
     id('maven-publish')
-    id('net.neoforged.gradle.userdev') version('7.0.153')//https://projects.neoforged.net/neoforged/neogradle
+    id('net.neoforged.gradle.userdev') version('7.0.155')//https://projects.neoforged.net/neoforged/neogradle
 }
 
 tasks.named('wrapper', Wrapper).configure {
     //Define wrapper values here so as to not have to always do so when updating gradlew.properties
-    gradleVersion = '8.8'
+    gradleVersion = '8.9'
     distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -382,8 +382,7 @@ dependencies {
         //datagenMainRuntimeOnly(emi)
     }
 
-    //TODO: Re-enable once it doesn't cause Datagen to fail
-    //localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
+    localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
 
     compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}:api")
     localRuntime("mcjty.theoneprobe:theoneprobe:${top_version}")

docs/Development.md

@@ -4,7 +4,7 @@ Mekanism is developed for Minecraft 1.21 using NeoForge.
 
 ## Prerequisites
 
-* Gradle - Version 8.8 is known to work, your mileage with other versions may vary
+* Gradle - Version 8.9 is known to work, your mileage with other versions may vary
 * JDK - Version 21 is the target as that is what Mojang ships, but to run gradle you must use a minimum of JDK 17.
 
 ## Directory Structure

gradle.properties

@@ -9,11 +9,11 @@ minecraft_version=1.21
 previous_minecraft_version=1.20.4
 previous_minor_minecraft_version=1.20.6
 loader_version_range=[4,)
-forge_version=21.0.86-beta
+forge_version=21.0.113-beta
 mod_version=10.6.5
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[21.0.86-beta,)
+forge_version_range=[21.0.110-beta,)
 minecraft_version_range=[1.21]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release
@@ -25,7 +25,7 @@ jqwik_version=1.9.0
 
 #NeoGradle Settings
 neogradle.subsystems.parchment.minecraftVersion=1.21
-neogradle.subsystems.parchment.mappingsVersion=2024.06.23
+neogradle.subsystems.parchment.mappingsVersion=2024.07.07
 neogradle.subsystems.conventions.sourcesets.enabled=false
 
 #misc settings
@@ -37,14 +37,14 @@ yamlops_version=1.2.0
 
 #Mod dependencies
 cc_tweaked_version=1.111.0
-crafttweaker_version=20.0.17
-ctm_version=1.2.0+1
-curios_version=9.0.4+1.21
+crafttweaker_version=20.0.18
+ctm_version=1.2.0+2
+curios_version=9.0.5+1.21
 emi_version=1.1.10
 grand_power_version=3.0.0
 jade_api_id=5427895
-jade_id=5493270
-jei_version=19.5.0.30
+jade_id=5529595
+jei_version=19.5.0.44
 json_things_version=0.12.0
 top_version=1.21_neo-12.0.0-1
 wthit_version=12.2.2
@@ -56,8 +56,8 @@ wthit_version=12.2.2
 
 
 #Mod dependencies for recipes (only used by our data generators)
-ae2_version=19.0.8-alpha
-biomesoplenty_version=21.0.0.11
+ae2_version=19.0.15-alpha
+biomesoplenty_version=21.0.0.12
 glitchcore_version=2.0.0.2
 terrablender_version=4.0.0.1
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################