mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-19 12:47:50 -06:00
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:
commit
d733ab7e7b
54 changed files with 500 additions and 1230 deletions
|
@ -10,6 +10,7 @@
|
|||
#include <cstdint>
|
||||
#include <array>
|
||||
#include <vector>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <optional>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue