CURA-5334 corrected extruders that didn't have a material_diameter yet

32 files changed, 38 insertions, 10 deletions

diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json
index 65a56ba03f..1fcea7620a 100644
--- a/resources/definitions/imade3d_jellybox.def.json
+++ b/resources/definitions/imade3d_jellybox.def.json
@@ -15,8 +15,7 @@
         "has_variants": true,
         "has_machine_materials": true,
         "has_machine_quality": true,
-        "machine_extruder_trains":
-        {
+        "machine_extruder_trains": {
             "0": "imade3d_jellybox_extruder_0"
         }
       },
diff --git a/resources/extruders/builder_premium_large_front.def.json b/resources/extruders/builder_premium_large_front.def.json
index 159682dc1c..059f7ef8a7 100644
--- a/resources/extruders/builder_premium_large_front.def.json
+++ b/resources/extruders/builder_premium_large_front.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 		
 	    "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/builder_premium_large_rear.def.json b/resources/extruders/builder_premium_large_rear.def.json
index 5e9cc062ae..769178a8b4 100644
--- a/resources/extruders/builder_premium_large_rear.def.json
+++ b/resources/extruders/builder_premium_large_rear.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/builder_premium_medium_front.def.json b/resources/extruders/builder_premium_medium_front.def.json
index 9a330b4f4b..bd735fbe25 100644
--- a/resources/extruders/builder_premium_medium_front.def.json
+++ b/resources/extruders/builder_premium_medium_front.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 		
 	    "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/builder_premium_medium_rear.def.json b/resources/extruders/builder_premium_medium_rear.def.json
index 49d4734306..59e688ff71 100644
--- a/resources/extruders/builder_premium_medium_rear.def.json
+++ b/resources/extruders/builder_premium_medium_rear.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/builder_premium_small_front.def.json b/resources/extruders/builder_premium_small_front.def.json
index 2e6293d153..17fb914a42 100644
--- a/resources/extruders/builder_premium_small_front.def.json
+++ b/resources/extruders/builder_premium_small_front.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 		
 	    "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/builder_premium_small_rear.def.json b/resources/extruders/builder_premium_small_rear.def.json
index d1606cdd79..70a2dbf1aa 100644
--- a/resources/extruders/builder_premium_small_rear.def.json
+++ b/resources/extruders/builder_premium_small_rear.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json
index 47b5b5abf5..6d2b5f634e 100644
--- a/resources/extruders/cartesio_extruder_0.def.json
+++ b/resources/extruders/cartesio_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
           "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n"         
         },
diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json
index 78bcccd12a..3d49a220c0 100644
--- a/resources/extruders/cartesio_extruder_1.def.json
+++ b/resources/extruders/cartesio_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 24.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
           "default_value": "\n;start T1\n\nM104 T1 S{material_print_temperature_layer_0}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y15 F3000; wipe\nG1 X34 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n"         
         },
diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json
index dbd6643bfe..1f8f8b9ca9 100644
--- a/resources/extruders/cartesio_extruder_2.def.json
+++ b/resources/extruders/cartesio_extruder_2.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 24.0 },
         "machine_nozzle_offset_y": { "default_value": -100.0 },
+        "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
           "default_value": "\n;start T2\n\nM104 T2 S{material_print_temperature_layer_0}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n"         
         },
diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json
index beed117abe..0b1cfe493e 100644
--- a/resources/extruders/cartesio_extruder_3.def.json
+++ b/resources/extruders/cartesio_extruder_3.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": -100.0 },
+        "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
           "default_value": "\n;start T3\n\nM104 T3 S{material_print_temperature_layer_0}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n"         
         },
