Merge branch 'origin/main' into main

client/overrides/options.txt

@@ -48,9 +48,9 @@ mouseSensitivity:0.5
 damageTiltStrength:1.0
 highContrast:false
 narratorHotkey:true
-resourcePacks:["vanilla","mod_resources","file/CozyUI+_v1"]
+resourcePacks:[]
 incompatibleResourcePacks:[]
-lastServer:192.168.121.90
+lastServer:
 lang:zh_cn
 chatVisibility:0
 chatOpacity:1.0
@@ -190,6 +190,24 @@ key_gui.xaero_map_zoom_in:key.keyboard.unknown
 key_gui.xaero_map_zoom_out:key.keyboard.unknown
 key_gui.xaero_quick_confirm:key.keyboard.right.shift
 key_gui.xaero_toggle_dimension:key.keyboard.unknown
+key_key.replaymod.playeroverview:key.keyboard.b
+key_key.replaymod.lighting:key.keyboard.z
+key_key.replaymod.quickmode:key.keyboard.q
+key_key.replaymod.settings:key.keyboard.unknown
+key_key.replaymod.marker:key.keyboard.m
+key_key.replaymod.thumbnail:key.keyboard.n
+key_key.replaymod.playpause:key.keyboard.p
+key_key.replaymod.rollclockwise:key.keyboard.l
+key_key.replaymod.rollcounterclockwise:key.keyboard.j
+key_key.replaymod.resettilt:key.keyboard.k
+key_key.replaymod.pathpreview:key.keyboard.h
+key_key.replaymod.keyframerepository:key.keyboard.x
+key_key.replaymod.clearkeyframes:key.keyboard.c
+key_key.replaymod.synctimeline:key.keyboard.v
+key_key.replaymod.positionkeyframe:key.keyboard.i
+key_key.replaymod.positiononlykeyframe:key.keyboard.unknown
+key_key.replaymod.timekeyframe:key.keyboard.o
+key_key.replaymod.bothkeyframes:key.keyboard.unknown
 key_iris.keybind.reload:key.keyboard.r
 key_iris.keybind.toggleShaders:key.keyboard.k
 key_iris.keybind.shaderPackSelection:key.keyboard.o

client/overrides/shaderpacks/ComplementaryReimagined_r5.txt

@@ -1,4 +1,4 @@
-#Mon May 18 17:20:06 CST 2026
+#Mon Jun 15 01:08:33 CST 2026
 BLOCK_REFLECT_QUALITY=0
 CLOUD_QUALITY=1
 DETAIL_QUALITY=0