Merge pull request #3 from prusa3d/master

Update to upstream master.

resources/profiles/Creality.idx

@@ -1,4 +1,5 @@
 min_slic3r_version = 2.3.0-alpha2
+0.0.7 Updated start g-code for Creality printers
 0.0.6 Added filament profiles, adjusted temperatures, updated start g-code for some models.
 0.0.5 Added 0.08mm SUPERDETAIL and 0.28mm SUPERDRAFT print profiles. Updated OPTIMAL print profile.
 0.0.4 Added initial CR-10 profile, end g-code improvements.

resources/profiles/Creality.ini

@@ -5,7 +5,7 @@
 name = Creality
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 0.0.6
+config_version = 0.0.7
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/
 # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%

resources/profiles/PrusaResearch.idx

@@ -1,3 +1,5 @@
+min_slic3r_version = 2.3.0-alpha4
+1.2.0-alpha0 Added filament spool weights
 min_slic3r_version = 2.2.0-alpha3
 1.1.10 Updated firmware version.
 1.1.9 Updated K values in filament profiles (linear advance). Added new filament profiles and SLA materials.

resources/profiles/PrusaResearch.ini

@@ -5,7 +5,7 @@
 name = Prusa Research
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 1.1.10
+config_version = 1.2.0-alpha0
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
 changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -1807,12 +1807,14 @@ inherits = *PLA*
 filament_vendor = Fillamentum
 filament_cost = 21.99
 filament_density = 1.24
+filament_spool_weight = 230
 
 [filament:Fillamentum ABS]
 inherits = *ABSC*
 filament_vendor = Fillamentum
 filament_cost = 32.4
 filament_density = 1.04
+filament_spool_weight = 230
 first_layer_temperature = 240
 temperature = 240
 
@@ -1821,6 +1823,7 @@ inherits = *ABS*
 filament_vendor = Fillamentum
 filament_cost = 38.7
 filament_density = 1.07
+filament_spool_weight = 230
 fan_always_on = 1
 cooling = 1
 min_fan_speed = 20
@@ -1836,6 +1839,7 @@ inherits = *ABS*
 filament_vendor = Prusa Polymers
 filament_cost = 35.28
 filament_density = 1.07
+filament_spool_weight = 201
 fan_always_on = 1
 first_layer_temperature = 260
 first_layer_bed_temperature = 105
@@ -1857,6 +1861,7 @@ inherits = *ABS*
 filament_vendor = Prusa Polymers
 filament_cost = 49.99 
 filament_density = 1.22
+filament_spool_weight = 201
 fan_always_on = 0
 first_layer_temperature = 275
 first_layer_bed_temperature = 110
@@ -1883,6 +1888,7 @@ inherits = *ABS*
 filament_vendor = Prusa Polymers
 filament_cost = 49.99
 filament_density = 1.22
+filament_spool_weight = 201
 fan_always_on = 0
 first_layer_temperature = 275
 first_layer_bed_temperature = 105
@@ -1916,6 +1922,7 @@ inherits = *PET*
 filament_vendor = Fillamentum
 filament_cost = 34.99
 filament_density = 1.25
+filament_spool_weight = 230
 filament_type = CPE
 first_layer_bed_temperature = 90
 first_layer_temperature = 275
@@ -1931,6 +1938,7 @@ compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.
 extrusion_multiplier = 1.1
 filament_cost = 68
 filament_density = 1.15
+filament_spool_weight = 230
 filament_colour = #804040
 filament_max_volumetric_speed = 10
 first_layer_temperature = 190
@@ -1969,12 +1977,14 @@ inherits = *ABSC*
 filament_vendor = Hatchbox
 filament_cost = 27.82
 filament_density = 1.04
+filament_spool_weight = 225
 
 [filament:Plasty Mladec ABS]
 inherits = *ABSC*
 filament_vendor = Plasty Mladec
 filament_cost = 27.82
 filament_density = 1.08
