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 2022-12-21 16:54:14 +08:00
commit d733ab7e7b
54 changed files with 500 additions and 1230 deletions

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.