From a039f3e6ceae55e4da123e167c4d732c6d499db3 Mon Sep 17 00:00:00 2001
From: rtyr <36745189+rtyr@users.noreply.github.com>
Date: Wed, 1 Sep 2021 13:39:15 +0200
Subject: [PATCH] Sync with master.

---
 live/PrusaResearch/1.4.0-alpha7.ini | 33 +++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/live/PrusaResearch/1.4.0-alpha7.ini b/live/PrusaResearch/1.4.0-alpha7.ini
index 835e552..47a3883 100644
--- a/live/PrusaResearch/1.4.0-alpha7.ini
+++ b/live/PrusaResearch/1.4.0-alpha7.ini
@@ -213,6 +213,7 @@ support_material_angle = 0
 support_material_buildplate_only = 0
 support_material_enforce_layers = 0
 support_material_contact_distance = 0.2
+raft_contact_distance = 0.2
 support_material_interface_contact_loops = 0
 support_material_interface_layers = 2
 support_material_interface_spacing = 0.2
@@ -432,6 +433,7 @@ solid_infill_speed = 30
 support_material_extrusion_width = 0.33
 support_material_spacing = 1.5
 support_material_contact_distance = 0.15
+raft_contact_distance = 0.15
 perimeter_acceleration = 300
 perimeter_speed = 30
 perimeters = 3
@@ -461,6 +463,7 @@ layer_height = 0.1
 perimeter_acceleration = 800
 top_solid_layers = 9
 support_material_contact_distance = 0.17
+raft_contact_distance = 0.17
 
 [print:*0.15mm*]
 inherits = *common*
@@ -613,6 +616,7 @@ solid_infill_extrusion_width = 0.7
 top_infill_extrusion_width = 0.45
 support_material_extrusion_width = 0.37
 support_material_contact_distance = 0.1
+raft_contact_distance = 0.2
 top_solid_infill_speed = 40
 thick_bridges = 1
 
@@ -669,6 +673,7 @@ small_perimeter_speed = 15
 solid_infill_speed = 20
 support_material_speed = 20
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.10mm DETAIL @0.25 nozzle]
 inherits = *0.10mm*; *0.25nozzle*
@@ -683,6 +688,7 @@ small_perimeter_speed = 15
 solid_infill_speed = 40
 top_solid_infill_speed = 30
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.15mm OPTIMAL @0.25 nozzle]
 inherits = *0.15mm*; *0.25nozzle*
@@ -698,6 +704,7 @@ small_perimeter_speed = 15
 solid_infill_speed = 40
 top_solid_infill_speed = 30
 support_material_contact_distance = 0.08
+raft_contact_distance = 0.08
 
 ## MK2 - 0.6mm nozzle
 
@@ -923,6 +930,7 @@ solid_infill_extrusion_width = 0.5
 top_infill_extrusion_width = 0.45
 support_material_extrusion_width = 0.38
 support_material_contact_distance = 0.2
+raft_contact_distance = 0.2
 
 ## MK3 - MMU2 specific
 [print:0.15mm SOLUBLE FULL @MK3]
@@ -977,6 +985,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.07mm ULTRADETAIL @0.25 nozzle MK3]
 inherits = *0.07mm*; *0.25nozzle*; *MK3*
@@ -988,6 +997,7 @@ top_solid_infill_speed = 20
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.10mm DETAIL @0.25 nozzle MK3]
 inherits = *0.10mm*; *0.25nozzleMK3*; *MK3*
@@ -995,6 +1005,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.15mm QUALITY @0.25 nozzle MK3]
 inherits = *0.15mm*; *0.25nozzleMK3*; *MK3*
@@ -1002,6 +1013,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.08
+raft_contact_distance = 0.08
 
 ## MK3 - 0.6mm nozzle
 
@@ -1016,6 +1028,7 @@ perimeter_speed = 45
 solid_infill_speed = 70
 top_solid_infill_speed = 45
 support_material_contact_distance = 0.22
+raft_contact_distance = 0.22
 bridge_flow_ratio = 1
 
 [print:0.20mm DETAIL @0.6 nozzle MK3]
@@ -1029,6 +1042,7 @@ perimeter_speed = 45
 solid_infill_speed = 70
 top_solid_infill_speed = 45
 support_material_contact_distance = 0.22
+raft_contact_distance = 0.22
 bridge_flow_ratio = 1
 
 [print:0.30mm QUALITY @0.6 nozzle MK3]
@@ -1042,6 +1056,7 @@ perimeter_speed = 45
 solid_infill_speed = 70
 top_solid_infill_speed = 45
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.25
 bridge_flow_ratio = 1
 
 [print:0.35mm SPEED @0.6 nozzle MK3]
@@ -1059,6 +1074,7 @@ perimeter_extrusion_width = 0.68
 infill_extrusion_width = 0.68
 solid_infill_extrusion_width = 0.68
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.25
 bridge_flow_ratio = 0.95
 
 [print:0.40mm DRAFT @0.6 nozzle MK3]
