Merge branch '1.7'

# Conflicts:
#	StaticData/SliceSettings/Properties.json
This commit is contained in:
Lars Brubaker 2017-03-14 14:18:57 -07:00
commit 0b6c4e94f1
83 changed files with 2568 additions and 673 deletions

View file

@ -1543,7 +1543,8 @@
"HelpText": "The serial port communication speed of the printers firmware.",
"DataEditType": "INT",
"ShowAsOverride": false,
"ShowIfSet": "!enable_network_printing",
"ShowIfSet": null,
"ResetAtEndOfPrint": false,
"DefaultValue": "250000",
"RebuildGCodeOnChange": false
},