Merge pull request #5318 from larsbrubaker/may_release

May release

MatterControlLib/ApplicationView/Config/PrinterConfig.cs

@@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl
 				var foundPartSettings = false;
 				var newSceneOverrides = new PrinterSettingsLayer();
 				// accumulate all the scene overrides ordered by their names, which is the order they will be in the design tree
-				foreach (var partSettingsObject in scene.DescendantsAndSelf().Where(c => c is PartSettingsObject3D).OrderBy(i => i.Name))
+				foreach (var partSettingsObject in scene.DescendantsAndSelf().Where(c => c is PartSettingsObject3D && c.Parent?.WorldPrintable() == true).OrderBy(i => i.Name))
 				{
 					foundPartSettings = true;
 					var settings = ((PartSettingsObject3D)partSettingsObject).Overrides;

MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs

@@ -204,7 +204,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 
                 if (set.Count > 1)
                 {
-#if false
+#if true
                     setMesh = BooleanProcessing.DoArray(set.Select(i => (i.mesh, i.matrix)),
                         CsgModes.Union,
                         Processing,

StaticData/Translations/Master.txt

@@ -2434,6 +2434,9 @@ Translated:Item cannot be exported
 English:Item cannot be exported as AMF
 Translated:Item cannot be exported as AMF
 
+English:Item cannot be exported as MCX
+Translated:Item cannot be exported as MCX
+
 English:Item not Found
 Translated:Item not Found
 

Submodules/agg-sharp

@@ -1 +1 @@
-Subproject commit 171deb5573a4497a73bf4497fcaae47d7264e1e1
+Subproject commit e83b5b6e0f0030b24513124d84649e6d05417d2b