Merge branch '1.5.0'

Conflicts:
	StaticData/Translations/Master.txt
This commit is contained in:
Lars Brubaker 2016-01-21 15:12:50 -08:00
commit e4a761bdd9
52 changed files with 630 additions and 468 deletions

View file

@ -155,6 +155,7 @@ Advanced
support_material_z_gap_layers
support_air_gap
support_material_create_internal_support
support_material_create_perimeter
Extruders
support_material_extruder
support_material_interface_extruder

View file

@ -509,7 +509,7 @@
"PresentationName": "Leveling Solution",
"HelpText": "The print leveling algorithm to use.",
"DataEditType": "LIST",
"ExtraSettings": "3-Point Plane,7-Point Disk,13-Point Disk"
"ExtraSettings": "3 Point Plane,7 Point Disk,13 Point Disk"
},
{
"SlicerConfigName": "print_leveling_required_to_print",
@ -942,6 +942,13 @@
"DataEditType": "CHECK_BOX",
"ExtraSettings": ""
},
{
"SlicerConfigName": "support_material_create_perimeter",
"PresentationName": "Create Perimeter",
"HelpText": "Generates an outline around the support material to improve strength and hold up interface layers.",
"DataEditType": "CHECK_BOX",
"ExtraSettings": ""
},
{
"SlicerConfigName": "support_material_enforce_layers",
"PresentationName": "Enforce Support For First",