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

resources/definitions/hms434.def.json

@@ -56,7 +56,7 @@
         "prime_tower_position_y":     {"value": 70 },
         "prime_blob_enable":          {"default_value": false },
         "machine_max_feedrate_z":     {"default_value": 1200 },
-        "machine_start_gcode":        {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X150 Y10 F9000\nG30 H0\nM340 P0 S1500\n\nG1 X-20 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nG1 Y-50 F9000\nG1 X150 Y10 F9000\nM117 HMS434 Printing ...\n\n" },
+        "machine_start_gcode":        {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
         "machine_end_gcode":          {"default_value": "" },
 
         "retraction_extra_prime_amount":      {"minimum_value_warning": "-2.0" },
@@ -94,7 +94,7 @@
                                                "maximum_value_warning": "material_print_temperature + 15"},
         "material_final_print_temperature":   {"value": "material_print_temperature"},
         "material_bed_temperature_layer_0":   {"value": "material_bed_temperature + 1"},
-        "material_flow":                      {"value": "120 if infill_sparse_density < 95 else 115"},
+        "material_flow":                      {"value": "100"},
         "retraction_amount":                  {"value": "1"},
         "retraction_speed":                   {"value": "20"},
         "retraction_prime_speed":             {"value": "8"},

resources/extruders/hms434_tool_1.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": "\nM109 T0 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
+          "default_value": "\n;changing to tool1\nM109 T0 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
         },
         "machine_extruder_end_code": {
-           "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n\n"
+           "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n; ending tool1\n\n"
         }
     }
 }

resources/extruders/hms434_tool_2.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": "\nM109 T1 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
+          "default_value": "\n;changing to tool2\nM109 T1 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
         },
         "machine_extruder_end_code": {
-           "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n\n"
+           "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n; ending tool2\n\n"
         }
     }
 }

resources/extruders/hms434_tool_3.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": ""
+          "default_value": "\n;changing to tool3"
         },
         "machine_extruder_end_code": {
-           "default_value": ""
+           "default_value": "\n;ending tool3"
         }
     }
 }

resources/extruders/hms434_tool_4.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": ""
+          "default_value": "\n;changing to tool4"
         },
         "machine_extruder_end_code": {
-           "default_value": ""
+           "default_value": "\n;ending tool4"
         }
     }
 }

resources/extruders/hms434_tool_5.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": ""
+          "default_value": "\n;changing to tool5"
         },
         "machine_extruder_end_code": {
-           "default_value": ""
+           "default_value": "\n;ending tool5"
         }
     }
 }

resources/extruders/hms434_tool_6.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": ""
+          "default_value": "\n;changing to tool6"
         },
         "machine_extruder_end_code": {
-           "default_value": ""
+           "default_value": "\n;ending tool6"
         }
     }
 }

resources/extruders/hms434_tool_7.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": ""
+          "default_value": "\n;changing to tool7"
         },
         "machine_extruder_end_code": {
-           "default_value": ""
+           "default_value": "\n;ending tool7"
         }
     }
 }

resources/extruders/hms434_tool_8.def.json

@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": ""
+          "default_value": "\n;changing to tool8"
         },
         "machine_extruder_end_code": {
-           "default_value": ""
+           "default_value": "\n;ending tool8"
         }
     }
 }