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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work

Browse source
This commit is contained in:
Gregory Diaz 2015-05-05 09:55:53 -07:00
commit 7e53249ff4
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/SlicingQueue.cs
View file

@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return extruder1StlFileToSlice;
}
public static bool runInProcess = true;
public static bool runInProcess = false;
private static Process slicerProcess = null;
private static void CreateSlicedPartsThread()

18
StaticData/Translations/Master.txt
View file

@ -3220,3 +3220,21 @@ Translated:The temperature the extruder will be when extruder wipes.
English:The temperature the extruder will be when extruder wipes.
Translated:The temperature the extruder will be when extruder wipes.
English:Basic
Translated:Basic
English:Sets the size of the outer solid surface for the entire print.
Translated:Sets the size of the outer solid surface for the entire print.
English:The number, or total width, of external shells to create. Add mm to the end of the number to specify width.
Translated:The number, or total width, of external shells to create. Add mm to the end of the number to specify width.
English:Layers/Surface
Translated:Layers/Surface
English:Width
Translated:Width
English:Arrange
Translated:Arrange

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit e084a51863a78eb98b67978b42653329c6f1915e
Subproject commit 183204caa9035f392c3fb09f4ebbec01d0fb15c9

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 352e17ee0d3473d314d6b2f4b81142d5fff4cf86
Subproject commit fb4bb934052fc39dc38180a8dd17bcda6faf59a2