Merge branch 'feature/masa-pre-modrinth' into staging/1.20.1

Merge remote-tracking branch 'upstream/staging/quilt/1.20.1' into staging/1.20.1
grrr gitea doesn't serve symlinks properly
2023-11-04 01:30:54 -04:00 · 2023-11-04 01:29:35 -04:00 · 2023-11-04 01:00:51 -04:00 · 2023-11-04 00:57:39 -04:00 · 2023-11-03 23:22:01 -04:00 · 2023-11-03 23:18:33 -04:00
16 changed files with 197 additions and 21 deletions
--- a/config/yosbr/config/default_carpet.conf
+++ b/config/yosbr/config/default_carpet.conf
@ -0,0 +1 @@
+accurateBlockPlacement true
--- a/config/yosbr/config/litematica.json
+++ b/config/yosbr/config/litematica.json
@ -0,0 +1,7 @@
+{
+  "Hotkeys": {
+    "openGuiMainMenu": {
+      "keys": ""
+    }
+  }
+}
--- a/config/yosbr/config/minihud.json
+++ b/config/yosbr/config/minihud.json
@ -0,0 +1,21 @@
+{
+  "Generic": {
+    "mainRenderingToggle": {
+      "enabled": false,
+      "hotkey": {
+        "keys": "H,T",
+        "settings": {
+          "activate_on": "PRESS",
+          "context": "INGAME",
+          "allow_empty": false,
+          "allow_extra_keys": false,
+          "order_sensitive": true,
+          "exclusive": false,
+          "cancel": true
+        }
+      }
+    }
+  },
+  "config_version": 1
+}
+
--- a/config/yosbr/config/tweakeroo.json
+++ b/config/yosbr/config/tweakeroo.json
@ -0,0 +1,10 @@
+{
+  "DisableToggles": {
+    "disablePortalGuiClosing": {
+      "enabled": true,
+      "hotkey": {
+        "keys": ""
+      }
+    }
+  }
+}
--- a/config/yosbr/options.txt
+++ b/config/yosbr/options.txt
@ -12,5 +12,13 @@ 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","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
--- a/config/yosbr/world/carpet.conf
+++ b/config/yosbr/world/carpet.conf
@ -0,0 +1 @@
+accurateBlockPlacement true
--- a/index.toml
+++ b/index.toml
@ -12,6 +12,10 @@ hash = "f5931fa810e46cf080715fe862132aded028984f89c80f293ef66ee34856e6a5"
 file = "config/yosbr/config/capes.json5"
 hash = "b0e11760190870b23a50e68018a3792e6ad3929302bb2917db21268a20f858af"

+[[files]]
+file = "config/yosbr/config/default_carpet.conf"
+hash = "7e5cdd9f750de73a3962a551a54ac01aaae9411f84c8b8f2519b3ce1c138fff5"
+
 [[files]]
 file = "config/yosbr/config/doubledoors.json5"
 hash = "c499be02b3bda95064ad3791a6018b7d4d07d351cd429bf0397a3f710d06c36c"
@ -24,6 +28,14 @@ hash = "b6842d4f8da21a23a32b70c584ba495d6311b5c7e2a8a79b5f7d4ee2a048016b"
 file = "config/yosbr/config/inventoryprofilesnext/inventoryprofiles.json"
 hash = "000b31b1c42d90dbc3cd9964df47b9093e698ac08c002771c924b340529e6a18"

+[[files]]
+file = "config/yosbr/config/litematica.json"
+hash = "660a48ce63d51851782f9b750f6d8861254db88403a68e53ae681f048ce12f91"
+
+[[files]]
+file = "config/yosbr/config/minihud.json"
+hash = "5fd286fe131243fda8c1bac1ecdc51046a75da8325ea6b9c360edb4b1e0f16b8"
+
 [[files]]
 file = "config/yosbr/config/puzzle.json"
 hash = "f4f3a9663a482ff424c2db4212fc6f6842c1af3bfb97ebe5c5d7e35e33974e78"
@ -40,6 +52,10 @@ hash = "faf30cde5b1e7f771326d67ef62a96c21b77528fda556b6211e35ac15335d5df"
 file = "config/yosbr/config/roughlyenoughitems/config.json5"
 hash = "c072599a7c36a2e240d61ea78ee02b57dec67ae1cfb6dfe70f8ea58537099d40"

+[[files]]
+file = "config/yosbr/config/tweakeroo.json"
+hash = "e447b1be8e496c94829e795ec3342e304970222b7539a31c9f9a7693d33bdfc0"
+
 [[files]]
 file = "config/yosbr/config/xaerominimap.txt"
 hash = "8617ce5864f1a621c27456ad72a5dfb44d826c006afdd772cf32970dc6455a47"
@ -54,7 +70,7 @@ hash = "29e8afe5258e9f0cbeb96d3e8ab0cbdb4eadacf48621a6df06a6dece25410547"

 [[files]]
 file = "config/yosbr/options.txt"
