Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add filament vendors (CERPRiSE, FilamentOne, Tianse, and VOXELPLA) & rename Formfortura to Formfutura #5472

Merged
merged 6 commits into from
May 28, 2024
Merged

Add filament vendors (CERPRiSE, FilamentOne, Tianse, and VOXELPLA) & rename Formfortura to Formfutura #5472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8049623
Add filament vendors part 1
cochcoder May 26, 2024
619cc04
Add filament vendors part 2
cochcoder May 26, 2024
555a363
Fix merge confilcts
cochcoder May 28, 2024
8386b67
Merge branch 'main' into filament
cochcoder May 28, 2024
92062fe
Readd filament vendors & remove duplicate
cochcoder May 28, 2024
63d9c44
Merge branch 'filament' of https://github.com/cochcoder/OrcaSlicer in…
cochcoder May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions scripts/generate_presets_vendors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
'Comgrow',
'Cookiecad',
'Creality',
'CERPRiSE',
'Das Filament',
'DO3D',
'DOW',
Expand All @@ -90,8 +91,9 @@
'Filamentive',
'Fillamentum',
'FLASHFORGE',
'Formfortura',
'Formfutura',
'Francofil',
'FilamentOne',
'GEEETECH',
'Giantarm',
'Gizmo Dorks',
Expand Down Expand Up @@ -132,11 +134,13 @@
'Spectrum',
'SUNLU',
'TTYT3D',
'Tianse',
'UltiMaker',
'Valment',
'Verbatim',
'VO3D',
'Voxelab',
'VOXELPLA',
'YOOPAI',
'Yousu',
'Ziro',
Expand All @@ -148,4 +152,4 @@
filaments_formatted = ' {'
filament_indent = len(filaments_formatted)
filaments_formatted += ('\n' + ' ' * filament_indent).join(' '.join(f'{vendor_name:{fil_col_width}}' for vendor_name in filament_vendors_formatted[i:i+5]) for i in range(0, len(filament_vendors), 5)).rstrip()[:-1] + '};'
print(filaments_formatted)
print(filaments_formatted)
29 changes: 15 additions & 14 deletions src/slic3r/GUI/CreatePresetsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,21 @@ static const std::vector<std::string> filament_vendors =
"Ankermake", "Anycubic", "Atomic", "AzureFilm", "BASF",
"Bblife", "BCN3D", "Beyond Plastic", "California Filament", "Capricorn",
"CC3D", "colorFabb", "Comgrow", "Cookiecad", "Creality",
"Das Filament", "DO3D", "DOW", "DSM", "Duramic",
"ELEGOO", "Eryone", "Essentium", "eSUN", "Extrudr",
"Fiberforce", "Fiberlogy", "FilaCube", "Filamentive", "Fillamentum",
"FLASHFORGE", "Formfortura", "Francofil", "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", "UltiMaker", "Valment",
"Verbatim", "VO3D", "Voxelab", "YOOPAI", "Yousu",
"Ziro", "Zyltech"};
"CERPRiSE", "Das Filament", "DO3D", "DOW", "DSM",
"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"};

static const std::vector<std::string> filament_types = {"PLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF",
"NYLON", "PVA", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETG",
Expand Down
Loading