From 76433da64c24c5aa73ac247bf963fef9c313dadf Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Sat, 8 Feb 2020 22:11:44 +0100
Subject: [PATCH] Printer profiles were updated by @rtyr

---
 resources/profiles/Creality.idx      |   1 +
 resources/profiles/Creality.ini      |   6 +-
 resources/profiles/PrusaResearch.idx |   1 +
 resources/profiles/PrusaResearch.ini | 149 +++++++++++++++++++--------
 4 files changed, 113 insertions(+), 44 deletions(-)

diff --git a/resources/profiles/Creality.idx b/resources/profiles/Creality.idx
index d877ae7c9..9ac64e8cf 100644
--- a/resources/profiles/Creality.idx
+++ b/resources/profiles/Creality.idx
@@ -1,4 +1,5 @@
 min_slic3r_version = 2.2.0-alpha3
+0.0.2-alpha1 Extended list of default filaments to be installed
 0.0.2-alpha0 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
 # The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
 # so they will see the print bed.
diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini
index 4f8dbe572..ddb043775 100644
--- a/resources/profiles/Creality.ini
+++ b/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.2-alpha0
+config_version = 0.0.2-alpha1
 # Where to get the updates from?
 config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/
 # changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -20,7 +20,7 @@ variants = 0.4
 technology = FFF
 bed_model = ender3_bed.stl
 bed_texture = ender3.svg
-default_materials = Creality PLA @ENDER3; Prusament PLA @ENDER3
+default_materials = Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -422,4 +422,4 @@ retract_before_wipe = 70%
 default_print_profile = 0.20mm NORMAL
 default_filament_profile = Creality PLA
 start_gcode = G90 ; 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 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0.0\nG1 Y190 E15.0 F1500.0 ; intro line\nG1 X2.3 F5000\nG1 Y10 E30 F1200.0 ; intro line\nG92 E0.0
-end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+10, max_print_height)} F600{endif} ; Move print head up\nG1 X0 Y200 F3000 ; present print\nM84 X Y E ; disable motors
\ No newline at end of file
+end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+10, max_print_height)} F600{endif} ; Move print head up\nG1 X0 Y200 F3000 ; present print\nM84 X Y E ; disable motors
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index 9ac22c59d..d063303d9 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,4 +1,5 @@
 min_slic3r_version = 2.2.0-alpha3
+1.1.1-alpha4 Extended list of default filaments to be installed, top/bottom_solid_min_thickness defined, infill_acceleration changed etc
 1.1.1-alpha3 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
 # The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
 # so they will see the print bed.
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index aa4b7cff0..cc791097d 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 = 1.1.1-alpha3
+config_version = 1.1.1-alpha4
 # 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%
@@ -24,7 +24,7 @@ technology = FFF
 family = MINI
 bed_model = mini_bed.stl
 bed_texture = mini.svg
-default_materials = Prusament PLA; Prusament PETG @MINI
+default_materials = Generic PLA; Generic ABS @MINI; Generic PETG @MINI; Prusament PLA; Prusament PETG @MINI; Prusament ASA @MINI
 
 [printer_model:MK3S]
 name = Original Prusa i3 MK3S
@@ -33,7 +33,7 @@ technology = FFF
 family = MK3
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA; Prusament PETG
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA
 
 [printer_model:MK3]
 name = Original Prusa i3 MK3
@@ -42,7 +42,7 @@ technology = FFF
 family = MK3
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA; Prusament PETG
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA
 
 [printer_model:MK3SMMU2S]
 name = Original Prusa i3 MK3S MMU2S
@@ -51,7 +51,7 @@ technology = FFF
 family = MK3
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA @MMU2; Prusament PETG @MMU2; Prusament ASA @MMU2; Verbatim BVOH @MMU2
 
 [printer_model:MK3MMU2]
 name = Original Prusa i3 MK3 MMU2
@@ -60,7 +60,7 @@ technology = FFF
 family = MK3
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA @MMU2; Prusament PETG @MMU2; Prusament ASA @MMU2; Verbatim BVOH @MMU2
 
 [printer_model:MK2.5S]
 name = Original Prusa i3 MK2.5S
@@ -69,7 +69,7 @@ technology = FFF
 family = MK2.5
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA; Prusament PETG
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA
 
 [printer_model:MK2.5]
 name = Original Prusa i3 MK2.5
@@ -78,7 +78,7 @@ technology = FFF
 family = MK2.5
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA; Prusament PETG
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA
 
 [printer_model:MK2.5SMMU2S]
 name = Original Prusa i3 MK2.5S MMU2S
