Merge remote-tracking branch 'origin/1.0.5' into development Conflicts: PartPreviewWindow/GcodeViewBasic.cs |
||
|---|---|---|
| .. | ||
| ExportToFolderProcess.cs | ||
| ExportToSdCardProcess.cs | ||
| PartsSheet.cs | ||
| PrintItemWrapper.cs | ||
| PrintQueueControl.cs | ||
| PrintQueueItem.cs | ||
| PrintQueueMenu.cs | ||
| QueueControlsWidget.cs | ||