Merge branch 'master' into libArachne_rebased

Conflicts:
	resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting.
	resources/definitions/ultimaker3.def.json
	resources/definitions/ultimaker_s3.def.json
	resources/definitions/ultimaker_s5.def.json

12 files changed, 155 insertions, 0 deletions

diff --git a/resources/variants/xyzprinting_base_0.40.inst.cfg b/resources/variants/xyzprinting_base_0.40.inst.cfg
new file mode 100644
index 0000000000..ade1dea1f1
--- /dev/null
+++ b/resources/variants/xyzprinting_base_0.40.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = xyzprinting_base
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg
new file mode 100644
index 0000000000..867fa94351
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Copper 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_1p0_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Copper 0.4mm Nozzle
\ No newline at end of file
diff --git a/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg
new file mode 100644
index 0000000000..79833c630c
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Copper 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_1p0a_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Copper 0.4mm Nozzle
\ No newline at end of file
diff --git a/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg
new file mode 100644
index 0000000000..8d542987a8
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Hardened Steel 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_1p0a_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Hardened Steel 0.4mm Nozzle
\ No newline at end of file
diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg
new file mode 100644
index 0000000000..bb83d95524
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Copper 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_pro_xeplus
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Copper 0.4mm Nozzle
diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg
new file mode 100644
index 0000000000..1cda9d703c
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Hardened Steel 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_pro_xeplus
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Hardened Steel 0.4mm Nozzle
diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg
new file mode 100644
index 0000000000..39ae593be4
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Copper 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_pro_xplus
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Copper 0.4mm Nozzle
diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg
new file mode 100644
index 0000000000..2d192c729a
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Hardened Steel 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_pro_xplus
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Hardened Steel 0.4mm Nozzle
diff --git a/resources/variants/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg
new file mode 100644
index 0000000000..1cda468b70
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Hardened Steel 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_w_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Hardened Steel 0.4mm Nozzle
\ No newline at end of file
diff --git a/resources/variants/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg
new file mode 100644
index 0000000000..aaf2d4054d
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Stainless Steel 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_jr_w_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Stainless Steel 0.4mm Nozzle
\ No newline at end of file
diff --git a/resources/variants/xyzprinting_da_vinci_super_copper_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_super_copper_0.40.inst.cfg
new file mode 100644
index 0000000000..e5a37cb1ed
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_super_copper_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Copper 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_super
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Copper 0.4mm Nozzle
diff --git a/resources/variants/xyzprinting_da_vinci_super_hs_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_super_hs_0.40.inst.cfg
new file mode 100644
index 0000000000..bd76c921ec
--- /dev/null
+++ b/resources/variants/xyzprinting_da_vinci_super_hs_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Hardened Steel 0.4mm Nozzle
+version = 4
+definition = xyzprinting_da_vinci_super
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+machine_nozzle_id = Hardened Steel 0.4mm Nozzle