merge conflicts are funny and i hate life

Author: Cartrigger

index.toml

@@ -24,6 +24,10 @@ hash = "dd35ecb3544d0fe28d38a7f79d733c81bcfbb356d71bf92e8380ea5f987f1e3f"
 file = "config/customwindowtitle/icon.png"
 hash = "b0079cebac576d90000f09106d3a587876ba9d62e8bd20b755a11930d1860308"
 
+[[files]]
+file = "config/do_a_barrel_roll-client.json"
+hash = "22d6678a60c101e625f1eeea6179f08e9063bf4b0523372482956d0c283c5964"
+
 [[files]]
 file = "config/polydex.json"
 hash = "2a9fa4c5b60e5918349ef56c678b27f1349241c4e4ad14f9f449eaa14af4eedc"
@@ -184,11 +188,6 @@ file = "mods/blahaj_fabric.pw.toml"
 hash = "6ad56a9580061e6d287ba30806d62d5452caaff8cb0fb655748fbd0599017cc2"
 metafile = true
 
-[[files]]
-file = "mods/blast.pw.toml"
-hash = "2a664bb1c8ca299e73d60100cf1662ad8f7d1ef6ccbe549aa445ec7deea08a2a"
-metafile = true
-
 [[files]]
 file = "mods/blocky-bass.pw.toml"
 hash = "cd6dbfa58246fb0efdfc0d76cf09c81fcc862ab271d30c323b1c3a14657b254b"
@@ -1275,7 +1274,7 @@ metafile = true
 
 [[files]]
 file = "mods/winterisms.pw.toml"
-hash = "a690d2d2444593912c35cc3146d59d25826561c86eb33ec1e6fcea3b23cabbc3"
+hash = "bcc7e7f0f1a925e16d41c287a6c43c75fb5d01fbd37cef0c8b6e3ea0256d4dcd"
 metafile = true
 
 [[files]]
@@ -1364,4 +1363,4 @@ metafile = true
 
 [[files]]
 file = "unsup.toml"
-hash = "83e9947bb7357c2de2a85f26ce39586eecb228423edee48c221248af889149c5"
+hash = "ec18b7c47083a3bf2ec83cbf17a0214ac6b1e5ed74601d3a84eed15444c65944"

mods/blast.pw.toml

@@ -1,15 +1,15 @@
 name = "Winterisms"
-filename = "Winterisms-2.0.3+rev.d532af1.jar"
+filename = "Winterisms-2.1.1+build.74.jar"
 side = "both"
 
 [download]
-url = "https://github.com/devOS-Sanity-Edition/Winterisms/releases/download/v2.0.3/Winterisms-2.0.3%2Brev.d532af1.jar"
+url = "https://github.com/devOS-Sanity-Edition/Winterisms/releases/download/v2.1.1/Winterisms-2.1.1%2Bbuild.74.jar"
 hash-format = "sha256"
-hash = "8d72f4e1edf83082eea729a5faec71353cfe369fa1b9d0e70c67e9a7aee58491"
+hash = "372b1aa0ab728d85c41405b00e1bc24fe6af6492532d5bb4fe21847d053a8b39"
 
 [update]
 [update.github]
 branch = "kt/1.21.1/summer"
 regex = "^.+(?<!-api|-dev|-dev-preshadow|-sources)\\.jar$"
 slug = "devOS-Sanity-Edition/Winterisms"
-tag = "v2.0.3"
+tag = "v2.1.1"

mods/winterisms.pw.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "e6e546c1929bade8fa3dbbb7270a210a40f5ac3216a4186bc87202b4315d86b0"
+hash = "d5a1da180353e939f3f275fecddfb0abf761874a491fe45bac4eaf6cd6f2d2a7"
 
 [versions]
 fabric = "0.17.0"