Lars Brubaker 352eb792f1 Merge branch 'smash_1.7.1' into design_tools ... # Conflicts: # PartPreviewWindow/View3D/View3DWidget.cs # SlicerConfiguration/SliceSettingsWidget.cs # SlicerConfiguration/SlicingQueue.cs # StaticData/SliceSettings/Properties.json		2017-05-19 14:57:04 -07:00
..
InstructionsPage.cs	Consolidate duplicated manual_movement_speeds functions into Settings	2016-06-17 09:29:11 -07:00
LevelingStrings.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
LevelWizard3Point.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
LevelWizard7PointRadial.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
LevelWizard13PointRadial.cs	Finished print leveling test – fixed reset to defaults	2016-09-27 12:47:15 -07:00
LevelWizardBase.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
LevelWizardMesh.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
PrintLevelingData.cs	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
PrintLevelPages.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00