Merge branch 'main' into CURA-12525_put_primary_extruder_not_0

Author: HellAholic

.github/workflows/package.yml

@@ -47,7 +47,7 @@ jobs:
 
   npm-package:
     needs: [ conan-package ]
-    if: ${{ github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'NP-') || startsWith(github.ref_name, '5.')) }}  # FIXME: have a more generic way to determine release branches
+    if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'NP-') || startsWith(github.ref_name, '5.'))) || github.event_name == 'pull_request' && (github.head_ref == 'main' || startsWith(github.head_ref, '5.'))}}  # FIXME: have a more generic way to determine release branches
     uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@main
     with:
       package_version_full: ${{ needs.conan-package.outputs.package_version_full }}

include/plugins/pluginproxy.h

@@ -5,6 +5,7 @@
 #define PLUGINS_PLUGINPROXY_H
 
 #include <chrono>
+#include <sstream>
 
 #include <agrpc/asio_grpc.hpp>
 #include <agrpc/client_rpc.hpp>
@@ -275,7 +276,9 @@ class PluginProxy
 
         // Metadata
         client_context.AddMetadata("cura-engine-uuid", slot_info.engine_uuid.data());
-        client_context.AddMetadata("cura-thread-id", fmt::format("{}", std::this_thread::get_id()));
+        std::stringstream strstrm;
+        strstrm << std::this_thread::get_id();
+        client_context.AddMetadata("cura-thread-id", strstrm.str());
     }
 
     /**

src/communication/CommandLine.cpp

@@ -509,7 +509,7 @@ int CommandLine::loadJSON(const std::filesystem::path& json_filename, Settings&
     std::ifstream file(json_filename, std::ios::binary);
     if (! file)
     {
-        spdlog::error("Couldn't open JSON file: {}", json_filename);
+        spdlog::error("Couldn't open JSON file: {}", json_filename.generic_string());
         return 1;
     }
 
@@ -695,7 +695,7 @@ std::optional<container_setting_map> CommandLine::readResolvedJsonValues(const s
     std::ifstream file(json_filename, std::ios::binary);
     if (! file)
     {
-        spdlog::error("Couldn't open JSON file: {}", json_filename);
+        spdlog::error("Couldn't open JSON file: {}", json_filename.generic_string());
         return std::nullopt;
     }
 

stress_benchmark/stress_benchmark.cpp

@@ -17,6 +17,7 @@
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/io/wkt/read.hpp>
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 #include <spdlog/spdlog.h>
 
 #include "WallsComputation.h"