From 3dd0ecd5db3930030ba0287560a63812ddf72087 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 6 Dec 2020 16:44:44 -0800 Subject: [PATCH] updating nuget packages --- Community.CsharpSqlite/Community.CsharpSqlite.csproj | 2 +- MatterControl.Common/MatterControl.Common.csproj | 4 ++++ .../MatterControl.MeshOperations.csproj | 4 ++++ MatterControl.OpenGL/MatterControl.OpenGL.csproj | 4 ++++ MatterControl.Printing/MatterControl.Printing.csproj | 6 +++++- MatterControl.csproj | 6 +++--- .../DesignTools/Primitives/WedgeObject3D.cs | 2 +- MatterControlLib/MatterControlLib.csproj | 12 ++++++++---- MatterHackers.gsSlicer/MatterControl.gsSlicer.csproj | 4 ++++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 11 files changed, 36 insertions(+), 12 deletions(-) diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 2357826c3..3e709e6b5 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -16,7 +16,7 @@ - + diff --git a/MatterControl.Common/MatterControl.Common.csproj b/MatterControl.Common/MatterControl.Common.csproj index e6021c8dd..1e8458629 100644 --- a/MatterControl.Common/MatterControl.Common.csproj +++ b/MatterControl.Common/MatterControl.Common.csproj @@ -12,4 +12,8 @@ + + + + \ No newline at end of file diff --git a/MatterControl.MeshOperations/MatterControl.MeshOperations.csproj b/MatterControl.MeshOperations/MatterControl.MeshOperations.csproj index f75aed7b9..b2307c2f5 100644 --- a/MatterControl.MeshOperations/MatterControl.MeshOperations.csproj +++ b/MatterControl.MeshOperations/MatterControl.MeshOperations.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/MatterControl.OpenGL/MatterControl.OpenGL.csproj b/MatterControl.OpenGL/MatterControl.OpenGL.csproj index 8c68008d9..950501308 100644 --- a/MatterControl.OpenGL/MatterControl.OpenGL.csproj +++ b/MatterControl.OpenGL/MatterControl.OpenGL.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index 410d6cf75..68103a912 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -8,7 +8,7 @@ - + @@ -26,4 +26,8 @@ + + + + diff --git a/MatterControl.csproj b/MatterControl.csproj index 77581f70b..751ec33d3 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -142,13 +142,13 @@ 15.0.5 - 5.2.6 + 5.2.7 - 5.6.0 + 5.12.0 - 0.9.13 + 1.0.2-beta1 diff --git a/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs index 614baef87..d3f80b4cc 100644 --- a/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs @@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl.DesignTools if (Round) { - var range = 360 / 4; + var range = 360 / 4.0; for (int i = 1; i < RoundSegments - 1; i++) { var angle = range / (RoundSegments - 1) * i; diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index 49850dd09..da5c43821 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -93,12 +93,12 @@ - - + + - + - + @@ -114,4 +114,8 @@ PreserveNewest + + + + diff --git a/MatterHackers.gsSlicer/MatterControl.gsSlicer.csproj b/MatterHackers.gsSlicer/MatterControl.gsSlicer.csproj index 2fd06188d..48efce996 100644 --- a/MatterHackers.gsSlicer/MatterControl.gsSlicer.csproj +++ b/MatterHackers.gsSlicer/MatterControl.gsSlicer.csproj @@ -29,4 +29,8 @@ + + + + diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 57f7f1c85..85f4e4092 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 57f7f1c85dedbabce25325b6a11dc73cfaed0b29 +Subproject commit 85f4e4092fcc06de264f8345a50bf3115249a07f diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 160cf60a5..f7c4ca445 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 160cf60a5267285db78a413ee0181dfa5d358718 +Subproject commit f7c4ca4457b4552ee61d95913f65675351e19c4b