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
..
ExportGcodePlugin.cs	Fixing the export button to work correctly.	2017-03-06 17:32:46 -08:00
ExportToFolderFeedbackWindow.cs	Text changes	2016-10-06 14:12:36 -07:00
ExportToFolderProcess.cs	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
ExportToSdCardFeedbackWindow.cs	Text changes	2016-10-06 14:12:36 -07:00
MergeQueueItems.cs	More localizations	2016-12-16 15:25:00 -08:00
PartsSheetCreator.cs	Design tools	2017-03-15 16:29:56 -07:00
QueueOptionsMenu.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00