CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity
Files
1.1.2
GeneralKlipperScreen/styles
History
zkk 2727d4615e 合并主项目的master分支 
Squashed commit of the following:

commit bfd5ba6a3c
Author: zkk <1007518571@qq.com>
Date:   Fri Feb 14 15:22:09 2025 +0800

    优化网络页面卡顿问题

    Squashed commit of the following:

    commit 2dba9f8ee2725847f31c891b19df6d9b81e03568
    Merge: 03cd3722 18f05cc5
    Author: zkk <1007518571@qq.com>
    Date:   Fri Feb 14 15:21:36 2025 +0800

        Merge commit '18f05cc52dfb7889853a4f84aad975309ab7dbbe' into release

    commit 18f05cc52d
    Author: zkk <1007518571@qq.com>
    Date:   Wed Feb 5 10:59:00 2025 +0800

        修复连接不了未加密网络的旧问题

    commit 025a26209c
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 24 15:48:52 2025 +0800

        重构网络页面，解决卡顿问题

    commit fdc851c4e6
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 24 15:13:41 2025 +0800

        优化菜单页面的点击效果和增加列表风格属性

    commit e6cfa87420
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 21 15:11:28 2025 +0800

        优化进入工厂模式的方式为10s内点击5次

    commit 03cd37229ee6c606e9814af602709d81b2c79bec
    Merge: cf7cafef adcbaa17
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 17 14:38:18 2025 +0800

        Merge commit 'adcbaa1795bffedc3000bc9e59eabba04d946dd4' into release

    commit adcbaa1795
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 14 15:34:10 2025 +0800

        实现探针偏移值校准保存前范围检测，避免保存错误值无法启动问题

    commit cf7cafefbcd2274c9a481e58042d11db8cd79961
    Merge: dc3478b4 8d259cea
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 7 17:26:59 2025 +0800

        Merge commit '8d259ceadd5026cecc1dc61224d91aef4f3877b4' into release

    commit 8d259ceadd
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 7 17:15:46 2025 +0800

        实现 打印中恢复喷头温度 提示语的翻译

    commit dd11c9683c
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 7 16:52:04 2025 +0800

        优化单个喷头时不显示喷头偏移菜单

    commit c3ec7a81bb
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 3 17:52:24 2025 +0800

        修复屏幕耗材检测显示偶尔不准确的问题

    commit 413bf6fc4a
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 3 15:00:54 2025 +0800

        修复耗材检测弹窗异常问题

    commit dc3478b48c7da1dbae120d1270c9ab64646d6647
    Merge: 02c7556c 3bfc1aa7
    Author: zkk <1007518571@qq.com>
    Date:   Thu Jan 2 11:18:07 2025 +0800

        Merge commit '3bfc1aa714e282d74b801155d830377ca58d8f59' into release

    commit 3bfc1aa714
    Author: zkk <1007518571@qq.com>
    Date:   Thu Jan 2 11:17:15 2025 +0800

        修复移轴页面移轴功能失效问题

    commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
    Merge: 6bfa42e0 991003e6
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 15:07:54 2024 +0800

        Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

    commit 991003e6cb
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 15:03:34 2024 +0800

        优化完整 简体中文和繁体中文的翻译

    commit 1a177e90d0
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 14:10:03 2024 +0800

        优化排除对象的英文语法错误

    commit e8d509cb6c
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 16:40:52 2024 +0800

        优化耗材检测显示内容

    commit 1b7670485a
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 14:56:25 2024 +0800

        完善断料自动切头功能描述

    commit ecc0c3dd16
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 13:40:01 2024 +0800

        实现弹窗翻译功能

    commit bc6d60fa18
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 09:53:16 2024 +0800

        优化不合理名称和不合理大小写

    commit 2e650926bd
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 26 15:06:11 2024 +0800

        修复10寸屏幕偏移值微调页面出界问题

    commit c481b551f7
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 15:28:26 2024 +0800

        优化移轴设置页面没有返回按钮的问题

    commit 2b3c9936bd
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 10:05:04 2024 +0800

        删除移动设置页面中轴反转的选项

    commit 5e37d59497
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 09:05:03 2024 +0800

        优化选择语言标题

    commit 5214c3697b
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 24 10:57:41 2024 +0800

        增加设置hostname功能

    commit 3709a7465c
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 24 10:43:46 2024 +0800

        增加工厂设置中打包模式

    commit 0c2a2618be
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 23 16:25:37 2024 +0800

        实现恢复出厂设置功能

    commit e3a38f8561
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 23 15:48:17 2024 +0800

        一点格式化

    commit 4e9e452e8b
    Author: zkk <1007518571@qq.com>
    Date:   Sat Dec 21 14:20:22 2024 +0800

        优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

    commit 3b85e8e8d5
    Merge: 882850db 10ec2029
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:26:08 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 882850dbde
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:21:16 2024 +0800

        补充双喷头偏移校准页面二维码图片

    commit 10ec2029eb
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 18 17:17:18 2024 +0800

        增加自动切换喷头开关选项

    commit 3d6eed9d95
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 16 16:33:34 2024 +0800

        喷头偏移值校准功能的实现

    commit 40ecbb3ea4
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:20:00 2024 +0800

        z探针校准时指定默认激活工具头为第一个头

    commit bce3caa409
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:19:19 2024 +0800

        优化z探针校准时候移动过慢问题

    commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
    Merge: 1a87ced3 4f3aa9aa
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:33:58 2024 +0800

        Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

    commit 4f3aa9aa4c
    Merge: e3fd413d 1a69b518
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:30:00 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 1a69b5180d
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 11 11:44:36 2024 +0800

        新增D600pro2、D1000的V0版机型

    commit e3fd413d62
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:34:13 2024 +0800

        修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

    commit 594fb668fe
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:25:04 2024 +0800

        设置自适应调平选项默认为关闭状态

    commit 1a87ced3f5
    Merge: 629416d1 6064a6e1
    Author: zkk <1007518571@qq.com>
    Date:   Fri Nov 29 10:18:32 2024 +0800

        Merge branch 'develop' into release

