Merge branch '1.7' into design_tools

# Conflicts:
#	StaticData/Translations/Master.txt
This commit is contained in:
Lars Brubaker 2017-04-12 18:28:16 -07:00
commit 3fc69a7e81
4 changed files with 138 additions and 112 deletions

View file

@ -735,13 +735,14 @@
},
{
"SlicerConfigName": "use_g30_for_bed_probe",
"PresentationName": "Use G30 for probing",
"PresentationName": "Use G30 For Probing",
"HelpText": "Enable this if your printer has hardware support for G30 (automatic bed probing) and you want to use it rather than manually measuring the probe positions.",
"DataEditType": "CHECK_BOX",
"ShowAsOverride": true,
"ShowIfSet": "!has_hardware_leveling",
"ResetAtEndOfPrint": false,
"RebuildGCodeOnChange": false
"RebuildGCodeOnChange": false,
"DefaultValue": "0"
},
{
"QuickMenuSettings": [ ],