@@ -87,7 +87,7 @@ technology = FFF
 family = MK2.5
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA @MMU2; Prusament PETG @MMU2; Prusament ASA @MMU2; Verbatim BVOH @MMU2
 
 [printer_model:MK2.5MMU2]
 name = Original Prusa i3 MK2.5 MMU2
@@ -96,7 +96,7 @@ technology = FFF
 family = MK2.5
 bed_model = mk3_bed.stl
 bed_texture = mk3.svg
-default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA @MMU2; Prusament PETG @MMU2; Prusament ASA @MMU2; Verbatim BVOH @MMU2
 
 [printer_model:MK2S]
 name = Original Prusa i3 MK2S
@@ -105,7 +105,7 @@ technology = FFF
 family = MK2
 bed_model = mk2_bed.stl
 bed_texture = mk2.svg
-default_materials = Prusament PLA; Prusament PETG
+default_materials = Generic PLA; Generic ABS; Generic PETG; Prusament PLA; Prusament PETG; Prusament ASA
 
 [printer_model:MK2SMM]
 name = Original Prusa i3 MK2S MMU1
@@ -114,7 +114,7 @@ technology = FFF
 family = MK2
 bed_model = mk2_bed.stl
 bed_texture = mk2.svg
-default_materials = Prusament PLA; Prusament PETG @MMU1
+default_materials =  Generic PLA; Generic ABS; Generic PETG @MMU1; Prusament PLA; Prusament PETG @MMU1; Prusament ASA
 
 [printer_model:SL1]
 name = Original Prusa SL1
@@ -123,7 +123,7 @@ technology = SLA
 family = SL1
 bed_model = sl1_bed.stl
 bed_texture = sl1.svg
-default_materials = Prusa Transparent Tough @0.05
+default_materials = Prusa Orange Tough @0.05
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -226,6 +226,8 @@ wipe_tower_width = 60
 wipe_tower_x = 170
 wipe_tower_y = 140
 xy_size_compensation = 0
+top_solid_min_thickness = 0.6
+bottom_solid_min_thickness = 0.5
 
 [print:*MK3*]
 fill_pattern = grid
