fix merge

resources/profiles/NematX.idx

@@ -1,3 +1,4 @@
+min_slic3r_version = 2.5.0
 0.0.3 percentage speed.
 0.0.2 Updated start g-code.
 0.0.1 Initial NemtaX bundle

src/libslic3r/GCode.cpp

@@ -2379,7 +2379,7 @@ void GCode::process_layers(
 
         if (fan_mover.get() == nullptr)
             fan_mover.reset(new Slic3r::FanMover(
-                writer,
+                writer, config,
                 std::abs((float)config.fan_speedup_time.value),
                 config.fan_speedup_time.value > 0,
                 config.use_relative_e_distances.value,

src/libslic3r/GCode/CoolingBuffer.cpp

@@ -1186,7 +1186,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
                     current_fan_speed = m_fan_speed;
                     // return to default
                     new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_config.gcode_comments, m_fan_speed,
-                                                      EXTRUDER_CONFIG(extruder_fan_offset), m_current_extruder
+                                                      EXTRUDER_CONFIG(extruder_fan_offset), m_current_extruder,
                                                       m_config.fan_percentage,
                                                       "set default fan");
                 }

src/libslic3r/Print.hpp

@@ -504,7 +504,6 @@ struct PrintStatistics
     std::string                     printing_filament_types;
     std::map<size_t, double>        filament_stats; // extruder id -> volume in mm3
     std::vector<std::pair<double, float>> layer_area_stats; // print_z to area
-    std::vector<std::pair<double, float>> layer_area_stats; // print_z to area
 
     std::atomic_bool is_computing_gcode;
 

src/libslic3r/PrintConfig.cpp

@@ -5174,6 +5174,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->mode = comExpert | comSuSi;
     def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
+    def->aliases = {"solid_infill_below_thickness"};
 
     def = this->add("solid_infill_overlap", coPercent);
     def->label = L("Solid infill overlap");

src/libslic3r/PrintObjectSlice.cpp

@@ -1315,7 +1315,7 @@ void PrintObject::slice_volumes()
         std::atomic_size_t next_layer_idx(0);
 	    tbb::parallel_for(
 	        tbb::blocked_range<size_t>(0, m_layers.size()),
-			[this](const tbb::blocked_range<size_t>& range) {
+			[this, &next_layer_idx](const tbb::blocked_range<size_t>& range) {
 	  //          for (size_t layer_id = range.begin(); layer_id < range.end(); ++ layer_id) {
                 for (size_t layer_id = next_layer_idx++; layer_id < m_layers.size(); layer_id = next_layer_idx++) {
 	                m_print->throw_if_canceled();
@@ -1513,7 +1513,7 @@ void PrintObject::slice_volumes()
                     //    m_layers.front()->lslices = offset_ex(std::move(m_layers.front()->lslices), -first_layer_compensation);
                     //}
 	            }
-	        //});
+	        });
 	}
 
     m_print->throw_if_canceled();

src/slic3r/GUI/CalibrationTempDialog.cpp

@@ -72,7 +72,7 @@ void CalibrationTempDialog::create_geometry(wxCommandEvent& event_args) {
     // -- get temps
     const ConfigOptionInts* temperature_config = filament_config->option<ConfigOptionInts>("temperature");
     const int first_layer_temperature = filament_config->option<ConfigOptionInts>("temperature")->get_at(0);
-    assert(temperature_config->values.size() >= 1);
+    assert(temperature_config->size() >= 1);
     long nb_items_up = 1;
     if (!nb_up->GetValue().ToLong(&nb_items_up)) {
         nb_items_up = 2;

src/slic3r/GUI/DoubleSlider.cpp

@@ -436,7 +436,6 @@ void Control::SetLayersTimes(const std::vector<float>& layers_times, float total
                 m_layers_times.push_back(total_time);
         m_need_refresh_and_update = true;
     }
-    }
 }
 
 void Control::SetLayersTimes(const std::vector<double>& layers_times)

src/slic3r/GUI/UnsavedChangesDialog.cpp

@@ -1193,7 +1193,7 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig&
                 return out;
             }
             if (!strings->empty())
-                if (opt_idx < strings->values.size())
+                if (opt_idx < strings->size())
                     return from_u8(strings->get_at(opt_idx));
                 else
                     return from_u8(strings->serialize());
@@ -1209,7 +1209,7 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig&
     case coFloatsOrPercents: {
         const ConfigOptionFloatsOrPercents* floats_percents = config.opt<ConfigOptionFloatsOrPercents>(opt_key);
         if (floats_percents)
-            if(opt_idx < floats_percents->values.size())
+            if(opt_idx < floats_percents->size())
                 return double_to_string(floats_percents->get_at(opt_idx).value, opt->precision) + (floats_percents->get_at(opt_idx).percent ? "%" : "");
             else
                 return from_u8(floats_percents->serialize());
@@ -1229,8 +1229,8 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig&
         }
 
         const ConfigOptionPoints* opt_pts = config.opt<ConfigOptionPoints>(opt_key);
-        if (!opt_pts->values.empty())
-            if (opt_idx < opt_pts->values.size())
+        if (!opt_pts->empty())
+            if (opt_idx < opt_pts->size())
                 return from_u8((boost::format("[%1%]") % ConfigOptionPoint(opt_pts->get_at(opt_idx)).serialize()).str());
             else
                 return from_u8(opt_pts->serialize());