Merge remote-tracking branch 'upstream/main'

docs/mods.md

@@ -67,6 +67,7 @@ The [`Better Leaves` resource-pack by MidnightDust](https://modrinth.com/resourc
 - `Axes are Weapons` — allows sword enchantments for axes
 - `Culinaire` — more food items
 - `Debugify` — fixes various bugs
+- `Extended Drawers` — storage drawers
 - `Fabric Waystones` — waystones
 - `Gravestones`
 - `Light Overlay`
@@ -90,6 +91,8 @@ The [`Better Leaves` resource-pack by MidnightDust](https://modrinth.com/resourc
 - `Moonlight Lib` — required by `Supplementaries`
 - `oωo` — required by `Fabric Waystones`, `Infinity Buttons`
 - `Resourceful Lib` — required by `Chipped`, `Handcrafted`
+- `Statement` — required by `Lanterns Belong on Walls`
+- `YetAnotherConfigLib` — required by `Zoomify`
 
 ## Not included
 ### Experimental

src/client/one-time-overrides/config/iris.properties

@@ -0,0 +1,8 @@
+#This file stores configuration options for Iris, such as the currently active shaderpack
+#Tue Sep 05 23:05:57 CEST 2023
+colorSpace=SRGB
+disableUpdateMessage=true
+enableDebugOptions=false
+maxShadowRenderDistance=32
+shaderPack=
+enableShaders=true

src/client/one-time-overrides/options.amecsapi.txt

@@ -43,23 +43,6 @@ key_modifiers_key.amecs.toggle_right_pants_leg:0,0,0
 key_modifiers_key.amecs.toggle_hat:0,0,0
 key_modifiers_key.dynamic_fps.toggle_forced:0,0,0
 key_modifiers_key.dynamic_fps.toggle_disabled:0,0,0
-key_modifiers_key.journeymap.zoom_in:0,0,0
-key_modifiers_key.journeymap.zoom_out:0,0,0
-key_modifiers_key.journeymap.minimap_type:0,0,0
-key_modifiers_key.journeymap.minimap_preset:0,0,0
-key_modifiers_key.journeymap.create_waypoint:0,0,0
-key_modifiers_key.journeymap.toggle_waypoints:0,0,0
-key_modifiers_key.journeymap.fullscreen_create_waypoint:0,0,0
-key_modifiers_key.journeymap.fullscreen_chat_position:0,0,0
-key_modifiers_key.journeymap.map_toggle_alt:0,0,0
-key_modifiers_key.journeymap.fullscreen_waypoints:0,0,0
-key_modifiers_key.journeymap.minimap_toggle_alt:0,0,0
-key_modifiers_key.journeymap.fullscreen_options:0,0,0
-key_modifiers_key.journeymap.fullscreen.north:0,0,0
-key_modifiers_key.journeymap.fullscreen.south:0,0,0
-key_modifiers_key.journeymap.fullscreen.east:0,0,0
-key_modifiers_key.journeymap.fullscreen.west:0,0,0
-key_modifiers_key.journeymap.fullscreen.disable_buttons:0,0,0
 key_modifiers_key.lightoverlay.enable_overlay:0,0,0
 key_modifiers_key.modmenu.open_menu:0,0,0
 key_modifiers_key.raised.hud.down:0,0,0

src/client/one-time-overrides/options.txt

@@ -66,23 +66,6 @@ key_key.amecs.toggle_right_pants_leg:key.keyboard.unknown
 key_key.amecs.toggle_hat:key.keyboard.unknown
 key_key.dynamic_fps.toggle_forced:key.keyboard.unknown
 key_key.dynamic_fps.toggle_disabled:key.keyboard.unknown
-key_key.journeymap.zoom_in:key.keyboard.equal
-key_key.journeymap.zoom_out:key.keyboard.minus
-key_key.journeymap.minimap_type:key.keyboard.left.bracket
-key_key.journeymap.minimap_preset:key.keyboard.backslash
-key_key.journeymap.create_waypoint:key.keyboard.b
-key_key.journeymap.toggle_waypoints:key.keyboard.z
-key_key.journeymap.fullscreen_create_waypoint:key.keyboard.b
-key_key.journeymap.fullscreen_chat_position:key.keyboard.c
-key_key.journeymap.map_toggle_alt:key.keyboard.j
-key_key.journeymap.fullscreen_waypoints:key.keyboard.n
-key_key.journeymap.minimap_toggle_alt:key.keyboard.m
-key_key.journeymap.fullscreen_options:key.keyboard.o
-key_key.journeymap.fullscreen.north:key.keyboard.up
-key_key.journeymap.fullscreen.south:key.keyboard.down
-key_key.journeymap.fullscreen.east:key.keyboard.right
-key_key.journeymap.fullscreen.west:key.keyboard.left
-key_key.journeymap.fullscreen.disable_buttons:key.keyboard.h
 key_key.lightoverlay.enable_overlay:key.keyboard.f7
 key_key.modmenu.open_menu:key.keyboard.unknown
 key_key.raised.hud.down:key.keyboard.unknown

src/universal/mods/extended-drawers.hm.json

@@ -0,0 +1,21 @@
+{
+  "formatVersion": 1,
+  "displayName": "Extended Drawers",
+  "enabled": true,
+  "version": {
+    "name": "2.0.5+mc.1.20.1",
+    "size": 2336303,
+    "fileName": "ExtendedDrawers-2.0.5+mc.1.20.1.jar",
+    "downloadUrl": "https://cdn.modrinth.com/data/AhtxbnpG/versions/bMTgXYHf/ExtendedDrawers-2.0.5%2Bmc.1.20.1.jar",
+    "hashes": {
+      "sha1": "da30ddcb45651e6070cecf2208c7e8ad179e0169",
+      "sha512": "9792945c4ea5d3225ecd37a5128f688faa9c02ad63999feb3f35e1516b1c426caae78c9a5ae38d8be7d4f50ba00885e669cf32a7ee948c644e9f68f3eea41b47"
+    }
+  },
+  "source": {
+    "type": "modrinth",
+    "modId": "AhtxbnpG",
+    "versionId": "bMTgXYHf",
+    "ignoreUpdates": false
+  }
+}