@@ -359,9 +361,9 @@ output_filename_format = {input_filename_base}_{nozzle_diameter[0]}n_{layer_heig
 external_perimeter_extrusion_width = 0.65
 extrusion_width = 0.65
 first_layer_extrusion_width = 0.65
-infill_extrusion_width = 0.7
+infill_extrusion_width = 0.65
 perimeter_extrusion_width = 0.65
-solid_infill_extrusion_width = 0.7
+solid_infill_extrusion_width = 0.65
 top_infill_extrusion_width = 0.6
 support_material_extrusion_width = 0.55
 bridge_flow_ratio = 0.95
@@ -555,7 +557,7 @@ inherits = *0.10mm*; *MK3*
 bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
 external_perimeter_speed = 25
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 80
 max_print_speed = 200
 perimeter_speed = 45
@@ -655,7 +657,7 @@ inherits = *0.15mm*; *MK3*
 bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 25
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 80
 max_print_speed = 200
 perimeter_speed = 45
@@ -670,7 +672,7 @@ inherits = *0.15mm*; *MK3*
 bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 60
@@ -735,7 +737,7 @@ inherits = *0.15mm*; *0.6nozzleMK3*; *MK306*
 # alias = 0.15mm DETAIL
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 70
 max_print_speed = 100
 perimeter_speed = 45
@@ -780,7 +782,7 @@ inherits = *0.20mm*; *MK3*
 bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 25
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 80
 max_print_speed = 200
 perimeter_speed = 45
@@ -795,7 +797,7 @@ inherits = *0.20mm*; *MK3*
 bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 60
@@ -860,7 +862,7 @@ inherits = *0.20mm*; *0.6nozzleMK3*; *MK306*
 # alias = 0.20mm DETAIL
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 70
 max_print_speed = 100
 perimeter_speed = 45
@@ -905,7 +907,7 @@ inherits = *0.30mm*; *0.6nozzleMK3*; *MK306*
 # alias = 0.30mm QUALITY
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 70
 max_print_speed = 100
 perimeter_speed = 45
@@ -942,7 +944,7 @@ bottom_solid_layers = 3
 bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 85
 max_print_speed = 200
 perimeter_speed = 50
@@ -1027,7 +1029,7 @@ inherits = *0.35mm*; *0.6nozzleMK3*; *MK306*
 # alias = 0.35mm SPEED
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 70
 max_print_speed = 100
 perimeter_speed = 45
@@ -1035,6 +1037,8 @@ solid_infill_speed = 70
 top_solid_infill_speed = 45
 external_perimeter_extrusion_width = 0.68
 perimeter_extrusion_width = 0.68
+infill_extrusion_width = 0.68
+solid_infill_extrusion_width = 0.68
 
 # XXXXXXXXXXXXXXXXXXXX
 # XXX--- 0.40mm ---XXX
@@ -1063,7 +1067,7 @@ inherits = *0.40mm*; *0.6nozzleMK3*; *MK306*
 # alias = 0.40mm DRAFT
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
-infill_acceleration = 1250
+infill_acceleration = 1000
 infill_speed = 70
 max_print_speed = 100
 perimeter_speed = 45
@@ -1185,6 +1189,7 @@ top_infill_extrusion_width = 0.4
 small_perimeter_speed = 15
 perimeter_extrusion_width = 0.4
 external_perimeter_extrusion_width = 0.4
+support_material_xy_spacing = 60%
 
 [print:0.07mm ULTRADETAIL @MINI]
 inherits = *0.07mm*; *MINI*
@@ -1196,6 +1201,7 @@ top_infill_extrusion_width = 0.4
 small_perimeter_speed = 15
 perimeter_extrusion_width = 0.4
 external_perimeter_extrusion_width = 0.4
+support_material_xy_spacing = 60%
 
 [print:0.10mm DETAIL @MINI]
 inherits = *0.10mm*; *MINI*
@@ -1212,6 +1218,7 @@ fill_pattern = gyroid
 fill_density = 15%
 perimeters = 3
 bridge_acceleration = 1000
+support_material_xy_spacing = 60%
 
 [print:0.15mm QUALITY @MINI]
 inherits = *0.15mm*; *MINI*
@@ -1226,6 +1233,7 @@ top_solid_infill_speed = 40
 fill_pattern = gyroid
 fill_density = 15%
 bridge_flow_ratio = 0.85
+support_material_xy_spacing = 60%
 
 [print:0.15mm SPEED @MINI]
 inherits = *0.15mm*; *MINI*
@@ -1238,6 +1246,7 @@ infill_speed = 140
 solid_infill_speed = 140
 top_solid_infill_speed = 40
 bridge_flow_ratio = 0.85
+support_material_xy_spacing = 60%
 
 [print:0.20mm QUALITY @MINI]
 inherits = *0.20mm*; *MINI*
@@ -1251,6 +1260,7 @@ solid_infill_speed = 80
 top_solid_infill_speed = 40
 fill_pattern = gyroid
 fill_density = 15%
+support_material_xy_spacing = 60%
 
 [print:0.20mm SPEED @MINI]
 inherits = *0.20mm*; *MINI*
@@ -1263,6 +1273,7 @@ infill_speed = 140
 max_print_speed = 150
 solid_infill_speed = 140
 top_solid_infill_speed = 40
+support_material_xy_spacing = 60%
 
 [print:0.25mm DRAFT @MINI]
 inherits = *0.25mm*; *MINI*
@@ -1279,6 +1290,7 @@ first_layer_extrusion_width = 0.42
 infill_extrusion_width = 0.45
 solid_infill_extrusion_width = 0.45
 top_infill_extrusion_width = 0.4
+support_material_xy_spacing = 60%
 
 # 0.25mm nozzle
 
@@ -1551,7 +1563,7 @@ bridge_fan_speed = 80
 compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model!="MK2SMM" and printer_model!="MINI" 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 = 3
-extrusion_multiplier = 1.2
+extrusion_multiplier = 1.15
 fan_always_on = 0
 fan_below_layer_time = 100
 filament_colour = #008000
@@ -1626,7 +1638,7 @@ filament_density = 1.24
 inherits = *PLA*
 filament_vendor = ColorFabb
 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)
-extrusion_multiplier = 1.2
+extrusion_multiplier = 1.1
 filament_cost = 58.30
 filament_density = 1.15
 filament_colour = #dfc287
@@ -1634,12 +1646,13 @@ filament_max_volumetric_speed = 9
 first_layer_temperature = 200
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode"
 temperature = 200
+filament_retract_lift = 0.2
 
 [filament:ColorFabb corkFill]
 inherits = *PLA*
 filament_vendor = ColorFabb
 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)
-extrusion_multiplier = 1.2
+extrusion_multiplier = 1.1
 filament_cost = 58.30
 filament_density = 1.18
 filament_colour = #634d33
