From 7b556918ee584f33160eef9fe624550b7446a511 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 18 Mar 2022 14:06:52 -0700 Subject: [PATCH] Improving z-calibration wizard Improving materials --- .../PrintLeveling/LevelingStrings.cs | 18 +++++------ .../SetupWizards/PrintLevelingWizard.cs | 3 +- .../SetupWizards/ZCalibrationWizard.cs | 10 ++----- .../WizardPages/FindBedHeight.cs | 30 +++++++++++++++---- .../WizardPages/GetCoarseBedHeight.cs | 7 ++++- .../WizardPages/GetFineBedHeight.cs | 6 ++-- .../WizardPages/GetUltraFineBedHeight.cs | 10 +++++-- .../ControlElements/MHDropDownList.cs | 4 +-- .../ControlElements/MHNumberEdit.cs | 2 +- .../ControlElements/MHTextEditWidget.cs | 2 +- .../Materials/BASF/Ultrafuse 316L.material | 11 ++----- .../Materials/Filamentum/CPE HG100.material | 3 +- .../_MatterHackers/Build Series/ABS.material | 15 ++-------- .../_MatterHackers/Build Series/PETg.material | 5 +--- .../_MatterHackers/Build Series/PLA.material | 5 +--- .../Materials/_MatterHackers/NylonG.material | 6 ++-- .../Materials/_MatterHackers/NylonX.material | 4 +-- .../_MatterHackers/PRO Series/ABS.material | 5 +--- .../_MatterHackers/PRO Series/Nylon.material | 3 +- .../_MatterHackers/PRO Series/PLA.material | 7 +---- .../_MatterHackers/PRO Series/RYNO.material | 3 -- .../PRO Series/Tough PLA.material | 5 +--- .../_MatterHackers/Quantum PLA.material | 7 +---- StaticData/Translations/Master.txt | 3 ++ Submodules/agg-sharp | 2 +- 25 files changed, 76 insertions(+), 100 deletions(-) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs index 21574eb3f..01c15aada 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs @@ -64,17 +64,15 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } } - public string CoarseInstruction2 => string.Format( - "\t• {0}\n\t• {1}\n{2}", - "Place the paper under the extruder".Localize(), - "Using the above controls".Localize(), - this.FineInstruction2); - - public string FineInstruction2 => string.Format( - "\t• {0}\n\t• {1}\n\n{2}", + public static string BelowControlsInstructions => string.Format( + "\t• {0}\n\t• {1}", "Press [Z-] until there is resistance to moving the paper".Localize(), - "Press [Z+] once to release the paper".Localize(), - "Finally click 'Next' to continue.".Localize()); + "Press [Z+] once to release the paper".Localize()); + + public static string BelowControlsUltraFineInstructions => string.Format( + "\t• {0}\n\t• {1}", + "Press [Z-] until there is resistance to moving the paper".Localize(), + "The ideal resistance is when the paper first begins to bend".Localize()); public string GetStepString(int totalSteps) { diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrintLevelingWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrintLevelingWizard.cs index 4c89a8517..62bec4500 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrintLevelingWizard.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrintLevelingWizard.cs @@ -320,8 +320,7 @@ Avoid contact with your skin.".Replace("\r", "").Localize().FormatWith(targetHot i + 1, "High Precision".Localize()), probePositions, - i, - levelingStrings); + i); } i++; diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/ZCalibrationWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/ZCalibrationWizard.cs index 640577a1a..9c8c8cd19 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/ZCalibrationWizard.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/ZCalibrationWizard.cs @@ -331,15 +331,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling yield return new GetUltraFineBedHeight( this, - string.Format( - "{0} {1} {2} - {3}", - levelingStrings.GetStepString(totalSteps), - "Position".Localize(), - 1, - "High Precision".Localize()), + $"{levelingStrings.GetStepString(totalSteps)} {"Position".Localize()} 1 - {"High Precision".Localize()}", manualProbePositions[extruderIndex], - 0, - levelingStrings); + 0); SetExtruderOffset(autoProbePositions, manualProbePositions, extruderIndex); } diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs index c43e8982c..a672f7883 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs @@ -31,6 +31,8 @@ using System; using System.Collections.Generic; using System.Linq; using MatterHackers.Agg; +using MatterHackers.Agg.Image; +using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; @@ -51,12 +53,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public FindBedHeight(ISetupWizard setupWizard, string pageDescription, - string setZHeightCoarseInstruction1, - string setZHeightCoarseInstruction2, + string aboveControlsInstructions, + string belowControlsInstructions, + string urlToImageToShow, + string nextInstructions, double moveDistance, List probePositions, int probePositionsBeingEditedIndex) - : base(setupWizard, pageDescription, setZHeightCoarseInstruction1) + : base(setupWizard, pageDescription, aboveControlsInstructions) { this.probePositions = probePositions; this.moveAmount = moveDistance; @@ -90,8 +94,24 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling contentRow.AddChild(zButtonsAndInfo); - contentRow.AddChild( - this.CreateTextField(setZHeightCoarseInstruction2)); + contentRow.AddChild(this.CreateTextField(belowControlsInstructions)); + + if (!string.IsNullOrEmpty(urlToImageToShow)) + { + var icon = StaticData.Instance.LoadIcon("internet.png", 16, 16); + + var sequenceWidget = new ResponsiveImageSequenceWidget(new ImageSequence(icon)) + { + Cursor = Cursors.Hand, + Margin = 9 + }; + + WebCache.RetrieveImageSquenceAsync(sequenceWidget.ImageSequence, urlToImageToShow); + + contentRow.AddChild(sequenceWidget); + } + + contentRow.AddChild(this.CreateTextField(nextInstructions)); } public override void OnLoad(EventArgs args) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs index 880c89853..2eff0a746 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs @@ -49,7 +49,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling : base(context, pageDescription, "Using the [Z] controls on this screen, we will now take a coarse measurement of the extruder height at this position.".Localize(), - levelingStrings.CoarseInstruction2, + string.Format("\t• {0}\n\t• {1}\n{2}", + "Place the paper under the extruder".Localize(), + "Using the above controls".Localize(), + LevelingStrings.BelowControlsInstructions), + null, + "Finally click 'Next' to continue.".Localize(), 1, probePositions, probePositionsBeingEditedIndex) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs index ca1ef61e5..b3b701196 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs @@ -39,8 +39,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling : base( context, pageDescription, - "We will now refine our measurement of the extruder height at this position.".Localize(), - levelingStrings.FineInstruction2, + "We will now refine our measurement of the extruder height at this position.".Localize(), + LevelingStrings.BelowControlsInstructions, + null, + "Finally click 'Next' to continue.".Localize(), .1, probePositions, probePositionsBeingEditedIndex) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs index 6c563f90a..5f85ce90d 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs @@ -34,13 +34,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling { public class GetUltraFineBedHeight : FindBedHeight { - public GetUltraFineBedHeight(ISetupWizard setupWizard, string pageDescription, List probePositions, - int probePositionsBeingEditedIndex, LevelingStrings levelingStrings) + public GetUltraFineBedHeight(ISetupWizard setupWizard, + string pageDescription, + List probePositions, + int probePositionsBeingEditedIndex) : base( setupWizard, pageDescription, "We will now finalize our measurement of the extruder height at this position.".Localize(), - levelingStrings.FineInstruction2, + LevelingStrings.BelowControlsUltraFineInstructions, + "https://lh3.googleusercontent.com/ZSbsEWr_jrr_2ZDqbcgbhQrC8pZz8y8sfl2Cg_q2u02P51iACGsmuC6clHt_ULiFIgnZ_RiQA2odLcvqBlOsWYHfq488O8KlVZexSyBE=w220", + "Finally click 'Next' to continue.".Localize(), .02, probePositions, probePositionsBeingEditedIndex) diff --git a/MatterControlLib/ControlElements/MHDropDownList.cs b/MatterControlLib/ControlElements/MHDropDownList.cs index 6d9e4f430..ece7fb855 100644 --- a/MatterControlLib/ControlElements/MHDropDownList.cs +++ b/MatterControlLib/ControlElements/MHDropDownList.cs @@ -72,11 +72,11 @@ namespace MatterHackers.MatterControl { return Color.Transparent; } - else if (this.mouseInBounds) + else if (this.mouseInBounds && this.ContainsFirstUnderMouseRecursive()) { return theme.DropList.Hovered.BorderColor; } - else if (this.ContainsFocus) + else if (this.ContainsFocus && this.ContainsFirstUnderMouseRecursive()) { return theme.DropList.Focused.BorderColor; } diff --git a/MatterControlLib/ControlElements/MHNumberEdit.cs b/MatterControlLib/ControlElements/MHNumberEdit.cs index 1f5535da7..75ba8da5a 100644 --- a/MatterControlLib/ControlElements/MHNumberEdit.cs +++ b/MatterControlLib/ControlElements/MHNumberEdit.cs @@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl { return theme.EditFieldColors.Focused.BorderColor; } - else if (this.mouseInBounds) + else if (this.mouseInBounds && this.ContainsFirstUnderMouseRecursive()) { return theme.EditFieldColors.Hovered.BorderColor; } diff --git a/MatterControlLib/ControlElements/MHTextEditWidget.cs b/MatterControlLib/ControlElements/MHTextEditWidget.cs index 3b802de27..5f72795ec 100644 --- a/MatterControlLib/ControlElements/MHTextEditWidget.cs +++ b/MatterControlLib/ControlElements/MHTextEditWidget.cs @@ -123,7 +123,7 @@ namespace MatterHackers.MatterControl { return theme.EditFieldColors.Focused.BorderColor; } - else if (this.mouseInBounds) + else if (this.mouseInBounds && this.ContainsFirstUnderMouseRecursive()) { return theme.EditFieldColors.Hovered.BorderColor; } diff --git a/StaticData/Materials/BASF/Ultrafuse 316L.material b/StaticData/Materials/BASF/Ultrafuse 316L.material index cfd2b4a24..d4791ca99 100644 --- a/StaticData/Materials/BASF/Ultrafuse 316L.material +++ b/StaticData/Materials/BASF/Ultrafuse 316L.material @@ -7,10 +7,8 @@ "layer_name": "BASF 316L", "layer_id": "5858d9d9-76b9-44af-8557-3349ba27b51f", "enable_fan": "0", - "retract_length": "4", - "retract_speed": "50", "retract_lift": "1", - "min_extrusion_before_retract": "0.1", + "filament_cost": "465", "temperature": "240", "bed_temperature": "100", "bed_temperature_buildtak": "100", @@ -19,13 +17,10 @@ "bed_temperature_kapton": "100", "bed_temperature_pei": "100", "bed_temperature_pp": "100", - "layer_height": "0.2", + "filament_density": "7851", "fill_density": "100%", "infill_type": "LINES", - "avoid_crossing_perimeters": "1", "perimeter_start_end_overlap": "50", - "coast_at_end_distance": "0.4", - "fill_angle": "45", "infill_overlap_perimeter": "50%", "first_layer_speed": "18", "infill_speed": "35", @@ -36,8 +31,6 @@ "air_gap_speed": "30", "bridge_speed": "18", "min_print_speed": "10", - "perimeters": "4", - "support_material_create_perimeter": "0", "material_sku": "MRDKJRRS" } ], diff --git a/StaticData/Materials/Filamentum/CPE HG100.material b/StaticData/Materials/Filamentum/CPE HG100.material index 1679d6ad3..55ee564da 100644 --- a/StaticData/Materials/Filamentum/CPE HG100.material +++ b/StaticData/Materials/Filamentum/CPE HG100.material @@ -16,8 +16,7 @@ "max_fan_speed_layer_time": "10", "layer_etag": "", "layer_source": "", - "extrusion_multiplier": "0.95", - "filament_cost": "24.99", + "filament_cost": "49.99", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/_MatterHackers/Build Series/ABS.material b/StaticData/Materials/_MatterHackers/Build Series/ABS.material index cd7a9284c..0b3d63dc0 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/ABS.material +++ b/StaticData/Materials/_MatterHackers/Build Series/ABS.material @@ -9,19 +9,8 @@ "layer_id": "8b9e4573-75c3-43cb-b02d-9b9926ed5d27", "bed_temperature": "100", "temperature": "235", - "min_fan_speed": "70", - "max_fan_speed": "100", - "bridge_fan_speed": "50", - "merge_overlapping_lines": "1", - "enable_fan": "1", - "layer_etag": "", - "layer_source": "", - "min_fan_speed_layer_time": "8", - "max_fan_speed_layer_time": "8", - "create_skirt": "0", - "create_brim": "1", - "brims": "5mm", - "filament_cost": "19.99", + "enable_fan": "0", + "filament_cost": "16.17", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", diff --git a/StaticData/Materials/_MatterHackers/Build Series/PETg.material b/StaticData/Materials/_MatterHackers/Build Series/PETg.material index b4e8d0c1b..df68e109d 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/PETg.material +++ b/StaticData/Materials/_MatterHackers/Build Series/PETg.material @@ -14,10 +14,7 @@ "min_fan_speed": "35", "min_fan_speed_layer_time": "25", "max_fan_speed_layer_time": "10", - "layer_etag": "", - "layer_source": "", - "extrusion_multiplier": "0.95", - "filament_cost": "24.99", + "filament_cost": "21.98", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/_MatterHackers/Build Series/PLA.material b/StaticData/Materials/_MatterHackers/Build Series/PLA.material index f8af123d3..16d9d8d7d 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/PLA.material +++ b/StaticData/Materials/_MatterHackers/Build Series/PLA.material @@ -12,12 +12,9 @@ "min_fan_speed": "70", "max_fan_speed": "100", "bridge_fan_speed": "100", - "layer_etag": "", - "layer_source": "", - "filament_cost": "19.99", + "filament_cost": "16.17", "min_fan_speed_layer_time": "180", "max_fan_speed_layer_time": "60", - "extrusion_multiplier": "0.97", "disable_fan_first_layers": "5", "bed_temperature_buildtak": "50", "bed_temperature_garolite": "75", diff --git a/StaticData/Materials/_MatterHackers/NylonG.material b/StaticData/Materials/_MatterHackers/NylonG.material index bc5bb7661..720c9dded 100644 --- a/StaticData/Materials/_MatterHackers/NylonG.material +++ b/StaticData/Materials/_MatterHackers/NylonG.material @@ -6,12 +6,10 @@ { "layer_name": "NylonG", "layer_id": "f8bf5181-0d9a-47ac-b8dd-c6ff6e24dc57", - "retract_restart_extra_time_to_apply": "0", - "retract_restart_extra": "0", "temperature": "255", "bed_temperature": "60", "filament_density": "1.01", - "filament_cost": "128", + "filament_cost": "64", "min_fan_speed": "35", "max_fan_speed": "100", "raft_fan_speed_percent": "0", @@ -26,7 +24,7 @@ "bed_temperature_kapton": "60", "bed_temperature_pei": "75", "bed_temperature_pp": "60", - "material_sku": "MTGV1M9J" + "material_sku": "MZ9H8W56" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/NylonX.material b/StaticData/Materials/_MatterHackers/NylonX.material index 3547d57ca..ec4e372bf 100644 --- a/StaticData/Materials/_MatterHackers/NylonX.material +++ b/StaticData/Materials/_MatterHackers/NylonX.material @@ -6,12 +6,10 @@ { "layer_name": "NylonX", "layer_id": "9c66e529-0034-407e-baa2-e4bb2d1fa0b8", - "retract_restart_extra_time_to_apply": "0", - "retract_restart_extra": "0", "temperature": "255", "bed_temperature": "60", "filament_density": "1.01", - "filament_cost": "116", + "filament_cost": "51.04", "min_fan_speed": "35", "max_fan_speed": "50", "raft_fan_speed_percent": "0", diff --git a/StaticData/Materials/_MatterHackers/PRO Series/ABS.material b/StaticData/Materials/_MatterHackers/PRO Series/ABS.material index 3e9e4766e..7b52c42f9 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/ABS.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/ABS.material @@ -12,10 +12,7 @@ "min_fan_speed": "70", "max_fan_speed": "100", "bridge_fan_speed": "50", - "merge_overlapping_lines": "1", - "enable_fan": "1", - "layer_etag": "", - "layer_source": "", + "enable_fan": "0", "filament_cost": "42", "min_fan_speed_layer_time": "8", "max_fan_speed_layer_time": "8", diff --git a/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material b/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material index 80c44d435..b9ea16f9e 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material @@ -18,8 +18,7 @@ "bed_temperature_kapton": "70", "bed_temperature_pei": "70", "bed_temperature_pp": "50", - "layer_etag": "", - "layer_source": "", + "enable_fan": "0", "material_sku": "MCR8GQZT" } ], diff --git a/StaticData/Materials/_MatterHackers/PRO Series/PLA.material b/StaticData/Materials/_MatterHackers/PRO Series/PLA.material index b2cf3d76a..14586c7ab 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/PLA.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/PLA.material @@ -12,15 +12,10 @@ "min_fan_speed": "70", "max_fan_speed": "100", "bridge_fan_speed": "100", - "retract_restart_extra": "0", - "retract_restart_extra_time_to_apply": "0", "min_fan_speed_layer_time": "180", "max_fan_speed_layer_time": "60", "filament_cost": "42", - "disable_fan_first_layers": "5", - "extrusion_multiplier": "0.97", - "layer_etag": "", - "layer_source": "", + "disable_fan_first_layers": "3", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material b/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material index c7d14dbf4..779138fff 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material @@ -15,7 +15,6 @@ "min_fan_speed_layer_time": "15", "max_fan_speed_layer_time": "10", "filament_cost": "64", - "extrusion_multiplier": "0.95", "disable_fan_first_layers": "3", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", @@ -23,8 +22,6 @@ "bed_temperature_kapton": "55", "bed_temperature_pei": "75", "bed_temperature_pp": "55", - "layer_etag": "", - "layer_source": "", "material_sku": "M6989PRZ" } ], diff --git a/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material b/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material index 79392f348..801774460 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material @@ -12,10 +12,7 @@ "max_fan_speed_layer_time": "60", "min_fan_speed": "60", "disable_fan_first_layers": "5", - "extrusion_multiplier": "0.97", - "filament_cost": "52", - "layer_etag": "", - "layer_source": "", + "filament_cost": "42", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", diff --git a/StaticData/Materials/_MatterHackers/Quantum PLA.material b/StaticData/Materials/_MatterHackers/Quantum PLA.material index 86fbd059e..1a765d3d3 100644 --- a/StaticData/Materials/_MatterHackers/Quantum PLA.material +++ b/StaticData/Materials/_MatterHackers/Quantum PLA.material @@ -12,15 +12,10 @@ "min_fan_speed": "70", "max_fan_speed": "100", "bridge_fan_speed": "100", - "retract_restart_extra": "0", - "retract_restart_extra_time_to_apply": "0", "min_fan_speed_layer_time": "180", "max_fan_speed_layer_time": "60", - "filament_cost": "42", + "filament_cost": "37", "disable_fan_first_layers": "5", - "extrusion_multiplier": "0.97", - "layer_etag": "", - "layer_source": "", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 241e31209..9b4aaf9b6 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4993,6 +4993,9 @@ Translated:The geometric shape of the support structure for the inside of parts. English:The height of the printer's printable volume, in millimeters. Controls the height of the visual print area displayed in 3D View. Translated:The height of the printer's printable volume, in millimeters. Controls the height of the visual print area displayed in 3D View. +English:The ideal resistance is when the paper first begins to bend +Translated:The ideal resistance is when the paper first begins to bend + English:The inset amount for each side of the bed.\n- As a % of the width or depth\n- Ordered: Left, Front, Right, Back\n- NOTE: The probe offset is added on top of this Translated:The inset amount for each side of the bed.\n- As a % of the width or depth\n- Ordered: Left, Front, Right, Back\n- NOTE: The probe offset is added on top of this diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index e53350017..67f89b06f 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit e53350017c3b8ebb2c8c028a07f5fe958aecb74a +Subproject commit 67f89b06fe709544b528c38037f2f3a878bea401