From 14180a38c83c9246e28b0d5c339c8e87b2a77f8e Mon Sep 17 00:00:00 2001
From: isxander <xander@isxander.dev>
Date: Mon, 27 May 2024 00:25:19 +0100
Subject: Fix mods.toml being included in fabric jar, update to 1.20.6 target,
 bump version

---
 build.gradle.kts                           |  4 +++-
 changelog.md                               | 13 ++++---------
 settings.gradle.kts                        |  4 ++--
 stonecutter.gradle.kts                     |  2 +-
 versions/1.20.5-fabric/gradle.properties   |  7 -------
 versions/1.20.5-neoforge/gradle.properties | 11 -----------
 versions/1.20.6-fabric/gradle.properties   |  7 +++++++
 versions/1.20.6-neoforge/gradle.properties | 11 +++++++++++
 8 files changed, 28 insertions(+), 31 deletions(-)
 delete mode 100644 versions/1.20.5-fabric/gradle.properties
 delete mode 100644 versions/1.20.5-neoforge/gradle.properties
 create mode 100644 versions/1.20.6-fabric/gradle.properties
 create mode 100644 versions/1.20.6-neoforge/gradle.properties

diff --git a/build.gradle.kts b/build.gradle.kts
index 6dfe457..f551c2f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ val isForgeLike = isNeoforge || isForge
 val mcVersion = stonecutter.current.version
 
 group = "dev.isxander"
-val versionWithoutMC = "3.4.2"
+val versionWithoutMC = "3.4.3"
 version = "$versionWithoutMC+${stonecutter.current.project}"
 
 val snapshotVer = "${grgit.branch.current().name.replace('/', '.')}-SNAPSHOT"
@@ -207,9 +207,11 @@ tasks {
 
         if (isFabric) {
             filesMatching("fabric.mod.json") { expand(props) }
+            exclude(listOf("META-INF/mods.toml", "META-INF/neoforge.mods.toml"))
         }
         if (isForgeLike) {
             filesMatching(listOf("META-INF/mods.toml", "META-INF/neoforge.mods.toml")) { expand(props) }
+            exclude("fabric.mod.json")
         }
     }
 
diff --git a/changelog.md b/changelog.md
index 86a41b7..631e6f9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,18 +1,13 @@
-# YetAnotherConfigLib 3.4.2
+# YetAnotherConfigLib 3.4.3
 
 This build supports the following versions:
 - Fabric 1.20.1
 - Fabric 1.20.4
-- Fabric 1.20.5
-- Forge 1.20.1
-- NeoForge 1.20.4
-- NeoForge 1.20.5
+- Fabric 1.20.6 (also supports 1.20.5)
 
 ## Bug Fixes
 
-- Fix YACL breaking fabric reload listener dependency order
+- Fix YACL's metadata not displaying properly in MultiMC and its forks.
+- Fix (Neo)Forge throwing an unusual error when a user accidentally puts YACL for fabric on forge.
 
-## Translation Updates
-
-- Added colour picker translations for Tatar ([#174](https://github.com/isXander/YetAnotherConfigLib/pull/174))
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 89d62fb..7b78e52 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.3.2"
+    id("dev.kikugie.stonecutter") version "0.3.7"
 }
 
 extensions.configure<StonecutterSettings> {
@@ -28,7 +28,7 @@ extensions.configure<StonecutterSettings> {
 
         mc("1.20.4", loaders = listOf("fabric", "neoforge"))
         mc("1.20.1", loaders = listOf("fabric", "forge"))
-        mc("1.20.5", loaders = listOf("fabric", "neoforge"))
+        mc("1.20.6", loaders = listOf("fabric", "neoforge"))
     }
     create(rootProject)
 }
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
index b3ba7eb..d2562de 100644
--- a/stonecutter.gradle.kts
+++ b/stonecutter.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("dev.kikugie.stonecutter")
 }
-stonecutter active "1.20.5-fabric" /* [SC] DO NOT EDIT */
+stonecutter active "1.20.6-fabric" /* [SC] DO NOT EDIT */
 
 stonecutter registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) {
     group = "mod"
diff --git a/versions/1.20.5-fabric/gradle.properties b/versions/1.20.5-fabric/gradle.properties
deleted file mode 100644
index 5eb352c..0000000
--- a/versions/1.20.5-fabric/gradle.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-loom.platform=fabric
-
-java.version=21
-
-deps.quiltMappings=
-deps.fabricApi=0.97.1+1.20.5
-fmj.mcDep=~1.20.5
diff --git a/versions/1.20.5-neoforge/gradle.properties b/versions/1.20.5-neoforge/gradle.properties
deleted file mode 100644
index 340219d..0000000
--- a/versions/1.20.5-neoforge/gradle.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-loom.platform=neoforge
-
-java.version=21
-
-deps.quiltMappings=
-deps.neoforge=20.5.20-beta
-
-modstoml.mcDep=[1.20.5,1.20.6]
-modstoml.loaderVersion=[1,)
-modstoml.forgeId=neoforge
-modstoml.forgeConstraint=[20,)
diff --git a/versions/1.20.6-fabric/gradle.properties b/versions/1.20.6-fabric/gradle.properties
new file mode 100644
index 0000000..5a65f6d
--- /dev/null
+++ b/versions/1.20.6-fabric/gradle.properties
@@ -0,0 +1,7 @@
+loom.platform=fabric
+
+java.version=21
+
+deps.quiltMappings=
+deps.fabricApi=0.99.0+1.20.6
+fmj.mcDep=~1.20.5
diff --git a/versions/1.20.6-neoforge/gradle.properties b/versions/1.20.6-neoforge/gradle.properties
new file mode 100644
index 0000000..f354ca0
--- /dev/null
+++ b/versions/1.20.6-neoforge/gradle.properties
@@ -0,0 +1,11 @@
+loom.platform=neoforge
+
+java.version=21
+
+deps.quiltMappings=
+deps.neoforge=20.6.87-beta
+
+modstoml.mcDep=[1.20.5,1.20.6]
+modstoml.loaderVersion=[1,)
+modstoml.forgeId=neoforge
+modstoml.forgeConstraint=[20,)
-- 
cgit