+filament_spool_weight = 230
 
 [filament:Verbatim ABS]
 inherits = *ABSC*
@@ -1995,6 +2005,7 @@ inherits = *PET*
 filament_vendor = Plasty Mladec
 filament_cost = 27.82
 filament_density = 1.27
+filament_spool_weight = 230
 
 [filament:Generic PLA]
 inherits = *PLA*
@@ -2039,6 +2050,7 @@ inherits = *FLEX*
 filament_vendor = Fillamentum
 filament_cost = 33.99
 filament_density = 1.20
+filament_spool_weight = 230
 filament_max_volumetric_speed = 1.2
 filament_retract_length = 0
 filament_retract_speed = nil
@@ -2136,6 +2148,7 @@ inherits = *ABSC*
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.08
+filament_spool_weight = 230
 
 [filament:*ABS MMU2*]
 inherits = Prusa ABS
@@ -2185,6 +2198,7 @@ inherits = *ABS MMU2*
 filament_vendor = Prusa Polymers
 filament_cost = 35.28
 filament_density = 1.07
+filament_spool_weight = 201
 fan_always_on = 1
 first_layer_temperature = 260
 first_layer_bed_temperature = 105
@@ -2209,6 +2223,7 @@ inherits = *ABS MMU2*
 filament_vendor = Prusa Polymers
 filament_cost = 49.99
 filament_density = 1.22
+filament_spool_weight = 201
 fan_always_on = 0
 fan_below_layer_time = 30
 first_layer_temperature = 265
@@ -2237,17 +2252,20 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and no
 inherits = *ABS MMU2*
 filament_vendor = Made for Prusa
 filament_cost = 22.99
+filament_spool_weight = 230
 
 [filament:Plasty Mladec ABS @MMU2]
 inherits = *ABS MMU2*
 filament_vendor = Plasty Mladec
 filament_density = 1.08
+filament_spool_weight = 230
 
 [filament:Prusa HIPS]
 inherits = *ABS*
 filament_vendor = Made for Prusa
 filament_cost = 27.3
 filament_density = 1.04
+filament_spool_weight = 230
 bridge_fan_speed = 50
 cooling = 1
 extrusion_multiplier = 1
@@ -2287,6 +2305,7 @@ renamed_from = "Prusa PET"
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.27
+filament_spool_weight = 230
 compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
 [filament:Verbatim PETG]
@@ -2310,6 +2329,7 @@ first_layer_temperature = 240
 temperature = 250
 filament_cost = 29.99
 filament_density = 1.27
+filament_spool_weight = 201
 filament_type = PETG
 compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
@@ -2319,6 +2339,7 @@ renamed_from = "Prusa PET 0.6 nozzle"; "Prusa PETG 0.6 nozzle"
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.27
+filament_spool_weight = 230
 
 [filament:Prusament PETG @0.6 nozzle]
 inherits = *PET06*
@@ -2327,6 +2348,7 @@ first_layer_temperature = 240
 temperature = 250
 filament_cost = 29.99
 filament_density = 1.27
+filament_spool_weight = 201
 filament_type = PETG
 
 [filament:Plasty Mladec PETG @0.6 nozzle]
@@ -2336,6 +2358,7 @@ first_layer_temperature = 230
 temperature = 240
 filament_cost = 27.92
 filament_density = 1.27
+filament_spool_weight = 230
 filament_type = PETG
 
 [filament:Devil Design PETG @0.6 nozzle]
@@ -2398,12 +2421,14 @@ filament_vendor = Generic
 [filament:Plasty Mladec PETG @MMU2]
 inherits = *PET MMU2*
 filament_vendor = Plasty Mladec
+filament_spool_weight = 230
 
 [filament:Prusa PETG @MMU2]
 inherits = *PET MMU2*
 renamed_from = "Prusa PET MMU2"; "Prusa PETG MMU2"
 filament_vendor = Made for Prusa
 filament_cost = 22.99
