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

Merge main and fix conflicts

Browse Source
This commit is contained in:
Lam Wei Lun
2026-10-06 13:43:22 +08:00
parent ecbd03fed7 1d577ea4e2
commit a87639ac41
26 changed files with 69 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
-2
View File
@@ -32,8 +32,6 @@
#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
#include <algorithm>
using namespace nlohmann;
namespace Slic3r {
src/slic3r/GUI/SendMultiMachinePage.cpp
+1 -2
View File
@@ -61,8 +61,7 @@
#include "DeviceCore/DevManager.h"
#include "DeviceCore/DevStorage.h"
#include "slic3r/Utils/NetworkAgentFactory.hpp"
#include "FilamentMappingUtils.hpp"
#include "libslic3r/AppConfig.hpp"
#include "libslic3r/GCode/GCodeProcessor.hpp"
#include "libslic3r/Model.hpp"