Merge branch 'master' into dev

Browse Source

# Conflicts:
#	module/device/method/pool.py

...

This commit is contained in:

LmeSzinc

2025-05-18 03:15:41 +08:00

parent 96475813a9 e7fed79ad1

commit 79d72c4fa0

39 changed files with 414 additions and 136 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/cn/ui/IDLE_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

assets/cn/ui/IDLE_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB