Merge branch 'master' into CURA-8466_version_upgrade_50

Conflicts:
	resources/definitions/fdmprinter.def.json -> Removed a setting while on master it was made hidden. Conflicting CURA-8466 with CURA-9069.
This commit is contained in:
Ghostkeeper 2022-03-29 15:46:03 +02:00
commit bdd4e359a7
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A

View file

@ -1175,10 +1175,9 @@
"type": "enum",
"options": {
"inside_out": "Inside To Outside",
"outside_in": "Outside To Inside",
"center_last": "Center Last"
"outside_in": "Outside To Inside"
},
"default_value": "center_last",
"default_value": "outside_in",
"settable_per_mesh": true
},
"alternate_extra_perimeter":