nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/1.7' into design_tools

Browse source 
# Conflicts:
#	StaticData/SliceSettings/Properties.json
This commit is contained in:
Lars Brubaker 2017-04-14 12:51:17 -07:00
commit bc9d9ca9c0
12 changed files with 214 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
StaticData/SliceSettings/Properties.json
View file

@ -704,12 +704,16 @@
"RebuildGCodeOnChange": false
},
{
"SlicerConfigName": "print_leveling_required_to_print",
"PresentationName": "Require Leveling To Print",
"HelpText": "The printer requires print leveling to run correctly.",
"DataEditType": "CHECK_BOX",
"ShowIfSet": "!has_hardware_leveling",
"DefaultValue": "0",
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "fillament_runout_endstop",
"PresentationName": "Fillament Runout Endstop",
"HelpText": "Specifies the endstop (if any) that is used to detect filament runout. Closed state defines filament has runout. If runout is detected the printers pause G-Code is run.",
"DataEditType": "LIST",
"ExtraSettings": "None,X Min,X Max,Y Min,Y Max,Z Min,Z Max",
"ShowAsOverride": true,
"ResetAtEndOfPrint": false,
"DefaultValue": "None",
"ReloadUiWhenChanged": true,
"RebuildGCodeOnChange": false
},