commit 2a187b3c23
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 17 14:42:32 2025 +0800

    发布版本1.1.1

    优化探针偏移应用前范围值检查

    # Conflicts:
    #	ks_includes/locales/KlipperScreen.pot   resolved by 03cd37229ee6c606e9814af602709d81b2c79bec version
    #	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by 03cd37229ee6c606e9814af602709d81b2c79bec version
    #	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po   resolved by 03cd37229ee6c606e9814af602709d81b2c79bec version
    #	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by 03cd37229ee6c606e9814af602709d81b2c79bec version
    #	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po   resolved by 03cd37229ee6c606e9814af602709d81b2c79bec version

commit 0db1b6ca4a
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:01:05 2025 +0800

    发布版本1.1.0

commit 7f8d113e74
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 17:33:36 2025 +0800

    修复耗材检测显示偶尔不正确的问题，有些弹窗会异常问题，以及一点翻译优化

    Squashed commit of the following:

    commit cf7cafefbcd2274c9a481e58042d11db8cd79961
    Merge: dc3478b4 8d259cea
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 7 17:26:59 2025 +0800

        Merge commit '8d259ceadd5026cecc1dc61224d91aef4f3877b4' into release

    commit 8d259ceadd
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 7 17:15:46 2025 +0800

        实现 打印中恢复喷头温度 提示语的翻译

    commit dd11c9683c
    Author: zkk <1007518571@qq.com>
    Date:   Tue Jan 7 16:52:04 2025 +0800

        优化单个喷头时不显示喷头偏移菜单

    commit c3ec7a81bb
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 3 17:52:24 2025 +0800

        修复屏幕耗材检测显示偶尔不准确的问题

    commit 413bf6fc4a
    Author: zkk <1007518571@qq.com>
    Date:   Fri Jan 3 15:00:54 2025 +0800

        修复耗材检测弹窗异常问题

    commit dc3478b48c7da1dbae120d1270c9ab64646d6647
    Merge: 02c7556c 3bfc1aa7
    Author: zkk <1007518571@qq.com>
    Date:   Thu Jan 2 11:18:07 2025 +0800

        Merge commit '3bfc1aa714e282d74b801155d830377ca58d8f59' into release

    commit 3bfc1aa714
    Author: zkk <1007518571@qq.com>
    Date:   Thu Jan 2 11:17:15 2025 +0800

        修复移轴页面移轴功能失效问题

    commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
    Merge: 6bfa42e0 991003e6
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 15:07:54 2024 +0800

        Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

    commit 991003e6cb
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 15:03:34 2024 +0800

        优化完整 简体中文和繁体中文的翻译

    commit 1a177e90d0
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 14:10:03 2024 +0800

        优化排除对象的英文语法错误

    commit e8d509cb6c
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 16:40:52 2024 +0800

        优化耗材检测显示内容

    commit 1b7670485a
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 14:56:25 2024 +0800

        完善断料自动切头功能描述

    commit ecc0c3dd16
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 13:40:01 2024 +0800

        实现弹窗翻译功能

    commit bc6d60fa18
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 09:53:16 2024 +0800

        优化不合理名称和不合理大小写

    commit 2e650926bd
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 26 15:06:11 2024 +0800

        修复10寸屏幕偏移值微调页面出界问题

    commit c481b551f7
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 15:28:26 2024 +0800

        优化移轴设置页面没有返回按钮的问题

    commit 2b3c9936bd
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 10:05:04 2024 +0800

        删除移动设置页面中轴反转的选项

    commit 5e37d59497
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 09:05:03 2024 +0800

        优化选择语言标题

    commit 5214c3697b
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 24 10:57:41 2024 +0800

        增加设置hostname功能

    commit 3709a7465c
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 24 10:43:46 2024 +0800

        增加工厂设置中打包模式

    commit 0c2a2618be
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 23 16:25:37 2024 +0800

        实现恢复出厂设置功能

    commit e3a38f8561
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 23 15:48:17 2024 +0800

        一点格式化

    commit 4e9e452e8b
    Author: zkk <1007518571@qq.com>
    Date:   Sat Dec 21 14:20:22 2024 +0800

        优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

    commit 3b85e8e8d5
    Merge: 882850db 10ec2029
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:26:08 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 882850dbde
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:21:16 2024 +0800

        补充双喷头偏移校准页面二维码图片

    commit 10ec2029eb
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 18 17:17:18 2024 +0800

        增加自动切换喷头开关选项

    commit 3d6eed9d95
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 16 16:33:34 2024 +0800

        喷头偏移值校准功能的实现

    commit 40ecbb3ea4
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:20:00 2024 +0800

        z探针校准时指定默认激活工具头为第一个头

    commit bce3caa409
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:19:19 2024 +0800

        优化z探针校准时候移动过慢问题

    commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
    Merge: 1a87ced3 4f3aa9aa
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:33:58 2024 +0800

        Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

    commit 4f3aa9aa4c
    Merge: e3fd413d 1a69b518
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:30:00 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 1a69b5180d
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 11 11:44:36 2024 +0800

        新增D600pro2、D1000的V0版机型

    commit e3fd413d62
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:34:13 2024 +0800

        修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

    commit 594fb668fe
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:25:04 2024 +0800

        设置自适应调平选项默认为关闭状态

    commit 1a87ced3f5
    Merge: 629416d1 6064a6e1
    Author: zkk <1007518571@qq.com>
    Date:   Fri Nov 29 10:18:32 2024 +0800

        Merge branch 'develop' into release

    # Conflicts:
    #	config/main_menu.conf
    #	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by cf7cafefbcd2274c9a481e58042d11db8cd79961 version
    #	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po
    #	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by cf7cafefbcd2274c9a481e58042d11db8cd79961 version
    #	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po
    #	ks_includes/prompts_text.py
    #	ks_includes/widgets/prompts.py
    #	screen.py

