nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'smash_1.7.1' into design_tools

Browse source 
# Conflicts:
#	PartPreviewWindow/View3D/View3DWidget.cs
#	SlicerConfiguration/SliceSettingsWidget.cs
#	SlicerConfiguration/SlicingQueue.cs
#	StaticData/SliceSettings/Properties.json
This commit is contained in:
Lars Brubaker 2017-05-19 14:56:16 -07:00
commit 352eb792f1
63 changed files with 30032 additions and 26547 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Queue/OptionsMenu/ExportToFolderProcess.cs
View file

@ -153,7 +153,7 @@ namespace MatterHackers.MatterControl.PrintQueue
{
if (UpdatePartStatus != null)
{
UpdatePartStatus(this, new StringEventArgs("Calculating Total fillament mm..."));
UpdatePartStatus(this, new StringEventArgs("Calculating Total filament mm..."));
}
if (savedGCodeFileNames.Count > 0)