Merge branch 'master' into SoftFever

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
This commit is contained in:
SoftFever committed 2022-12-21 16:54:14 +08:00
commit d733ab7e7b
54 files changed
+500 -1230

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.