Merge remote-tracking branch 'origin/twoconfig' into twoconfig

# Conflicts: # build.gradle.kts # root.gradle.kts
Polyfrost · Jan 4, 2025 · 4778cf5 · 4778cf5
2 parents 9890832 + 2ed432b
commit 4778cf5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
     id("dev.deftu.gradle.tools.resources") // Applies resource processing so that we can replace tokens, such as our mod name/version, in our resources.
     id("dev.deftu.gradle.tools.bloom") // Applies the Bloom plugin, which allows us to replace tokens in our source files, such as being able to use `@MOD_VERSION` in our source files.
     id("dev.deftu.gradle.tools.shadow") // Applies the Shadow plugin, which allows us to shade our dependencies into our mod JAR. This is NOT recommended for Fabric mods, but we have an *additional* configuration for those!
-    id("dev.deftu.gradle.tools.ducks") // Creates a ducks source set, which allows us to use theoretical classes which may not exist at runtime (such as things which are in other mods).
     id("dev.deftu.gradle.tools.minecraft.loom") // Applies the Loom plugin, which automagically configures Essential's Architectury Loom plugin for you.
     id("dev.deftu.gradle.tools.minecraft.releases") // Applies the Minecraft auto-releasing plugin, which allows you to automatically release your mod to CurseForge and Modrinth.
 }
@@ -55,4 +54,4 @@ dependencies {
             modImplementation("net.fabricmc.fabric-api:fabric-api:${mcData.dependencies.fabric.fabricApiVersion}")
         }
     }
-}
+}
diff --git a/root.gradle.kts b/root.gradle.kts
@@ -11,4 +11,4 @@ preprocess {
     // }
     "1.8.9-forge"(10809, "srg")
     strictExtraMappings.set(true)
-}
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -40,11 +40,14 @@ rootProject.buildFileName = "root.gradle.kts"
 // The format is: version-modloader (f.ex: 1.8.9-forge, 1.17.1-fabric, etc)
 // **REMEMBER TO ALSO UPDATE THE `root.gradle.kts` AND `build.gradle.kts` FILES WITH THE NEW VERSION(S).
 listOf(
-    "1.8.9-forge"
+    "1.8.9-forge",
+    "1.8.9-fabric",
+    "1.12.2-fabric",
+    "1.12.2-forge",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {
         projectDir = file("versions/$version")
         buildFileName = "../../build.gradle.kts"
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ preprocess { @@
         // }
         "1.8.9-forge"(10809, "srg")
         strictExtraMappings.set(true)
-    }
+    }