Merge pull request #10 from FTBTeam/dev

Dev
FTBTeam · Jun 20, 2024 · 3e469ae · 3e469ae
2 parents 7ba2fae + fc62d35
commit 3e469ae
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.0]
+
+### Changed
+* Ported to Minecraft 1.21. Support for Fabric and NeoForge.
+  * Forge support may be re-added if/when Architectury adds support for Forge
+
 ## [2.1.0]
 
 ### Changed

diff --git a/common/build.gradle b/common/build.gradle
@@ -13,8 +13,7 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
-//    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}")
-    modCompileOnly("mezz.jei:jei-1.20.4-common-api:${rootProject.jei_version}")
+    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}")
 }
 
 tasks.register("buildApi", Jar) {

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -25,8 +25,7 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
 
-//    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric-api:${rootProject.jei_version}")
-//    modCompileOnly("mezz.jei:jei-1.20.4-fabric-api:${rootProject.jei_version}")
+    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric-api:${rootProject.jei_version}")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }

diff --git a/gradle.properties b/gradle.properties
@@ -22,6 +22,6 @@ neoforge_version=21.0.10-beta
 # https://maven.neoforged.net/#/releases/net/neoforged/fancymodloader/loader
 neoforge_loader_version=4
 
-jei_version=17.3.0.49
+jei_version=19.0.0.3
 
 curseforge_id=943925
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -30,8 +30,7 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
 
-//    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge-api:${rootProject.jei_version}")
-//    modCompileOnly("mezz.jei:jei-1.20.4-forge-api:${rootProject.jei_version}")
+    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-neoforge-api:${rootProject.jei_version}")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }

diff --git a/settings.gradle b/settings.gradle
@@ -9,4 +9,4 @@ pluginManagement {
 
 include("common", "fabric", /*"forge",*/ "neoforge")
 
-rootProject.name = "FTB-Filter-System-1.20.6"
+rootProject.name = "FTB-Filter-System-1.21"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ pluginManagement {

		include("common", "fabric", /"forge",/ "neoforge")

		rootProject.name = "FTB-Filter-System-1.20.6"
		rootProject.name = "FTB-Filter-System-1.21"