From b1a06e80b30779d3898fa4f93dce3b5c013b6cf9 Mon Sep 17 00:00:00 2001 From: Duan Gauche Date: Fri, 2 Aug 2024 09:48:11 -0500 Subject: [PATCH] added FilX as a Filament vendor (#6216) * added FilX * Fixed Typo * Merge branch 'main' into FilX * Merge branch 'main' into FilX --- scripts/generate_presets_vendors.py | 1 + src/slic3r/GUI/CreatePresetsDialog.cpp | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/generate_presets_vendors.py b/scripts/generate_presets_vendors.py index e5c3c837d..2dd53db53 100644 --- a/scripts/generate_presets_vendors.py +++ b/scripts/generate_presets_vendors.py @@ -94,6 +94,7 @@ filament_vendors = [ 'Formfutura', 'Francofil', 'FilamentOne', + 'Fil X', 'GEEETECH', 'Giantarm', 'Gizmo Dorks', diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index cebe58fc0..0166238ca 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -47,17 +47,17 @@ static const std::vector filament_vendors = "Duramic", "ELEGOO", "Eryone", "Essentium", "eSUN", "Extrudr", "Fiberforce", "Fiberlogy", "FilaCube", "Filamentive", "Fillamentum", "FLASHFORGE", "Formfutura", "Francofil", "FilamentOne", - "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", "HATCHBOX", - "Hello3D", "IC3D", "IEMAI", "IIID Max", "INLAND", - "iProspect", "iSANMATE", "Justmaker", "Keene Village Plastics", "Kexcelled", - "MakerBot", "MatterHackers", "MIKA3D", "NinjaTek", "Nobufil", - "Novamaker", "OVERTURE", "OVVNYXE", "Polymaker", "Priline", - "Printed Solid", "Protopasta", "Prusament", "Push Plastic", "R3D", - "Re-pet3D", "Recreus", "Regen", "Sain SMART", "SliceWorx", - "Snapmaker", "SnoLabs", "Spectrum", "SUNLU", "TTYT3D", - "Tianse", "UltiMaker", "Valment", "Verbatim", "VO3D", - "Voxelab", "VOXELPLA", "YOOPAI", "Yousu", "Ziro", - "Zyltech"}; + "Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", + "HATCHBOX", "Hello3D", "IC3D", "IEMAI", "IIID Max", + "INLAND", "iProspect", "iSANMATE", "Justmaker", "Keene Village Plastics", + "Kexcelled", "MakerBot", "MatterHackers", "MIKA3D", "NinjaTek", + "Nobufil", "Novamaker", "OVERTURE", "OVVNYXE", "Polymaker", + "Priline", "Printed Solid", "Protopasta", "Prusament", "Push Plastic", + "R3D", "Re-pet3D", "Recreus", "Regen", "Sain SMART", + "SliceWorx", "Snapmaker", "SnoLabs", "Spectrum", "SUNLU", + "TTYT3D", "Tianse", "UltiMaker", "Valment", "Verbatim", + "VO3D", "Voxelab", "VOXELPLA", "YOOPAI", "Yousu", + "Ziro", "Zyltech"}; static const std::vector filament_types = {"PLA", "rPLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", "NYLON", "PVA", "PVB", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETG",