Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2016-09-19 14:34:04 +02:00
commit 87a9555719
6 changed files with 18 additions and 7 deletions

View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"material_print_temperature": {
"default_value": 210

View file

@ -254,8 +254,19 @@
{
"label": "Gcode flavour",
"description": "The type of gcode to be generated.",
"default_value": "RepRap",
"type": "str",
"type": "enum",
"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_extruder": false,
"settable_per_meshgroup": false

View file

@ -42,7 +42,7 @@
"default_value": 55
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_disallowed_areas": {
"default_value": []