Merge remote-tracking branch 'upstream/staging/quilt/1.20.1' into staging/1.20.1

.packwizignore

@@ -3,6 +3,7 @@ README.md
 README-modrinth.md
 COPYING.txt
 release-notes.sh
+merge.sh
 result
 flake.nix
 flake.lock

index.toml

@@ -115,11 +115,6 @@ file = "mods/ambientsounds.pw.toml"
 hash = "0aaa2baf7599cb983776a86f1ca5ba002589331bd765ae759f5de214f884a758"
 metafile = true
 
-[[files]]
-file = "mods/amecs.pw.toml"
-hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc"
-metafile = true
-
 [[files]]
 file = "mods/amendments.pw.toml"
 hash = "d2ff820d3f64aa84579d914f4241fe13d60de8be0ee9ffa6f58179eae41e2984"
@@ -265,6 +260,11 @@ file = "mods/continuity.pw.toml"
 hash = "acbde04e67f2f0970a6b81e3c818a5f8ed3eceab4f3a04330d80c70c24d03afe"
 metafile = true
 
+[[files]]
+file = "mods/controlling.pw.toml"
+hash = "0360f47c1afd7385518db9df5d809344e1bcdc163e940a8744ee61b6d745b6ce"
+metafile = true
+
 [[files]]
 file = "mods/create-connected-fabric.pw.toml"
 hash = "d98a04d6e59566b368d7c549dca1a6004f714bcc8a1d8e790cf3700fd8180c32"
@@ -510,6 +510,11 @@ file = "mods/jei.pw.toml"
 hash = "93eae4c1e9899ecd8472208d67138b7043340eccd83433dffdc0d44604f5d5c1"
 metafile = true
 
+[[files]]
+file = "mods/keybind-fix.pw.toml"
+hash = "48777d535f2dbe76ec2adb6a001ab4442e40e0e403570eb5dc9a49e6957e40a1"
+metafile = true
+
 [[files]]
 file = "mods/krypton.pw.toml"
 hash = "71ef7cc16632c0039fe194183b5885968c6d740aaa67a58000653ae0cb40b882"
@@ -600,11 +605,6 @@ file = "mods/mouse-tweaks.pw.toml"
 hash = "9ecf3bd4cd96af63bb04063f74b8a13cea46a77bfce670b4408417f8d0d293e0"
 metafile = true
 
-[[files]]
-file = "mods/nmuk.pw.toml"
-hash = "bf90fb21fcd2f9ea1f8b6b9abdd489e3fa56cb706602ea37741234630efd56ad"
-metafile = true
-
 [[files]]
 file = "mods/no-chat-reports.pw.toml"
 hash = "7ca62a9da5c2ec9f0a8bed5394021c959e90077db16b313be44f4c8736f7fbf5"
@@ -690,6 +690,11 @@ file = "mods/screenshot-to-clipboard.pw.toml"
 hash = "672f3809a2053eef01aea4015ca4b0d4be6c507622172c091c17833b8d2ffb39"
 metafile = true
 
+[[files]]
+file = "mods/searchables.pw.toml"
+hash = "5d694c42e5e6759807f1f5756de3dd24f098517143b8d8aac5721b7d5cf502b1"
+metafile = true
+
 [[files]]
 file = "mods/slice-and-dice.pw.toml"
 hash = "35242355a5725fc5ee4b6e6929f534fdbb32b05e9a7f149f670fcd97eb743079"

merge.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -Eeuxo pipefail
+cd "$(dirname "$0")"
+
+< /dev/null cat > index.toml
+gawk -i inplace '/^<<<<<<</{skip=1;next;} /^>>>>>>>/ {skip=0;next;} !skip' pack.toml
+packwiz refresh
+
+git add pack.toml index.toml
+git status

mods/amecs.pw.toml

@@ -1,13 +0,0 @@
-name = "Amecs"
-filename = "amecs-1.3.10+mc.1.20.1.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/rcLriA4v/versions/HuXAp0GB/amecs-1.3.10%2Bmc.1.20.1.jar"
-hash-format = "sha1"
-hash = "1eff33308da62b47e5767875b28cdd436da77e2c"
-
-[update]
-[update.modrinth]
-mod-id = "rcLriA4v"
-version = "HuXAp0GB"

mods/controlling.pw.toml

@@ -0,0 +1,13 @@
+name = "Controlling"
+filename = "Controlling-fabric-1.20.1-12.0.2.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/xv94TkTM/versions/6ipZLQSK/Controlling-fabric-1.20.1-12.0.2.jar"
+hash-format = "sha1"
+hash = "8d6badebb7f2aea04793c92174dafa946b13f1e9"
+
+[update]
+[update.modrinth]
+mod-id = "xv94TkTM"
+version = "6ipZLQSK"

mods/keybind-fix.pw.toml

@@ -0,0 +1,13 @@
+name = "Keybind Fix"
+filename = "keybind_fix-1.0.0.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/vuWNr14n/versions/4VeEKlR8/keybind_fix-1.0.0.jar"
+hash-format = "sha1"
+hash = "d99355fe589dfb41b2d7d7e2c20b733ca3a086d8"
+
+[update]
+[update.modrinth]
+mod-id = "vuWNr14n"
+version = "4VeEKlR8"

mods/nmuk.pw.toml

@@ -1,13 +0,0 @@
-name = "No More Useless Keys - NMUK"
-filename = "nmuk-1.1.1+mc1.20.1.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/YCcdA1Lp/versions/wX0qDRqE/nmuk-1.1.1%2Bmc1.20.1.jar"
-hash-format = "sha1"
-hash = "df246e99b615da7236a14c6f07054cd44f6ca9b2"
-
-[update]
-[update.modrinth]
-mod-id = "YCcdA1Lp"
-version = "wX0qDRqE"

mods/searchables.pw.toml

@@ -0,0 +1,13 @@
+name = "Searchables"
+filename = "Searchables-fabric-1.20.1-1.0.3.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/fuuu3xnx/versions/eh4IBlu2/Searchables-fabric-1.20.1-1.0.3.jar"
+hash-format = "sha1"
+hash = "d7cbd06088a90f8adfd4bb9a99d1c256bcdf22a1"
+
+[update]
+[update.modrinth]
+mod-id = "fuuu3xnx"
+version = "eh4IBlu2"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "034111e4f7a38978ccc16cecc61da7474c11deac0aa1d603bd6131372453b43e"
+hash = "1fc814db12592da628e13cfc2f11c800ec4e29c18d7cc4a7feef6cd438d1bfd9"
 
 [versions]
 minecraft = "1.20.1"