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

Fabric and Quilt use slightly different values for this setting aaAAAAAA

config/yosbr/options.txt

@@ -11,7 +11,7 @@ tutorialStep:none
 skipMultiplayerWarning:true
 joinedFirstServer:true
 onboardAccessibility:false
-resourcePacks:["vanilla","fabric","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"]
 incompatibleResourcePacks:["betterbeds:connectedbeds","midnightcontrols:bedrock"]
 key_key.saveToolbarActivator:key.keyboard.v
 key_iris.keybind.reload:key.keyboard.unknown

index.toml

@@ -34,7 +34,7 @@ hash = "29e8afe5258e9f0cbeb96d3e8ab0cbdb4eadacf48621a6df06a6dece25410547"
 
 [[files]]
 file = "config/yosbr/options.txt"
-hash = "41150bb1b8b9238fcce207696cd32bd83650f0cd51e8c69c98f2314147f6a6e7"
+hash = "9b49e7162aeeb2a53a1df56d3a785db854f219b66025501d185d250b82784c92"
 
 [[files]]
 file = "config/yosbr/shaderpacks/ComplementaryReimagined_r2.2.zip.txt"
@@ -128,11 +128,6 @@ file = "mods/cull-less-leaves.pw.toml"
 hash = "312270e142843c8709d2768888f6a95572ed385d4b4aaf50526f1bfa667cf23c"
 metafile = true
 
-[[files]]
-file = "mods/dashloader.pw.toml"
-hash = "f0f82f41fef1fbc7d19723170410c631894de34ba0701157a1a897bac0af34d1"
-metafile = true
-
 [[files]]
 file = "mods/dynamic-fps.pw.toml"
 hash = "c8c6a3893859d2f0e04ebf400c8ce8b47de21cfe6097996b5dde1561e92f3c80"
@@ -140,7 +135,7 @@ metafile = true
 
 [[files]]
 file = "mods/entity-model-features.pw.toml"
-hash = "4e3baa9e0fc7c2263e325aa6a60fc97fda722fbf0c82520b0430cec6fad68199"
+hash = "a42efa3033cacd177b4ad1d014f354246aa05e996f9183695b5eedb6fe93f8b6"
 metafile = true
 
 [[files]]
@@ -153,6 +148,16 @@ file = "mods/entitytexturefeatures.pw.toml"
 hash = "49a42a2456b0d0024bb61afdfeb279c51d581901fbd59a4d00ff772b206fefaa"
 metafile = true
 
+[[files]]
+file = "mods/fabric-api.pw.toml"
+hash = "2205239199b4a1e74afcdba1151807d2e4487ce2cf116cee9f62d25f1659a3f5"
+metafile = true
+
+[[files]]
+file = "mods/fabric-language-kotlin.pw.toml"
+hash = "de9b5bac4165fb069bf6df9da2bb6028d50dd51fa0d294f0fb62d1d0c64b707b"
+metafile = true
+
 [[files]]
 file = "mods/fabricskyboxes-interop.pw.toml"
 hash = "3a86b3417b781abc294b6e41c475e5ac1831944527db6f07f0107a30e5bde0bd"
@@ -268,21 +273,6 @@ file = "mods/puzzle.pw.toml"
 hash = "684594797d13dbc0ca57a5a6349a4597c03f629617bff83621bafb147a22ee76"
 metafile = true
 
-[[files]]
-file = "mods/qkl.pw.toml"
-hash = "02343a477f6f4ffd9cbedd4f93252f443c599b2f8d250037920d3a47f5756e6a"
-metafile = true
-
-[[files]]
-file = "mods/qsl.pw.toml"
-hash = "be8073079bf41847c3aa1fb80c9941fa52b8c0ae39eb44a1475618d31c33e1d9"
-metafile = true
-
-[[files]]
-file = "mods/quilt-loading-screen.pw.toml"
-hash = "0431d2fbc92b56108c48fc955caafbefcafeb69bc9773c5413daa89af5d87966"
-metafile = true
-
 [[files]]
 file = "mods/reeses-sodium-options.pw.toml"
 hash = "a1d419cad5a32a4a442b37b2e2fe2db3e761429d6ab60dd3bb79f43d36df2297"
@@ -320,7 +310,7 @@ metafile = true
 
 [[files]]
 file = "mods/wthit.pw.toml"
-hash = "ba1c6b53100f4b5666ccd77de55a8a29daf7b5b1b961f16dcbb8127959221a61"
+hash = "5d920f14136c4e3b7731846bd21dbb5ace512d962b61338ffffeae284525b520"
 metafile = true
 
 [[files]]

mods/dashloader.pw.toml

@@ -1,13 +0,0 @@
-name = "DashLoader"
-filename = "dashloader-5.0.0-beta.1+1.20.0.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/ZfQ3kTvR/versions/mcU33FBx/dashloader-5.0.0-beta.1%2B1.20.0.jar"
-hash-format = "sha1"
-hash = "2ba04e6d6876faf160367fbe4c8bf3a8ea301261"
-
-[update]
-[update.modrinth]
-mod-id = "ZfQ3kTvR"
-version = "mcU33FBx"