-hash = "f34523709dbae8f3b48196c4331ab6da7d6c6d70bbd5f0c4f6d2b7196021ec70"
+hash = "14303032dc114706dd212b473599d7c504cd1ec59ad3023e4214eab7859ed7ef"

 [[files]]
 file = "config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt"
@ -68,6 +84,10 @@ hash = "6f5bf766cebabca0bcfa339eeb119956c48c40eba03c5aa39d7685eab67c56b5"
 file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt"
 hash = "6e7b02f11cb6feb7f08d1088d042518d1a04cb6b71a7b2b109cf997173510e3c"

+[[files]]
+file = "config/yosbr/world/carpet.conf"
+hash = "7e5cdd9f750de73a3962a551a54ac01aaae9411f84c8b8f2519b3ce1c138fff5"
+
 [[files]]
 file = "kubejs/server_scripts/cherry_wood_fixes.js"
 hash = "4f35c8097157e770778f53b4b81dbd3450c1b76d0d99cd8cca76d8551c5dda1e"
@ -87,6 +107,11 @@ file = "mods/ambientsounds.pw.toml"
 hash = "65df20d0156ede8eefdedbcb297ee041f3e0d4058e957f3b7d52c509d9d07852"
 metafile = true

+[[files]]
+file = "mods/amecs.pw.toml"
+hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc"
+metafile = true
+
 [[files]]
 file = "mods/appleskin.pw.toml"
 hash = "e3dfb2478e6bb096667d4ec89b0ddfef627747939373bdefee02f358d6e3dee1"
@ -172,6 +197,11 @@ file = "mods/capes.pw.toml"
 hash = "4c712d7ad6d2ddb130b845c3b2c660be7cb7795db21be00b130443730719305e"
 metafile = true

+[[files]]
+file = "mods/carpet-extra.pw.toml"
+hash = "5aa266498f131bf7b9d764d608b6416f36555c228110c0d5126bcd7c8bec9f9c"
+metafile = true
+
 [[files]]
 file = "mods/carpet-fixes.pw.toml"
 hash = "d7c6555b666ff113894f6dd6dba7e6cc95c041542d06a39fd6f67421341711b9"
@ -452,11 +482,6 @@ file = "mods/jei.pw.toml"
 hash = "3851cfa6f95cac87314de473dd4179271c8dab6c639652dc83ac688169c00124"
 metafile = true

-[[files]]
-file = "mods/keybind-fix.pw.toml"
-hash = "48777d535f2dbe76ec2adb6a001ab4442e40e0e403570eb5dc9a49e6957e40a1"
-metafile = true
-
 [[files]]
 file = "mods/krypton.pw.toml"
 hash = "71ef7cc16632c0039fe194183b5885968c6d740aaa67a58000653ae0cb40b882"
@ -487,16 +512,31 @@ file = "mods/lilac.pw.toml"
 hash = "40da6c11ac0a856fb0fa5688bf7df6538bba3cb0c0258b6611ce56fb8a0f0f69"
 metafile = true

+[[files]]
+file = "mods/litematica.pw.toml"
+hash = "87a313a3e048b2dffb8d501e4cb4afd275f263d8b0fbcdeb6f55d7d0efbdef8f"
+metafile = true
+
 [[files]]
 file = "mods/lithium.pw.toml"
 hash = "c239c951796882b9c93e649a0dba4f2d95804441faaed707b686381b7a5c67da"
 metafile = true

+[[files]]
+file = "mods/malilib.pw.toml"
+hash = "1acd996072e196d8bf814766bcbd074c726d8ed95d0be773ce2ce04ca2d60e95"
+metafile = true
+
 [[files]]
 file = "mods/midnightcontrols.pw.toml"
 hash = "5f6bbdeff1476501410b0e6f304a3d37183d9774bd1b182c20ffd186bb140ba2"
 metafile = true

+[[files]]
+file = "mods/minihud.pw.toml"
+hash = "1bdf87c5dd44a752e0fa20ba3b42eb2671d3271c20da595115ae9b7ca63b1ada"
+metafile = true
+
 [[files]]
 file = "mods/mixintrace.pw.toml"
 hash = "b89656eaf7e4404d8d2c5b1e1155aae85a839939f83cab6d1b5e791412ad5f86"
@ -527,6 +567,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"
@ -652,6 +697,11 @@ file = "mods/tree-harvester.pw.toml"
 hash = "7abb44df595d8176b296678936304e7f6e046d704d365bf2df06b964f1a632fb"
 metafile = true

+[[files]]
+file = "mods/tweakeroo.pw.toml"
+hash = "75b8ac35dee78b95e98d995a1d22e2b122e39425b2ab8838334b8cac849ca0f4"
+metafile = true
+
 [[files]]
 file = "mods/way2wayfabric.pw.toml"
 hash = "8d2217dc18ef88b1032c2e192ed2905a738e15e8425cc2a5a292949bca77d109"
