Lars Brubaker aa7445b618 Merge remote-tracking branch 'origin/1.7' into design_tools ... # Conflicts: # StaticData/Translations/Master.txt		2017-04-11 13:25:42 -07:00
..
Io	Request temp rate should be 1 second	2017-04-11 12:05:24 -07:00
PrinterConnectionAndCommunication.cs	Merge remote-tracking branch 'origin/1.7' into design_tools	2017-04-11 13:25:42 -07:00