mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-10 07:15:03 -06:00
Merge branch 'master' into libArachne_rebased
Conflicts: cura/CuraApplication.py: Setting version fdmprinter and fdmextruder: Setting version intents, qualities and variants: Setting version Changelog: 4.9.1 was added, should be below Arachne changes
This commit is contained in:
commit
611208368c
1015 changed files with 103196 additions and 86144 deletions
|
@ -4,7 +4,7 @@ name = Dynamic Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = adaptive
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Draft Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Low Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = low
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Standard Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Super Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = super
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Dynamic Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = adaptive
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Draft Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Low Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = low
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Standard Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Draft Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Low Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = low
|
||||
material = generic_tpu
|
||||
|
|
|
@ -4,7 +4,7 @@ name = Standard Quality
|
|||
definition = flashforge_base
|
||||
|
||||
[metadata]
|
||||
setting_version = 16
|
||||
setting_version = 18
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_tpu
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue