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

config/yosbr/config/default_carpet.conf

@@ -0,0 +1 @@
+accurateBlockPlacement true

config/yosbr/options.txt

@@ -12,5 +12,13 @@ joinedFirstServer:true
 onboardAccessibility:false
 resourcePacks:["vanilla","fabric","continuity/default","continuity/glass_pane_culling_fix","betterbeds/connectedbeds","midnightcontrols/bedrock","continuity:default","continuity:glass_pane_culling_fix","betterbeds:connectedbeds","midnightcontrols:bedrock","file/VanillaTweaks_r265009.zip","file/enhanced-boss-bars.zip"]
 incompatibleResourcePacks:["betterbeds:connectedbeds","midnightcontrols:bedrock"]
-key_key.saveToolbarActivator:key.keyboard.v
 key_iris.keybind.reload:key.keyboard.unknown
+key_key.replaymod.marker:key.keyboard.comma
+key_key.presencefootsteps.settings:key.keyboard.unknown
+key_key.identity:key.keyboard.backslash
+key_key.identity_ability:key.keyboard.y
+key_key.optigui.inspect:key.keyboard.unknown
+key_key.fabricskyboxes.toggle.debug_hud:key.keyboard.unknown
+key_key.ae2.guide:key.keyboard.w
+key_gui.xaero_open_settings:key.keyboard.unknown
+key_gui.xaero_minimap_settings:key.keyboard.unknown

config/yosbr/world/carpet.conf

@@ -0,0 +1 @@
+accurateBlockPlacement true

index.toml

@@ -12,6 +12,10 @@ hash = "f5931fa810e46cf080715fe862132aded028984f89c80f293ef66ee34856e6a5"
 file = "config/yosbr/config/capes.json5"
 hash = "b0e11760190870b23a50e68018a3792e6ad3929302bb2917db21268a20f858af"
 
+[[files]]
+file = "config/yosbr/config/default_carpet.conf"
+hash = "7e5cdd9f750de73a3962a551a54ac01aaae9411f84c8b8f2519b3ce1c138fff5"
+
 [[files]]
 file = "config/yosbr/config/doubledoors.json5"
 hash = "c499be02b3bda95064ad3791a6018b7d4d07d351cd429bf0397a3f710d06c36c"
@@ -54,7 +58,7 @@ hash = "29e8afe5258e9f0cbeb96d3e8ab0cbdb4eadacf48621a6df06a6dece25410547"
 
 [[files]]
 file = "config/yosbr/options.txt"
-hash = "f34523709dbae8f3b48196c4331ab6da7d6c6d70bbd5f0c4f6d2b7196021ec70"
+hash = "14303032dc114706dd212b473599d7c504cd1ec59ad3023e4214eab7859ed7ef"
 
 [[files]]
 file = "config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt"
@@ -68,6 +72,10 @@ hash = "6f5bf766cebabca0bcfa339eeb119956c48c40eba03c5aa39d7685eab67c56b5"
 file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt"
 hash = "6e7b02f11cb6feb7f08d1088d042518d1a04cb6b71a7b2b109cf997173510e3c"
 
+[[files]]
+file = "config/yosbr/world/carpet.conf"
+hash = "7e5cdd9f750de73a3962a551a54ac01aaae9411f84c8b8f2519b3ce1c138fff5"
+
 [[files]]
 file = "kubejs/server_scripts/cherry_wood_fixes.js"
 hash = "4f35c8097157e770778f53b4b81dbd3450c1b76d0d99cd8cca76d8551c5dda1e"
@@ -87,6 +95,11 @@ file = "mods/ambientsounds.pw.toml"
 hash = "65df20d0156ede8eefdedbcb297ee041f3e0d4058e957f3b7d52c509d9d07852"
 metafile = true
 
+[[files]]
+file = "mods/amecs.pw.toml"
+hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc"
+metafile = true
+
 [[files]]
 file = "mods/appleskin.pw.toml"
 hash = "e3dfb2478e6bb096667d4ec89b0ddfef627747939373bdefee02f358d6e3dee1"
@@ -172,6 +185,11 @@ file = "mods/capes.pw.toml"
 hash = "4c712d7ad6d2ddb130b845c3b2c660be7cb7795db21be00b130443730719305e"
 metafile = true
 
+[[files]]
+file = "mods/carpet-extra.pw.toml"
+hash = "5aa266498f131bf7b9d764d608b6416f36555c228110c0d5126bcd7c8bec9f9c"
+metafile = true
+
 [[files]]
 file = "mods/carpet-fixes.pw.toml"
 hash = "d7c6555b666ff113894f6dd6dba7e6cc95c041542d06a39fd6f67421341711b9"
@@ -452,11 +470,6 @@ file = "mods/jei.pw.toml"
 hash = "3851cfa6f95cac87314de473dd4179271c8dab6c639652dc83ac688169c00124"
 metafile = true
 
-[[files]]
-file = "mods/keybind-fix.pw.toml"
-hash = "48777d535f2dbe76ec2adb6a001ab4442e40e0e403570eb5dc9a49e6957e40a1"
-metafile = true
-
 [[files]]
 file = "mods/krypton.pw.toml"
 hash = "71ef7cc16632c0039fe194183b5885968c6d740aaa67a58000653ae0cb40b882"
@@ -527,6 +540,11 @@ file = "mods/mouse-tweaks.pw.toml"
 hash = "669008dbd2508a67f8c409096cf2357de450f26a69494289e5852045ade7d358"
 metafile = true
 
+[[files]]
+file = "mods/nmuk.pw.toml"
+hash = "c5c79054c0fe0b73e75f871f003fef87ed3be204cabd77c5df6cf6bb149f379c"
+metafile = true
+
 [[files]]
 file = "mods/no-chat-reports.pw.toml"
 hash = "7ca62a9da5c2ec9f0a8bed5394021c959e90077db16b313be44f4c8736f7fbf5"

mods/amecs.pw.toml

@@ -0,0 +1,13 @@
+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/carpet-extra.pw.toml

@@ -0,0 +1,13 @@
+name = "Carpet Extra"
+filename = "carpet-extra-1.20-1.4.115.jar"
+side = "server"
+
+[download]
+url = "https://cdn.modrinth.com/data/VX3TgwQh/versions/gPJoJ3mr/carpet-extra-1.20-1.4.115.jar"
+hash-format = "sha1"
+hash = "09f1aeb870393d9ee07d895b5a60c7594a0bddd5"
+
+[update]
+[update.modrinth]
+mod-id = "VX3TgwQh"
+version = "gPJoJ3mr"

mods/keybind-fix.pw.toml

@@ -1,13 +0,0 @@
-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

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

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "ef7d0e111b0f8fa9be2c6856f814b09a9b66a02e89b3ad7206568d4a88066161"
+hash = "35fa739cc5a7af72bc99b4192417e4bba8a264cd1bd61ed98836cd0db68baae7"
 
 [versions]
 minecraft = "1.20.1"