Merge branch 'dev'

This commit is contained in:
bubnikv 2018-06-12 17:11:45 +02:00
commit 2cd0c64b96

View File

@ -211,7 +211,7 @@ fill_pattern = grid
top_infill_extrusion_width = 0.4 top_infill_extrusion_width = 0.4
[print:0.05mm ULTRADETAIL 0.25 nozzle] [print:0.05mm ULTRADETAIL 0.25 nozzle]
inherits = *0.05mm* inherits = *0.05mm*; *0.25nozzle*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25 and num_extruders==1 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25 and num_extruders==1
external_perimeter_extrusion_width = 0 external_perimeter_extrusion_width = 0
extrusion_width = 0.28 extrusion_width = 0.28
@ -271,7 +271,7 @@ top_infill_extrusion_width = 0.4
top_solid_infill_speed = 50 top_solid_infill_speed = 50
[print:0.10mm DETAIL 0.25 nozzle] [print:0.10mm DETAIL 0.25 nozzle]
inherits = *0.10mm* inherits = *0.10mm*; *0.25nozzle*
bridge_acceleration = 600 bridge_acceleration = 600
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25
external_perimeter_speed = 20 external_perimeter_speed = 20
@ -284,7 +284,7 @@ solid_infill_speed = 40
top_solid_infill_speed = 30 top_solid_infill_speed = 30
[print:0.10mm DETAIL 0.25 nozzle MK3] [print:0.10mm DETAIL 0.25 nozzle MK3]
inherits = *0.10mm* inherits = *0.10mm*; *0.25nozzle*
bridge_speed = 30 bridge_speed = 30
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
external_perimeter_speed = 35 external_perimeter_speed = 35
@ -298,7 +298,7 @@ top_infill_extrusion_width = 0.4
top_solid_infill_speed = 50 top_solid_infill_speed = 50
[print:0.10mm DETAIL 0.6 nozzle MK3] [print:0.10mm DETAIL 0.6 nozzle MK3]
inherits = *0.10mm* inherits = *0.10mm*; *0.6nozzle*
bridge_speed = 30 bridge_speed = 30
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
external_perimeter_speed = 35 external_perimeter_speed = 35
@ -398,7 +398,7 @@ support_material_with_sheath = 0
support_material_xy_spacing = 80% support_material_xy_spacing = 80%
[print:0.15mm OPTIMAL 0.25 nozzle MK3] [print:0.15mm OPTIMAL 0.25 nozzle MK3]
inherits = *0.15mm* inherits = *0.15mm*; *0.25nozzle*
bridge_speed = 30 bridge_speed = 30
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
external_perimeter_speed = 35 external_perimeter_speed = 35
@ -424,7 +424,7 @@ top_infill_extrusion_width = 0.4
top_solid_layers = 5 top_solid_layers = 5
[print:0.15mm OPTIMAL 0.6 nozzle MK3] [print:0.15mm OPTIMAL 0.6 nozzle MK3]
inherits = *0.15mm* inherits = *0.15mm*; *0.6nozzle*
bridge_speed = 30 bridge_speed = 30
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
external_perimeter_speed = 35 external_perimeter_speed = 35
@ -491,7 +491,7 @@ support_material_with_sheath = 0
support_material_xy_spacing = 80% support_material_xy_spacing = 80%
[print:0.20mm FAST 0.6 nozzle MK3] [print:0.20mm FAST 0.6 nozzle MK3]
inherits = *0.20mm* inherits = *0.20mm*; *0.6nozzle*
bridge_speed = 30 bridge_speed = 30
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
external_perimeter_speed = 35 external_perimeter_speed = 35
@ -1005,7 +1005,7 @@ printer_variant = 0.25
default_print_profile = 0.10mm DETAIL 0.25 nozzle default_print_profile = 0.10mm DETAIL 0.25 nozzle
[printer:Original Prusa i3 MK2 0.6 nozzle] [printer:Original Prusa i3 MK2 0.6 nozzle]
inherits = *common* inherits = *common*; *0.6nozzle*
max_layer_height = 0.35 max_layer_height = 0.35
min_layer_height = 0.1 min_layer_height = 0.1
nozzle_diameter = 0.6 nozzle_diameter = 0.6
@ -1020,7 +1020,7 @@ default_print_profile = 0.20mm NORMAL 0.6 nozzle
inherits = *mm-single* inherits = *mm-single*
[printer:Original Prusa i3 MK2 MM Single Mode 0.6 nozzle] [printer:Original Prusa i3 MK2 MM Single Mode 0.6 nozzle]
inherits = *mm-single* inherits = *mm-single*; *0.6nozzle*
nozzle_diameter = 0.6 nozzle_diameter = 0.6
printer_variant = 0.6 printer_variant = 0.6
default_print_profile = 0.20mm NORMAL 0.6 nozzle default_print_profile = 0.20mm NORMAL 0.6 nozzle
@ -1030,7 +1030,7 @@ inherits = *mm-multi*
nozzle_diameter = 0.4,0.4,0.4,0.4 nozzle_diameter = 0.4,0.4,0.4,0.4
[printer:Original Prusa i3 MK2 MultiMaterial 0.6 nozzle] [printer:Original Prusa i3 MK2 MultiMaterial 0.6 nozzle]
inherits = *mm-multi* inherits = *mm-multi*; *0.6nozzle*
nozzle_diameter = 0.6,0.6,0.6,0.6 nozzle_diameter = 0.6,0.6,0.6,0.6
printer_variant = 0.6 printer_variant = 0.6
default_print_profile = 0.20mm NORMAL 0.6 nozzle default_print_profile = 0.20mm NORMAL 0.6 nozzle