Merge remote-tracking branch 'unlimitedbacon/density'

This commit is contained in:
Lars Brubaker 2016-07-05 12:13:54 -07:00
commit c9b6e4762e
5 changed files with 66 additions and 19 deletions

View file

@ -59,6 +59,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
"com_port",
"created_date",
"delete_printer",
"filament_cost",
"filament_density",
"manual_probe_paper_width",
"pause_gcode",
"print_leveling_method",
@ -89,4 +91,4 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public abstract bool MapContains(string canonicalSettingsName);
}
}
}