mods/entity-model-features.pw.toml

@@ -1,13 +1,13 @@
 name = "Entity Model Features [CEM]"
-filename = "entity_model_features_fabric_1.20-0.2.11.jar"
+filename = "entity_model_features_fabric_1.20-0.2.12.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/nqu0vi2x/entity_model_features_fabric_1.20-0.2.11.jar"
+url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/ZAuTqMfx/entity_model_features_fabric_1.20-0.2.12.jar"
 hash-format = "sha1"
-hash = "c0481a39a05d484096fec589318e9dd545199416"
+hash = "d38ed7290ba1e8443b09ea68b2ef8000b59c3e41"
 
 [update]
 [update.modrinth]
 mod-id = "4I1XuqiY"
-version = "nqu0vi2x"
+version = "ZAuTqMfx"

mods/fabric-api.pw.toml

@@ -0,0 +1,13 @@
+name = "Fabric API"
+filename = "fabric-api-0.85.0+1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/hFdJG9fY/fabric-api-0.85.0%2B1.20.1.jar"
+hash-format = "sha1"
+hash = "02ae17b8122b176f2884cae49af440e27bee7161"
+
+[update]
+[update.modrinth]
+mod-id = "P7dR8mSH"
+version = "hFdJG9fY"

mods/fabric-language-kotlin.pw.toml

@@ -0,0 +1,13 @@
+name = "Fabric Language Kotlin"
+filename = "fabric-language-kotlin-1.10.0+kotlin.1.9.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/65oEzjEs/fabric-language-kotlin-1.10.0%2Bkotlin.1.9.0.jar"
+hash-format = "sha1"
+hash = "e0a7c6564243009f9bf2476b70e9af98dd2dd944"
+
+[update]
+[update.modrinth]
+mod-id = "Ha28R6CL"
+version = "65oEzjEs"

mods/qkl.pw.toml

@@ -1,13 +0,0 @@
-name = "Quilt Kotlin Libraries (QKL)"
-filename = "quilt-kotlin-libraries-2.1.0+kt.1.8.22+flk.1.9.4.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/lwVhp9o5/versions/AD5KqMGz/quilt-kotlin-libraries-2.1.0%2Bkt.1.8.22%2Bflk.1.9.4.jar"
-hash-format = "sha1"
-hash = "2c94176466a836d289c3af3dde39d97a167f8070"
-
-[update]
-[update.modrinth]
-mod-id = "lwVhp9o5"
-version = "AD5KqMGz"

mods/qsl.pw.toml

@@ -1,13 +0,0 @@
-name = "Quilted Fabric API (QFAPI) / Quilt Standard Libraries (QSL)"
-filename = "qfapi-7.0.6_qsl-6.0.4_fapi-0.85.0_mc-1.20.1.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/4JBkYQUF/qfapi-7.0.6_qsl-6.0.4_fapi-0.85.0_mc-1.20.1.jar"
-hash-format = "sha1"
-hash = "96f0d25eceddfbbc65be529c59d3211b47664b32"
-
-[update]
-[update.modrinth]
-mod-id = "qvIfYCYJ"
-version = "4JBkYQUF"

mods/quilt-loading-screen.pw.toml

@@ -1,13 +0,0 @@
-name = "Quilt Loading Screen"
-filename = "quilt_loading_screen-6.0.0+1.20.1.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/VPU6VYVP/versions/ZxKclDRW/quilt_loading_screen-6.0.0%2B1.20.1.jar"
-hash-format = "sha1"
-hash = "b257e89ff9bb3cf2cad5ffd6de781722f37f02ee"
-
-[update]
-[update.modrinth]
-mod-id = "VPU6VYVP"
-version = "ZxKclDRW"

mods/wthit.pw.toml

@@ -1,13 +1,13 @@
 name = "WTHIT"
-filename = "wthit-quilt-8.1.1.jar"
+filename = "wthit-fabric-8.1.1.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/Q8mlBOGM/wthit-quilt-8.1.1.jar"
+url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/k8RgJjbP/wthit-fabric-8.1.1.jar"
 hash-format = "sha1"
-hash = "fcfcd6c0b5c65f68246043f372fd7e85de615d07"
+hash = "9a8640b2af89537ade0da2d16f0c39bb5b76d04e"
 
 [update]
 [update.modrinth]
 mod-id = "6AQIaxuO"
-version = "Q8mlBOGM"
+version = "k8RgJjbP"

pack.toml

@@ -1,16 +1,16 @@
 name = "NullLite"
 author = "NullBite"
-version = "1.3.1"
+version = "1.3.2"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "22028d801ac83e3e973d8d8ccc1b266bc70dac84e485dc7599543f35bf975ac6"
+hash = "dd6e3453a2bffa6695c8bca647165fb223c93b2203bc1aecd74bf0ed0ec193e4"
 
 [versions]
+fabric = "0.14.21"
 minecraft = "1.20.1"
-quilt = "0.19.2"
 
 [options]
 acceptable-game-versions = ["1.20"]