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 @@ name = Fast
definition = ultimaker3
[metadata]
setting_version = 17
setting_version = 19
type = quality
quality_type = draft
weight = -2