diff --git a/MatterControl.csproj b/MatterControl.csproj index 563ae7d2d..eee506988 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -103,6 +103,8 @@ MatterSlice + {50505F12-985B-4C5F-8DAB-D5BEA734CD51} + MatterControl.Common diff --git a/MatterControl.sln b/MatterControl.sln index 678744d2d..130327455 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -98,6 +98,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.Common", "Mat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.PartSheet", "Plugins\MatterControl.PartSheet\MatterControl.PartSheet.csproj", "{312CE0DD-0F8F-4366-96A4-44D0AAEF60AA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.MeshOperations", "MatterControl.MeshOperations\MatterControl.MeshOperations.csproj", "{8A33EE41-BEFA-499F-9184-1B8D0C8A4600}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gsSlicer", "gsSlicer", "{19D0D43D-0007-412B-980A-445EA6E8AD94}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clipper_library", "Submodules\gsSlicer\thirdparty\clipper_library\clipper_library.csproj", "{E75C6D22-D942-47C9-9591-1F83BA2C4762}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "geometry3Sharp", "Submodules\geometry3Sharp\geometry3Sharp.csproj", "{A27598CF-B162-4083-88B9-6B8902348107}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gsGCode", "Submodules\gsGCode\gsGCode.csproj", "{1BB917A2-56AF-4A43-A99F-FF073F53A113}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gsSlicer", "Submodules\gsSlicer\gsSlicer.csproj", "{B3B79E5B-B7E2-4DE8-9810-666B0037D86F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.gsSlicer", "MatterHackers.gsSlicer\MatterControl.gsSlicer.csproj", "{C4F5AB29-8AED-4183-9562-9CA428E736B3}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.projitems*{235a071b-8d06-40ae-a5c5-b1ce59715ee9}*SharedItemsImports = 13 @@ -424,6 +438,54 @@ Global {312CE0DD-0F8F-4366-96A4-44D0AAEF60AA}.Release|Any CPU.Build.0 = Release|Any CPU {312CE0DD-0F8F-4366-96A4-44D0AAEF60AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {312CE0DD-0F8F-4366-96A4-44D0AAEF60AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Any CPU.Build.0 = Release|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Any CPU.Build.0 = Release|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Release|Any CPU.Build.0 = Release|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A27598CF-B162-4083-88B9-6B8902348107}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Any CPU.Build.0 = Release|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Any CPU.Build.0 = Release|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Any CPU.Build.0 = Release|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -468,6 +530,12 @@ Global {235A071B-8D06-40AE-A5C5-B1CE59715EE9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {50505F12-985B-4C5F-8DAB-D5BEA734CD51} = {FED00F38-E911-45E1-A788-26980E84C3D6} {312CE0DD-0F8F-4366-96A4-44D0AAEF60AA} = {FED00F38-E911-45E1-A788-26980E84C3D6} + {8A33EE41-BEFA-499F-9184-1B8D0C8A4600} = {FED00F38-E911-45E1-A788-26980E84C3D6} + {E75C6D22-D942-47C9-9591-1F83BA2C4762} = {19D0D43D-0007-412B-980A-445EA6E8AD94} + {A27598CF-B162-4083-88B9-6B8902348107} = {19D0D43D-0007-412B-980A-445EA6E8AD94} + {1BB917A2-56AF-4A43-A99F-FF073F53A113} = {19D0D43D-0007-412B-980A-445EA6E8AD94} + {B3B79E5B-B7E2-4DE8-9810-666B0037D86F} = {19D0D43D-0007-412B-980A-445EA6E8AD94} + {C4F5AB29-8AED-4183-9562-9CA428E736B3} = {19D0D43D-0007-412B-980A-445EA6E8AD94} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}