Merge remote-tracking branch 'remote/main' into dev/h2d-2

# Conflicts:
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp

src/libslic3r/CMakeLists.txt

@@ -344,6 +344,8 @@ set(lisbslic3r_sources
     PrintApply.cpp
     PrintBase.cpp
     PrintBase.hpp
+    MaterialType.cpp
+    MaterialType.hpp
     PrintConfig.cpp
     PrintConfig.hpp
     Print.cpp