+filament_spool_weight = 230
 
 [filament:Prusament PETG @MMU2]
 inherits = *PET MMU2*
@@ -2411,6 +2436,7 @@ filament_type = PETG
 filament_vendor = Prusa Polymers
 filament_cost = 29.99
 filament_density = 1.27
+filament_spool_weight = 201
 
 [filament:Generic PETG @MMU2 0.6 nozzle]
 inherits = *PET MMU2 06*
@@ -2421,6 +2447,7 @@ filament_vendor = Generic
 inherits = *PET MMU2 06*
 renamed_from = "Prusa PET MMU2 0.6 nozzle"; "Prusa PETG MMU2 0.6 nozzle"
 filament_vendor = Made for Prusa
+filament_spool_weight = 230
 
 [filament:Prusament PETG @MMU2 0.6 nozzle]
 inherits = *PET MMU2 06*
@@ -2428,17 +2455,20 @@ filament_type = PETG
 filament_vendor = Prusa Polymers
 filament_cost = 29.99
 filament_density = 1.27
+filament_spool_weight = 201
 
 [filament:Plasty Mladec PETG @MMU2 0.6 nozzle]
 inherits = *PET MMU2 06*
 filament_type = PETG
 filament_vendor = Plasty Mladec
+filament_spool_weight = 230
 
 [filament:Prusa PLA]
 inherits = *PLA*
 filament_vendor = Made for Prusa
 filament_cost = 20.99
 filament_density = 1.24
+filament_spool_weight = 230
 
 [filament:Fiberlogy PLA]
 inherits = *PLA*
@@ -2451,6 +2481,7 @@ inherits = *PLA*
 filament_vendor = Plasty Mladec
 filament_cost = 25.4
 filament_density = 1.24
+filament_spool_weight = 230
 
 [filament:AmazonBasics PLA]
 inherits = *PLA*
@@ -2463,6 +2494,7 @@ inherits = *PLA*
 filament_vendor = Hatchbox
 filament_cost = 25.4
 filament_density = 1.24
+filament_spool_weight = 225
 
 [filament:Esun PLA]
 inherits = *PLA*
@@ -2494,6 +2526,7 @@ filament_vendor = Prusa Polymers
 temperature = 215
 filament_cost = 24.99
 filament_density = 1.24
+filament_spool_weight = 201
 filament_notes = "Affordable filament for everyday printing in premium quality manufactured in-house by Josef Prusa"
 
 [filament:*PLA MMU2*]
@@ -2520,18 +2553,21 @@ filament_vendor = Generic
 inherits = *PLA MMU2*
 filament_vendor = Made for Prusa
 filament_cost = 20.99
+filament_spool_weight = 230
 
 [filament:Prusament PLA @MMU2]
 inherits = *PLA MMU2*
 filament_vendor = Prusa Polymers
 filament_cost = 24.99
 filament_density = 1.24
+filament_spool_weight = 201
 
 [filament:Fillamentum PLA @MMU2]
 inherits = *PLA MMU2*
 filament_vendor = Fillamentum
 filament_cost = 21.99
 filament_density = 1.24
+filament_spool_weight = 230
 
 [filament:SemiFlex or Flexfill 98A]
 inherits = *FLEX*
@@ -2545,6 +2581,7 @@ inherits = *FLEX*
 filament_vendor = Fillamentum
 filament_cost = 33.99
 filament_density = 1.23
+filament_spool_weight = 230
 filament_max_volumetric_speed = 1.35
 fan_always_on = 1
 cooling = 0
@@ -2579,6 +2616,7 @@ inherits = *common*
 filament_vendor = Fillamentum
 filament_cost = 56.99
 filament_density = 1.01
+filament_spool_weight = 230
 bed_temperature = 90
 bridge_fan_speed = 30
 cooling = 1
@@ -2790,6 +2828,7 @@ inherits = *PETMMU1*
 filament_vendor = Fillamentum
 filament_cost = 34.99
 filament_density = 1.25
