mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-09-04 07:51:49 -06:00
Merge branch 'master' of github.com:Ultimaker/Cura
This commit is contained in:
commit
87a9555719
6 changed files with 18 additions and 7 deletions
|
@ -37,7 +37,7 @@
|
||||||
"default_value": false
|
"default_value": false
|
||||||
},
|
},
|
||||||
"machine_gcode_flavor": {
|
"machine_gcode_flavor": {
|
||||||
"default_value": "RepRap"
|
"default_value": "RepRap (Marlin/Sprinter)"
|
||||||
},
|
},
|
||||||
"layer_height": {
|
"layer_height": {
|
||||||
"default_value": 0.2
|
"default_value": 0.2
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
"default_value": false
|
"default_value": false
|
||||||
},
|
},
|
||||||
"machine_gcode_flavor": {
|
"machine_gcode_flavor": {
|
||||||
"default_value": "RepRap"
|
"default_value": "RepRap (Marlin/Sprinter)"
|
||||||
},
|
},
|
||||||
"layer_height": {
|
"layer_height": {
|
||||||
"default_value": 0.2
|
"default_value": 0.2
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
"default_value": false
|
"default_value": false
|
||||||
},
|
},
|
||||||
"machine_gcode_flavor": {
|
"machine_gcode_flavor": {
|
||||||
"default_value": "RepRap"
|
"default_value": "RepRap (Marlin/Sprinter)"
|
||||||
},
|
},
|
||||||
"layer_height": {
|
"layer_height": {
|
||||||
"default_value": 0.2
|
"default_value": 0.2
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
"default_value": false
|
"default_value": false
|
||||||
},
|
},
|
||||||
"machine_gcode_flavor": {
|
"machine_gcode_flavor": {
|
||||||
"default_value": "RepRap"
|
"default_value": "RepRap (Marlin/Sprinter)"
|
||||||
},
|
},
|
||||||
"material_print_temperature": {
|
"material_print_temperature": {
|
||||||
"default_value": 210
|
"default_value": 210
|
||||||
|
|
|
@ -254,8 +254,19 @@
|
||||||
{
|
{
|
||||||
"label": "Gcode flavour",
|
"label": "Gcode flavour",
|
||||||
"description": "The type of gcode to be generated.",
|
"description": "The type of gcode to be generated.",
|
||||||
"default_value": "RepRap",
|
"type": "enum",
|
||||||
"type": "str",
|
"options":
|
||||||
|
{
|
||||||
|
"RepRap (Marlin/Sprinter)": "RepRap (Marlin/Sprinter)",
|
||||||
|
"RepRap (Volumatric)": "RepRap (Volumetric)",
|
||||||
|
"UltiGCode": "Ultimaker 2",
|
||||||
|
"Griffin": "Griffin",
|
||||||
|
"Makerbot": "Makerbot",
|
||||||
|
"BFB": "Bits from Bytes",
|
||||||
|
"MACH3": "Mach3",
|
||||||
|
"Repetier": "Repetier"
|
||||||
|
},
|
||||||
|
"default_value": "RepRap (Marlin/Sprinter)",
|
||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
"settable_per_extruder": false,
|
"settable_per_extruder": false,
|
||||||
"settable_per_meshgroup": false
|
"settable_per_meshgroup": false
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
"default_value": 55
|
"default_value": 55
|
||||||
},
|
},
|
||||||
"machine_gcode_flavor": {
|
"machine_gcode_flavor": {
|
||||||
"default_value": "RepRap"
|
"default_value": "RepRap (Marlin/Sprinter)"
|
||||||
},
|
},
|
||||||
"machine_disallowed_areas": {
|
"machine_disallowed_areas": {
|
||||||
"default_value": []
|
"default_value": []
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue