Merge branch 'staging/quilt/1.20.1' into staging/quilt/mixed/1.20.1

config/yosbr/config/puzzle.json

@@ -0,0 +1,5 @@
+{
+  "disabledIntegrations": [
+    "entity_model_features"
+  ]
+}

config/yosbr/config/replaymod.json

@@ -0,0 +1,7 @@
+{
+  "recording": {
+    "recordSingleplayer": false,
+    "recordServer": false,
+    "autoStartRecording": false
+  }
+}

config/yosbr/options.txt

@@ -10,7 +10,15 @@ tutorialStep:none
 skipMultiplayerWarning:true
 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"]
+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

index.toml

@@ -16,6 +16,14 @@ hash = "783c458bf3501796a8f07e396a5bb0d623c7f694c82974fefc228eb921bb82f3"
 file = "config/yosbr/config/inventoryprofilesnext/inventoryprofiles.json"
 hash = "000b31b1c42d90dbc3cd9964df47b9093e698ac08c002771c924b340529e6a18"
 
+[[files]]
+file = "config/yosbr/config/puzzle.json"
+hash = "f4f3a9663a482ff424c2db4212fc6f6842c1af3bfb97ebe5c5d7e35e33974e78"
+
+[[files]]
+file = "config/yosbr/config/replaymod.json"
+hash = "93659cc038fc404d0cab2eb840121b47f5287206a9e6aa00858ed70372b84187"
+
 [[files]]
 file = "config/yosbr/config/roughlyenoughitems/config.json5"
 hash = "c072599a7c36a2e240d61ea78ee02b57dec67ae1cfb6dfe70f8ea58537099d40"
@@ -34,20 +42,25 @@ hash = "29e8afe5258e9f0cbeb96d3e8ab0cbdb4eadacf48621a6df06a6dece25410547"
 
 [[files]]
 file = "config/yosbr/options.txt"
-hash = "7ddd41029052fd0b4affd666ddcb183919d93fcf331bd3aa1110bb4734be038d"
+hash = "14303032dc114706dd212b473599d7c504cd1ec59ad3023e4214eab7859ed7ef"
 
 [[files]]
-file = "config/yosbr/shaderpacks/ComplementaryReimagined_r2.2.zip.txt"
+file = "config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt"
 hash = "f4aaafa7cda512e478ea8942387ebbb0662bbb20b6e0c916c341c373e33a2a50"
 
 [[files]]
-file = "config/yosbr/shaderpacks/ComplementaryShaders_v4.7.2.zip.txt"
+file = "config/yosbr/shaderpacks/ComplementaryUnbound_r5.0.1.zip.txt"
 hash = "6f5bf766cebabca0bcfa339eeb119956c48c40eba03c5aa39d7685eab67c56b5"
 
 [[files]]
-file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha4.zip.txt"
+file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt"
 hash = "6e7b02f11cb6feb7f08d1088d042518d1a04cb6b71a7b2b109cf997173510e3c"
 
+[[files]]
+file = "mods/amecs.pw.toml"
+hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc"
+metafile = true
+
 [[files]]
 file = "mods/appleskin.pw.toml"
 hash = "e3dfb2478e6bb096667d4ec89b0ddfef627747939373bdefee02f358d6e3dee1"
@@ -83,6 +96,11 @@ file = "mods/betterf3.pw.toml"
 hash = "ba31b113733abc813e36738bdc8104fad628232d29907f66f48cf8c45299de9f"
 metafile = true
 
+[[files]]
+file = "mods/blur-fabric.pw.toml"
+hash = "5f53eb8d272bfec2c6f58d6d744397b8152d7561a370f1d6e7e1e495fc4a1e7a"
+metafile = true
+
 [[files]]
 file = "mods/bobby.pw.toml"
 hash = "628ca822826f31018f97293b673e09defe9bc46616a7636bbd4a3b51ee4c9949"
@@ -108,6 +126,11 @@ file = "mods/carpet.pw.toml"
 hash = "095a93b4f0b4e2b8fadf8359bc145cbdd83be3c5bf23432e9a5f4e54d60de5b4"
 metafile = true
 
+[[files]]
+file = "mods/chat-heads.pw.toml"
+hash = "0159525d452d7e755045223330b3bfc0a3df5491c4a83beee9f00af0b68b8758"
+metafile = true
+
 [[files]]
 file = "mods/cit-resewn.pw.toml"
 hash = "44e2cc695c040b7bbca462165099fa3c56a98aa8f01104bb067dc850b65f6d02"
@@ -138,11 +161,36 @@ file = "mods/dynamic-fps.pw.toml"
 hash = "6e6ee1bf66d6977728d3bf5404338c87a0a4ad5260833efcd912aaaca776cf8f"
 metafile = true
 
+[[files]]
+file = "mods/dynamiccrosshair.pw.toml"
+hash = "9bdd24aca5f45e5179b9796da6731ba0b0cdbcdda5ae2b06f77d4e48b9a8839a"
+metafile = true
+
 [[files]]
 file = "mods/e4mc.pw.toml"
 hash = "7685618d499e7cf9e0296dab7b06dd8520019c1d3c147ffab5d3da9ea7791549"
 metafile = true
 
+[[files]]
+file = "mods/emi-loot.pw.toml"
+hash = "8766521465c1cc6b57199a24008be030eabfd417c0ba7eb6c91f26c2f6ffa70a"
+metafile = true
+
+[[files]]
+file = "mods/emi.pw.toml"
+hash = "61d4f489d43922fb32e1868ddce2129ecfaddb40e42029908d41142057a28f89"
+metafile = true
+
+[[files]]
+file = "mods/emiffect.pw.toml"
+hash = "6395441f751bc9aca4cd024df876b9f7abbfc53d8911f5264c5c36eabbb21c82"
+metafile = true
+
+[[files]]
+file = "mods/emitrades.pw.toml"
+hash = "4c59088a2cb975f60347da57d72bb1069b65452c6a7b92af8facec6e1bed9409"
+metafile = true
+
 [[files]]
 file = "mods/entity-model-features.pw.toml"
 hash = "ceabdf57ccfdf9aefc04e6f3bc10e06d6a3320037a0ff60f5990501c9a5d6302"
@@ -168,6 +216,16 @@ file = "mods/fabricskyboxes.pw.toml"
 hash = "ae83dfcccd580352eee3cf509ace37f67f1bf0d2862d2d9c9d64d8909892d2d4"
 metafile = true
 
+[[files]]
+file = "mods/fallingleaves.pw.toml"
+hash = "0c4c20d601b15dbc85c275732d9efe9369597503c7d6caa9a7fee217f67073e7"
+metafile = true
+
+[[files]]
+file = "mods/fastquit.pw.toml"
+hash = "26b473edf76a38c7f6f883381b6a42a33eea992501f26c46bae8b6149c86e234"
+metafile = true
+
 [[files]]
 file = "mods/ferrite-core.pw.toml"
 hash = "03e174cf691b52da20bd973b955fae6f3720d3d2120f9d6cc1de5fdf3180013c"
@@ -198,6 +256,16 @@ file = "mods/iris.pw.toml"
 hash = "87ea5bf588ed195eaee3bcbd2432b5671692a203b25b688ffcbfeea6d2cea775"
 metafile = true
 
+[[files]]
+file = "mods/itemswapper.pw.toml"
+hash = "a87a5e7a9a1234525c9b2d5259e061317c35e0c863c2b061a2e6d2826c05f152"
+metafile = true
+
+[[files]]
+file = "mods/jei.pw.toml"
+hash = "3851cfa6f95cac87314de473dd4179271c8dab6c639652dc83ac688169c00124"
+metafile = true
+
 [[files]]
 file = "mods/krypton.pw.toml"
 hash = "71ef7cc16632c0039fe194183b5885968c6d740aaa67a58000653ae0cb40b882"
@@ -253,6 +321,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"
@@ -294,8 +367,8 @@ hash = "44b0a2294e1693230308e53b529d671a0303e94b623ba2c2650cdf5760a5a335"
 metafile = true
 
 [[files]]
-file = "mods/rei.pw.toml"
+file = "mods/replaymod.pw.toml"
-hash = "c58c05a65fca731fca51d0f07f9a67f14b44341b6374fa948c6acfcb09f7ceee"
+hash = "9e7c1e6cf3b81dce5a77bf5c95ed9d8e9b936b932aeadb1255245234230ced16"
 metafile = true
 
 [[files]]
@@ -323,6 +396,11 @@ file = "mods/starlight.pw.toml"
 hash = "218f67d6bcaae849582618cd3e5eb1d4cac0fd6045115f64340620300e160c11"
 metafile = true
 
