zkk 812c10499e Merge commit 'ee29d06f9eeb888dc2e45ef5c097facc581d1784' into develop
# Conflicts:
#	config/main_menu.conf   resolved by ee29d06 version
#	config/model_menu.conf   resolved by develop version
#	ks_includes/locales/KlipperScreen.pot   resolved by ee29d06 version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by ee29d06 version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po   resolved by ee29d06 version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by ee29d06 version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po   resolved by ee29d06 version
#	ks_includes/prompts_text.py   resolved by ee29d06 version
#	ks_includes/widgets/prompts.py   resolved by ee29d06 version
#	panels/factory_settings.py   resolved by ee29d06 version
#	panels/offset_fine_tune.py   resolved by develop version
#	screen.py   resolved by ee29d06 version
#	styles/dark/images/wiki_qr_code.svg   resolved by develop version
#	styles/light/images/wiki_qr_code.svg   resolved by develop version
2025-03-05 13:55:21 +08:00
..
2021-12-04 12:28:37 -05:00