Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2019-08-01 12:53:22 +0300
committerbubnikv <bubnikv@gmail.com>2019-08-01 12:53:22 +0300
commit576643c7eddca1f2fb516f2cccdd27ec07fad32c (patch)
tree414522387fbd64859b09a5e6e7ab40309bcd6265
parent5f89414501f84fc7075173bb8b9c9e514ec30607 (diff)
Bumped up the version to 2.1.0-alpha0.version_2.1.0-alpha0
Updated the bundled profiles to integrate retract overrides for PET and FLEX materials.
-rw-r--r--resources/profiles/PrusaResearch.idx2
-rw-r--r--resources/profiles/PrusaResearch.ini233
-rw-r--r--src/libslic3r/GCode/WipeTower.hpp2
-rw-r--r--version.inc6
4 files changed, 217 insertions, 26 deletions
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index 81b1ca15f..a7fd819d4 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,3 +1,5 @@
+min_slic3r_version = 2.1.0-alpha0
+1.0.0-alpha0 Filament specific retract for PET and similar copolymers, and for FLEX
min_slic3r_version = 1.42.0-alpha6
0.8.3 FW version and SL1 materials update
0.8.2 FFF and SL1 settings update
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index f17066636..b78eb7f54 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/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 = 0.8.3
+config_version = 1.0.0-alpha0
# Where to get the updates from?
config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -811,7 +811,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
# MK2 MMU #
[print:0.35mm FAST sol full 0.6 nozzle]
inherits = *0.35mm*; *0.6nozzle*; *soluble_support*
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.6 and num_extruders>1
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_model=="MK2SMM" and nozzle_diameter[0]==0.6 and num_extruders>1
external_perimeter_extrusion_width = 0.6
external_perimeter_speed = 30
notes = Set your solluble extruder in Multiple Extruders > Support material/raft interface extruder
@@ -876,8 +876,8 @@ solid_infill_speed = 70
top_solid_infill_speed = 45
external_perimeter_extrusion_width = 0.7
perimeter_extrusion_width = 0.7
-infill_extrusion_width = 0.72
-solid_infill_extrusion_width = 0.72
+infill_extrusion_width = 0.7
+solid_infill_extrusion_width = 0.7
# XXXXXXXXXXXXXXXXXXXXXX
# XXX----- MK2.5 ----XXX
@@ -1009,12 +1009,22 @@ max_fan_speed = 50
min_fan_speed = 30
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{elsif nozzle_diameter[0]==0.6}24{else}45{endif} ; Filament gcode"
temperature = 240
+filament_retract_length = 1.4
+filament_retract_lift = 0.2
+compatible_printers_condition = printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
[filament:*PET06*]
inherits = *PET*
-compatible_printers_condition = nozzle_diameter[0]==0.6 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
+compatible_printers_condition = nozzle_diameter[0]==0.6 and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
filament_max_volumetric_speed = 15
+[filament:*PETMMU1*]
+inherits = *PET*
+filament_retract_length = nil
+filament_retract_speed = nil
+filament_retract_lift = 0.2
+compatible_printers_condition = printer_model=="MK2SMM"
+
[filament:*ABS*]
inherits = *common*
bed_temperature = 110
@@ -1039,7 +1049,7 @@ inherits = *common*
bed_temperature = 50
bridge_fan_speed = 100
# For now, all but selected filaments are disabled for the MMU 2.0
-compatible_printers_condition = nozzle_diameter[0]>0.35 and num_extruders==1 && ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material)
+compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model!="MK2SMM" and num_extruders==1 && ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material)
cooling = 0
disable_fan_first_layers = 1
extrusion_multiplier = 1.2
@@ -1052,8 +1062,10 @@ first_layer_bed_temperature = 50
first_layer_temperature = 240
max_fan_speed = 90
min_fan_speed = 70
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode"
+start_filament_gcode = "M900 K0"; Filament gcode"
temperature = 240
+filament_retract_length = 0.4
+filament_retract_lift = 0
[filament:ColorFabb Brass Bronze]
inherits = *PLA*
@@ -1124,7 +1136,7 @@ temperature = 270
[filament:ColorFabb XT-CF20]
inherits = *PET*
-compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
+compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
extrusion_multiplier = 1.2
filament_cost = 80.65
filament_density = 1.35
@@ -1134,6 +1146,8 @@ first_layer_bed_temperature = 90
first_layer_temperature = 260
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
temperature = 260
+filament_retract_length = nil
+filament_retract_lift = 0.2
[filament:ColorFabb nGen]
inherits = *PET*
@@ -1163,13 +1177,15 @@ first_layer_temperature = 260
max_fan_speed = 35
min_fan_speed = 20
temperature = 260
+filament_retract_length = nil
+filament_retract_lift = 0
+compatible_printers_condition = nozzle_diameter[0]>0.35 and num_extruders==1 && ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material)
[filament:E3D Edge]
inherits = *PET*
filament_cost = 56.9
filament_density = 1.26
filament_type = EDGE
-filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG"
[filament:E3D PC-ABS]
inherits = *ABS*
@@ -1195,11 +1211,10 @@ first_layer_temperature = 265
temperature = 265
filament_type = ASA
-[filament:Fillamentum CPE HG100 HM100]
+[filament:Fillamentum CPE]
inherits = *PET*
filament_cost = 54.1
filament_density = 1.25
-filament_notes = "CPE HG100 , CPE HM100"
filament_type = CPE
first_layer_bed_temperature = 90
first_layer_temperature = 275
@@ -1238,6 +1253,15 @@ filament_cost = 25.4
filament_density = 1.24
filament_notes = "List of materials tested with standard PLA print settings:\n\nDas Filament\nEsun PLA\nEUMAKERS PLA\nFiberlogy HD-PLA\nFillamentum PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladec PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nVerbatim PLA\nVerbatim BVOH"
+[filament:Generic FLEX]
+inherits = *FLEX*
+filament_cost = 82
+filament_density = 1.22
+filament_max_volumetric_speed = 1.2
+filament_retract_length = 0
+filament_retract_speed = nil
+filament_retract_lift = nil
+
[filament:Polymaker PC-Max]
inherits = *ABS*
filament_cost = 77.3
@@ -1313,7 +1337,7 @@ inherits = *PET*
filament_cost = 27.82
filament_density = 1.27
filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG"
-compatible_printers_condition = nozzle_diameter[0]!=0.6 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
+compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
[filament:Prusament PETG]
inherits = *PET*
@@ -1322,7 +1346,7 @@ temperature = 250
filament_cost = 24.99
filament_density = 1.27
filament_type = PETG
-compatible_printers_condition = nozzle_diameter[0]!=0.6 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
+compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
[filament:Prusa PET 0.6 nozzle]
inherits = *PET06*
@@ -1340,7 +1364,7 @@ filament_type = PETG
[filament:*PET MMU2*]
inherits = Prusa PET
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
+compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
temperature = 230
first_layer_temperature = 230
filament_cooling_final_speed = 1
@@ -1354,6 +1378,13 @@ filament_unload_time = 12
filament_unloading_speed = 20
filament_unloading_speed_start = 120
filament_loading_speed_start = 19
+filament_retract_length = 1.4
+filament_retract_lift = 0.2
+
+[filament:*PET MMU2 06*]
+inherits = *PET MMU2*
+compatible_printers_condition = nozzle_diameter[0]==0.6 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material
+filament_max_volumetric_speed = 13
[filament:Generic PET MMU2]
inherits = *PET MMU2*
@@ -1365,6 +1396,16 @@ inherits = *PET MMU2*
inherits = *PET MMU2*
filament_type = PETG
+[filament:Generic PET MMU2 0.6 nozzle]
+inherits = *PET MMU2 06*
+
+[filament:Prusa PET MMU2 0.6 nozzle]
+inherits = *PET MMU2 06*
+
+[filament:Prusament PETG MMU2 0.6 nozzle]
+inherits = *PET MMU2 06*
+filament_type = PETG
+
[filament:Prusa PLA]
inherits = *PLA*
filament_cost = 25.4
@@ -1407,6 +1448,7 @@ inherits = *PLA MMU2*
inherits = *FLEX*
filament_cost = 82
filament_density = 1.22
+filament_max_volumetric_speed = 1.35
[filament:Taulman Bridge]
inherits = *common*
@@ -1544,6 +1586,130 @@ min_fan_speed = 100
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode"
temperature = 220
+## Filaments MMU1
+
+[filament:ColorFabb HT MMU1]
+inherits = *PETMMU1*
+bed_temperature = 110
+bridge_fan_speed = 30
+cooling = 1
+disable_fan_first_layers = 3
+fan_always_on = 0
+fan_below_layer_time = 10
+filament_cost = 58.66
+filament_density = 1.18
+first_layer_bed_temperature = 105
+first_layer_temperature = 270
+max_fan_speed = 20
+min_fan_speed = 10
+start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}45{endif}; Filament gcode"
+temperature = 270
+
+[filament:ColorFabb XT MMU1]
+inherits = *PETMMU1*
+filament_type = PET
+filament_cost = 62.9
+filament_density = 1.27
+first_layer_bed_temperature = 90
+first_layer_temperature = 260
+temperature = 270
+
+[filament:ColorFabb XT-CF20 MMU1]
+inherits = *PETMMU1*
+compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model=="MK2SMM"
+extrusion_multiplier = 1.2
+filament_cost = 80.65
+filament_density = 1.35
+filament_colour = #804040
+filament_max_volumetric_speed = 1
+first_layer_bed_temperature = 90
+first_layer_temperature = 260
+start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
+temperature = 260
+
+[filament:ColorFabb nGen MMU1]
+inherits = *PETMMU1*
+filament_cost = 21.2
+filament_density = 1.2
+bridge_fan_speed = 40
+fan_always_on = 0
+fan_below_layer_time = 10
+filament_type = NGEN
+first_layer_temperature = 240
+max_fan_speed = 35
+min_fan_speed = 20
+
+[filament:E3D Edge MMU1]
+inherits = *PETMMU1*
+filament_cost = 56.9
+filament_density = 1.26
+filament_type = EDGE
+filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG"
+
+[filament:Fillamentum CPE MMU1]
+inherits = *PETMMU1*
+filament_cost = 54.1
+filament_density = 1.25
+filament_type = CPE
+first_layer_bed_temperature = 90
+first_layer_temperature = 275
+max_fan_speed = 50
+min_fan_speed = 50
+temperature = 275
+
+[filament:Generic PET MMU1]
+inherits = *PETMMU1*
+filament_cost = 27.82
+filament_density = 1.27
+filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG"
+
+[filament:Prusa PET MMU1]
+inherits = *PETMMU1*
+filament_cost = 27.82
+filament_density = 1.27
+filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG"
+
+[filament:Prusament PETG MMU1]
+inherits = *PETMMU1*
+first_layer_temperature = 240
+temperature = 250
+filament_cost = 24.99
+filament_density = 1.27
+filament_type = PETG
+
+[filament:Taulman T-Glase MMU1]
+inherits = *PETMMU1*
+filament_cost = 40
+filament_density = 1.27
+bridge_fan_speed = 40
+cooling = 0
+fan_always_on = 0
+first_layer_bed_temperature = 90
+first_layer_temperature = 240
+max_fan_speed = 5
+min_fan_speed = 0
+start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
+
+[filament:SemiFlex or Flexfill 98A MMU1]
+inherits = *FLEX*
+filament_cost = 82
+filament_density = 1.22
+filament_max_volumetric_speed = 1.35
+filament_retract_length = nil
+filament_retract_speed = nil
+filament_retract_lift = nil
+compatible_printers_condition = printer_model=="MK2SMM"
+
+[filament:Generic FLEX MMU1]
+inherits = *FLEX*
+filament_cost = 82
+filament_density = 1.22
+filament_max_volumetric_speed = 1.2
+filament_retract_length = 0
+filament_retract_speed = nil
+filament_retract_lift = nil
+compatible_printers_condition = printer_model=="MK2SMM"
+
[sla_print:*common*]
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_SL1.*/
layer_height = 0.05
@@ -2328,6 +2494,21 @@ extruder_colour = #FF8000;#DB5182;#00FFFF;#FF4F4F;#9FFF9F
start_gcode = M115 U3.7.2 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG21 ; set units to millimeters\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\nG92 E0.0\n
end_gcode = {if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n{endif}\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors\n
+[printer:Original Prusa i3 MK2.5S MMU2S 0.6 nozzle]
+inherits = Original Prusa i3 MK2.5S MMU2S
+nozzle_diameter = 0.6,0.6,0.6,0.6,0.6
+max_layer_height = 0.40
+min_layer_height = 0.15
+printer_variant = 0.6
+default_print_profile = 0.20mm NORMAL 0.6 nozzle
+
+[printer:Original Prusa i3 MK2.5 MMU2 0.6 nozzle]
+inherits = Original Prusa i3 MK2.5 MMU2
+nozzle_diameter = 0.6,0.6,0.6,0.6,0.6
+max_layer_height = 0.40
+min_layer_height = 0.15
+printer_variant = 0.6
+default_print_profile = 0.20mm NORMAL 0.6 nozzle
# XXXXXXXXXXXXXXXXX
# XXX--- MK3 ---XXX
@@ -2488,15 +2669,23 @@ extruder_colour = #FF8000;#DB5182;#00FFFF;#FF4F4F;#9FFF9F
start_gcode = M115 U3.7.2 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG21 ; set units to millimeters\n\n; Send the filament type to the MMU2.0 unit.\n; E stands for extruder number, F stands for filament type (0: default; 1:flex; 2: PVA)\nM403 E0 F{"" + ((filament_type[0]=="FLEX") ? 1 : ((filament_type[0]=="PVA") ? 2 : 0))}\nM403 E1 F{"" + ((filament_type[1]=="FLEX") ? 1 : ((filament_type[1]=="PVA") ? 2 : 0))}\nM403 E2 F{"" + ((filament_type[2]=="FLEX") ? 1 : ((filament_type[2]=="PVA") ? 2 : 0))}\nM403 E3 F{"" + ((filament_type[3]=="FLEX") ? 1 : ((filament_type[3]=="PVA") ? 2 : 0))}\nM403 E4 F{"" + ((filament_type[4]=="FLEX") ? 1 : ((filament_type[4]=="PVA") ? 2 : 0))}\n\n{if not has_single_extruder_multi_material_priming}\n;go outside print area\nG1 Y-3.0 F1000.0\nG1 Z0.4 F1000.0\n; select extruder\nT[initial_tool]\n; initial load\nG1 X55.0 E29.0 F1073.0\nG1 X5.0 E29.0 F1800.0\nG1 X55.0 E8.0 F2000.0\nG1 Z0.3 F1000.0\nG92 E0.0\nG1 X240.0 E25.0 F2200.0\nG1 Y-2.0 F1000.0\nG1 X55.0 E25 F1400.0\nG1 Z0.20 F1000.0\nG1 X5.0 E4.0 F1000.0\nG92 E0.0\n{endif}\n\nM221 S{if layer_height<0.075}100{else}95{endif}\nG92 E0.0\n
end_gcode = {if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG1 E2 F5000\nG1 E2 F5500\nG1 E2 F6000\nG1 E-15.0000 F5800\nG1 E-20.0000 F5500\nG1 E10.0000 F3000\nG1 E-10.0000 F3100\nG1 E10.0000 F3150\nG1 E-10.0000 F3250\nG1 E10.0000 F3300\n{endif}\n\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors\n
-# 0.6 nozzle MMU printer profile - only for single mode for now
+## 0.6mm nozzle MMU2/S printer profiles
+
+[printer:Original Prusa i3 MK3S MMU2S 0.6 nozzle]
+inherits = Original Prusa i3 MK3S MMU2S
+nozzle_diameter = 0.6,0.6,0.6,0.6,0.6
+max_layer_height = 0.40
+min_layer_height = 0.15
+printer_variant = 0.6
+default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
-# [printer:Original Prusa i3 MK3S MMU2S 0.6 nozzle]
-# inherits = Original Prusa i3 MK3S MMU2S
-# nozzle_diameter = 0.6,0.6,0.6,0.6,0.6
-# max_layer_height = 0.40
-# min_layer_height = 0.15
-# printer_variant = 0.6
-# default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
+[printer:Original Prusa i3 MK3 MMU2 0.6 nozzle]
+inherits = Original Prusa i3 MK3 MMU2
+nozzle_diameter = 0.6,0.6,0.6,0.6,0.6
+max_layer_height = 0.40
+min_layer_height = 0.15
+printer_variant = 0.6
+default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
[printer:Original Prusa SL1]
printer_technology = SLA
diff --git a/src/libslic3r/GCode/WipeTower.hpp b/src/libslic3r/GCode/WipeTower.hpp
index 6dfad1b8c..3c6b4afca 100644
--- a/src/libslic3r/GCode/WipeTower.hpp
+++ b/src/libslic3r/GCode/WipeTower.hpp
@@ -134,7 +134,7 @@ public:
m_filpar[idx].cooling_final_speed = cooling_final_speed;
}
- m_filpar[idx].filament_area = (M_PI/4.f) * pow(filament_diameter, 2); // all extruders are assumed to have the same filament diameter at this point
+ m_filpar[idx].filament_area = float((M_PI/4.f) * pow(filament_diameter, 2)); // all extruders are assumed to have the same filament diameter at this point
m_filpar[idx].nozzle_diameter = nozzle_diameter; // to be used in future with (non-single) multiextruder MM
if (max_volumetric_speed != 0.f)
diff --git a/version.inc b/version.inc
index 8f5ff57d1..4e1607bda 100644
--- a/version.inc
+++ b/version.inc
@@ -3,7 +3,7 @@
set(SLIC3R_APP_NAME "PrusaSlicer")
set(SLIC3R_APP_KEY "PrusaSlicer")
-set(SLIC3R_VERSION "2.0.0")
+set(SLIC3R_VERSION "2.1.0-alpha0")
set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
-set(SLIC3R_RC_VERSION "2,0,0,0")
-set(SLIC3R_RC_VERSION_DOTS "2.0.0.0")
+set(SLIC3R_RC_VERSION "2,1,0,0")
+set(SLIC3R_RC_VERSION_DOTS "2.1.0.0")