3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 15:07:31 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add filament_vendors：FusRock

Browse source 
Add FusRock and keep the alphabetical order
This commit is contained in:
FusRock 2025-04-15 16:25:26 +08:00
parent 035b047fef
commit 3a3f695967
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/generate_presets_vendors.py
View file

@ -70,11 +70,11 @@ filament_vendors = [
'California Filament', 'California Filament',
'Capricorn', 'Capricorn',
'CC3D', 'CC3D',
'CERPRiSE',
'colorFabb', 'colorFabb',
'Comgrow', 'Comgrow',
'Cookiecad', 'Cookiecad',
'Creality', 'Creality',
'CERPRiSE',
'Das Filament', 'Das Filament',
'DO3D', 'DO3D',
'DOW', 'DOW',
@ -89,12 +89,13 @@ filament_vendors = [
'Fiberlogy', 'Fiberlogy',
'FilaCube', 'FilaCube',
'Filamentive', 'Filamentive',
'FilamentOne',
'Fillamentum', 'Fillamentum',
'Fil X',
'FLASHFORGE', 'FLASHFORGE',
'Formfutura', 'Formfutura',
'Francofil', 'Francofil',
'FilamentOne', 'FusRock',
'Fil X',
'GEEETECH', 'GEEETECH',
'Giantarm', 'Giantarm',
'Gizmo Dorks', 'Gizmo Dorks',
@ -147,7 +148,7 @@ filament_vendors = [
'Yousu', 'Yousu',
'Ziro', 'Ziro',
'Zyltech', 'Zyltech',
] ]
filament_vendors_formatted = [f'"{vendor_name}",' for vendor_name in filament_vendors] filament_vendors_formatted = [f'"{vendor_name}",' for vendor_name in filament_vendors]
fil_col_width = len(max(filament_vendors_formatted, key=len)) fil_col_width = len(max(filament_vendors_formatted, key=len))

26
src/slic3r/GUI/CreatePresetsDialog.cpp
View file

@ -38,7 +38,7 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
static const std::vector<std::string> filament_vendors = static const std::vector<std::string> filament_vendors =
{"3Dgenius", "3DJake", "3DXTECH", "3D BEST-Q", "3D Hero", {"3Dgenius", "3DJake", "3DXTECH", "3D BEST-Q", "3D Hero",
"3D-Fuel", "Aceaddity", "AddNorth", "Amazon Basics", "AMOLEN", "3D-Fuel", "Aceaddity", "AddNorth", "Amazon Basics", "AMOLEN",
"Ankermake", "Anycubic", "Atomic", "AzureFilm", "BASF", "Ankermake", "Anycubic", "Atomic", "AzureFilm", "BASF",
@ -47,18 +47,18 @@ static const std::vector<std::string> filament_vendors =
"CERPRiSE", "Das Filament", "DO3D", "DOW", "DSM", "CERPRiSE", "Das Filament", "DO3D", "DOW", "DSM",
"Duramic", "ELEGOO", "Eryone", "Essentium", "eSUN", "Duramic", "ELEGOO", "Eryone", "Essentium", "eSUN",
"Extrudr", "Fiberforce", "Fiberlogy", "FilaCube", "Filamentive", "Extrudr", "Fiberforce", "Fiberlogy", "FilaCube", "Filamentive",
"Fillamentum", "FLASHFORGE", "Formfutura", "Francofil", "FilamentOne", "Fillamentum", "FLASHFORGE", "Formfutura", "Francofil", "FusRock",
"Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", "FilamentOne", "Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks",
"HATCHBOX", "Hello3D", "IC3D", "IEMAI", "IIID Max", "GreenGate3D", "HATCHBOX", "Hello3D", "IC3D", "IEMAI",
"INLAND", "iProspect", "iSANMATE", "Justmaker", "Keene Village Plastics", "IIID Max", "INLAND", "iProspect", "iSANMATE", "Justmaker",
"Kexcelled", "LDO", "MakerBot", "MatterHackers", "MIKA3D", "Keene Village Plastics", "Kexcelled", "LDO", "MakerBot", "MatterHackers",
"NinjaTek", "Nobufil", "Novamaker", "OVERTURE", "OVVNYXE", "MIKA3D", "NinjaTek", "Nobufil", "Novamaker", "OVERTURE",
"Polymaker", "Priline", "Printed Solid", "Protopasta", "Prusament", "OVVNYXE", "Polymaker", "Priline", "Printed Solid", "Protopasta",
"Push Plastic", "R3D", "Re-pet3D", "Recreus", "Regen", "Prusament", "Push Plastic", "R3D", "Re-pet3D", "Recreus",
"RatRig", "Sain SMART", "SliceWorx", "Snapmaker", "SnoLabs", "Regen", "RatRig", "Sain SMART", "SliceWorx", "Snapmaker",
"Spectrum", "SUNLU", "TTYT3D", "Tianse", "UltiMaker", "SnoLabs", "Spectrum", "SUNLU", "TTYT3D", "Tianse",
"Valment", "Verbatim", "VO3D", "Voxelab", "VOXELPLA", "UltiMaker", "Valment", "Verbatim", "VO3D", "Voxelab",
"YOOPAI", "Yousu", "Ziro", "Zyltech"}; "VOXELPLA", "YOOPAI", "Yousu", "Ziro", "Zyltech"};
static const std::vector<std::string> filament_types = {"PLA", "rPLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", static const std::vector<std::string> 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", "NYLON", "PVA", "PVB", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET",