juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/p2s-pr

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/Utils/CalibUtils.cpp
This commit is contained in:
Noisyfox
2025-10-29 21:03:22 +08:00
parent 9b015c9d45 4b7b81a0a2
commit 00122a9de5
37 changed files with 7726 additions and 4803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/Jobs/SendJob.hpp
+3
View File
@@ -3,6 +3,7 @@
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include "slic3r/GUI/DeviceCore/DevStorage.h"
#include "Job.hpp"
#include "PrintJob.hpp"
@@ -46,6 +47,8 @@ public:
bool has_sdcard { false };
bool task_use_ams { true };
DevStorage::SdcardState sdcard_state = DevStorage::SdcardState::NO_SDCARD;
wxWindow* m_parent{nullptr};
int status_range() const