Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-7

Author: lonelyicer

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'idea'
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.192'
+    id 'net.neoforged.gradle.userdev' version '7.1.21'
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -158,10 +158,11 @@ dependencies {
 
     // KubeJS
     api("dev.latvian.mods:kubejs-neoforge:$kubejs_version")
+
     // Ponder
-    implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
-    // Flywheel
+    implementation("net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}")
     compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}")
+    runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}")
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -12,22 +12,22 @@ minecraft_version_range=[1.21.1, 1.22)
 neo_version=21.1.211
 loader_version_range=[1,)
 
-jei_version=19.21.2.313
+jei_version=19.27.0.340
 curios_version=9.5.1+1.21.1
 curios_version_range=[9.5.0+1.21.1,)
 emi_version=1.1.22+1.21.1
-jade_version=15.10.1+neoforge
-patchouli_version=1.21-88-NEOFORGE
-kubejs_version=2101.7.1-build.181
+jade_version=15.10.5+neoforge
+patchouli_version=1.21.1-93-NEOFORGE
+kubejs_version=2101.7.2-build.4
 sbm_version=1.4.0-neoforge+mc1.21.1
 mae_version=1.0.2
-ponder_version=1.0.60
-flywheel_version=1.0.4
+ponder_version=1.0.81
+flywheel_version=1.0.6
 
 mod_id=mia
 mod_name=Memento In Abyss
 mod_license=MIT
-mod_version=0.1.0-alpha.23
+mod_version=0.1.0-alpha.30
 mod_group_id=com.altnoir.mia
 mod_authors=Altnoir, lonelyicer, zljtt, zhaijineet
 mod_description=Memento In Abyss.

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.3-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mia:block/abyss_chlorophyte_ore"
+    }
+  }
+}

gradlew

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mia:block/abyss_portal_core"
+    }
+  }
+}

gradlew.bat

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "compass=false": {
+    "": {
       "model": "mia:block/abyss_portal_frame"
-    },
-    "compass=true": {
-      "model": "mia:block/abyss_portal_frame_open"
     }
   }
 }

src/generated/resources/assets/mia/blockstates/abyss_chlorophyte_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mia:block/budding_caerulite"
+    }
+  }
+}