commit 7fb4963292
Author: zkk <1007518571@qq.com>
Date:   Thu Jan 2 11:19:18 2025 +0800

    修复移轴页面移轴功能失效问题

    # Conflicts:
    #	panels/move.py

commit d822333489
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:13:07 2024 +0800

    优化翻译，耗材检测提示和一些细节问题

    Squashed commit of the following:

    commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
    Merge: 6bfa42e0 991003e6
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 15:07:54 2024 +0800

        Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

    commit 991003e6cb
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 15:03:34 2024 +0800

        优化完整 简体中文和繁体中文的翻译

    commit 1a177e90d0
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 31 14:10:03 2024 +0800

        优化排除对象的英文语法错误

    commit e8d509cb6c
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 16:40:52 2024 +0800

        优化耗材检测显示内容

    commit 1b7670485a
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 14:56:25 2024 +0800

        完善断料自动切头功能描述

    commit ecc0c3dd16
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 13:40:01 2024 +0800

        实现弹窗翻译功能

    commit bc6d60fa18
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 27 09:53:16 2024 +0800

        优化不合理名称和不合理大小写

    commit 2e650926bd
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 26 15:06:11 2024 +0800

        修复10寸屏幕偏移值微调页面出界问题

    commit c481b551f7
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 15:28:26 2024 +0800

        优化移轴设置页面没有返回按钮的问题

    commit 2b3c9936bd
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 10:05:04 2024 +0800

        删除移动设置页面中轴反转的选项

    commit 5e37d59497
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 25 09:05:03 2024 +0800

        优化选择语言标题

    commit 5214c3697b
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 24 10:57:41 2024 +0800

        增加设置hostname功能

    commit 3709a7465c
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 24 10:43:46 2024 +0800

        增加工厂设置中打包模式

    commit 0c2a2618be
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 23 16:25:37 2024 +0800

        实现恢复出厂设置功能

    commit e3a38f8561
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 23 15:48:17 2024 +0800

        一点格式化

    commit 4e9e452e8b
    Author: zkk <1007518571@qq.com>
    Date:   Sat Dec 21 14:20:22 2024 +0800

        优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

    commit 3b85e8e8d5
    Merge: 882850db 10ec2029
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:26:08 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 882850dbde
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:21:16 2024 +0800

        补充双喷头偏移校准页面二维码图片

    commit 10ec2029eb
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 18 17:17:18 2024 +0800

        增加自动切换喷头开关选项

    commit 3d6eed9d95
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 16 16:33:34 2024 +0800

        喷头偏移值校准功能的实现

    commit 40ecbb3ea4
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:20:00 2024 +0800

        z探针校准时指定默认激活工具头为第一个头

    commit bce3caa409
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:19:19 2024 +0800

        优化z探针校准时候移动过慢问题

    commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
    Merge: 1a87ced3 4f3aa9aa
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:33:58 2024 +0800

        Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

    commit 4f3aa9aa4c
    Merge: e3fd413d 1a69b518
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:30:00 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 1a69b5180d
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 11 11:44:36 2024 +0800

        新增D600pro2、D1000的V0版机型

    commit e3fd413d62
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:34:13 2024 +0800

        修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

    commit 594fb668fe
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:25:04 2024 +0800

        设置自适应调平选项默认为关闭状态

    commit 1a87ced3f5
    Merge: 629416d1 6064a6e1
    Author: zkk <1007518571@qq.com>
    Date:   Fri Nov 29 10:18:32 2024 +0800

        Merge branch 'develop' into release

    # Conflicts:
    #	panels/advanced.py
    #	panels/nozzle_offset.py
    #	panels/offset_fine_tune.py
    #	panels/zcalibrate.py