@@ -1647,6 +1660,7 @@ filament_max_volumetric_speed = 6
 first_layer_temperature = 220
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode"
 temperature = 220
+filament_retract_lift = 0.2
 
 [filament:ColorFabb XT]
 inherits = *PET*
@@ -1788,7 +1802,7 @@ temperature = 275
 inherits = *PLA*
 filament_vendor = Fillamentum
 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)
-extrusion_multiplier = 1.2
+extrusion_multiplier = 1.1
 filament_cost = 68
 filament_density = 1.15
 filament_colour = #804040
@@ -1796,6 +1810,21 @@ filament_max_volumetric_speed = 10
 first_layer_temperature = 190
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode"
 temperature = 190
+filament_retract_lift = 0.2
+
+[filament:Smartfil Wood]
+inherits = *PLA*
+filament_vendor = Smart Materials 3D
+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)
+extrusion_multiplier = 1.1
+filament_cost = 68
+filament_density = 1.58
+filament_colour = #804040
+filament_max_volumetric_speed = 9
+first_layer_temperature = 220
+start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode"
+temperature = 220
+filament_retract_lift = 0.2
 
 [filament:Generic ABS]
 inherits = *ABS*
@@ -1855,7 +1884,7 @@ inherits = *FLEX*
 filament_vendor = SainSmart
 fan_always_on = 1
 filament_max_volumetric_speed = 2.5
-extrusion_multiplier = 1.15
+extrusion_multiplier = 1.1
 first_layer_temperature = 230
 first_layer_bed_temperature = 50
 temperature = 230
@@ -1881,7 +1910,7 @@ inherits = *FLEX*
 filament_vendor = Filatech
 fan_always_on = 1
 filament_max_volumetric_speed = 2.5
-extrusion_multiplier = 1.15
+extrusion_multiplier = 1.1
 first_layer_temperature = 230
 first_layer_bed_temperature = 50
 temperature = 230
@@ -1914,6 +1943,7 @@ first_layer_bed_temperature = 100
 first_layer_temperature = 270
 temperature = 270
 bridge_fan_speed = 0
+filament_max_volumetric_speed = 8
 
 [filament:PrimaSelect PVA+]
 inherits = *PLA*
@@ -2009,6 +2039,25 @@ min_fan_speed = 20
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode"
 temperature = 220
 
+[filament:Generic HIPS]
+inherits = *ABS*
+filament_vendor = Generic
+filament_cost = 27.3
+filament_density = 1.04
+bridge_fan_speed = 50
+cooling = 1
+extrusion_multiplier = 1
+fan_always_on = 1
+fan_below_layer_time = 10
+filament_colour = #FFFFD7
+filament_soluble = 1
+filament_type = HIPS
+first_layer_temperature = 230
+max_fan_speed = 20
+min_fan_speed = 20
+start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode"
+temperature = 230
+
 [filament:Prusa PETG]
 inherits = *PET*
 filament_vendor = Made for Prusa
@@ -2753,6 +2802,7 @@ filament_density = 1.07
 inherits = Polymaker PC-Max; *ABSMINI*
 # alias = Polymaker PC-Max
 filament_type = PC
+filament_max_volumetric_speed = 7
 bed_temperature = 100
 filament_colour = #3A80CA
 first_layer_bed_temperature = 100
@@ -2777,7 +2827,7 @@ filament_cost = 27.3
 filament_density = 1.04
 bridge_fan_speed = 50
 cooling = 1
-extrusion_multiplier = 0.9
+extrusion_multiplier = 1
 fan_always_on = 1
 fan_below_layer_time = 10
 filament_colour = #FFFFD7
@@ -2963,6 +3013,13 @@ initial_exposure_time = 30
 material_type = Tough
 material_vendor = 3DM
 
+[sla_material:3DM-TOUGH Clear 0.025]
+inherits = *common 0.025*
+exposure_time = 9
+initial_exposure_time = 30
+material_type = Tough
+material_vendor = 3DM
+
 [sla_material:BlueCast Phrozen Wax @0.025]
 inherits = *common 0.025*
 exposure_time = 15
@@ -3323,6 +3380,13 @@ initial_exposure_time = 30
 material_type = Tough
 material_vendor = 3DM
 
+[sla_material:3DM-TOUGH Clear 0.05]
+inherits = *common 0.05*
+exposure_time = 15
+initial_exposure_time = 30
+material_type = Tough
+material_vendor = 3DM
+
 [sla_material:FTD Ash Grey @0.05]
 inherits = *common 0.05*
 exposure_time = 9