@@ -1076,6 +1092,7 @@ perimeter_extrusion_width = 0.68
 infill_extrusion_width = 0.68
 solid_infill_extrusion_width = 0.68
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.25
 bridge_flow_ratio = 0.95
 
 ## MK3 - MMU2 specific
@@ -1255,6 +1272,7 @@ solid_infill_extrusion_width = 0.45
 top_infill_extrusion_width = 0.4
 support_material_xy_spacing = 60%
 support_material_contact_distance = 0.2
+raft_contact_distance = 0.2
 
 # MINI - 0.25mm nozzle
 
@@ -1265,6 +1283,7 @@ fill_pattern = grid
 fill_density = 20%
 support_material_speed = 30
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.07mm ULTRADETAIL @0.25 nozzle MINI]
 inherits = *0.07mm*; *0.25nozzle*; *MINI*
@@ -1276,6 +1295,7 @@ top_solid_infill_speed = 20
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.10mm DETAIL @0.25 nozzle MINI]
 inherits = *0.10mm*; *0.25nozzleMINI*; *MINI*
@@ -1283,6 +1303,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.07
+raft_contact_distance = 0.07
 
 [print:0.15mm QUALITY @0.25 nozzle MINI]
 inherits = *0.15mm*; *0.25nozzleMINI*; *MINI*
@@ -1290,6 +1311,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.08
+raft_contact_distance = 0.08
 
 # MINI - 0.6mm nozzle
 
@@ -1305,6 +1327,7 @@ top_solid_infill_speed = 45
 infill_extrusion_width = 0.65
 solid_infill_extrusion_width = 0.65
 support_material_contact_distance = 0.22
+raft_contact_distance = 0.22
 bridge_flow_ratio = 1
 
 [print:0.20mm DETAIL @0.6 nozzle MINI]
@@ -1319,6 +1342,7 @@ top_solid_infill_speed = 45
 infill_extrusion_width = 0.65
 solid_infill_extrusion_width = 0.65
 support_material_contact_distance = 0.22
+raft_contact_distance = 0.22
 bridge_flow_ratio = 1
 
 [print:0.30mm QUALITY @0.6 nozzle MINI]
@@ -1333,6 +1357,7 @@ top_solid_infill_speed = 45
 external_perimeter_extrusion_width = 0.68
 perimeter_extrusion_width = 0.68
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.25
 bridge_flow_ratio = 1
 
 [print:0.35mm SPEED @0.6 nozzle MINI]
@@ -1347,6 +1372,7 @@ top_solid_infill_speed = 45
 external_perimeter_extrusion_width = 0.68
 perimeter_extrusion_width = 0.68
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.25
 bridge_flow_ratio = 0.95
 
 [print:0.40mm DRAFT @0.6 nozzle MINI]
@@ -1363,6 +1389,7 @@ perimeter_extrusion_width = 0.68
 infill_extrusion_width = 0.68
 solid_infill_extrusion_width = 0.68
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.25
 bridge_flow_ratio = 0.95
 
 # MINI - 0.8mm nozzle
@@ -1398,6 +1425,7 @@ infill_speed = 40
 solid_infill_speed = 40
 support_material_speed = 35
 support_material_contact_distance = 0.25
+raft_contact_distance = 0.2
 top_solid_infill_speed = 28
 external_perimeter_extrusion_width = 1
 perimeter_extrusion_width = 1
@@ -6522,7 +6550,7 @@ start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104
 end_gcode = G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n
 extruder_colour = 
-color_change_gcode = M600\nG1 E0.8 F1500 ; prime after color change
+color_change_gcode = M600
 
 [printer:Original Prusa MINI & MINI+ 0.25 nozzle]
 inherits = Original Prusa MINI & MINI+
@@ -6536,7 +6564,6 @@ retract_length = 3
 retract_lift = 0.15
 retract_before_travel = 1
 start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F600\nG1 X40 E10 F400\nG92 E0\n\nM221 S95 ; set flow
-color_change_gcode = M600\nG1 E0.6 F1500 ; prime after color change
 
 [printer:Original Prusa MINI & MINI+ 0.6 nozzle]
 inherits = Original Prusa MINI & MINI+
@@ -6548,7 +6575,6 @@ min_layer_height = 0.15
 default_print_profile = 0.30mm QUALITY @0.6 nozzle MINI
 retract_length = 3.5
 retract_before_travel = 1.5
-color_change_gcode = M600\nG1 E1 F1500 ; prime after color change
 
 [printer:Original Prusa MINI & MINI+ 0.8 nozzle]
 inherits = Original Prusa MINI & MINI+
@@ -6560,7 +6586,6 @@ default_print_profile = 0.40mm QUALITY @0.8 nozzle MINI
 default_filament_profile = Prusament PLA @0.8 nozzle
 retract_length = 3.5
 retract_before_travel = 1.5
-color_change_gcode = M600\nG1 E1.2 F1500 ; prime after color change
 
 [printer:Original Prusa SL1]
 printer_technology = SLA