Merge branch 'staging/quilt/mixed/1.20.1' into staging/fabric/mixed/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]]
@@ -173,6 +168,11 @@ file = "mods/fabricskyboxes.pw.toml"
 hash = "08b843dfc24cc97afeba5b3a60a1263c8aa4fc786398a1972cc69741f0253e22"
 metafile = true
 
+[[files]]
+file = "mods/farsight-fabric.pw.toml"
+hash = "825458a5e2a5ffe04e07e92643be57bdbef5861a6670fa996bf0b6a5a10cba9e"
+metafile = true
+
 [[files]]
 file = "mods/ferrite-core.pw.toml"
 hash = "03e174cf691b52da20bd973b955fae6f3720d3d2120f9d6cc1de5fdf3180013c"
@@ -343,6 +343,11 @@ file = "mods/zoomify.pw.toml"
 hash = "fe67f559bf7c07593f1eb0e3cfabb56635de7e566b26241559452dc04484bd4e"
 metafile = true
 
+[[files]]
+file = "resourcepacks/vanillatweaks.pw.toml"
+hash = "2ada98e4a07f325283f285b9ac397636df3414e2b578d3f6e4d55ed00904f23d"
+metafile = true
+
 [[files]]
 file = "shaderpacks/bsl-shaders.pw.toml"
 hash = "ef5060e4fee094045e79fad89880359d0f3ad6042a63c74314adde206f8f208c"

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

@@ -0,0 +1,13 @@
+name = "Farsight [Fabric]"
+filename = "farsight-fabric-1.20.1-3.7.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "fcc303ad8d7b937e175f1dec2e74f5a4bbc5389f"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4595154
+project-id = 579192

pack.toml

@@ -1,11 +1,12 @@
 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 = "91f6a7c6690dd0cdcee7931124439a2e37d63c60f6453801eecc85f494bf1028"
 
 [versions]
 fabric = "0.14.21"

resourcepacks/vanillatweaks.pw.toml

@@ -0,0 +1,7 @@
+name = "resourcepacks/vanillatweaks"
+filename = "VanillaTweaks_r265009.zip"
+
+[download]
+url = "https://f002.backblazeb2.com/file/nullbite-personal/fabric-lite/VanillaTweaks_r265009.zip"
+hash-format = "sha256"
+hash = "72909653977df8ea25db672708ae3ac546da197db6972d551202b3784c904fc7"