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

it breaks armor trims with Figura

README.md

@@ -4,78 +4,12 @@ NotLite is a custom gameplay-altering modpack using
 [NullLite](https://proot.link/nulllite) as its base.
 
 ## Installation
-If you have Prism Launcher, the best way to install this is to import the
-following instance. It comes pre-bundled with
-[packwiz-installer-bootstrap](https://github.com/packwiz/packwiz-installer-bootstrap),
-as well as a pre-configured pre-launch command which will keep the instance
-up-to-date.
-- https://b2.nullbite.com/file/nullbite-personal/fabric-lite/fabric-lite-minecraft-1.20.1.zip
-
-Alternatively, install the `.mrpack` files from the [releases](https://gitea.protogen.io/nullbite/fabric-lite/releases) section.
-
-## Credits
-### Shaders
-- BSL - CaptTatsu (https://bitslablab.com/)
-- Complementary Shaders v4 - EminGT (https://modrinth.com/shader/complementary-shaders-v4)
-- Complementary Reimagined - EminGT (https://modrinth.com/shader/complementary-reimagined)
-- Rethinking Voxels - gri573, EnimGT (https://modrinth.com/shader/rethinking-voxels)
-- MakeUp - javiergchim (https://modrinth.com/shader/makeup-ultra-fast-shaders)
-- VanillAA - leo60228 (https://github.com/leo60228/VanillAA-Shaders)
-
-### Mods
-- AppleSkin - squeek502 (https://github.com/squeek502/AppleSkin)
-- Architectury API - shedaniel (https://github.com/architectury/architectury)
-- Auth Me - axieum (https://github.com/axieum/authme)
-- BetterF3 - treyruffy (https://github.com/cominixo/BetterF3)
-- Better Mount HUD - Lortseam (https://github.com/Lortseam/better-mount-hud)
-- Borderless Mining - comp500 (https://github.com/comp500/BorderlessMining)
-- Capes - caelthecolher (https://github.com/CaelTheColher/Capes)
-- Carpet-Fixes - fxmorin (https://github.com/fxmorin/carpet-fixes)
-- Carpet - gnembon (https://github.com/gnembon/fabric-carpet)
-- CIT Resewn - shsupercm (https://github.com/SHsuperCM/CITResewn)
-- Cloth Config API - shedaniel (https://github.com/shedaniel/ClothConfig/)
-- Continuity - peppercode1 (https://github.com/PepperCode1/Continuity)
-- Cull Less Leaves - isxander (https://github.com/isXander/CullLessLeaves)
-- DashLoader - alphaqu (https://github.com/alphaqu/DashLoader)
-- Dynamic FPS - juliand665 (https://github.com/juliand665/Dynamic-FPS)
-- Entity Culling - tr7zw (https://github.com/tr7zw/EntityCulling)
-- Entity Model Features [CEM] - Traben (https://github.com/Traben-0/Entity_Model_Features)
-- Entity Texture Features - Traben (https://github.com/Traben-0/Entity_Texture_Features)
-- Fabric API - sfPlayer1, modmuss50 (https://github.com/FabricMC/fabric)
-- Fabric Language Kotlin - modmuss50 (https://github.com/FabricMC/fabric-language-kotlin/)
-- FabricSkyboxes - AMereBagatelle (https://github.com/AMereBagatelle/fabricskyboxes)
-- FabricSkyBoxes Interop - FlashyReese (https://github.com/FlashyReese/fabricskyboxes-interop)
-- FerriteCore - malte0811 (https://github.com/malte0811/FerriteCore)
-- Figura - Fran (https://github.com/Kingdom-of-The-Moon/FiguraRewriteRewrite)
-- ImmediatelyFast - RaphiMC (https://github.com/RaphiMC/ImmediatelyFast)
-- Indium - comp500 (https://github.com/comp500/Indium)
-- Inventory Profiles Next - blackd (https://github.com/blackd/Inventory-Profiles)
-- Iris Shaders - coderbot (https://github.com/IrisShaders/Iris)
-- Krypton - astei (https://github.com/astei/krypton)
-- LambDynamicLights - LambdAurora (https://github.com/LambdAurora/LambDynamicLights)
-	- Custom build from Pull Request [#156](https://github.com/LambdAurora/LambDynamicLights/pull/156)
-- Language Reload - Jerozgen (https://github.com/Jerozgen/LanguageReload)
-- libIPN - blackd (https://github.com/blackd/libIPN)
-- Lithium - jellysquid3 (https://github.com/jellysquid3/lithium-fabric)
-- Memory Leak Fix - fxmorin (https://github.com/fxmorin/memoryLeakFix)
-- MidnightControls - Motschen (https://github.com/TeamMidnightDust/MidnightControls)
-- MixinTrace - comp500 (https://github.com/comp500/mixintrace)
-- Mod Menu - Prospector (https://github.com/TerraformersMC/ModMenu)
-- MoreChatHistory - JackFred2 (https://github.com/JackFred2/MoreChatHistory)
-- Mouse Tweaks - YaLTeR (https://github.com/YaLTeR/MouseTweaks)
-- No Chat Reports - Aizistral (https://github.com/Aizistral-Studios/No-Chat-Reports)
-- OptiGUI - opekope2 (https://github.com/opekope2/OptiGUI)
-- Presence Footsteps - Sollace (https://github.com/Sollace/Presence-Footsteps)
-- Puzzle - Motschen (https://github.com/PuzzleMC/Puzzle)
-- Reese's Sodium Options - FlashyReese (https://github.com/FlashyReese/reeses-sodium-options)
-- Roughly Enough Items (REI) - shedaniel (https://github.com/shedaniel/RoughlyEnoughItems)
-- Screenshot to Clipboard - comp500 (https://github.com/comp500/ScreenshotToClipboard)
-- Sodium Extra - FlashyReese (https://github.com/FlashyReese/sodium-extra-fabric)
-- Sodium - jellysquid3 (https://github.com/CaffeineMC/sodium-fabric)
-- spark - lucko (https://github.com/lucko/spark)
-- Starlight (Fabric) - spottedleaf (https://github.com/PaperMC/Starlight)
-- Xaero's Minimap - thexaero (https://modrinth.com/mod/xaeros-minimap)
-- Xaero's World Map - thexaero (https://modrinth.com/mod/xaeros-world-map)
-- YetAnotherConfigLib - isxander (https://github.com/isXander/YetAnotherConfigLib)
-- Your Options Shall Be Respected (YOSBR) - shedaniel (https://github.com/shedaniel/your-options-shall-be-respected)
-- Zoomify - isxander (https://github.com/isXander/Zoomify)
+### Prism Launcher
+1. Create a new Minecraft 1.20.1 instance with Quilt 0.21.0
+2. Download
+   [packwiz-installer-bootstrap](https://github.com/packwiz/packwiz-installer-bootstrap/releases/latest)
+   and place the JAR in your instance's `.minecraft` folder
+3. Add the following pre-launch command:
+   ```
+   $INST_JAVA -jar packwiz-installer-bootstrap.jar -g -s client https://gitea.protogen.io/nullbite/notlite/raw/branch/release/1.20.1/pack.toml
+   ```

index.toml

@@ -432,11 +432,6 @@ file = "mods/identity.pw.toml"
 hash = "89a2dd47f2d4d5da0964bb7e36f733e152ae277e500acc033d66e7fcc0aaaaeb"
 metafile = true
 
-[[files]]
-file = "mods/immediatelyfast.pw.toml"
-hash = "7e9f6a5b564e4fbe92bff784eb13a2565eb5a631ed452cf9b8748e73935ae8b2"
-metafile = true
-
 [[files]]
 file = "mods/immersive-structures.pw.toml"
 hash = "87184da0fbda69dd2d209f9597beca5241893eb32e3e3d07356d1be3afa496b8"
@@ -549,7 +544,7 @@ metafile = true
 
 [[files]]
 file = "mods/moonlight.pw.toml"
-hash = "b903976c1e5c36f0eb88b3dca5f615a538f680f5d3d12ff08f544ce2299206c6"
+hash = "eee45054a6eec19739116ae54df856b8b6826753099f8e45edfc913025b668f5"
 metafile = true
 
 [[files]]
@@ -684,7 +679,7 @@ metafile = true
 
 [[files]]
 file = "mods/supplementaries.pw.toml"
-hash = "265ee1c03e7a25a984f32079edfc45a34edcef45dd2125b6cf8e56507cade89a"
+hash = "26fba32648688af068d9c6ec14e3c83c845abb4fc6f7a86fcdfd0dbabf828d59"
 metafile = true
 
 [[files]]

mods/immediatelyfast.pw.toml

@@ -1,13 +0,0 @@
-name = "ImmediatelyFast"
-filename = "ImmediatelyFast-1.2.6+1.20.2.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/mbeaDZtb/ImmediatelyFast-1.2.6%2B1.20.2.jar"
-hash-format = "sha1"
-hash = "13b4fd8f0214d36a01b2c874f0f88c9ddb2dd556"
-
-[update]
-[update.modrinth]
-mod-id = "5ZwdcRci"
-version = "mbeaDZtb"

mods/moonlight.pw.toml

@@ -1,13 +1,13 @@
 name = "Moonlight Lib"
-filename = "moonlight-1.20-2.8.49-fabric.jar"
+filename = "moonlight-1.20-2.8.59-fabric.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/twkfQtEc/versions/GFChSR1Q/moonlight-1.20-2.8.49-fabric.jar"
+url = "https://cdn.modrinth.com/data/twkfQtEc/versions/vBIzpz3C/moonlight-1.20-2.8.59-fabric.jar"
 hash-format = "sha1"
-hash = "a92962f740cdca34266b06df9d1cc3a348592ecc"
+hash = "ab64ead4371a1ac0ff4a992b4e9e8d5a29c6153a"
 
 [update]
 [update.modrinth]
 mod-id = "twkfQtEc"
-version = "GFChSR1Q"
+version = "vBIzpz3C"

mods/supplementaries.pw.toml

@@ -1,13 +1,13 @@
 name = "Supplementaries"
-filename = "supplementaries-1.20-2.6.12-fabric.jar"
+filename = "supplementaries-1.20-2.6.20-fabric.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/fFEIiSDQ/versions/N7Bej41a/supplementaries-1.20-2.6.12-fabric.jar"
+url = "https://cdn.modrinth.com/data/fFEIiSDQ/versions/3ttoUnCm/supplementaries-1.20-2.6.20-fabric.jar"
 hash-format = "sha1"
-hash = "3f39967253055d986c9b299cbc30919f4442738d"
+hash = "2d57daac728b6a18654df2ff2a2e85d38d8cdff9"
 
 [update]
 [update.modrinth]
 mod-id = "fFEIiSDQ"
-version = "N7Bej41a"
+version = "3ttoUnCm"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "3ab26abc33fdc69408d7b5f5a2fae160b4821a288028f0623d0d234ec67d80a2"
+hash = "8bbda1205c4a0c69ded5211145b11ac16ad435571f93925d1b7a2d4115306585"
 
 [versions]
 minecraft = "1.20.1"