+filament_spool_weight = 230
 filament_type = CPE
 first_layer_bed_temperature = 90
 first_layer_temperature = 275
@@ -2819,6 +2858,7 @@ inherits = *PETMMU1*
 filament_vendor = Plasty Mladec
 filament_cost = 27.82
 filament_density = 1.27
+filament_spool_weight = 230
 
 [filament:Verbatim PETG @MMU1]
 inherits = *PETMMU1*
@@ -2838,6 +2878,7 @@ renamed_from = "Prusa PET MMU1"; "Prusa PETG MMU1"
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.27
+filament_spool_weight = 230
 
 [filament:Prusament PETG @MMU1]
 inherits = *PETMMU1*
@@ -2846,6 +2887,7 @@ first_layer_temperature = 240
 temperature = 250
 filament_cost = 29.99
 filament_density = 1.27
+filament_spool_weight = 201
 filament_type = PETG
 
 [filament:Taulman T-Glase @MMU1]
@@ -2910,6 +2952,7 @@ inherits = Generic PETG; *PETMINI*
 filament_vendor = Plasty Mladec
 filament_cost = 27.82
 filament_density = 1.27
+filament_spool_weight = 230
 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6
 
 [filament:Verbatim PETG @MINI]
@@ -2979,6 +3022,7 @@ inherits = Generic ABS; *ABSMINI*
 filament_vendor = Hatchbox
 filament_cost = 27.82
 filament_density = 1.08
+filament_spool_weight = 225
 fan_always_on = 0
 cooling = 1
 min_fan_speed = 15
@@ -2993,6 +3037,7 @@ inherits = Generic ABS; *ABSMINI*
 filament_vendor = Plasty Mladec
 filament_cost = 27.82
 filament_density = 1.08
+filament_spool_weight = 230
 fan_always_on = 0
 cooling = 1
 min_fan_speed = 15
@@ -3022,6 +3067,7 @@ filament_vendor = Prusa Polymers
 first_layer_temperature = 240
 temperature = 250
 filament_density = 1.27
+filament_spool_weight = 201
 filament_cost = 29.99
 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6
 
@@ -3044,6 +3090,7 @@ inherits = Prusament PETG; *PETMINI06*
 first_layer_temperature = 240
 temperature = 250
 filament_density = 1.27
+filament_spool_weight = 201
 filament_cost = 29.99
 
 [filament:Generic PETG @0.6 nozzle MINI]
@@ -3063,6 +3110,7 @@ filament_density = 1.23
 [filament:Plasty Mladec PETG @0.6 nozzle MINI]
 inherits = Generic PETG; *PETMINI06*
 filament_vendor = Plasty Mladec
+filament_spool_weight = 230
 
 [filament:Verbatim PETG @0.6 nozzle MINI]
 inherits = Generic PETG; *PETMINI06*
@@ -3090,6 +3138,7 @@ filament_type = ASA
 filament_colour = #FFF2EC
 filament_cost = 35.28
 filament_density = 1.07
+filament_spool_weight = 201
 
 [filament:Fillamentum Flexfill 98A @MINI]
 inherits = SemiFlex or Flexfill 98A; *FLEXMINI*
@@ -3098,6 +3147,7 @@ first_layer_temperature = 240
 temperature = 240
 filament_max_volumetric_speed = 1.35
 filament_cost = 33.99
+filament_spool_weight = 230
 
 [filament:Generic FLEX @MINI]
 inherits = SemiFlex or Flexfill 98A; *FLEXMINI*
@@ -3173,6 +3223,7 @@ filament_retract_lift = 0
 filament_retract_before_travel = 7
 filament_wipe = 0
 filament_density = 1.20
+filament_spool_weight = 230
 filament_cost = 33.95
 bridge_fan_speed = 70
 fan_always_on = 1
@@ -3193,6 +3244,7 @@ temperature = 265
 filament_type = CPE
 filament_cost = 34.99
 filament_density = 1.25
