juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-01 15:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remote/main' into dev/h2d-2

Browse Source 
# Conflicts:
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
This commit is contained in:
Noisyfox
2025-10-19 23:11:13 +08:00
parent 9e889afb53 a754387566
commit 8e0e8ce461
35 changed files with 1852 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Format/SL1.cpp
View File

@@ -305,8 +305,8 @@ ConfigSubstitutions import_sla_archive(
std::function<bool(int)> progr)
{
// Ensure minimum window size for marching squares
windowsize.x() = std::max(2, windowsize.x());
windowsize.y() = std::max(2, windowsize.y());
windowsize.x() = std::max(1, windowsize.x());
windowsize.y() = std::max(1, windowsize.y());
std::string exclude_entries{"thumbnail"};
ArchiveData arch = extract_sla_archive(zipfname, exclude_entries);