Merge branch 'main' into main

src/libslic3r/PresetBundle.cpp

@@ -80,6 +80,8 @@
 #include <vector>
 #include <utility>
 
+namespace fs = boost::filesystem;
+
 // Mark string for localization and translate.
 #define L(s) Slic3r::I18N::translate(s)
 
@@ -87,6 +89,8 @@
 // This breaks compatibility with the upstream Slic3r if the --datadir is used to switch between the two versions.
 //#define SLIC3R_PROFILE_USE_PRESETS_SUBDIR
 
+using json = nlohmann::json;
+
 namespace Slic3r {
 
 // Project-level options imported from a loaded 3MF into project_config. s_project_options_published
@@ -1535,7 +1539,6 @@ bool PresetBundle::apply_vendor_config(
     const std::string& preferred_printer_variant,
     const std::string& preferred_filament)
 {
-    namespace fs = boost::filesystem;
 
     // Get current configuration from AppConfig
     const auto old_vendors = app_config->vendors();