@@ -3835,18 +3899,21 @@ min_layer_height = 0.1
 inherits = Original Prusa i3 MK2S
 printer_model = MK2.5
 remaining_times = 1
+machine_max_jerk_e = 4.5
 start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.8.1 ; 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\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
 
 [printer:Original Prusa i3 MK2.5 0.25 nozzle]
 inherits = Original Prusa i3 MK2S 0.25 nozzle
 printer_model = MK2.5
 remaining_times = 1
+machine_max_jerk_e = 4.5
 start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.8.1 ; 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\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
 
 [printer:Original Prusa i3 MK2.5 0.6 nozzle]
 inherits = Original Prusa i3 MK2S 0.6 nozzle
 printer_model = MK2.5
 remaining_times = 1
+machine_max_jerk_e = 4.5
 start_gcode = M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.8.1 ; 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\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0
 
 [printer:Original Prusa i3 MK2.5 MMU2 Single]
@@ -3867,7 +3934,7 @@ machine_max_feedrate_e = 120
 machine_max_feedrate_x = 500
 machine_max_feedrate_y = 500
 machine_max_feedrate_z = 12
-machine_max_jerk_e = 2.5
+machine_max_jerk_e = 4.5
 machine_max_jerk_x = 10
 machine_max_jerk_y = 10
 machine_max_jerk_z = 0.2
@@ -3904,7 +3971,7 @@ machine_max_feedrate_e = 120
 machine_max_feedrate_x = 500
 machine_max_feedrate_y = 500
 machine_max_feedrate_z = 12
-machine_max_jerk_e = 2.5
+machine_max_jerk_e = 4.5
 machine_max_jerk_x = 10
 machine_max_jerk_y = 10
 machine_max_jerk_z = 0.2
@@ -3954,7 +4021,7 @@ machine_max_feedrate_e = 120
 machine_max_feedrate_x = 500
 machine_max_feedrate_y = 500
 machine_max_feedrate_z = 12
-machine_max_jerk_e = 2.5
+machine_max_jerk_e = 4.5
 machine_max_jerk_x = 10
 machine_max_jerk_y = 10
 machine_max_jerk_z = 0.2
@@ -4003,7 +4070,7 @@ machine_max_feedrate_e = 120
 machine_max_feedrate_x = 500
 machine_max_feedrate_y = 500
 machine_max_feedrate_z = 12
-machine_max_jerk_e = 2.5
+machine_max_jerk_e = 4.5
 machine_max_jerk_x = 10
 machine_max_jerk_y = 10
 machine_max_jerk_z = 0.2
@@ -4053,7 +4120,7 @@ machine_max_feedrate_e = 120,120
 machine_max_feedrate_x = 200,100
 machine_max_feedrate_y = 200,100
 machine_max_feedrate_z = 12,12
-machine_max_jerk_e = 1.5,1.5
+machine_max_jerk_e = 4.5,4.5
 machine_max_jerk_x = 8,8
 machine_max_jerk_y = 8,8
 machine_max_jerk_z = 0.4,0.4
@@ -4261,7 +4328,7 @@ retract_lift_below = 179
 retract_layer_change = 0
 silent_mode = 0
 remaining_times = 1
-start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM92 E317 ; set steps/unit for extruder\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\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 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.0 E8.0 F900\nG1 X40.0 E10.0 F700\nG92 E0.0\n\nM221 S95 ; set flow
+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\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 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.0 E8.0 F900\nG1 X40.0 E10.0 F700\nG92 E0.0\n\nM221 S95 ; set flow
 end_gcode = G1 E-1 F2100 ; retract\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+5, max_print_height)}{endif} F720 ; Move print head up\nG1 X178 Y180 F4200 ; park print head\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\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 = 
@@ -4280,7 +4347,7 @@ deretract_speed = 40
 wipe = 1
 retract_before_wipe = 70%
 retract_before_travel = 1
-start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM92 E317 ; set steps/unit for extruder\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\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 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.0 E8.0 F600\nG1 X40.0 E10.0 F400\nG92 E0.0\n\nM221 S95 ; set flow
+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\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 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.0 E8.0 F600\nG1 X40.0 E10.0 F400\nG92 E0.0\n\nM221 S95 ; set flow
 
 [printer:Original Prusa MINI 0.6 nozzle]
 inherits = Original Prusa MINI
@@ -4295,7 +4362,7 @@ retract_speed = 70
 deretract_speed = 40
 wipe = 1
 retract_before_wipe = 70%
-retract_before_travel = 1
+retract_before_travel = 1.5
 
 [printer:Original Prusa SL1]
 printer_technology = SLA