diff --git a/resources/extruders/felixtec4_dual_extruder_0.def.json b/resources/extruders/felixtec4_dual_extruder_0.def.json
index e8af92daef..fee4cbb995 100644
--- a/resources/extruders/felixtec4_dual_extruder_0.def.json
+++ b/resources/extruders/felixtec4_dual_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/felixtec4_dual_extruder_1.def.json b/resources/extruders/felixtec4_dual_extruder_1.def.json
index 23d2d6648f..2c44b41186 100644
--- a/resources/extruders/felixtec4_dual_extruder_1.def.json
+++ b/resources/extruders/felixtec4_dual_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 13 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/gmax15plus_dual_extruder_0.def.json b/resources/extruders/gmax15plus_dual_extruder_0.def.json
index 0037b75a1c..b490f4a40e 100644
--- a/resources/extruders/gmax15plus_dual_extruder_0.def.json
+++ b/resources/extruders/gmax15plus_dual_extruder_0.def.json
@@ -16,6 +16,7 @@
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
 		"machine_nozzle_size": { "default_value": 0.5 },
+        "material_diameter": { "default_value": 1.75 },
 		
 		"machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": 40 },
diff --git a/resources/extruders/gmax15plus_dual_extruder_1.def.json b/resources/extruders/gmax15plus_dual_extruder_1.def.json
index 2db9aef3ee..ad3c628d6f 100644
--- a/resources/extruders/gmax15plus_dual_extruder_1.def.json
+++ b/resources/extruders/gmax15plus_dual_extruder_1.def.json
@@ -16,6 +16,7 @@
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
 		"machine_nozzle_size": { "default_value": 0.5 },
+        "material_diameter": { "default_value": 1.75 },
 		
 		"machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": 40 },
diff --git a/resources/extruders/hBp_extruder_left.def.json b/resources/extruders/hBp_extruder_left.def.json
index f250ab2d55..7e71ca27a8 100644
--- a/resources/extruders/hBp_extruder_left.def.json
+++ b/resources/extruders/hBp_extruder_left.def.json
@@ -15,7 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
-
+        "material_diameter": { "default_value": 1.75 },
         
         "extruder_prime_pos_x": { "default_value": 0 },
         "extruder_prime_pos_y": { "default_value": 0 },
diff --git a/resources/extruders/hBp_extruder_right.def.json b/resources/extruders/hBp_extruder_right.def.json
index aa963cc35b..acd2312268 100644
--- a/resources/extruders/hBp_extruder_right.def.json
+++ b/resources/extruders/hBp_extruder_right.def.json
@@ -15,7 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
-
+        "material_diameter": { "default_value": 1.75 },
         
         "extruder_prime_pos_x": { "default_value": 185 },
         "extruder_prime_pos_y": { "default_value": 0 },
diff --git a/resources/extruders/makeit_dual_1st.def.json b/resources/extruders/makeit_dual_1st.def.json
index ebfa475eac..2882054cca 100644
--- a/resources/extruders/makeit_dual_1st.def.json
+++ b/resources/extruders/makeit_dual_1st.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/makeit_dual_2nd.def.json b/resources/extruders/makeit_dual_2nd.def.json
index 99744e8b5a..24e9be3a4a 100644
--- a/resources/extruders/makeit_dual_2nd.def.json
+++ b/resources/extruders/makeit_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/makeit_l_dual_2nd.def.json b/resources/extruders/makeit_l_dual_2nd.def.json
index 3db9c0696c..3964ef6779 100644
--- a/resources/extruders/makeit_l_dual_2nd.def.json
+++ b/resources/extruders/makeit_l_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/ord_extruder_1.def.json b/resources/extruders/ord_extruder_1.def.json
index 9b7990605d..9ea08cf626 100644
--- a/resources/extruders/ord_extruder_1.def.json
+++ b/resources/extruders/ord_extruder_1.def.json
@@ -14,6 +14,7 @@
             "maximum_value": "4"
         },
         "machine_nozzle_offset_x": { "default_value": 62.95 },