+filament_spool_weight = 230
 
 [filament:ColorFabb nGen @MINI]
 inherits = ColorFabb nGen; *PETMINI*
@@ -3208,6 +3260,7 @@ filament_cost = 28.80
 inherits = Fillamentum ABS; *ABSMINI*
 filament_cost = 32.4
 filament_density = 1.04
+filament_spool_weight = 230
 fan_always_on = 0
 cooling = 1
 min_fan_speed = 15
@@ -3234,6 +3287,7 @@ filament_type = ASA
 filament_colour = #FFF2EC
 filament_cost = 38.7
 filament_density = 1.07
+filament_spool_weight = 230
 
 [filament:Polymaker PC-Max @MINI]
 inherits = Polymaker PC-Max; *ABSMINI*
@@ -3253,6 +3307,7 @@ inherits = *ABSMINI*
 filament_vendor = Prusa Polymers
 filament_cost = 49.99
 filament_density = 1.22
+filament_spool_weight = 201
 fan_always_on = 0
 first_layer_temperature = 275
 first_layer_bed_temperature = 100
@@ -3281,6 +3336,7 @@ inherits = *ABSMINI*
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.08
+filament_spool_weight = 230
 fan_always_on = 0
 cooling = 1
 min_fan_speed = 15
@@ -3374,6 +3430,7 @@ renamed_from = "Prusa PET MINI"; "Prusa PETG MINI"
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.27
+filament_spool_weight = 230
 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6
 
 [filament:Prusa PETG @0.6 nozzle MINI]
@@ -3382,6 +3439,7 @@ renamed_from = "Prusa PET 0.6 nozzle MINI"; "Prusa PETG 0.6 nozzle MINI"
 filament_vendor = Made for Prusa
 filament_cost = 22.99
 filament_density = 1.27
+filament_spool_weight = 230
 
 [sla_print:*common*]
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_SL1.*/
@@ -3409,6 +3467,7 @@ support_pillar_diameter = 1
 support_pillar_connection_mode = zigzag
 support_pillar_widening_factor = 0
 supports_enable = 1
+support_small_pillar_diameter_percent = 60%
 
 [sla_print:0.025 UltraDetail]
 inherits = *common*

src/libslic3r/Fill/FillBase.cpp

@@ -29,6 +29,7 @@ Fill* Fill::new_from_type(const InfillPattern type)
     case ip3DHoneycomb:         return new Fill3DHoneycomb();
     case ipGyroid:              return new FillGyroid();
     case ipRectilinear:         return new FillRectilinear();
+    case ipAlignedRectilinear:  return new FillAlignedRectilinear();
     case ipMonotonic:           return new FillMonotonic();
     case ipLine:                return new FillLine();
     case ipGrid:                return new FillGrid();

src/libslic3r/Fill/FillRectilinear.hpp

@@ -29,6 +29,17 @@ protected:
     bool fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out);
 };
 
+class FillAlignedRectilinear : public FillRectilinear
+{
+public:
+    Fill* clone() const override { return new FillAlignedRectilinear(*this); };
+    ~FillAlignedRectilinear() override = default;
+
+protected:
+    // Always generate infill at the same angle.
+    virtual float _layer_angle(size_t idx) const { return 0.f; }
+};
+
 class FillMonotonic : public FillRectilinear
 {
 public:

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -390,13 +390,11 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
     };
 
     // check for temporary lines
