Merge pull request #10841 from Ultimaker/master

Merge master into libArachne
This commit is contained in:
Jelle Spijker 2021-11-16 08:04:41 +01:00 committed by GitHub
commit cc92a9dc1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 135 additions and 163 deletions

View file

@ -159,6 +159,16 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine Height",
"description": "The height (Z-direction) of the printable area.",
"default_value": 100,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_shape":
{
"label": "Build Plate Shape",
@ -189,16 +199,6 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine Height",
"description": "The height (Z-direction) of the printable area.",
"default_value": 100,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_heated_bed":
{
"label": "Has Heated Build Plate",
@ -571,7 +571,7 @@
},
"machine_max_feedrate_e":
{
"label": "Maximum Feedrate",
"label": "Maximum Speed E",
"description": "The maximum speed of the filament.",
"unit": "mm/s",
"type": "float",