Merge branch 'main' into main

2026-10-13 10:51:12 +00:00 · 2026-10-07 19:31:24 +08:00
parent 6561c4d35b 6d02a945e0
commit 7fdfea6efa
357 changed files with 15625 additions and 7102 deletions
@@ -34,7 +34,7 @@
 #include "slic3r/GUI/Widgets/SideMenuPopup.hpp"
 #include <utility>
 #include "libslic3r/libslic3r.h"
-#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <nlohmann/json.hpp>
 #include <algorithm>
 #include <wx/dirdlg.h>
 #include <exception>
@@ -155,6 +155,8 @@
 #include <wx/window.h>


+using json = nlohmann::json;
+
 namespace Slic3r {
 namespace GUI {