forked from CreatBot/CreatBotKlipperScreen
# Conflicts: # config/main_menu.conf resolved byee29d06
version # config/model_menu.conf resolved by develop version # ks_includes/locales/KlipperScreen.pot resolved byee29d06
version # ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo resolved byee29d06
version # ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po resolved byee29d06
version # ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo resolved byee29d06
version # ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po resolved byee29d06
version # ks_includes/prompts_text.py resolved byee29d06
version # ks_includes/widgets/prompts.py resolved byee29d06
version # panels/factory_settings.py resolved byee29d06
version # panels/offset_fine_tune.py resolved by develop version # screen.py resolved byee29d06
version # styles/dark/images/wiki_qr_code.svg resolved by develop version # styles/light/images/wiki_qr_code.svg resolved by develop version