Merge branch 'master' of github.com:Ultimaker/Cura into alternate_wall_directionalternate_wall_direction

35 files changed, 674 insertions, 0 deletions

diff --git a/resources/extruders/arjun_dm_extruder.def.json b/resources/extruders/arjun_dm_extruder.def.json
new file mode 100644
index 0000000000..da3e4da203
--- /dev/null
+++ b/resources/extruders/arjun_dm_extruder.def.json
@@ -0,0 +1,20 @@
+{
+    "version": 2,
+    "name": "Duplication Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "arjun_duplication",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 }
+    }
+}
diff --git a/resources/extruders/arjun_extruder_0.def.json b/resources/extruders/arjun_extruder_0.def.json
new file mode 100644
index 0000000000..c47c93a851
--- /dev/null
+++ b/resources/extruders/arjun_extruder_0.def.json
@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Left Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "arjun300",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": -51 },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_start_code": { "default_value": "T0" }
+    }
+}
diff --git a/resources/extruders/arjun_extruder_1.def.json b/resources/extruders/arjun_extruder_1.def.json
new file mode 100644
index 0000000000..b8ee27f33e
--- /dev/null
+++ b/resources/extruders/arjun_extruder_1.def.json
@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Right Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "arjun300",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": 257 },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_start_code": { "default_value": "T1" }
+    }
+}
diff --git a/resources/extruders/arjun_mm_extruder.def.json b/resources/extruders/arjun_mm_extruder.def.json
new file mode 100644
index 0000000000..a8364e95f1
--- /dev/null
+++ b/resources/extruders/arjun_mm_extruder.def.json
@@ -0,0 +1,20 @@
+{
+    "version": 2,
+    "name": "Mirror Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "arjun_mirrored",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 }
+    }
+}
diff --git a/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json b/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json
new file mode 100644
index 0000000000..4f6ced9818
--- /dev/null
+++ b/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json
@@ -0,0 +1,26 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "cubicon_style_neo_a31",
+        "position": "0"
+    },
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_offset_x": {
+            "default_value": -7.13
+        },
+        "machine_nozzle_offset_y": {
+            "default_value": -3.77
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
+    }
+}
diff --git a/resources/extruders/eryone_er20_extruder_0.def.json b/resources/extruders/eryone_er20_extruder_0.def.json
new file mode 100644
index 0000000000..9b1c1fa435
--- /dev/null
+++ b/resources/extruders/eryone_er20_extruder_0.def.json
@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "eryone_er20",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { 
+		    "default_value": 0 
+		},
+        "machine_nozzle_size": { 
+		    "default_value": 0.4 
+		},
+        "material_diameter": { 
+		    "default_value": 1.75 
+		},
+		"machine_nozzle_offset_x": {
+		    "default_value": -10.0
+		},
+        "machine_nozzle_offset_y": {
+		    "default_value": 8.0
+		}
+	}
+}
diff --git a/resources/extruders/eryone_thinker_extruder_0.def.json b/resources/extruders/eryone_thinker_extruder_0.def.json
new file mode 100644
index 0000000000..32889435a8
--- /dev/null
+++ b/resources/extruders/eryone_thinker_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "eryone_thinker",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/fusedform_doppia_base_extruder_0.def.json b/resources/extruders/fusedform_doppia_base_extruder_0.def.json
new file mode 100644
index 0000000000..005647b736
--- /dev/null
+++ b/resources/extruders/fusedform_doppia_base_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "fusedform_doppia_base",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/fusedform_doppia_base_extruder_1.def.json b/resources/extruders/fusedform_doppia_base_extruder_1.def.json
new file mode 100644
index 0000000000..b0862c824c
--- /dev/null
+++ b/resources/extruders/fusedform_doppia_base_extruder_1.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "fusedform_doppia_base",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 1 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_hidra_extruder_0.def.json b/resources/extruders/hellbot_hidra_extruder_0.def.json
new file mode 100644
index 0000000000..f6e66d5381
--- /dev/null
+++ b/resources/extruders/hellbot_hidra_extruder_0.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extrusor E1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_hidra",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_hidra_extruder_1.def.json b/resources/extruders/hellbot_hidra_extruder_1.def.json
new file mode 100644
index 0000000000..87b18db36c
--- /dev/null
+++ b/resources/extruders/hellbot_hidra_extruder_1.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extrusor E2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_hidra",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_hidra_plus_extruder_0.def.json b/resources/extruders/hellbot_hidra_plus_extruder_0.def.json
new file mode 100644
index 0000000000..e8817236a1
--- /dev/null
+++ b/resources/extruders/hellbot_hidra_plus_extruder_0.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extrusor E1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_hidra_plus",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_hidra_plus_extruder_1.def.json b/resources/extruders/hellbot_hidra_plus_extruder_1.def.json
new file mode 100644
index 0000000000..37f37fc71f
--- /dev/null
+++ b/resources/extruders/hellbot_hidra_plus_extruder_1.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extrusor E2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_hidra_plus",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json
new file mode 100644
index 0000000000..b572ea4318
--- /dev/null
+++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_magna_2_230_dual",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json
new file mode 100644
index 0000000000..398822b156
--- /dev/null
+++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_magna_2_230_dual",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_magna_2_230_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_extruder_0.def.json
new file mode 100644
index 0000000000..926e8b94c4
--- /dev/null
+++ b/resources/extruders/hellbot_magna_2_230_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_magna_2_230",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+		
+    }
+}
diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json
new file mode 100644
index 0000000000..af68cc9422
--- /dev/null
+++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_magna_2_300_dual",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json
new file mode 100644
index 0000000000..3585978d6e
--- /dev/null
+++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_magna_2_300_dual",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/hellbot_magna_2_300_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_extruder_0.def.json
new file mode 100644
index 0000000000..db68460415
--- /dev/null
+++ b/resources/extruders/hellbot_magna_2_300_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "hellbot_magna_2_300",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/ideagen3D_sapphire_plus_0.def.json b/resources/extruders/ideagen3D_sapphire_plus_0.def.json
new file mode 100644
index 0000000000..ab14b131b6
--- /dev/null
+++ b/resources/extruders/ideagen3D_sapphire_plus_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ideagen3D_sapphire_plus",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/kosher_dm_extruder.def.json b/resources/extruders/kosher_dm_extruder.def.json
new file mode 100644
index 0000000000..50ce46b434
--- /dev/null
+++ b/resources/extruders/kosher_dm_extruder.def.json
@@ -0,0 +1,20 @@
+{
+    "version": 2,
+    "name": "Duplication Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "kosher_duplication",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 }
+    }
+}
diff --git a/resources/extruders/kosher_extruder_0.def.json b/resources/extruders/kosher_extruder_0.def.json
new file mode 100644
index 0000000000..9b1fa4d934
--- /dev/null
+++ b/resources/extruders/kosher_extruder_0.def.json
@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Left Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "kosher",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": -51 },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_start_code": { "default_value": "T0" }
+    }
+}
diff --git a/resources/extruders/kosher_extruder_1.def.json b/resources/extruders/kosher_extruder_1.def.json
new file mode 100644
index 0000000000..353d6bcea4
--- /dev/null
+++ b/resources/extruders/kosher_extruder_1.def.json
@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Right Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "kosher",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": 257 },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_start_code": { "default_value": "T1" }
+    }
+}
diff --git a/resources/extruders/kosher_mm_extruder.def.json b/resources/extruders/kosher_mm_extruder.def.json
new file mode 100644
index 0000000000..8eacf54875
--- /dev/null
+++ b/resources/extruders/kosher_mm_extruder.def.json
@@ -0,0 +1,20 @@
+{
+    "version": 2,
+    "name": "Mirror Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "kosher_mirror",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 }
+    }
+}
diff --git a/resources/extruders/maker_made_300x_extruder_0.def.json b/resources/extruders/maker_made_300x_extruder_0.def.json
new file mode 100644
index 0000000000..a35c47b395
--- /dev/null
+++ b/resources/extruders/maker_made_300x_extruder_0.def.json
@@ -0,0 +1,15 @@
+{

+    "name": "Extruder 1",

+    "version": 2,

+    "inherits": "fdmextruder",

+    "metadata": {

+        "machine": "maker_made_300x",

+        "position": "0"

+    },

+

+    "overrides": {

+        "extruder_nr": { "default_value": 0 },

+        "machine_nozzle_size": { "default_value": 0.4 },

+        "material_diameter": { "default_value": 1.75 }

+    }

+}

