Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master

resources/definitions/hms434.def.json

@@ -13,6 +13,7 @@
  "chromatik_pla",
  "dsm_arnitel2045_175", "dsm_novamid1070_175",
  "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a",
+ "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White",
  "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu",
  "fiberlogy_hd_pla",
  "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
@@ -118,6 +119,7 @@
         "material_final_print_temperature":   {"value": "material_print_temperature"},
         "material_bed_temperature_layer_0":   {"value": "material_bed_temperature"},
         "material_flow":                      {"value": "100"},
+        "material_flow_layer_0":              {"value": "material_flow"},
         "retraction_enable":                  {"value": true },
         "retract_at_layer_change":            {"value": true },
         "retraction_amount":                  {"value": "1"},
@@ -130,9 +132,9 @@
 
         "speed_print":             {"value": "50"},
         "speed_infill":            {"value": "speed_print"},
-        "speed_wall":              {"value": "(speed_print/5*3) if speed_print < 51 else speed_print"},
+        "speed_wall":              {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"},
         "speed_wall_x":            {"value": "speed_wall"},
-        "speed_layer_0":           {"value": "(speed_print/5*4) if speed_print < 51 else speed_print"},
+        "speed_layer_0":           {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"},
         "speed_topbottom":         {"value": "speed_layer_0"},
         "speed_travel":            {"value": "150"},
         "speed_travel_layer_0":    {"value": "speed_travel"},
@@ -151,8 +153,8 @@
         "cool_fan_speed":                    {"value": 0},
         "cool_fan_enabled":                  {"value": true},
         "cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"},
-        "cool_min_layer_time":               {"value": 20},
-        "cool_min_speed":                    {"value": "10"},
+        "cool_min_layer_time":               {"value": 30},
+        "cool_min_speed":                    {"value": "5"},
         "cool_lift_head":                    {"value": false},
 
         "support_infill_rate":       {"value": 25},

resources/extruders/hms434_tool_1.def.json

@@ -16,7 +16,7 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": "\n;changing to tool1\nM109 T0 S{material_print_temperature}\nG1 Y120 F3000\nG1 X10 F12000\n\n"
+          "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n"
         },
         "machine_extruder_end_code": {
            "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool1\n\n"

resources/extruders/hms434_tool_2.def.json

@@ -16,7 +16,7 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": "\n;changing to tool2\nM109 T1 S{material_print_temperature}\nG1 Y120 F3000\nG1 X10 F12000\n\n"
+          "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n"
         },
         "machine_extruder_end_code": {
            "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool2\n\n"