From 9c41acfb2a9e759742424629ad6912239a6cadb1 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sat, 20 May 2023 22:14:06 +0200
Subject: [PATCH] Backport of the century

- Flywheel is now included (jij) in Create jars on 1.18.2
---
 build.gradle                          | 7 +++----
 gradle.properties                     | 2 +-
 src/main/resources/META-INF/mods.toml | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a95c551c..ac45dd65c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,10 +164,9 @@ dependencies {
     jarJar("com.tterrag.registrate:Registrate:${registrate_version}") {
         jarJar.ranged(it, '[MC1.18.2-1.1.3,)')
     }
-    // Uncomment once Forge fixes mixins for included jars
-    //jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
-    //    jarJar.ranged(it, '[0.6.8,0.6.9)')
-    //}
+    jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
+        jarJar.ranged(it, '[0.6.8,0.6.9)')
+    }
 
     implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
 
diff --git a/gradle.properties b/gradle.properties
index 6daa849fc..e480a04c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ mod_version = 0.5.1.a
 artifact_minecraft_version = 1.18.2
 
 minecraft_version = 1.18.2
-forge_version = 40.2.1
+forge_version = 40.2.4
 
 # build dependency versions
 forgegradle_version = 5.1.74
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 2b1d9b4fd..d920a5943 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -19,7 +19,7 @@ Technology that empowers the player.'''
 [[dependencies.create]]
     modId="forge"
     mandatory=true
-    versionRange="[40.1.60,)"
+    versionRange="[40.2.4,)"
     ordering="NONE"
     side="BOTH"