Merge branch 'master' into PP-1-Improved_print_profiles

# Conflicts:
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
This commit is contained in:
p.kuiper 2021-09-29 17:33:02 +02:00
commit f9f59d0da1
4026 changed files with 4374 additions and 4056 deletions

View file

@ -4,7 +4,7 @@ version = 4
definition = leapfrog_bolt_pro
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = leapfrog_bolt_pro
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = Mark2_for_Ultimaker2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = Mark2_for_Ultimaker2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = Mark2_for_Ultimaker2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = Mark2_for_Ultimaker2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_duplication
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_duplication
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_duplication
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_duplication
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_duplication
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_duplication
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_mirrored
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_mirrored
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_mirrored
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_mirrored
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_mirrored
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun_mirrored
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -5,7 +5,7 @@ definition = arjun300
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_genius
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_sidewinder_x1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_sidewinder_x1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_sidewinder_x1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_sidewinder_x1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_sidewinder_x1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = artillery_sidewinder_x1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_asterion_ht
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_asterion_ht
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_asterion
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_asterion
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_galaxy_500
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_galaxy_500
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_galaxy_600
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_galaxy_600
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_300_v1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_300_v1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_300_v2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_300_v2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_400_v1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_400_v1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_400_v2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_400_v2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_500_v1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_500_v1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_500_v2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_pro_500_v2
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_xl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_xl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_xxl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_xxl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_xxxl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atmat_signal_xxxl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3_lite
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3_lite
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3_lite
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3_lite
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3_lite
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3_lite
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = atom3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1_abl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1_abl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1_abl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1_abl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1_abl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_b1_abl
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

View file

@ -4,7 +4,7 @@ version = 4
definition = biqu_base
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle

Some files were not shown because too many files have changed in this diff Show more