Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion

src/slic3r/GUI/Plater.hpp

@@ -216,6 +216,7 @@ public:
     // On activating the parent window.
     void on_activate();
     const DynamicPrintConfig* get_plater_config() const;
+    std::vector<std::string> get_extruder_colors_from_plater_config() const;
 
     void update_object_menu();