Merge remote-tracking branch 'origin/master' into refactoring_machine_manager

This commit is contained in:
Lipu Fei 2018-02-21 14:05:19 +01:00
commit 9a354efd19
15 changed files with 197 additions and 30 deletions

View file

@ -10,7 +10,7 @@ class MaterialSettingsVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
material_settings = {
"default_material_print_temperature",
"material_bed_temperature",
"default_material_bed_temperature",
"material_standby_temperature",
#"material_flow_temp_graph",
"cool_fan_speed",