Merge Main into Belt Printer

src/libslic3r/GCode.cpp

@@ -124,7 +124,6 @@
 
 #include <Shiny/Shiny.h>
 
-#include "miniz_extension.hpp"
 
 using namespace std::literals::string_view_literals;
 
@@ -136,6 +135,14 @@ using namespace std::literals::string_view_literals;
 #endif
 
 #include <assert.h>
+#include "AABBTreeLines.hpp"
+#include "Extruder.hpp"
+#include "ExtrusionEntityCollection.hpp"
+#include "FilamentMixer.hpp"
+#include "Format/STEP.hpp"
+#include "Model.hpp"
+#include "MultiNozzleUtils.hpp"
+#include "Slicing.hpp"
 
 namespace fs = boost::filesystem;