Merge branch '5.6'

# Conflicts:
#	conanfile.py
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json
This commit is contained in:
Jelle Spijker 2023-11-15 13:53:39 +01:00
commit efafe1503d
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
34 changed files with 221 additions and 187 deletions

View file

@ -9,7 +9,7 @@ material = ultimaker_abscf_175
quality_type = draft
setting_version = 22
type = intent
variant = Lab
variant = LABS
[values]
infill_sparse_density = 100

View file

@ -9,7 +9,7 @@ material = ultimaker_absr_175
quality_type = draft
setting_version = 22
type = intent
variant = Lab
variant = LABS
[values]
infill_sparse_density = 100

View file

@ -9,7 +9,7 @@ material = ultimaker_abscf_175
quality_type = draft
setting_version = 22
type = intent
variant = Lab
variant = LABS
[values]
infill_sparse_density = 100

View file

@ -9,7 +9,7 @@ material = ultimaker_absr_175
quality_type = draft
setting_version = 22
type = intent
variant = Lab
variant = LABS
[values]
infill_sparse_density = 100