diff --git a/resources/extruders/mingda_base_extruder_0.def.json b/resources/extruders/mingda_base_extruder_0.def.json
new file mode 100644
index 0000000000..034f6ce45f
--- /dev/null
+++ b/resources/extruders/mingda_base_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mingda_base",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+        
+    }
+}
diff --git a/resources/extruders/snapmaker_extruder_0.def.json b/resources/extruders/snapmaker_extruder_0.def.json
new file mode 100644
index 0000000000..c9b69703a7
--- /dev/null
+++ b/resources/extruders/snapmaker_extruder_0.def.json
@@ -0,0 +1,20 @@
+{

+    "name": "Extruder 1",

+    "version": 2,

+    "inherits": "fdmextruder",

+    "metadata": {

+        "machine": "snapmaker2",

+        "position": "0"

+    },

+    "overrides": {

+        "extruder_nr": {

+            "default_value": 0

+        },

+        "machine_nozzle_size": {

+            "default_value": 0.4

+        },

+        "material_diameter": {

+            "default_value": 1.75

+        }

+    }

+}

diff --git a/resources/extruders/syndaveraxi_extruder_0.def.json b/resources/extruders/syndaveraxi_extruder_0.def.json
new file mode 100644
index 0000000000..4d8d3e8ab4
--- /dev/null
+++ b/resources/extruders/syndaveraxi_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Hemera 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "syndaveraxi",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_steps_per_mm_e": { "default_value": 400 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/trimaker_cosmosII_extruder.def.json b/resources/extruders/trimaker_cosmosII_extruder.def.json
new file mode 100644
index 0000000000..87c9394d96
--- /dev/null
+++ b/resources/extruders/trimaker_cosmosII_extruder.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "trimaker_cosmosII",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/trimaker_nebula_extruder.def.json b/resources/extruders/trimaker_nebula_extruder.def.json
new file mode 100644
index 0000000000..6dbd251edc
--- /dev/null
+++ b/resources/extruders/trimaker_nebula_extruder.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "trimaker_nebula",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/twotrees_bluer_extruder_0.def.json b/resources/extruders/twotrees_bluer_extruder_0.def.json
new file mode 100644
index 0000000000..fb85e76647
--- /dev/null
+++ b/resources/extruders/twotrees_bluer_extruder_0.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "twotrees_bluer",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+		"machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/twotrees_bluer_extruder_1.def.json b/resources/extruders/twotrees_bluer_extruder_1.def.json
new file mode 100644
index 0000000000..fc70c5b65d
--- /dev/null
+++ b/resources/extruders/twotrees_bluer_extruder_1.def.json
@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "twotrees_bluer",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+		"machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json
new file mode 100644
index 0000000000..871fdd3645
--- /dev/null
+++ b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ultimaker2_plus_connect",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 2.85 }
+    }
+}
diff --git a/resources/extruders/zav_extruder_1.def.json b/resources/extruders/zav_extruder_1.def.json
new file mode 100644
index 0000000000..88c302aaf0
--- /dev/null
+++ b/resources/extruders/zav_extruder_1.def.json
@@ -0,0 +1,25 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "zav_base",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_extruder_start_code": 
+           {
+            "default_value": ";---- Starting Start G-code Extruder 1 ----\n;T0                             ;switch to extruder 1\n;G92 E0                      ;reset extruder distance\n;G1 F2000 E93           ;load filament\n;G92 E0                      ;reset extruder distance\n;M104 S{material_print_temperature}\n;---- Ending Start G-code Extruder 1 ----"
+           },
+        "machine_extruder_end_code":
+           {
+            "default_value": ";---- Starting End G-code Extruder 1 ----\n;G92 E0                       ;reset extruder distance\n;G1 F800 E-5               ;short retract\n;G1 F2400 X5 Y5         ;move near prime tower\n;G1 F2000 E-93           ;long retract for filament removal\n;G92 E0                       ;reset extruder distance\n;G90                            ;absolute coordinate\n;---- Ending End G-code Extruder 1 ----"
+           }
+    }
+}
diff --git a/resources/extruders/zav_extruder_2.def.json b/resources/extruders/zav_extruder_2.def.json
new file mode 100644
index 0000000000..f2b418f62c
--- /dev/null
+++ b/resources/extruders/zav_extruder_2.def.json
@@ -0,0 +1,25 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "zav_base",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 1 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 17.7 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_extruder_start_code": 
+           {
+            "default_value": ";---- Starting Start G-code Extruder 2 ----\nT1                             ;switch to extruder 2\nG92 E0                      ;reset extruder distance\nG1 F2000 E93           ;load filament\nG92 E0                      ;reset extruder distance\nM104 S{material_print_temperature}\n;---- Ending Start G-code Extruder 2 ----"
+           },
+        "machine_extruder_end_code":
+           {
+            "default_value": ";---- Starting End G-code Extruder 2 ----\nG92 E0                       ;reset extruder distance\nG1 F800 E-5               ;short retract\nG1 F2400 X5 Y5         ;move near prime tower\nG1 F2000 E-93           ;long retract for filament removal\nG92 E0                       ;reset extruder distance\nG90                            ;absolute coordinate\n;---- Ending End G-code Extruder 2 ----"
+           }
+    }
+}