commit 2bec6cd072
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 19 16:48:10 2024 +0800

    实现二喷头偏移值校准功能、断料自动切头开关选项、优化探针偏移校准移动速度慢的问题、优化打印结束没有调z偏移值显示保存偏移值按钮的问题等……
    Squashed commit of the following:

    commit 3b85e8e8d5
    Merge: 882850db 10ec2029
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:26:08 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 882850dbde
    Author: zkk <1007518571@qq.com>
    Date:   Wed Dec 18 17:21:16 2024 +0800

        补充双喷头偏移校准页面二维码图片

    commit 10ec2029eb
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 18 17:17:18 2024 +0800

        增加自动切换喷头开关选项

    commit 3d6eed9d95
    Author: zkk <1007518571@qq.com>
    Date:   Mon Dec 16 16:33:34 2024 +0800

        喷头偏移值校准功能的实现

    commit 40ecbb3ea4
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:20:00 2024 +0800

        z探针校准时指定默认激活工具头为第一个头

    commit bce3caa409
    Author: zkk <1007518571@qq.com>
    Date:   Fri Dec 13 09:19:19 2024 +0800

        优化z探针校准时候移动过慢问题

    commit 4f3aa9aa4c
    Merge: e3fd413d 1a69b518
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:30:00 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 1a69b5180d
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 11 11:44:36 2024 +0800

        新增D600pro2、D1000的V0版机型

    commit e3fd413d62
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:34:13 2024 +0800

        修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

    commit 594fb668fe
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:25:04 2024 +0800

        设置自适应调平选项默认为关闭状态

