Fixing conflicts part 1:

fixed simple conflicts

src/libslic3r/CMakeLists.txt

@@ -317,10 +317,8 @@ set(SLIC3R_SOURCES
     SLA/Clustering.hpp
     SLA/Clustering.cpp
     SLA/ReprojectPointsOnMesh.hpp
-<<<<<<< HEAD
     SLA/DefaultSupportTree.hpp
     SLA/DefaultSupportTree.cpp
-=======
 
     Arachne/BeadingStrategy/BeadingStrategy.hpp
     Arachne/BeadingStrategy/BeadingStrategy.cpp
@@ -362,7 +360,6 @@ set(SLIC3R_SOURCES
     Arachne/SkeletalTrapezoidationJoint.hpp
     Arachne/WallToolPaths.hpp
     Arachne/WallToolPaths.cpp
->>>>>>> master_250
 )
 
 add_library(libslic3r STATIC ${SLIC3R_SOURCES})

src/libslic3r/Fill/Fill.cpp

@@ -13,10 +13,8 @@
 #include "FillBase.hpp"
 #include "FillRectilinear.hpp"
 #include "FillLightning.hpp"
-<<<<<<< HEAD
-=======
 #include "FillConcentric.hpp"
->>>>>>> master_250
+
 
 namespace Slic3r {
 
@@ -358,8 +356,6 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
         if (surface_fill.params.pattern == ipLightning)
             dynamic_cast<FillLightning::Filler*>(f.get())->generator = lightning_generator;
 
-<<<<<<< HEAD
-=======
         if (perimeter_generator.value == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentric) {
             FillConcentric *fill_concentric = dynamic_cast<FillConcentric *>(f.get());
             assert(fill_concentric != nullptr);
@@ -367,7 +363,6 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
             fill_concentric->print_object_config = &this->object()->config();
         }
 
->>>>>>> master_250
         // calculate flow spacing for infill pattern generation
         bool using_internal_flow = ! surface_fill.surface.is_solid() && ! surface_fill.params.bridge;
         double link_max_length = 0.;

src/libslic3r/GCode.cpp

@@ -2613,7 +2613,6 @@ std::string GCode::change_layer(coordf_t print_z)
     return gcode;
 }
 
-<<<<<<< HEAD
 static const auto comment_perimeter = "perimeter"sv;
 // Comparing string_view pointer & length for speed.
 static inline bool comment_is_perimeter(const std::string_view comment) {
@@ -2621,9 +2620,6 @@ static inline bool comment_is_perimeter(const std::string_view comment) {
 }
 
 std::string GCode::extrude_loop(ExtrusionLoop loop, const std::string_view description, double speed)
-=======
-std::string GCode::extrude_loop(ExtrusionLoop loop, std::string description, double speed)
->>>>>>> master_250
 {
     // get a copy; don't modify the orientation of the original loop object otherwise
     // next copies (if any) would not detect the correct orientation
@@ -2634,21 +2630,14 @@ std::string GCode::extrude_loop(ExtrusionLoop loop, std::string description, dou
     // find the point of the loop that is closest to the current extruder position
     // or randomize if requested
     Point last_pos = this->last_pos();
-<<<<<<< HEAD
+
     if (! m_config.spiral_vase && comment_is_perimeter(description)) {
         assert(m_layer != nullptr);
         m_seam_placer.place_seam(m_layer, loop, m_config.external_perimeters_first, this->last_pos());
-    } else
-        loop.split_at(last_pos, false);
-=======
-    if (! m_config.spiral_vase && description == "perimeter") {
-        assert(m_layer != nullptr);
-        m_seam_placer.place_seam(m_layer, loop, m_config.external_perimeters_first, this->last_pos());
     } else
         // Because the G-code export has 1um resolution, don't generate segments shorter than 1.5 microns,
         // thus empty path segments will not be produced by G-code export.
         loop.split_at(last_pos, false, scaled<double>(0.0015));
->>>>>>> master_250
 
     // clip the path to avoid the extruder to get exactly on the first point of the loop;
     // if polyline was shorter than the clipping distance we'd get a null polyline, so
@@ -2735,11 +2724,7 @@ std::string GCode::extrude_multi_path(ExtrusionMultiPath multipath, const std::s
     return gcode;
 }
 
-<<<<<<< HEAD
 std::string GCode::extrude_entity(const ExtrusionEntity &entity, const std::string_view description, double speed)
-=======
-std::string GCode::extrude_entity(const ExtrusionEntity &entity, std::string description, double speed)
->>>>>>> master_250
 {
     if (const ExtrusionPath* path = dynamic_cast<const ExtrusionPath*>(&entity))
         return this->extrude_path(*path, description, speed);
@@ -2774,11 +2759,7 @@ std::string GCode::extrude_perimeters(const Print &print, const std::vector<Obje
             m_config.apply(print.get_print_region(&region - &by_region.front()).config());
 
             for (const ExtrusionEntity* ee : region.perimeters)
-<<<<<<< HEAD
                 gcode += this->extrude_entity(*ee, comment_perimeter, -1.);
-=======
-                gcode += this->extrude_entity(*ee, "perimeter", -1.);
->>>>>>> master_250
         }
     return gcode;
 }

src/libslic3r/GCode.hpp

@@ -278,17 +278,10 @@ private:
     void            set_extruders(const std::vector<unsigned int> &extruder_ids);
     std::string     preamble();
     std::string     change_layer(coordf_t print_z);
-<<<<<<< HEAD
     std::string     extrude_entity(const ExtrusionEntity &entity, const std::string_view description, double speed = -1.);
     std::string     extrude_loop(ExtrusionLoop loop, const std::string_view description, double speed = -1.);
     std::string     extrude_multi_path(ExtrusionMultiPath multipath, const std::string_view description, double speed = -1.);
     std::string     extrude_path(ExtrusionPath path, const std::string_view description, double speed = -1.);
-=======
-    std::string     extrude_entity(const ExtrusionEntity &entity, std::string description = "", double speed = -1.);
-    std::string     extrude_loop(ExtrusionLoop loop, std::string description, double speed = -1.);
-    std::string     extrude_multi_path(ExtrusionMultiPath multipath, std::string description = "", double speed = -1.);
-    std::string     extrude_path(ExtrusionPath path, std::string description = "", double speed = -1.);
->>>>>>> master_250
 
     // Extruding multiple objects with soluble / non-soluble / combined supports
     // on a multi-material printer, trying to minimize tool switches.

src/libslic3r/Geometry/Curves.hpp

@@ -142,11 +142,7 @@ PiecewiseFittedCurve<Dimension, NumberType, Kernel> fit_curve(
         //find corresponding segment index; expects kernels to be centered
         int middle_right_segment_index = floor((observation_point - result.start) / result.segment_size);
         //find index of first segment that is affected by the point i; this can be deduced from kernel_span
-<<<<<<< HEAD
-        int start_segment_idx = middle_right_segment_index - Kernel::kernel_span / 2 + 1;
-=======
         int start_segment_idx = middle_right_segment_index - int(Kernel::kernel_span / 2) + 1;
->>>>>>> master_250
         for (int segment_index = start_segment_idx; segment_index < int(start_segment_idx + Kernel::kernel_span);
                 segment_index++) {
             NumberType segment_start = result.start + segment_index * result.segment_size;

src/libslic3r/PerimeterGenerator.cpp

@@ -13,11 +13,7 @@
 
 namespace Slic3r {
 
-<<<<<<< HEAD
-static ExtrusionPaths thick_polyline_to_extrusion_paths(const ThickPolyline &thick_polyline, ExtrusionRole role, const Flow &flow, const float tolerance, const float merge_tolerance)
-=======
 ExtrusionPaths thick_polyline_to_extrusion_paths(const ThickPolyline &thick_polyline, ExtrusionRole role, const Flow &flow, const float tolerance, const float merge_tolerance)
->>>>>>> master_250
 {
     ExtrusionPaths paths;
     ExtrusionPath path(role);

src/libslic3r/PrintConfig.hpp

@@ -123,8 +123,6 @@ enum DraftShield {
     dsDisabled, dsLimited, dsEnabled
 };
 
-<<<<<<< HEAD
-=======
 enum class PerimeterGeneratorType
 {
     // Classic perimeter generator using Clipper offsets with constant extrusion width.
@@ -134,7 +132,6 @@ enum class PerimeterGeneratorType
     Arachne
 };
 
->>>>>>> master_250
 enum class GCodeThumbnailsFormat {
     PNG, JPG, QOI
 };