diff --git a/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs b/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs index 9e0eb2da6..d7c704d63 100644 --- a/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs +++ b/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs @@ -313,7 +313,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { if (!firstExtruder) { - mergeRules += ","; + mergeRules += "E"; } mergeRules += AddObjectsForExtruder(itemsByExtruder[extruderIndex], holes, outputOptions, ref savedStlCount); firstExtruder = false; diff --git a/Program.cs b/Program.cs index 567813325..2b073bc24 100644 --- a/Program.cs +++ b/Program.cs @@ -223,8 +223,12 @@ namespace MatterHackers.MatterControl config.Bind("Agg:ProviderTypes", AggContext.Config.ProviderTypes); config.Bind("Agg:GraphicsMode", AggContext.Config.GraphicsMode); +#if DEBUG + Slicer.RunInProcess = config.GetValue("MatterControl:Slicer:Debug", true); +#else Slicer.RunInProcess = config.GetValue("MatterControl:Slicer:Debug"); - Application.EnableF5Collect = config.GetValue("MatterControl:Application:EnableF5Collect"); +#endif + Application.EnableF5Collect = config.GetValue("MatterControl:Application:EnableF5Collect"); Application.EnableNetworkTraffic = config.GetValue("MatterControl:Application:EnableNetworkTraffic", true); // Make sure we have the right working directory as we assume everything relative to the executable. diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 5e8df4758..3e48ee30a 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 5e8df4758b20789a14a54801c176717da9465275 +Subproject commit 3e48ee30a5a4ab9ad10c74be5526a513dad92983