Merge branch 'main' into main

2026-10-15 03:41:28 +00:00 · 2026-10-07 19:31:24 +08:00
parent 6561c4d35b 6d02a945e0
commit 7fdfea6efa
357 changed files with 15625 additions and 7102 deletions
@@ -87,6 +87,7 @@
 #include "libslic3r/GCode/Thumbnails.hpp"

 namespace fs = boost::filesystem;
+using json = nlohmann::json;

 using boost::property_tree::ptree;