-    auto is_temporary_decoration = [](const std::string& gcode_line) {
+    auto is_temporary_decoration = [](const std::string_view gcode_line) {
         // remove trailing '\n'
-        std::string line = gcode_line.substr(0, gcode_line.length() - 1);
+        assert(! gcode_line.empty());
-        if (line == ";" + Layer_Change_Tag)
+        assert(gcode_line.back() == '\n');
-            return true;
+        return gcode_line.substr(0, gcode_line.length() - 1) == ";" + Layer_Change_Tag;
-        else
-            return false;
     };
 
     // Iterators for the normal and silent cached time estimate entry recently processed, used by process_line_G1.

src/libslic3r/PrintConfig.cpp

@@ -460,12 +460,14 @@ void PrintConfigDef::init_fff_params()
     def->enum_keys_map = &ConfigOptionEnum<InfillPattern>::get_enum_values();
     def->enum_values.push_back("rectilinear");
     def->enum_values.push_back("monotonic");
+    def->enum_values.push_back("alignedrectilinear");
     def->enum_values.push_back("concentric");
     def->enum_values.push_back("hilbertcurve");
     def->enum_values.push_back("archimedeanchords");
     def->enum_values.push_back("octagramspiral");
     def->enum_labels.push_back(L("Rectilinear"));
     def->enum_labels.push_back(L("Monotonic"));
+    def->enum_labels.push_back(L("Aligned Rectilinear"));
     def->enum_labels.push_back(L("Concentric"));
     def->enum_labels.push_back(L("Hilbert Curve"));
     def->enum_labels.push_back(L("Archimedean Chords"));
@@ -808,7 +810,10 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("filament_spool_weight", coFloats);
     def->label = L("Spool weight");
-    def->tooltip = L("Enter weight of the spool without filament. This is only for statistical information.");
+    def->tooltip = L("Enter weight of the empty filament spool. "
+                     "One may weigh a partially consumed filament spool before printing and one may compare the measured weight "
+                     "with the calculated weight of the filament with the spool to find out whether the amount "
+                     "of filament on the spool is sufficient to finish the print.");
     def->sidetext = L("g");
     def->min = 0;
     def->set_default_value(new ConfigOptionFloats { 0. });
@@ -878,6 +883,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Fill pattern for general low-density infill.");
     def->enum_keys_map = &ConfigOptionEnum<InfillPattern>::get_enum_values();
     def->enum_values.push_back("rectilinear");
+    def->enum_values.push_back("alignedrectilinear");
     def->enum_values.push_back("grid");
     def->enum_values.push_back("triangles");
     def->enum_values.push_back("stars");
@@ -893,6 +899,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("adaptivecubic");
     def->enum_values.push_back("supportcubic");
     def->enum_labels.push_back(L("Rectilinear"));
+    def->enum_labels.push_back(L("Aligned Rectilinear"));
     def->enum_labels.push_back(L("Grid"));
     def->enum_labels.push_back(L("Triangles"));
     def->enum_labels.push_back(L("Stars"));

src/libslic3r/PrintConfig.hpp

@@ -44,7 +44,7 @@ enum AuthorizationType {
 };
 
 enum InfillPattern : int {
-    ipRectilinear, ipMonotonic, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
+    ipRectilinear, ipMonotonic, ipAlignedRectilinear, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
     ipGyroid, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipAdaptiveCubic, ipSupportCubic, ipCount,
 };
 
@@ -145,6 +145,7 @@ template<> inline const t_config_enum_values& ConfigOptionEnum<InfillPattern>::g
     if (keys_map.empty()) {
         keys_map["rectilinear"]         = ipRectilinear;
         keys_map["monotonic"]           = ipMonotonic;
+        keys_map["alignedrectilinear"]  = ipAlignedRectilinear;
         keys_map["grid"]                = ipGrid;
         keys_map["triangles"]           = ipTriangles;
         keys_map["stars"]               = ipStars;

src/slic3r/GUI/DoubleSlider.cpp

@@ -1,11 +1,6 @@
 #include "libslic3r/libslic3r.h"
-#if ENABLE_GCODE_VIEWER
 #include "DoubleSlider.hpp"
 #include "libslic3r/GCode.hpp"
-#else
-#include "wxExtensions.hpp"
-#include "libslic3r/GCode/PreviewData.hpp"
-#endif // ENABLE_GCODE_VIEWER
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "Plater.hpp"

src/slic3r/GUI/GCodeViewer.cpp

@@ -2675,7 +2675,9 @@ void GCodeViewer::render_legend() const
         }
         if (!m_settings_ids.filament.empty()) {
             for (unsigned char i : m_extruder_ids) {
-                imgui.text(_u8L("Filament") + " " + std::to_string(i + 1) + ":");
+                std::string txt = _u8L("Filament");
+                txt += (m_extruder_ids.size() == 1) ? ":" : " " + std::to_string(i + 1);
+                imgui.text(txt);
                 ImGui::SameLine(offset);
                 imgui.text(m_settings_ids.filament[i]);
             }

src/slic3r/GUI/GLCanvas3D.cpp

@@ -1091,7 +1091,7 @@ wxDEFINE_EVENT(EVT_GLCANVAS_RELOAD_FROM_DISK, SimpleEvent);
 
 const double GLCanvas3D::DefaultCameraZoomToBoxMarginFactor = 1.25;
 
-GLCanvas3D::ArrangeSettings load_arrange_settings()
+static GLCanvas3D::ArrangeSettings load_arrange_settings()
 {
     GLCanvas3D::ArrangeSettings settings;
 

src/slic3r/GUI/GUI_Preview.cpp

@@ -689,7 +689,7 @@ void Preview::update_layers_slider(const std::vector<double>& layers_z, bool kee
     if (sla_print_technology)
         m_layers_slider->SetLayersTimes(plater->sla_print().print_statistics().layers_times);
     else
-        m_layers_slider->SetLayersTimes(m_gcode_result->time_statistics.modes[0].layers_times);
+        m_layers_slider->SetLayersTimes(m_gcode_result->time_statistics.modes.front().layers_times);
 
     m_layers_slider_sizer->Show((size_t)0);
     Layout();

src/slic3r/GUI/InstanceCheck.cpp

@@ -259,14 +259,13 @@ bool instance_check(int argc, char** argv, bool app_config_single_instance)
 		std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
 #else
 		std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0]), ec).string());
