Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset

resources/profiles/PrusaResearch.ini

@@ -1,4 +1,28 @@
-# generated by Slic3r Prusa Edition 1.39.0.29-prusa3d-win64 on 2018-01-22 at 14:53:14
+# Print profiles for the Prusa Research printers.
+
+[vendor]
+# Vendor name will be shown by the Config Wizard.
+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 Slic3r configuration to be downgraded.
+config_version = 0.1
+# Where to get the updates from?
+config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch.ini
+
+# The printer models will be shown by the Configuration Wizard in this order,
+# also the first model installed & the first nozzle installed will be activated after install.
+#TODO: One day we may differentiate variants of the nozzles / hot ends,
+#for example by the melt zone size, or whether the nozzle is hardened.
+[printer_model:MK3]
+variants = 0.4; 0.25; 0.6
+
+[printer_model:MK2S]
+variants = 0.4; 0.25; 0.6
+
+[printer_model:MK2SMM]
+# Printer model name will be shown by the installation wizard.
+name = MK2S Multi Material
+variants = 0.4; 0.6
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -898,6 +922,10 @@ use_volumetric_e = 0
 variable_layer_height = 1
 wipe = 1
 z_offset = 0
+printer_model = MK2S
+printer_variant = 0.4
+default_print_profile = 0.15mm OPTIMAL
+default_filament_profile = Prusa PLA
 
 [printer:*multimaterial*]
 inherits = *common*
@@ -914,6 +942,7 @@ retract_restart_extra = 0
 retract_restart_extra_toolchange = 0
 retract_speed = 80
 single_extruder_multi_material = 1
+printer_model = MK2SMM
 
 [printer:*mm-single*]
 inherits = *multimaterial*
@@ -941,12 +970,15 @@ nozzle_diameter = 0.25
 retract_length = 1
 retract_speed = 50
 variable_layer_height = 0
+printer_variant = 0.25
+default_print_profile = 0.10mm DETAIL 0.25 nozzle
 
 [printer:Original Prusa i3 MK2 0.6 nozzle]
 inherits = *common*
 max_layer_height = 0.35
 min_layer_height = 0.1
 nozzle_diameter = 0.6
+printer_variant = 0.6
 
 [printer:Original Prusa i3 MK2 MM Single Mode]
 inherits = *mm-single*
@@ -954,6 +986,7 @@ inherits = *mm-single*
 [printer:Original Prusa i3 MK2 MM Single Mode 0.6 nozzle]
 inherits = *mm-single*
 nozzle_diameter = 0.6
+printer_variant = 0.6
 
 [printer:Original Prusa i3 MK2 MultiMaterial]
 inherits = *mm-multi*
@@ -962,6 +995,7 @@ nozzle_diameter = 0.4,0.4,0.4,0.4
 [printer:Original Prusa i3 MK2 MultiMaterial 0.6 nozzle]
 inherits = *mm-multi*
 nozzle_diameter = 0.6,0.6,0.6,0.6
+printer_variant = 0.6
 
 [printer:Original Prusa i3 MK3]
 inherits = *common*
@@ -969,8 +1003,5 @@ end_gcode = G4 ; wait\nM221 S100\nM104 S0 ; turn off temperature\nM140 S0 ; turn
 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_MK3\n
 retract_lift_below = 209
 start_gcode = M115 U3.1.1-RC5 ; tell printer latest fw version\nM201 X1000 Y1000 Z200 E5000 ; sets maximum accelerations, mm/sec^2\nM203 X200 Y200 Z12 E120 ; sets maximum feedrates, mm/sec\nM204 S1250 T1250 ; sets acceleration (S) and retract acceleration (T)\nM205 X10 Y10 Z0.4 E2.5 ; sets the jerk limits, mm/sec\nM205 S0 T0 ; sets the minimum extruding and travel feed rate, mm/sec\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\nM221 S{if layer_height==0.05}100{else}95{endif}
-
-[presets]
-print = 0.15mm OPTIMAL MK3
-printer = Original Prusa i3 MK3
-filament = Prusa PLA
+printer_model = MK3
+default_print_profile = 0.15mm OPTIMAL MK3