+[[files]]
+file = "mods/where-is-it.pw.toml"
+hash = "c19f0bf43ceb5415585dcec715a63d1430b563067e33cf9194850d18d5bf7265"
+metafile = true
+
 [[files]]
 file = "mods/wthit.pw.toml"
 hash = "874a680170fbf36204ee1c4e57650b6a28b15d10a32163964850aaccc9a7457a"
@@ -353,6 +431,11 @@ file = "mods/zoomify.pw.toml"
 hash = "ec7f94fcb88b139515557631074b5e90e64ea53761eb5753c2492007e24f59c4"
 metafile = true
 
+[[files]]
+file = "resourcepacks/enhanced-boss-bars.pw.toml"
+hash = "b61a47d866f7b3fb65e744e7e12a615a8b4c562101cb1456f155e4d80e385866"
+metafile = true
+
 [[files]]
 file = "resourcepacks/vanillatweaks.pw.toml"
 hash = "2ada98e4a07f325283f285b9ac397636df3414e2b578d3f6e4d55ed00904f23d"

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/blur-fabric.pw.toml

@@ -0,0 +1,13 @@
+name = "Blur (Fabric)"
+filename = "blur-3.1.0.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/NK39zBp2/versions/dki8Ab2D/blur-3.1.0.jar"
+hash-format = "sha1"
+hash = "3a0811af7f425daab896fbfc38898a22e7af39cf"
+
+[update]
+[update.modrinth]
+mod-id = "NK39zBp2"
+version = "dki8Ab2D"

mods/chat-heads.pw.toml

@@ -0,0 +1,13 @@
+name = "Chat Heads"
+filename = "chat_heads-0.10.22-fabric-1.20.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/gzgdiHby/chat_heads-0.10.22-fabric-1.20.jar"
+hash-format = "sha1"
+hash = "9a591c62cfbff2ed7ff314ae8b6dd83f4ce4613b"
+
+[update]
+[update.modrinth]
+mod-id = "Wb5oqrBJ"
+version = "gzgdiHby"

mods/dynamiccrosshair.pw.toml

@@ -0,0 +1,13 @@
+name = "Dynamic Crosshair"
+filename = "dynamiccrosshair-7.3+1.20-fabric.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/ZcR9weSm/versions/YZEVRL4i/dynamiccrosshair-7.3%2B1.20-fabric.jar"
+hash-format = "sha1"
+hash = "614bdac176b54d8d1c197534b0da45957a747614"
+
+[update]
+[update.modrinth]
+mod-id = "ZcR9weSm"
+version = "YZEVRL4i"

mods/emi-loot.pw.toml

@@ -0,0 +1,13 @@
+name = "EMI Loot"
+filename = "emi_loot-0.6.5+1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/qbbO7Jns/versions/7fjkgVEh/emi_loot-0.6.5%2B1.20.1.jar"
+hash-format = "sha1"
+hash = "e6398e3aef04cbe96273e9174601953ab48f5191"
+
+[update]
+[update.modrinth]
+mod-id = "qbbO7Jns"
+version = "7fjkgVEh"

mods/emi.pw.toml

@@ -0,0 +1,13 @@
+name = "EMI"
+filename = "emi-1.0.23+1.20.1+fabric.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/HlfhF7AQ/emi-1.0.23%2B1.20.1%2Bfabric.jar"
+hash-format = "sha1"
+hash = "199e6f30d68aac02bde11ac20e5c119fa15c6669"
+
+[update]
+[update.modrinth]
+mod-id = "fRiHVvU7"
+version = "HlfhF7AQ"

mods/emiffect.pw.toml

@@ -0,0 +1,13 @@
+name = "EMIffect"
+filename = "emiffect-fabric-1.1.1+mc1.20.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/705gWllI/versions/snwqJj9A/emiffect-fabric-1.1.1%2Bmc1.20.1.jar"
+hash-format = "sha1"
+hash = "01bdb198a9877a3c3fdb5e3f1d5dc2d63a8e2c9e"
+
+[update]
+[update.modrinth]
+mod-id = "705gWllI"
+version = "snwqJj9A"

mods/emitrades.pw.toml

@@ -0,0 +1,13 @@
+name = "EMI Trades"
+filename = "emitrades-fabric-1.2.0+mc1.20.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/j2HhbEE7/versions/hlcZDRJ1/emitrades-fabric-1.2.0%2Bmc1.20.1.jar"
+hash-format = "sha1"
+hash = "880671a5d55859627eb91f5938ff8d81b9cb24ad"
+
+[update]
+[update.modrinth]
+mod-id = "j2HhbEE7"
+version = "hlcZDRJ1"

