Lars Brubaker c0a7331579 Merge branch '1.7' into design_tools ... # Conflicts: # SlicerConfiguration/Settings/SettingsHelpers.cs # StaticData/SliceSettings/Properties.json # StaticData/Translations/Master.txt		2017-04-12 12:29:31 -07:00
..
EngineMapingBase.cs	Merge branch '1.7' into design_tools	2017-04-12 12:29:31 -07:00
EngineMappingCura.cs	Design tools	2017-03-15 16:29:56 -07:00
EngineMappingMatterSlice.cs	Fixed passing in the outer layer extrusion width.	2017-02-10 10:08:42 -08:00
EngineMappingSlic3r.cs	Made a mapping for slic3r	2017-01-30 12:55:12 -08:00
MappingClasses.cs	Made a mapping for slic3r	2017-01-30 12:55:12 -08:00