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
This commit is contained in:
Ghostkeeper 2021-11-12 15:08:29 +01:00
commit b8ccb32836
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
342 changed files with 19750 additions and 7653 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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