commit af5d755ff2
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:34:30 2024 +0800

    修复打印时没有修改探针偏移值显示保存探针偏移按钮问题，修改自适应调平默认为关闭状态，新增套件机型配置

    Squashed commit of the following:
    commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
    Merge: 1a87ced3 4f3aa9aa
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:33:58 2024 +0800

        Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

    commit 4f3aa9aa4c
    Merge: e3fd413d 1a69b518
    Author: zkk <1007518571@qq.com>
    Date:   Thu Dec 12 10:30:00 2024 +0800

        Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

    commit 1a69b5180d
    Author: ruipeng <1041589370@qq.com>
    Date:   Wed Dec 11 11:44:36 2024 +0800

        新增D600pro2、D1000的V0版机型

    commit e3fd413d62
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:34:13 2024 +0800

        修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

    commit 594fb668fe
    Author: zkk <1007518571@qq.com>
    Date:   Tue Dec 10 14:25:04 2024 +0800

        设置自适应调平选项默认为关闭状态

    commit 1a87ced3f5
    Merge: 629416d1 6064a6e1
    Author: zkk <1007518571@qq.com>
    Date:   Fri Nov 29 10:18:32 2024 +0800

        Merge branch 'develop' into release

# Conflicts:
#	config/main_menu.conf   resolved by bfd5ba6a3c version
#	config/model_menu.conf   resolved by master version
#	ks_includes/locales/KlipperScreen.pot   resolved by bfd5ba6a3c version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by bfd5ba6a3c version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po   resolved by bfd5ba6a3c version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by bfd5ba6a3c version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po   resolved by bfd5ba6a3c version
#	ks_includes/prompts_text.py   resolved by bfd5ba6a3c version
#	ks_includes/widgets/prompts.py   resolved by bfd5ba6a3c version
#	panels/offset_fine_tune.py   resolved by master version
#	screen.py   resolved by bfd5ba6a3c version
#	styles/dark/images/wiki_qr_code.svg   resolved by master version
#	styles/light/images/wiki_qr_code.svg   resolved by master version
2025-02-14 17:50:54 +08:00
..
dark
合并主项目的master分支
2025-02-14 17:50:54 +08:00
light
合并主项目的master分支
2025-02-14 17:50:54 +08:00
printers
printer_select: support custom icons #1240
2024-04-26 07:36:52 -03:00
base.conf
Fix graph error and make colors configurable
2021-12-07 21:05:17 -05:00
base.css
缩小文件列表页面的字体
2024-07-20 09:15:21 +08:00
circle.svg
Spoolman support close #1060
2023-08-19 18:43:45 -03:00
icon.svg
Add Desktop file to easily start KlipperScreen on a normal Linux desktop (#713)
2022-09-21 20:18:22 -03:00
spool.svg
Spoolman support close #1060
2023-08-19 18:43:45 -03:00