-		if(ec.value() > 0) { // canonical was not able to find execitable (can happen with appimage on some systems)
+	if (ec.value() > 0) { // canonical was not able to find the executable (can happen with appimage on some systems. Does it fail on Fuse file systems?)
 		ec.clear();
 		// Compose path with boost canonical of folder and filename
 		hashed_path = std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0]).parent_path(), ec).string() + "/" + boost::filesystem::system_complete(argv[0]).filename().string());
-			if(ec.value() > 0) {
+		if (ec.value() > 0) {
 			// Still not valid, process without canonical
 			hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
-				
 		}
 	}
 #endif // win32

src/slic3r/GUI/OG_CustomCtrl.cpp

@@ -8,6 +8,7 @@
 #include <boost/algorithm/string/split.hpp>
 #include "libslic3r/Utils.hpp"
 #include "I18N.hpp"
+#include "format.hpp"
 
 namespace Slic3r { namespace GUI {
 
@@ -243,8 +244,10 @@ void OG_CustomCtrl::OnMotion(wxMouseEvent& event)
 
     for (CtrlLine& line : ctrl_lines) {
         line.is_focused = is_point_in_rect(pos, line.rect_label);
-        if (line.is_focused && !suppress_hyperlinks) {
+        if (line.is_focused) {
-            tooltip = get_url(line.og_line.label_path);
+            if (!suppress_hyperlinks && !line.og_line.label_path.empty())
+                tooltip = get_url(line.og_line.label_path) +"\n\n";
+            tooltip += line.og_line.label_tooltip;
             break;
         }
 
@@ -609,7 +612,7 @@ wxCoord    OG_CustomCtrl::CtrlLine::draw_text(wxDC& dc, wxPoint pos, const wxStr
         dc.GetMultiLineTextExtent(out_text, &text_width, &text_height);
 
         pos.y = pos.y + lround((height - text_height) / 2);
-        if (width > 0 && is_url)
+        if (width > 0)
             rect_label = wxRect(pos, wxSize(text_width, text_height));
 
         wxColour old_clr = dc.GetTextForeground();

version.inc

@@ -3,7 +3,7 @@
 
 set(SLIC3R_APP_NAME "PrusaSlicer")
 set(SLIC3R_APP_KEY "PrusaSlicer")
-set(SLIC3R_VERSION "2.3.0-alpha3")
+set(SLIC3R_VERSION "2.3.0-alpha4")
 set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
 set(SLIC3R_RC_VERSION "2,3,0,0")
 set(SLIC3R_RC_VERSION_DOTS "2.3.0.0")

xs/src/perlglue.cpp

@@ -8,15 +8,12 @@ REGISTER_CLASS(ExPolygonCollection, "ExPolygon::Collection");
 REGISTER_CLASS(ExtrusionMultiPath, "ExtrusionMultiPath");
 REGISTER_CLASS(ExtrusionPath, "ExtrusionPath");
 REGISTER_CLASS(ExtrusionLoop, "ExtrusionLoop");
-// there is no ExtrusionLoop::Collection or ExtrusionEntity::Collection
 REGISTER_CLASS(ExtrusionEntityCollection, "ExtrusionPath::Collection");
 REGISTER_CLASS(ExtrusionSimulator, "ExtrusionSimulator");
 REGISTER_CLASS(Filler, "Filler");
 REGISTER_CLASS(Flow, "Flow");
 REGISTER_CLASS(CoolingBuffer, "GCode::CoolingBuffer");
 REGISTER_CLASS(GCode, "GCode");
-//REGISTER_CLASS(GCodePreviewData, "GCode::PreviewData");
-// REGISTER_CLASS(GCodeSender, "GCode::Sender");
 REGISTER_CLASS(Layer, "Layer");
 REGISTER_CLASS(SupportLayer, "Layer::Support");
 REGISTER_CLASS(LayerRegion, "Layer::Region");

xs/xsp/GCode.xsp

@@ -25,14 +25,6 @@
                 croak("%s\n", e.what());
             }
         %};
-//    void do_export_w_preview(Print *print, const char *path, GCodePreviewData *preview_data)
-//        %code%{
-//            try {
-//                THIS->do_export(print, path, preview_data);
-//            } catch (std::exception& e) {
-//                croak("%s\n", e.what());
-//            }
-//        %};
 
     Ref<Vec2d> origin()
         %code{% RETVAL = &(THIS->origin()); %};
@@ -58,27 +50,3 @@
     Ref<StaticPrintConfig> config()
         %code{% RETVAL = const_cast<StaticPrintConfig*>(static_cast<const StaticPrintConfig*>(static_cast<const PrintObjectConfig*>(&THIS->config()))); %};
 };
-
-//%name{Slic3r::GCode::PreviewData} class GCodePreviewData {
-//    GCodePreviewData();
-//    ~GCodePreviewData();
-//    void reset();
-//    bool empty() const;
-//    void set_type(int type)
-//        %code%{
-//            if ((0 <= type) && (type < GCodePreviewData::Extrusion::Num_View_Types)) 
-//                THIS->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type;
-//        %};
-//    int type() %code%{ RETVAL = (int)THIS->extrusion.view_type; %};
-//    void set_extrusion_flags(int flags)
-//        %code%{ THIS->extrusion.role_flags = (unsigned int)flags; %};
-//    void set_travel_visible(bool visible)
-//        %code%{ THIS->travel.is_visible = visible; %};
-//    void set_retractions_visible(bool visible)
-//        %code%{ THIS->retraction.is_visible = visible; %};
-//    void set_unretractions_visible(bool visible)
-//        %code%{ THIS->unretraction.is_visible = visible; %};
-//    void set_shells_visible(bool visible)
-//        %code%{ THIS->shell.is_visible = visible; %};
-//    void set_extrusion_paths_colors(std::vector<std::string> colors);
-//};