mods/fallingleaves.pw.toml

@@ -0,0 +1,13 @@
+name = "Falling Leaves"
+filename = "fallingleaves-1.15.4+1.20.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/WhbRG4iK/versions/KpvXCE2X/fallingleaves-1.15.4%2B1.20.1.jar"
+hash-format = "sha1"
+hash = "5101bd05c678a874c1fa40c3363d1c127f7074d5"
+
+[update]
+[update.modrinth]
+mod-id = "WhbRG4iK"
+version = "KpvXCE2X"

mods/fastquit.pw.toml

@@ -0,0 +1,13 @@
+name = "FastQuit"
+filename = "fastquit-3.0.0+1.20+.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/x1hIzbuY/versions/tNgyOUMr/fastquit-3.0.0%2B1.20%2B.jar"
+hash-format = "sha1"
+hash = "68f080925502a49027e231c63d3b94128ed6499b"
+
+[update]
+[update.modrinth]
+mod-id = "x1hIzbuY"
+version = "tNgyOUMr"

mods/itemswapper.pw.toml

@@ -0,0 +1,13 @@
+name = "ItemSwapper"
+filename = "itemswapper-fabric-0.5.3-mc1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/RPOSBQgq/versions/NEBVxulw/itemswapper-fabric-0.5.3-mc1.20.1.jar"
+hash-format = "sha1"
+hash = "ca3d145c48936b3eab92f5ab9bf64befe5ed15ec"
+
+[update]
+[update.modrinth]
+mod-id = "RPOSBQgq"
+version = "NEBVxulw"

mods/jei.pw.toml

@@ -0,0 +1,13 @@
+name = "Just Enough Items"
+filename = "jei-1.20.1-fabric-15.2.0.27.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/lIRFslED/jei-1.20.1-fabric-15.2.0.27.jar"
+hash-format = "sha1"
+hash = "c39352c9790d589a0ec7adcccd220e3388ca1296"
+
+[update]
+[update.modrinth]
+mod-id = "u6dRKJwZ"
+version = "lIRFslED"

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"

mods/rei.pw.toml

@@ -1,13 +0,0 @@
-name = "Roughly Enough Items (REI)"
-filename = "RoughlyEnoughItems-12.0.665.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/nfn13YXA/versions/hRM5B1Am/RoughlyEnoughItems-12.0.665.jar"
-hash-format = "sha1"
-hash = "16940571733214d11c008915fca75b1231b3f303"
-
-[update]
-[update.modrinth]
-mod-id = "nfn13YXA"
-version = "hRM5B1Am"

mods/replaymod.pw.toml

@@ -0,0 +1,13 @@
+name = "ReplayMod"
+filename = "replaymod-1.20.1-2.6.13.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/Nv2fQJo5/versions/akFkhrL8/replaymod-1.20.1-2.6.13.jar"
+hash-format = "sha1"
+hash = "a7d1cf1041c1b869dbe25d98abe81138ef634936"
+
+[update]
+[update.modrinth]
+mod-id = "Nv2fQJo5"
+version = "akFkhrL8"

mods/where-is-it.pw.toml

@@ -0,0 +1,13 @@
+name = "Where Is It"
+filename = "whereisit-2.0.24+1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/FCTyEqkn/versions/E3rNBZFj/whereisit-2.0.24%2B1.20.1.jar"
+hash-format = "sha1"
+hash = "1f1ed7da4534e1772749c769ca049d943766dce5"
+
+[update]
+[update.modrinth]
+mod-id = "FCTyEqkn"
+version = "E3rNBZFj"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "2df30398ae06631861294fa375d99c8d589387dd42fc8bfc8459d58eb40312a6"
+hash = "313f3f27c1da618e18ccb4b91646d40190e6f4616a0eea880730dd1cb59432e7"
 
 [versions]
 minecraft = "1.20.1"

resourcepacks/enhanced-boss-bars.pw.toml

@@ -0,0 +1,13 @@
+name = "Enhanced Boss Bars"
+filename = "enhanced-boss-bars.zip"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/U5SedJ9S/versions/UeydEnnB/%5B1.3%5D%20Enhanced%20Boss%20Bars.zip"
+hash-format = "sha1"
+hash = "5e51da85f73b436671ecd7a37b5f07c2263cdbfc"
+
+[update]
+[update.modrinth]
+mod-id = "U5SedJ9S"
+version = "UeydEnnB"