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

Merge branch 'development' into greg-development

Browse source 
Conflicts:
	MatterControl.csproj
	StaticData/Translations/Master.txt
This commit is contained in:
Kevin Pope 2014-08-20 10:52:47 -07:00
commit 4759adbf3b
28 changed files with 970 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/SlicingQueue.cs
View file

@ -241,7 +241,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
}
bool runInProcess = false;
bool runInProcess = true;
if ((OsInformation.OperatingSystem == OSType.Android || OsInformation.OperatingSystem == OSType.Mac || runInProcess)
&& ActivePrinterProfile.Instance.ActiveSliceEngineType == ActivePrinterProfile.SlicingEngineTypes.MatterSlice)
{