From e71ec183fa2c0ea17d25bb1687c714a1981ab47f Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 5 Jan 2022 13:22:06 -0800 Subject: [PATCH] Better loading of sub groups in 3mf files --- .../ContentProviders/MeshContentProvider.cs | 1 - StaticData/Translations/Master.txt | 30 +++++++++++++++++++ Submodules/agg-sharp | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs index 694e58295..442834267 100644 --- a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs +++ b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs @@ -34,7 +34,6 @@ namespace MatterHackers.MatterControl using System; using System.IO; using System.Threading; - using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.DataConverters3D; diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 58684941a..0676191ac 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -100,6 +100,9 @@ Translated:Add English:Add all the items on the bed to the print queue. Translated:Add all the items on the bed to the print queue. +English:Add an.stl, .obj, .3mf, .amf, .gcode or.zip file to the Library +Translated:Add an.stl, .obj, .3mf, .amf, .gcode or.zip file to the Library + English:Add an.stl, .obj, .amf, .gcode or.zip file to the Library Translated:Add an.stl, .obj, .amf, .gcode or.zip file to the Library @@ -940,6 +943,9 @@ Translated:Final Vertices English:Finalized Translated:Finalized +English:Find and create supports where needed +Translated:Find and create supports where needed + English:Find Slice Translated:Find Slice @@ -1051,6 +1057,9 @@ Translated:Gear English:General Translated:General +English:Generate +Translated:Generate + English:Generate Support Translated:Generate Support @@ -1153,6 +1162,9 @@ Translated:Help English:HEXAGON Translated:HEXAGON +English:Hide +Translated:Hide + English:History Translated:History @@ -1876,6 +1888,9 @@ Translated:Outside Perimeters English:Overhang Translated:Overhang +English:Overhang Angle +Translated:Overhang Angle + English:Override Radius Translated:Override Radius @@ -1930,6 +1945,9 @@ Translated:Perimeters Per Extruder English:PETG Temperature Tower Translated:PETG Temperature Tower +English:Pillar Size +Translated:Pillar Size + English:Pin Translated:Pin @@ -2191,6 +2209,9 @@ Translated:Reloading English:Remove Translated:Remove +English:Remove all auto generated supports +Translated:Remove all auto generated supports + English:Remove Items? Translated:Remove Items? @@ -2368,6 +2389,9 @@ Translated:Seam Placement English:Search Translated:Search +English:Search Results +Translated:Search Results + English:seconds Translated:seconds @@ -2737,6 +2761,9 @@ Translated:The angle at which the support material lines will be drawn. English:The angle of the infill, measured from the X axis. Not used when bridging. Translated:The angle of the infill, measured from the X axis. Not used when bridging. +English:The angle to generate support for +Translated:The angle to generate support for + English:The bed is currently heating and its target temperature cannot be changed until it reaches {0}°C.\n\nYou can set the starting bed temperature in SETTINGS -> Filament -> Temperatures.\n\n{1} Translated:The bed is currently heating and its target temperature cannot be changed until it reaches {0}°C.\n\nYou can set the starting bed temperature in SETTINGS -> Filament -> Temperatures.\n\n{1} @@ -3052,6 +3079,9 @@ Translated:The time it takes to heat back up from a cool down. English:The time over which to increase the Extra Length On Restart to its maximum value. Below this time only a portion of the extra length will be applied. Leave 0 to apply the entire amount all the time. Translated:The time over which to increase the Extra Length On Restart to its maximum value. Below this time only a portion of the extra length will be applied. Leave 0 to apply the entire amount all the time. +English:The width and depth of the support pillars +Translated:The width and depth of the support pillars + English:The X and Y position of the hot end that minimizes the chance of colliding with the parts on the bed. Translated:The X and Y position of the hot end that minimizes the chance of colliding with the parts on the bed. diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index a4ed28cd0..03e836b4b 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit a4ed28cd0824cc393a0af1bd1109541408a6a87a +Subproject commit 03e836b4b1a85321ef1d33fc66c1e2b5f67134df