From 23d597a3029d4ea8fb21e1d9437937f604dd0bf2 Mon Sep 17 00:00:00 2001 From: cochcoder <103969142+cochcoder@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:25:12 -0400 Subject: [PATCH] Add PETG-CF10 filament type & RatRig filament vendor --- .../Ratrig/filament/RatRig PunkFil ABS.json | 3 +++ .../Ratrig/filament/RatRig PunkFil PETG CF.json | 5 ++++- .../Ratrig/filament/RatRig PunkFil PETG.json | 3 +++ src/libslic3r/PrintConfig.cpp | 1 + src/slic3r/GUI/CreatePresetsDialog.cpp | 14 +++++++------- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json index f614f700966..c8affa0ab3f 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json @@ -63,6 +63,9 @@ "filament_cost": [ "25.5" ], + "filament_vendor": [ + "RatRig" + ], "compatible_printers": [ "RatRig V-Core 3 200 0.4 nozzle", "RatRig V-Core 3 300 0.4 nozzle", diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json index d475b3e4111..8150ef9d539 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json @@ -64,7 +64,10 @@ "48" ], "filament_type": [ - "PETG-CF" + "PETG-CF10" + ], + "filament_vendor": [ + "RatRig" ], "compatible_printers": [ "RatRig V-Core 3 200 0.4 nozzle", diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json index b4114f10b70..aff5fa4c6d3 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json @@ -63,6 +63,9 @@ "filament_cost": [ "24.5" ], + "filament_vendor": [ + "RatRig" + ], "compatible_printers": [ "RatRig V-Core 3 200 0.4 nozzle", "RatRig V-Core 3 300 0.4 nozzle", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 33941656dae..cc35375a094 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2124,6 +2124,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PETG"); def->enum_values.push_back("PETG-CF"); + def->enum_values.push_back("PETG-CF10"); def->enum_values.push_back("PHA"); def->enum_values.push_back("PLA"); def->enum_values.push_back("PLA-AERO"); diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index bb784e567d1..6606d5f5f52 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -47,20 +47,20 @@ static const std::vector filament_vendors = "Duramic", "ELEGOO", "Eryone", "Essentium", "eSUN", "Extrudr", "Fiberforce", "Fiberlogy", "FilaCube", "Filamentive", "Fillamentum", "FLASHFORGE", "Formfutura", "Francofil", "FilamentOne", - "Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", + "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"}; + "R3D", "Re-pet3D", "Recreus", "Regen", "RatRig", + "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", + "NYLON", "PVA", "PVB", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc", "TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber", "SBS"};