-        "machine_nozzle_offset_y": { "default_value": 2.05 }
+        "machine_nozzle_offset_y": { "default_value": 2.05 },
+        "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_2.def.json b/resources/extruders/ord_extruder_2.def.json
index 4e8a9f6c15..1b521c7507 100644
--- a/resources/extruders/ord_extruder_2.def.json
+++ b/resources/extruders/ord_extruder_2.def.json
@@ -14,6 +14,7 @@
             "maximum_value": "4"
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
-        "machine_nozzle_offset_y": { "default_value": 27.7 }
+        "machine_nozzle_offset_y": { "default_value": 27.7 },
+        "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_3.def.json b/resources/extruders/ord_extruder_3.def.json
index e8da77a6ec..bd4d0e2a61 100644
--- a/resources/extruders/ord_extruder_3.def.json
+++ b/resources/extruders/ord_extruder_3.def.json
@@ -14,6 +14,7 @@
             "maximum_value": "4"
         },
         "machine_nozzle_offset_x": { "default_value": 63.18 },
-        "machine_nozzle_offset_y": { "default_value": 28.65 }
+        "machine_nozzle_offset_y": { "default_value": 28.65 },
+        "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_4.def.json b/resources/extruders/ord_extruder_4.def.json
index aa6c8052bf..00635e9059 100644
--- a/resources/extruders/ord_extruder_4.def.json
+++ b/resources/extruders/ord_extruder_4.def.json
@@ -14,6 +14,7 @@
             "maximum_value": "4"
         },
         "machine_nozzle_offset_x": { "default_value": 31.6 },
-        "machine_nozzle_offset_y": { "default_value": 28.2 }
+        "machine_nozzle_offset_y": { "default_value": 28.2 },
+        "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/punchtec_connect_xl_extruder_0.def.json b/resources/extruders/punchtec_connect_xl_extruder_0.def.json
index b618999fc2..68c3d8c906 100644
--- a/resources/extruders/punchtec_connect_xl_extruder_0.def.json
+++ b/resources/extruders/punchtec_connect_xl_extruder_0.def.json
@@ -14,6 +14,7 @@
             "maximum_value": "1"
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
-        "machine_nozzle_offset_y": { "default_value": 0.0 }
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/punchtec_connect_xl_extruder_1.def.json b/resources/extruders/punchtec_connect_xl_extruder_1.def.json
index 1173bb5584..a2e4b31714 100644
--- a/resources/extruders/punchtec_connect_xl_extruder_1.def.json
+++ b/resources/extruders/punchtec_connect_xl_extruder_1.def.json
@@ -14,6 +14,7 @@
             "maximum_value": "1"
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
-        "machine_nozzle_offset_y": { "default_value": 0.0 }
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/raise3D_N2_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_dual_extruder_0.def.json
index 330d016c55..b97ee19d24 100644
--- a/resources/extruders/raise3D_N2_dual_extruder_0.def.json
+++ b/resources/extruders/raise3D_N2_dual_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/raise3D_N2_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_dual_extruder_1.def.json
index f79033e496..28c030b28e 100644
--- a/resources/extruders/raise3D_N2_dual_extruder_1.def.json
+++ b/resources/extruders/raise3D_N2_dual_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 24.8 },
         "machine_nozzle_offset_y": { "default_value": 0.6 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
index f105dcbaf9..3905e074ae 100644
--- a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
+++ b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
index b0fa1b51d0..65c9fb7274 100644
--- a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
+++ b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 24.8 },
         "machine_nozzle_offset_y": { "default_value": 0.6 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/vertex_k8400_dual_1st.def.json b/resources/extruders/vertex_k8400_dual_1st.def.json
index 74a9c557a5..2694323f7d 100644
--- a/resources/extruders/vertex_k8400_dual_1st.def.json
+++ b/resources/extruders/vertex_k8400_dual_1st.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 23.7 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/vertex_k8400_dual_2nd.def.json b/resources/extruders/vertex_k8400_dual_2nd.def.json
index ffa4b77a1e..044f7000af 100644
--- a/resources/extruders/vertex_k8400_dual_2nd.def.json
+++ b/resources/extruders/vertex_k8400_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },