Merge branch 'master' into profile_inheritance

This commit is contained in:
bubnikv 2018-03-13 13:49:23 +01:00
commit e845f3b864

View File

@ -114,7 +114,7 @@ top_infill_extrusion_width = 0.45
top_solid_infill_speed = 40 top_solid_infill_speed = 40
travel_speed = 180 travel_speed = 180
wipe_tower = 0 wipe_tower = 0
wipe_tower_per_color_wipe = 15 wipe_tower_per_color_wipe = 20
wipe_tower_width = 60 wipe_tower_width = 60
wipe_tower_x = 180 wipe_tower_x = 180
wipe_tower_y = 140 wipe_tower_y = 140
@ -145,6 +145,21 @@ perimeter_extrusion_width = 0.65
solid_infill_extrusion_width = 0.65 solid_infill_extrusion_width = 0.65
top_infill_extrusion_width = 0.6 top_infill_extrusion_width = 0.6
[print:*soluble_support*]
overhangs = 1
skirts = 0
support_material = 1
support_material_contact_distance = 0
support_material_extruder = 4
support_material_extrusion_width = 0.45
support_material_interface_extruder = 4
support_material_interface_spacing = 0.1
support_material_synchronize_layers = 1
support_material_threshold = 80
support_material_with_sheath = 1
support_material_xy_spacing = 120%
wipe_tower = 1
[print:*0.05mm*] [print:*0.05mm*]
inherits = *common* inherits = *common*
bottom_solid_layers = 10 bottom_solid_layers = 10
@ -331,29 +346,16 @@ top_solid_infill_speed = 50
wipe_tower = 1 wipe_tower = 1
[print:0.15mm OPTIMAL SOLUBLE FULL] [print:0.15mm OPTIMAL SOLUBLE FULL]
inherits = *0.15mm* inherits = *0.15mm*; *soluble_support*
bottom_solid_layers = 5 bottom_solid_layers = 5
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders>1 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
external_perimeter_speed = 25 external_perimeter_speed = 25
notes = Set your solluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder notes = Set your solluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
overhangs = 1
perimeter_speed = 40 perimeter_speed = 40
skirts = 0
solid_infill_speed = 40 solid_infill_speed = 40
support_material = 1
support_material_contact_distance = 0
support_material_extruder = 4
support_material_extrusion_width = 0.45
support_material_interface_extruder = 4
support_material_interface_spacing = 0.1
support_material_synchronize_layers = 1
support_material_threshold = 80
support_material_with_sheath = 1
support_material_xy_spacing = 60% support_material_xy_spacing = 60%
top_infill_extrusion_width = 0.45 top_infill_extrusion_width = 0.45
top_solid_infill_speed = 30 top_solid_infill_speed = 30
wipe_tower = 1
wipe_tower_per_color_wipe = 20
[print:0.15mm OPTIMAL SOLUBLE INTERFACE] [print:0.15mm OPTIMAL SOLUBLE INTERFACE]
inherits = 0.15mm OPTIMAL SOLUBLE FULL inherits = 0.15mm OPTIMAL SOLUBLE FULL
@ -419,26 +421,13 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
perimeters = 3 perimeters = 3
[print:0.20mm NORMAL SOLUBLE FULL] [print:0.20mm NORMAL SOLUBLE FULL]
inherits = *0.20mm* inherits = *0.20mm*; *soluble_support*
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders>1 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders>1
external_perimeter_speed = 30 external_perimeter_speed = 30
notes = Set your solluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder notes = Set your solluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
overhangs = 1
perimeter_speed = 40 perimeter_speed = 40
skirts = 0
solid_infill_speed = 40 solid_infill_speed = 40
support_material = 1
support_material_contact_distance = 0
support_material_extruder = 4
support_material_extrusion_width = 0.45
support_material_interface_extruder = 4
support_material_interface_spacing = 0.1
support_material_synchronize_layers = 1
support_material_threshold = 80
support_material_with_sheath = 1
support_material_xy_spacing = 120%
top_solid_infill_speed = 30 top_solid_infill_speed = 30
wipe_tower_per_color_wipe = 20
[print:0.20mm NORMAL SOLUBLE INTERFACE] [print:0.20mm NORMAL SOLUBLE INTERFACE]
inherits = 0.20mm NORMAL SOLUBLE FULL inherits = 0.20mm NORMAL SOLUBLE FULL
@ -488,25 +477,17 @@ perimeters = 3
top_solid_layers = 9 top_solid_layers = 9
[print:0.35mm FAST sol full 0.6 nozzle] [print:0.35mm FAST sol full 0.6 nozzle]
inherits = *0.35mm*; *0.6nozzle* 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_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.6 and num_extruders>1
external_perimeter_extrusion_width = 0.6 external_perimeter_extrusion_width = 0.6
external_perimeter_speed = 30 external_perimeter_speed = 30
notes = Set your solluble extruder in Multiple Extruders > Support material/raft interface extruder notes = Set your solluble extruder in Multiple Extruders > Support material/raft interface extruder
overhangs = 1
perimeter_speed = 40 perimeter_speed = 40
skirts = 0
support_material = 1
support_material_contact_distance = 0
support_material_extruder = 4
support_material_extrusion_width = 0.55 support_material_extrusion_width = 0.55
support_material_interface_extruder = 4
support_material_interface_layers = 3 support_material_interface_layers = 3
support_material_synchronize_layers = 1 support_material_interface_spacing = 0.2
support_material_threshold = 80 support_material_with_sheath = 0
support_material_xy_spacing = 120%
top_infill_extrusion_width = 0.57 top_infill_extrusion_width = 0.57
wipe_tower_per_color_wipe = 20
[print:0.35mm FAST sol int 0.6 nozzle] [print:0.35mm FAST sol int 0.6 nozzle]
inherits = 0.35mm FAST sol full 0.6 nozzle inherits = 0.35mm FAST sol full 0.6 nozzle