--- a/mods/amecs.pw.toml
+++ b/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"
--- a/mods/carpet-extra.pw.toml
+++ b/mods/carpet-extra.pw.toml
@ -0,0 +1,13 @@
+name = "Carpet Extra"
+filename = "carpet-extra-1.20-1.4.115.jar"
+side = "server"
+
+[download]
+url = "https://cdn.modrinth.com/data/VX3TgwQh/versions/gPJoJ3mr/carpet-extra-1.20-1.4.115.jar"
+hash-format = "sha1"
+hash = "09f1aeb870393d9ee07d895b5a60c7594a0bddd5"
+
+[update]
+[update.modrinth]
+mod-id = "VX3TgwQh"
+version = "gPJoJ3mr"
--- a/mods/keybind-fix.pw.toml
+++ b/mods/keybind-fix.pw.toml
@ -1,13 +0,0 @@
-name = "Keybind Fix"
-filename = "keybind_fix-1.0.0.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/vuWNr14n/versions/4VeEKlR8/keybind_fix-1.0.0.jar"
-hash-format = "sha1"
-hash = "d99355fe589dfb41b2d7d7e2c20b733ca3a086d8"
-
-[update]
-[update.modrinth]
-mod-id = "vuWNr14n"
-version = "4VeEKlR8"
--- a/mods/litematica.pw.toml
+++ b/mods/litematica.pw.toml
@ -0,0 +1,13 @@
+name = "Litematica"
+filename = "litematica-fabric-1.20.1-0.15.3.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "427b04faee05fab436c52c3618e8e391a010b648"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4626718
+project-id = 308892
--- a/mods/malilib.pw.toml
+++ b/mods/malilib.pw.toml
@ -0,0 +1,13 @@
+name = "MaLiLib"
+filename = "malilib-fabric-1.20.1-0.16.2.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "e68382cb8065919026b47090491bab92be13ee78"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4723020
+project-id = 303119
--- a/mods/minihud.pw.toml
+++ b/mods/minihud.pw.toml
@ -0,0 +1,13 @@
+name = "MiniHUD"
+filename = "minihud-fabric-1.20.1-0.27.0.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "ab371c460a00cb18bfe41c49e5645dfe0e133d65"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4593082
+project-id = 244260
--- a/mods/nmuk.pw.toml
+++ b/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"
--- a/mods/tweakeroo.pw.toml
+++ b/mods/tweakeroo.pw.toml
@ -0,0 +1,13 @@
+name = "Tweakeroo"
+filename = "tweakeroo-fabric-1.20.1-0.17.1.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "2a18f5905f9e10c6a3b45388b4401ec135b3b3cf"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4623488
+project-id = 297344
--- a/pack.toml
+++ b/pack.toml
@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "ef7d0e111b0f8fa9be2c6856f814b09a9b66a02e89b3ad7206568d4a88066161"
+hash = "3ab26abc33fdc69408d7b5f5a2fae160b4821a288028f0623d0d234ec67d80a2"

 [versions]
 minecraft = "1.20.1"
Author	SHA1	Message	Date
NullBite	3cf3e5b074	Merge branch 'feature/masa-pre-modrinth' into staging/1.20.1	2023-11-04 01:30:54 -04:00
NullBite	280d71fe1c	Merge remote-tracking branch 'upstream/staging/quilt/1.20.1' into staging/1.20.1	2023-11-04 01:29:35 -04:00
NullBite	0a294253c3	grrr gitea doesn't serve symlinks properly	2023-11-04 01:00:51 -04:00
NullBite	c9de177757	Set default options for Carpet - accurateBlockPlacement true (this allows Tweakeroo flexible block placement)	2023-11-04 00:57:39 -04:00
NullBite	4a37481c61	Add Carpet Extra This is for accurateBlockPlacement compatibility	2023-11-03 23:22:01 -04:00
NullBite	7101d947f5	Add configs for masa mods	2023-11-03 23:18:33 -04:00
NullBite	497a197461	Add Litematica, Tweakeroo, and MiniHUD	2023-11-03 22:48:34 -04:00
NullBite	e5e12b96dc	Change some keybinds Includes keybinds for some mods that are only in NotLite; I'd rather only mess with one upstream settings file instead of having yet anoter file to solve merge conflicts for. Hopefully Minecraft doesn't freak out about nonexistent keybinds.	2023-11-03 20:17:07 -04:00
NullBite	d4e85b21dd	Add No More Useless Keys This mod adds the ability to set multiple keybinds for actions	2023-11-03 19:18:04 -04:00
NullBite	ffa80ee603	Add Amecs (alternative to many keyboard mods) - replaces keyboard-fix - has functionality from controlling - add key combinations - add keybinds for toggling auto jump and skin layers	2023-11-03 19:16:35 -04:00
NullBite	94b03355e5	Remove keybind fix	2023-11-03 19:16:10 -04:00