From 5e5542d02f74c0b82fbb79e62c5e471c6de48faf Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 3 Mar 2025 20:32:47 +0800 Subject: [PATCH] Update default filaments for printers (#8655) * update M1 * update Voron * update Positron * update Biqu * update Eryone * update Folgetech * update Geeetech * update Kingroon * update MagicMaker * update Raise3D * update Rolohaun * update Tronxy * update Kingroon and Tronxy * update Voxelab * update Wanhao * more fix --- resources/profiles/BIQU/machine/BIQU B1.json | 2 +- resources/profiles/BIQU/machine/BIQU BX.json | 2 +- .../machine/BIQU Hurakan (0.4 nozzle).json | 2 +- .../profiles/BIQU/machine/BIQU Hurakan.json | 2 +- .../BIQU/machine/fdm_biqu_common.json | 2 +- .../BIQU/machine/fdm_klipper_common.json | 2 +- .../Chuanying/machine/Chuanying X1.json | 2 +- .../machine/fdm_chuanying_common.json | 2 +- .../Chuanying/machine/fdm_klipper_common.json | 2 +- .../Chuanying/machine/fdm_x1_common.json | 2 +- ...hromaSet 0.4 nozzle - Ender-3 V3 Plus.json | 2 +- ...int ChromaSet 0.4 nozzle - Ender-3 V3.json | 2 +- .../Co Print ChromaSet 0.4 nozzle fast.json | 2 +- .../Co Print ChromaSet 0.4 nozzle.json | 2 +- .../Co Print/machine/Co Print ChromaSet.json | 2 +- .../Co Print/machine/fdm_coprint_common.json | 2 +- .../Creality Generic ABS @Hi-all.json | 2 +- .../Custom/machine/fdm_klipper_common.json | 2 +- .../Custom/machine/fdm_rrf_common.json | 2 +- .../machine/fdm_toolchanger_common.json | 2 +- .../machine/fdm_klipper_common.json | 2 +- .../Elegoo/machine/EC/Elegoo Centauri.json | 2 +- .../machine/ECC/Elegoo Centauri Carbon.json | 2 +- .../Elegoo Neptune 4 (0.2 nozzle).json | 2 +- .../Elegoo Neptune 4 (0.4 nozzle).json | 2 +- .../Elegoo Neptune 4 (0.6 nozzle).json | 2 +- .../Elegoo Neptune 4 (0.8 nozzle).json | 2 +- .../Elegoo Neptune 4 Max (0.2 nozzle).json | 2 +- .../Elegoo Neptune 4 Max (0.4 nozzle).json | 2 +- .../Elegoo Neptune 4 Max (0.6 nozzle).json | 2 +- .../Elegoo Neptune 4 Max (0.8 nozzle).json | 2 +- .../Elegoo/machine/Elegoo Neptune 4 Max.json | 2 +- .../Elegoo Neptune 4 Plus (0.2 nozzle).json | 2 +- .../Elegoo Neptune 4 Plus (0.4 nozzle).json | 2 +- .../Elegoo Neptune 4 Plus (0.6 nozzle).json | 2 +- .../Elegoo Neptune 4 Plus (0.8 nozzle).json | 2 +- .../Elegoo/machine/Elegoo Neptune 4 Plus.json | 3 +- .../Elegoo Neptune 4 Pro (0.2 nozzle).json | 2 +- .../Elegoo Neptune 4 Pro (0.4 nozzle).json | 2 +- .../Elegoo Neptune 4 Pro (0.6 nozzle).json | 2 +- .../Elegoo Neptune 4 Pro (0.8 nozzle).json | 2 +- .../Elegoo/machine/Elegoo Neptune 4 Pro.json | 3 +- .../Elegoo/machine/Elegoo Neptune 4.json | 3 +- .../machine/Elegoo OrangeStorm Giga.json | 2 +- .../machine/Thinker X400 0.4 nozzle.json | 2 +- .../profiles/Eryone/machine/Thinker X400.json | 2 +- .../FlyingBear/machine/S1/FlyingBear S1.json | 2 +- .../machine/fdm_machine_common.json | 2 +- .../Folgertech/machine/Folgertech FT-5.json | 2 +- .../Folgertech/machine/Folgertech FT-6.json | 2 +- .../Folgertech/machine/Folgertech i3.json | 2 +- .../machine/fdm_folgertech_common.json | 2 +- .../machine/Geeetech A10 M 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A10 M.json | 2 +- .../machine/Geeetech A10 Pro 0.2 nozzle.json | 2 +- .../machine/Geeetech A10 Pro 0.4 nozzle.json | 2 +- .../machine/Geeetech A10 Pro 0.6 nozzle.json | 2 +- .../machine/Geeetech A10 Pro 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A10 Pro.json | 2 +- .../machine/Geeetech A10 T 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A10 T.json | 2 +- .../machine/Geeetech A20 0.2 nozzle.json | 2 +- .../machine/Geeetech A20 0.4 nozzle.json | 2 +- .../machine/Geeetech A20 0.6 nozzle.json | 2 +- .../machine/Geeetech A20 0.8 nozzle.json | 2 +- .../machine/Geeetech A20 M 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A20 M.json | 2 +- .../machine/Geeetech A20 T 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A20 T.json | 2 +- .../Geeetech/machine/Geeetech A20.json | 2 +- .../machine/Geeetech A30 M 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A30 M.json | 2 +- .../machine/Geeetech A30 Pro 0.2 nozzle.json | 2 +- .../machine/Geeetech A30 Pro 0.4 nozzle.json | 2 +- .../machine/Geeetech A30 Pro 0.6 nozzle.json | 2 +- .../machine/Geeetech A30 Pro 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A30 Pro.json | 2 +- .../machine/Geeetech A30 T 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech A30 T.json | 2 +- .../machine/Geeetech M1 0.2 nozzle.json | 2 +- .../machine/Geeetech M1 0.4 nozzle.json | 2 +- .../machine/Geeetech M1 0.6 nozzle.json | 2 +- .../machine/Geeetech M1 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech M1.json | 2 +- .../machine/Geeetech Mizar 0.2 nozzle.json | 2 +- .../machine/Geeetech Mizar 0.4 nozzle.json | 2 +- .../machine/Geeetech Mizar 0.6 nozzle.json | 2 +- .../machine/Geeetech Mizar 0.8 nozzle.json | 2 +- .../machine/Geeetech Mizar M 0.4 nozzle.json | 2 +- .../Geeetech/machine/Geeetech Mizar M.json | 2 +- .../Geeetech Mizar Max 0.2 nozzle.json | 2 +- .../Geeetech Mizar Max 0.4 nozzle.json | 2 +- .../Geeetech Mizar Max 0.6 nozzle.json | 2 +- .../Geeetech Mizar Max 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech Mizar Max.json | 2 +- .../Geeetech Mizar Pro 0.2 nozzle.json | 2 +- .../Geeetech Mizar Pro 0.4 nozzle.json | 2 +- .../Geeetech Mizar Pro 0.6 nozzle.json | 2 +- .../Geeetech Mizar Pro 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech Mizar Pro.json | 2 +- .../machine/Geeetech Mizar S 0.2 nozzle.json | 2 +- .../machine/Geeetech Mizar S 0.4 nozzle.json | 2 +- .../machine/Geeetech Mizar S 0.6 nozzle.json | 2 +- .../machine/Geeetech Mizar S 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech Mizar S.json | 2 +- .../Geeetech/machine/Geeetech Mizar.json | 2 +- .../machine/Geeetech Thunder 0.2 nozzle.json | 2 +- .../machine/Geeetech Thunder 0.4 nozzle.json | 2 +- .../machine/Geeetech Thunder 0.6 nozzle.json | 2 +- .../machine/Geeetech Thunder 0.8 nozzle.json | 2 +- .../Geeetech/machine/Geeetech Thunder.json | 2 +- .../machine/fdm_Geeetech_HS_common.json | 2 +- .../Geeetech/machine/fdm_geeetech_common.json | 2 +- .../machine/fdm_machine_common.json | 2 +- .../machine/HSN/fdm_klipper_common.json | 2 +- .../InfiMech/machine/fdm_klipper_common.json | 2 +- .../machine/Kingroon KLP1 0.4 nozzle.json | 2 +- .../Kingroon/machine/Kingroon KLP1.json | 2 +- .../Kingroon/machine/Kingroon KP3S 3.0.json | 2 +- .../machine/Kingroon KP3S PRO S1.json | 2 +- .../Kingroon KP3S PRO V2 0.4 nozzle.json | 2 +- .../machine/Kingroon KP3S PRO V2.json | 2 +- .../machine/Kingroon KP3S V1 0.4 nozzle.json | 2 +- .../Kingroon/machine/Kingroon KP3S V1.json | 2 +- .../machine/MM BoneKing 0.4 nozzle.json | 2 +- .../MagicMaker/machine/MM BoneKing.json | 2 +- .../machine/MM hj SK 0.4 nozzle.json | 2 +- .../profiles/MagicMaker/machine/MM hj SK.json | 2 +- .../machine/MM hqs SF 0.4 nozzle.json | 2 +- .../MagicMaker/machine/MM hqs SF.json | 2 +- .../machine/MM hqs hj 0.4 nozzle.json | 2 +- .../MagicMaker/machine/MM hqs hj.json | 2 +- .../MagicMaker/machine/MM slb 0.4 nozzle.json | 2 +- .../profiles/MagicMaker/machine/MM slb.json | 2 +- resources/profiles/Mellow/machine/M1.json | 2 +- .../Mellow/machine/fdm_common_M1.json | 2 +- .../Positron3D/machine/The Positron.json | 2 +- .../machine/fdm_common_the_positron.json | 2 +- .../Prusa/machine/Prusa MK4S 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4S 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4S 0.8 nozzle.json | 2 +- .../machine/Prusa MK4S HF0.4 nozzle.json | 2 +- .../machine/Prusa MK4S HF0.8 nozzle.json | 2 +- .../machine/fdm_machine_common_mk4s.json | 2 +- .../Qidi/machine/fdm_qidi_common.json | 2 +- .../Raise3D Pro3 0.4 nozzle (Dual).json | 2 +- .../Raise3D Pro3 0.4 nozzle (Left).json | 2 +- .../Raise3D Pro3 0.4 nozzle (Right).json | 2 +- .../Raise3D Pro3 Plus 0.4 nozzle (Dual).json | 2 +- .../Raise3D Pro3 Plus 0.4 nozzle (Left).json | 2 +- .../Raise3D Pro3 Plus 0.4 nozzle (Right).json | 2 +- .../Raise3D/machine/Raise3D Pro3 Plus.json | 2 +- .../Raise3D/machine/Raise3D Pro3.json | 2 +- .../RolohaunDesign/machine/Rook MK1 LDO.json | 2 +- .../machine/fdm_common_Rook MK1 LDO.json | 2 +- .../machine/Tronxy X5SA 400 0.4 nozzle.json | 2 +- .../Tronxy X5SA 400 Marlin Firmware.json | 2 +- .../machine/UltiMaker 2 0.4 nozzle.json | 2 +- .../UltiMaker/machine/UltiMaker 2.json | 2 +- .../Vivedino/machine/Troodon2Klipper.json | 2 +- .../Vivedino/machine/Troodon2RRF.json | 2 +- .../Vivedino/machine/fdm_klipper_common.json | 2 +- .../Vivedino/machine/fdm_rrf_common.json | 2 +- .../profiles/Voron/machine/Voron 0.1.json | 2 +- .../profiles/Voron/machine/Voron 2.4 250.json | 2 +- .../profiles/Voron/machine/Voron 2.4 300.json | 2 +- .../profiles/Voron/machine/Voron 2.4 350.json | 2 +- .../Voron/machine/Voron Switchwire 250.json | 2 +- .../Voron/machine/Voron Trident 250.json | 2 +- .../Voron/machine/Voron Trident 300.json | 2 +- .../Voron/machine/Voron Trident 350.json | 2 +- .../Voron/machine/fdm_klipper_common.json | 2 +- .../machine/Voxelab Aquila X2 0.4 nozzle.json | 2 +- .../Voxelab/machine/Voxelab Aquila X2.json | 2 +- .../Wanhao/machine/Wanhao D12-300.json | 2 +- .../Wanhao/machine/fdm_wanhao_common.json | 2 +- scripts/orca_extra_profile_check.py | 104 +++++++++++++++++- src/libslic3r/PresetBundle.cpp | 2 +- 178 files changed, 281 insertions(+), 180 deletions(-) diff --git a/resources/profiles/BIQU/machine/BIQU B1.json b/resources/profiles/BIQU/machine/BIQU B1.json index c9cfe75c984..c1347bd054c 100644 --- a/resources/profiles/BIQU/machine/BIQU B1.json +++ b/resources/profiles/BIQU/machine/BIQU B1.json @@ -8,5 +8,5 @@ "bed_model": "biqu_b1_buildplate_model.stl", "bed_texture": "biqu_b1_buildplate_texture.png", "hotend_model": "biqu_b1_hotend.stl", - "default_materials": "BIQU Generic PLA;BIQU Generic PETG;BIQU Generic ABS" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" } diff --git a/resources/profiles/BIQU/machine/BIQU BX.json b/resources/profiles/BIQU/machine/BIQU BX.json index e0d6e3d4707..e301c0d6eb3 100644 --- a/resources/profiles/BIQU/machine/BIQU BX.json +++ b/resources/profiles/BIQU/machine/BIQU BX.json @@ -8,5 +8,5 @@ "bed_model": "biqu_bx_buildplate_model.stl", "bed_texture": "biqu_bx_buildplate_texture.png", "hotend_model": "biqu_bx_hotend.stl", - "default_materials": "BIQU Generic PLA;BIQU Generic PETG;BIQU Generic ABS" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" } diff --git a/resources/profiles/BIQU/machine/BIQU Hurakan (0.4 nozzle).json b/resources/profiles/BIQU/machine/BIQU Hurakan (0.4 nozzle).json index 3fb4230123f..33ae2386841 100644 --- a/resources/profiles/BIQU/machine/BIQU Hurakan (0.4 nozzle).json +++ b/resources/profiles/BIQU/machine/BIQU Hurakan (0.4 nozzle).json @@ -138,7 +138,7 @@ "1" ], "default_filament_profile": [ - "BIQU Generic PLA" + "Generic PLA @System" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/BIQU/machine/BIQU Hurakan.json b/resources/profiles/BIQU/machine/BIQU Hurakan.json index ab3e2c804e4..9032969e295 100644 --- a/resources/profiles/BIQU/machine/BIQU Hurakan.json +++ b/resources/profiles/BIQU/machine/BIQU Hurakan.json @@ -8,5 +8,5 @@ "bed_model": "biqu_hurakan_buildplate_model.stl", "bed_texture": "biqu_hurakan_buildplate_texture.png", "hotend_model": "biqu_hurakan_hotend.stl", - "default_materials": "BIQU Generic PLA;BIQU Generic PETG;BIQU Generic ABS" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" } diff --git a/resources/profiles/BIQU/machine/fdm_biqu_common.json b/resources/profiles/BIQU/machine/fdm_biqu_common.json index ce450400f10..e348f8f4d98 100644 --- a/resources/profiles/BIQU/machine/fdm_biqu_common.json +++ b/resources/profiles/BIQU/machine/fdm_biqu_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "BIQU Generic PLA" + "Generic PLA @System" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/BIQU/machine/fdm_klipper_common.json b/resources/profiles/BIQU/machine/fdm_klipper_common.json index 71b1ace6603..5b32f9618de 100644 --- a/resources/profiles/BIQU/machine/fdm_klipper_common.json +++ b/resources/profiles/BIQU/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "BIQU Generic PLA" + "Generic PLA @System" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/Chuanying/machine/Chuanying X1.json b/resources/profiles/Chuanying/machine/Chuanying X1.json index f45796d4520..a854dcb6547 100644 --- a/resources/profiles/Chuanying/machine/Chuanying X1.json +++ b/resources/profiles/Chuanying/machine/Chuanying X1.json @@ -8,5 +8,5 @@ "bed_model": "chuanying_x1_buildplate_model.STL", "bed_texture": "chuanying_x1_buildplate_texture.png", "hotend_model": "chuanying_x1_hotend.STL", - "default_materials": "Flashforge Generic PETG;Flashforge Generic PLA" + "default_materials": "Chuanying Generic PETG;Chuanying Generic PLA" } diff --git a/resources/profiles/Chuanying/machine/fdm_chuanying_common.json b/resources/profiles/Chuanying/machine/fdm_chuanying_common.json index b5714ff2d41..270647dd8c7 100644 --- a/resources/profiles/Chuanying/machine/fdm_chuanying_common.json +++ b/resources/profiles/Chuanying/machine/fdm_chuanying_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Flashforge Generic PLA" + "Chuanying Generic PLA" ], "default_print_profile": "0.20mm Standard @Chuanying X1", "bed_exclude_area": [ diff --git a/resources/profiles/Chuanying/machine/fdm_klipper_common.json b/resources/profiles/Chuanying/machine/fdm_klipper_common.json index 673135bc4f9..d7558b0e948 100644 --- a/resources/profiles/Chuanying/machine/fdm_klipper_common.json +++ b/resources/profiles/Chuanying/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Flashforge Generic ABS" + "Chuanying Generic ABS" ], "default_print_profile": "0.20mm Standard @Chuanying X1", "bed_exclude_area": [ diff --git a/resources/profiles/Chuanying/machine/fdm_x1_common.json b/resources/profiles/Chuanying/machine/fdm_x1_common.json index d90c39cff58..cfff8c12ea9 100644 --- a/resources/profiles/Chuanying/machine/fdm_x1_common.json +++ b/resources/profiles/Chuanying/machine/fdm_x1_common.json @@ -37,7 +37,7 @@ "single_extruder_multi_material": "0", "change_filament_gcode": "", "machine_pause_gcode": "M25", - "default_filament_profile": [ "Flashforge Generic PLA" ], + "default_filament_profile": [ "Chuanying Generic PLA" ], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-0.2 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json index d7dbb1cddb8..f771cfe5ef9 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json @@ -105,7 +105,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "Co Print PLA" + "CoPrint Generic PLA" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json index a93a312ae7f..c238de36a56 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json @@ -105,7 +105,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "Co Print PLA" + "CoPrint Generic PLA" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json index ab8b3771228..0c4b068fc77 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json @@ -105,7 +105,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "Co Print PLA" + "CoPrint Generic PLA" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json index 5a6858a137f..0e54ac9c836 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json @@ -105,7 +105,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "Co Print PLA" + "CoPrint Generic PLA" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet.json b/resources/profiles/Co Print/machine/Co Print ChromaSet.json index a4126a28df2..c361aeacc4c 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "Co_Print_ChromaSet_buildplate_texture.png", "hotend_model": "", - "default_materials": "Co Print PLA" + "default_materials": "CoPrint Generic PLA" } diff --git a/resources/profiles/Co Print/machine/fdm_coprint_common.json b/resources/profiles/Co Print/machine/fdm_coprint_common.json index 3d13604e332..67c3372693f 100644 --- a/resources/profiles/Co Print/machine/fdm_coprint_common.json +++ b/resources/profiles/Co Print/machine/fdm_coprint_common.json @@ -100,7 +100,7 @@ "machine_start_gcode": "start_print EXTRUDER=[initial_extruder] EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", "machine_end_gcode": "end_print", "default_filament_profile": [ - "Co Print PLA" + "CoPrint Generic PLA" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json index 4f30a0525a8..8868260fa90 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json @@ -1,7 +1,7 @@ { "type": "filament", "setting_id": "GFSA04_CREALITY_00", - "name": "Creality Generic ABS @Hi", + "name": "Creality Generic ABS @Hi-all", "from": "system", "instantiation": "true", "inherits": "Creality Generic ABS", diff --git a/resources/profiles/Custom/machine/fdm_klipper_common.json b/resources/profiles/Custom/machine/fdm_klipper_common.json index af307008b98..9ba6b519c50 100644 --- a/resources/profiles/Custom/machine/fdm_klipper_common.json +++ b/resources/profiles/Custom/machine/fdm_klipper_common.json @@ -46,7 +46,7 @@ "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": ["1"], - "default_filament_profile": ["My Generic ABS"], + "default_filament_profile": ["Generic PLA @System"], "default_print_profile": "0.20mm Standard @MyKlipper", "bed_exclude_area": ["0x0"], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", diff --git a/resources/profiles/Custom/machine/fdm_rrf_common.json b/resources/profiles/Custom/machine/fdm_rrf_common.json index 9dfbfbef031..1c33af04814 100644 --- a/resources/profiles/Custom/machine/fdm_rrf_common.json +++ b/resources/profiles/Custom/machine/fdm_rrf_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "My Generic ABS" + "Generic PLA @System" ], "default_print_profile": "0.20mm Standard @MyRRF", "bed_exclude_area": [ diff --git a/resources/profiles/Custom/machine/fdm_toolchanger_common.json b/resources/profiles/Custom/machine/fdm_toolchanger_common.json index e151cf0d4c7..0f6ca7d606b 100644 --- a/resources/profiles/Custom/machine/fdm_toolchanger_common.json +++ b/resources/profiles/Custom/machine/fdm_toolchanger_common.json @@ -7,7 +7,7 @@ "gcode_flavor": "klipper", "single_extruder_multi_material": "0", "default_filament_profile": [ - "My Generic PLA @MyToolChanger" + "Generic PLA @MyToolChanger" ], "default_print_profile": "0.20mm Standard @MyToolChanger", "max_layer_height": [ diff --git a/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json b/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json index fcfe4d6f720..e739397ba06 100755 --- a/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json +++ b/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json @@ -46,7 +46,7 @@ "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": ["1"], - "default_filament_profile": ["DeltaMaker PLA"], + "default_filament_profile": ["DeltaMaker Generic PLA"], "default_print_profile": "0.20mm Standard @DeltaMaker 2 0.35 nozzle", "bed_exclude_area": ["0x0"], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nSTART_PRINT EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", diff --git a/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json b/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json index d16ef5ea4a6..29f7dcb8a40 100644 --- a/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json +++ b/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_C_buildplate_model.stl", "bed_texture": "", "hotend_model": "", - "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @EC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @EC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @EC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @EC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @EC;Elegoo PLA @EC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @EC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @EC;Elegoo RAPID PETG+ @0.2 nozzle;Elegoo RAPID PETG+ @EC;Elegoo RAPID PLA @0.2 nozzle;Elegoo RAPID PLA @EC;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @EC;Elegoo TPU 95A @EC" + "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @EC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @EC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @EC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @EC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @EC;Elegoo PLA @EC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @EC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @EC;Elegoo RAPID PETG+;;Elegoo RAPID PLA+ @EC;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @EC;Elegoo TPU 95A @EC" } diff --git a/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json b/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json index 999b98354e2..1514f068044 100644 --- a/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json +++ b/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_CC_buildplate_model.stl", "bed_texture": "", "hotend_model": "", - "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC;Elegoo PLA-CF @ECC;Elegoo PLA @ECC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @ECC;Elegoo RAPID PETG+ @0.2 nozzle;Elegoo RAPID PETG+ @ECC;Elegoo RAPID PLA @0.2 nozzle;Elegoo RAPID PLA @ECC;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @ECC;Elegoo TPU 95A @ECC" + "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC;Elegoo PLA-CF @ECC;Elegoo PLA @ECC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @ECC;Elegoo RAPID PETG+;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @ECC;Elegoo TPU 95A @ECC" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json index 978b436ae98..912d1e2c3be 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.2 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json index f7af80c3184..b12cf693170 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.4 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json index 1e1c35823a8..51206a91f53 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.6 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json index 34d51ddb6f1..3b1cce7f5ae 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.8 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json index ba0d8ddba46..c2a4055d98b 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.2 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json index 14186a34a8d..68d3921aada 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.4 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json index 622e1518bc2..113a4058ad9 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.6 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json index 9504347664a..a98e56f4c12 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.8 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json index 0fa4bdef742..4b8be6430b4 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json @@ -9,5 +9,5 @@ "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "bed_exclude_area": ["0x0"], "hotend_model": "", - "default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle" + "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json index 913aaf9f49e..59a277b126d 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.2 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json index 9f84e7856d4..80886659202 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.4 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json index 2fad4a21c91..aff5bc52a51 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.6 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json index 90774fe1c7d..b29c959c031 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.8 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json index 9d60ea7ac93..68ef6ef2b7b 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json @@ -9,5 +9,6 @@ "bed_texture": "elegoo_neptune4plus_buildplate_texture.png", "bed_exclude_area": ["0x0"], "hotend_model": "", - "default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle" + "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json index 6b3bd4c8e33..320f43565e8 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json @@ -50,7 +50,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.2 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json index c4f6baebdb2..86d9c7eff7f 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json @@ -50,7 +50,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.4 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json index 009e72604fc..b5271d46843 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json @@ -50,7 +50,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.6 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json index adb4ec4a763..a6797b1b35e 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json @@ -110,7 +110,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA @0.8 nozzle" + "Elegoo Generic PLA" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json index 2e4b90290f6..6fb800ca791 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json @@ -8,5 +8,6 @@ "bed_model": "elegoo_neptune4pro_buildplate_model.stl", "bed_texture": "elegoo_neptune4pro_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle" + "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json index 4cdf00dd036..e9f34396472 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json @@ -8,5 +8,6 @@ "bed_model": "elegoo_neptune4_buildplate_model.stl", "bed_texture": "elegoo_neptune4_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle" + "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + } diff --git a/resources/profiles/Elegoo/machine/Elegoo OrangeStorm Giga.json b/resources/profiles/Elegoo/machine/Elegoo OrangeStorm Giga.json index 610eabd723b..986ff57a8f0 100644 --- a/resources/profiles/Elegoo/machine/Elegoo OrangeStorm Giga.json +++ b/resources/profiles/Elegoo/machine/Elegoo OrangeStorm Giga.json @@ -8,5 +8,5 @@ "machine_tech": "FFF", "family": "Elegoo", "hotend_model": "", - "default_materials": "Elegoo PLA @Elegoo Giga;Elegoo PETG PRO @Elegoo Giga;Elegoo ABS @Elegoo Giga;Elegoo PLA Silk" + "default_materials": "Elegoo PLA @Elegoo Giga;Elegoo PETG PRO @Elegoo Giga;Elegoo PLA Silk" } \ No newline at end of file diff --git a/resources/profiles/Eryone/machine/Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/machine/Thinker X400 0.4 nozzle.json index f2f7ce92f75..d5ea9d7bdee 100644 --- a/resources/profiles/Eryone/machine/Thinker X400 0.4 nozzle.json +++ b/resources/profiles/Eryone/machine/Thinker X400 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "printer_model": "Thinker X400", "default_print_profile": "0.20mm Standard @Thinker X400", - "default_filament_profile":"Eryone Generic PLA;Eryone Generic ABS;Eryone Generic ASA;Eryone Generic PETG;Eryone Generic Silk PLA;Eryone Generic TPU", + "default_filament_profile":"Generic PLA @System;Generic ABS @System;Generic ASA @System;Generic PETG @System;Generic PLA Silk @System;Generic TPU @System", "auxiliary_fan": "0", "bed_custom_model": "", "bed_custom_texture": "", diff --git a/resources/profiles/Eryone/machine/Thinker X400.json b/resources/profiles/Eryone/machine/Thinker X400.json index 42dd7724c5a..007bba55d64 100644 --- a/resources/profiles/Eryone/machine/Thinker X400.json +++ b/resources/profiles/Eryone/machine/Thinker X400.json @@ -8,5 +8,5 @@ "bed_model": "X400_bed.stl", "bed_texture": "Thinker_texture.png", "hotend_model": "", - "default_materials": "Eryone Generic PLA;Eryone Generic ABS;Eryone Generic ASA;Eryone Generic PETG;Eryone Generic Silk PLA;Eryone Generic TPU" + "default_materials": "Generic PLA @System;Generic ABS @System;Generic ASA @System;Generic PETG @System;Generic PLA Silk @System;Generic TPU @System" } diff --git a/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json b/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json index d17147dae3d..9d10c23ea20 100644 --- a/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json +++ b/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json @@ -8,5 +8,5 @@ "bed_model": "FlyingBear S1-bed.stl", "bed_texture": "FlyingBear S1-texture.png", "hotend_model": "", - "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;InFlyingBearfiMech Generic TPU" + "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;FlyingBear Generic TPU" } \ No newline at end of file diff --git a/resources/profiles/FlyingBear/machine/fdm_machine_common.json b/resources/profiles/FlyingBear/machine/fdm_machine_common.json index e6119fa451f..059612edd80 100644 --- a/resources/profiles/FlyingBear/machine/fdm_machine_common.json +++ b/resources/profiles/FlyingBear/machine/fdm_machine_common.json @@ -16,7 +16,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "FlyingBear PLA" + "FlyingBear Generic PLA" ], "default_print_profile": "0.20mm Standard @FlyingBear Reborn3", "deretraction_speed": [ diff --git a/resources/profiles/Folgertech/machine/Folgertech FT-5.json b/resources/profiles/Folgertech/machine/Folgertech FT-5.json index 24c9d0f2c20..7efbc0272db 100644 --- a/resources/profiles/Folgertech/machine/Folgertech FT-5.json +++ b/resources/profiles/Folgertech/machine/Folgertech FT-5.json @@ -8,5 +8,5 @@ "bed_model": "Folgertech_FT5_buildplate_model.stl", "bed_texture": "Folgertech_FT5_buildplate_texture.png", "hotend_model": "hotend.stl", - "default_materials": "Folgertech Generic PLA;Folgertech Generic PETG;Folgertech Generic ABS;" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;" } diff --git a/resources/profiles/Folgertech/machine/Folgertech FT-6.json b/resources/profiles/Folgertech/machine/Folgertech FT-6.json index a4c730693bb..bbc17bf3e72 100644 --- a/resources/profiles/Folgertech/machine/Folgertech FT-6.json +++ b/resources/profiles/Folgertech/machine/Folgertech FT-6.json @@ -9,5 +9,5 @@ "bed_texture": "Folgertech_FT6_buildplate_texture.png", "hotend_model": "hotend.stl", "extruders_count": "2", - "default_materials": "Folgertech Generic PLA;Folgertech Generic PETG;Folgertech Generic ABS;Folgertech Generic TPU;" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System;" } diff --git a/resources/profiles/Folgertech/machine/Folgertech i3.json b/resources/profiles/Folgertech/machine/Folgertech i3.json index 0dfd567754e..57ad03d1071 100644 --- a/resources/profiles/Folgertech/machine/Folgertech i3.json +++ b/resources/profiles/Folgertech/machine/Folgertech i3.json @@ -8,5 +8,5 @@ "bed_model": "Folgertech_i3_buildplate_model.stl", "bed_texture": "Folgertech_i3_buildplate_texture.png", "hotend_model": "hotend.stl", - "default_materials": "Folgertech Generic PLA;Folgertech Generic PETG;Folgertech Generic ABS;" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;" } diff --git a/resources/profiles/Folgertech/machine/fdm_folgertech_common.json b/resources/profiles/Folgertech/machine/fdm_folgertech_common.json index 940582b7645..0e24a554211 100644 --- a/resources/profiles/Folgertech/machine/fdm_folgertech_common.json +++ b/resources/profiles/Folgertech/machine/fdm_folgertech_common.json @@ -123,7 +123,7 @@ "1" ], "default_filament_profile": [ - "Generic PLA @folgertech" + "Generic PLA @System" ], "default_print_profile": "0.20mm Standard @FT 0.4 Nozzle", "bed_exclude_area": [ diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 M 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A10 M 0.4 nozzle.json index fb4472c0a3e..4bf208a40b7 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 M 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 M 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A10 M", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 M.json b/resources/profiles/Geeetech/machine/Geeetech A10 M.json index f7c779522c0..ec8bf63afb1 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 M.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 M.json @@ -8,5 +8,5 @@ "bed_model": "220x220.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.2 nozzle.json index 109df68705b..ad7ea5a8f84 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A10 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.4 nozzle.json index eda6539f52d..ef94e84cdde 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A10 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.6 nozzle.json index 96e4d6e5aec..911837f911e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A10 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.8 nozzle.json index 1bbfba4063d..5735289835b 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A10 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 Pro.json b/resources/profiles/Geeetech/machine/Geeetech A10 Pro.json index 841ea895eb8..e002529d049 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 Pro.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 Pro.json @@ -8,5 +8,5 @@ "bed_model": "220x220.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 T 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A10 T 0.4 nozzle.json index e1756108191..62b38b8185e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 T 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 T 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A10 T", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A10 T.json b/resources/profiles/Geeetech/machine/Geeetech A10 T.json index b16b3009ea2..e5343684056 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A10 T.json +++ b/resources/profiles/Geeetech/machine/Geeetech A10 T.json @@ -8,5 +8,5 @@ "bed_model": "220x220.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A20 0.2 nozzle.json index bdfde666ae2..7da93521bf7 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A20", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A20 0.4 nozzle.json index f1b2e3411e7..8e0fc0d92af 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A20", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A20 0.6 nozzle.json index 8fdd32c9d9f..f4bfebf4063 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A20", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A20 0.8 nozzle.json index bdb7546609a..59f577f51da 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A20", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 M 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A20 M 0.4 nozzle.json index 141331df753..f085b0fa7dd 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 M 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 M 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A20 M", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 M.json b/resources/profiles/Geeetech/machine/Geeetech A20 M.json index e2254b1317c..71d6a568521 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 M.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 M.json @@ -8,5 +8,5 @@ "bed_model": "250x250.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 T 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A20 T 0.4 nozzle.json index b5853462c86..9730d8ec29c 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 T 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 T 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A20 T", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A20 T.json b/resources/profiles/Geeetech/machine/Geeetech A20 T.json index c6a13232dd8..6c13265f2d2 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20 T.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20 T.json @@ -8,5 +8,5 @@ "bed_model": "250x250.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A20.json b/resources/profiles/Geeetech/machine/Geeetech A20.json index a794b5cdf00..0d9cdc40bb4 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A20.json +++ b/resources/profiles/Geeetech/machine/Geeetech A20.json @@ -8,5 +8,5 @@ "bed_model": "250x250.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 M 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A30 M 0.4 nozzle.json index ddeab974961..8663a7d062e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 M 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 M 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A30 M", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 M.json b/resources/profiles/Geeetech/machine/Geeetech A30 M.json index 67e7537339d..90351c1113b 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 M.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 M.json @@ -8,5 +8,5 @@ "bed_model": "320x320.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.2 nozzle.json index cf58f5394e7..6f95065e58f 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A30 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.4 nozzle.json index fba94da6973..6b5fb9e4f8f 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A30 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.6 nozzle.json index bad39614257..9da10529417 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A30 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.8 nozzle.json index a79809d97bf..6d48c263fdd 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A30 Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 Pro.json b/resources/profiles/Geeetech/machine/Geeetech A30 Pro.json index 554bb6c63d1..6947db35728 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 Pro.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 Pro.json @@ -8,5 +8,5 @@ "bed_model": "320x320.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 T 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech A30 T 0.4 nozzle.json index b0308ceef31..a1a2848b35e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 T 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 T 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech A30 T", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech A30 T.json b/resources/profiles/Geeetech/machine/Geeetech A30 T.json index 37fe99d584a..23d87407aa9 100644 --- a/resources/profiles/Geeetech/machine/Geeetech A30 T.json +++ b/resources/profiles/Geeetech/machine/Geeetech A30 T.json @@ -8,5 +8,5 @@ "bed_model": "320x320.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json index 3e5bb81c6e8..f1868c1c6dd 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech M1", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech M1 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json index 04d69908c7e..1db3babab7f 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech M1", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech M1", diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json index b87332df041..c019c0a6480 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech M1", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech M1 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json index 8b4b0c9490d..a61f2adb197 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech M1", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.44mm Draft @Geeetech M1 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech M1.json b/resources/profiles/Geeetech/machine/Geeetech M1.json index 47e7942e80b..d3dc592a9ac 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1.json @@ -8,5 +8,5 @@ "bed_model": "105x105.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.2 nozzle.json index 505b17c4ef4..856f6e65f88 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.4 nozzle.json index def7505a2c8..07bfc5d0e7e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.6 nozzle.json index e5e3a267630..ce612cb6dad 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.8 nozzle.json index a96a25ab044..1a226553bbf 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar M 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar M 0.4 nozzle.json index b2f0c5dac8a..d035db9eabd 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar M 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar M 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar M", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar M.json b/resources/profiles/Geeetech/machine/Geeetech Mizar M.json index bf81f8a3b75..9837a537967 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar M.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar M.json @@ -8,5 +8,5 @@ "bed_model": "255x255.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.2 nozzle.json index 7d42429b20d..58ab09271bd 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Max", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.4 nozzle.json index b43f94739e7..b73884d57b3 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Max", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.6 nozzle.json index 6c83c269a96..f10449b8ffc 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Max", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.8 nozzle.json index 70f50d2317d..4a813ffb79a 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Max", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Max.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Max.json index 96315ef5c09..1d7eafa302d 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Max.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Max.json @@ -8,5 +8,5 @@ "bed_model": "320x320.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.2 nozzle.json index ba20b2cb214..8fed9ee9c1c 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.4 nozzle.json index b550fe11a85..2c70f4defe4 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.6 nozzle.json index c9013f3c9eb..c4eabd13798 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.8 nozzle.json index aab1d0bca7b..41120c0abf7 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar Pro", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro.json b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro.json index b00291ab556..a9ec8b504c0 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar Pro.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar Pro.json @@ -8,5 +8,5 @@ "bed_model": "220x220.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.2 nozzle.json index d80f6430b8d..d4891b2078a 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.2 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar S", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.4 nozzle.json index a1f829d5a64..70c7cfafba3 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.4 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar S", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.4", "default_print_profile": "0.20mm Standard @Geeetech common", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.6 nozzle.json index 31dc2a90f16..4b141c8fc33 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.6 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar S", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.6", "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.8 nozzle.json index 7136d696d8c..0e1f63386f9 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar S 0.8 nozzle.json @@ -7,7 +7,7 @@ "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Mizar S", "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "printer_variant": "0.8", "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle", diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar S.json b/resources/profiles/Geeetech/machine/Geeetech Mizar S.json index 745e5665ec2..0152d067d2e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar S.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar S.json @@ -8,5 +8,5 @@ "bed_model": "255x255.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech Mizar.json b/resources/profiles/Geeetech/machine/Geeetech Mizar.json index 81793e562c7..021588dab02 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Mizar.json +++ b/resources/profiles/Geeetech/machine/Geeetech Mizar.json @@ -8,5 +8,5 @@ "bed_model": "220x220.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.2 nozzle.json index 176d835251f..eca75e57252 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.2 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Thunder", - "default_filament_profile": ["Generic PLA @Geeetech_FastSpeed"], + "default_filament_profile": ["Generic PLA @System"], "extruder_type": ["Bowden"], "nozzle_diameter": ["0.2"], "printer_variant": "0.2", diff --git a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.4 nozzle.json index 1ba183c30c5..d1167f0d5d9 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Thunder", - "default_filament_profile": ["Generic PLA @Geeetech_FastSpeed"], + "default_filament_profile": ["Generic PLA @System"], "extruder_type": ["Bowden"], "nozzle_diameter": ["0.4"], "printer_variant": "0.4", diff --git a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.6 nozzle.json index 068c95159e3..f39419f4037 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.6 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Thunder", - "default_filament_profile": ["Generic PLA @Geeetech_FastSpeed"], + "default_filament_profile": ["Generic PLA @System"], "extruder_type": ["Bowden"], "nozzle_diameter": ["0.6"], "printer_variant": "0.6", diff --git a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.8 nozzle.json index 5b492961331..fadea44f6af 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Thunder 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech Thunder 0.8 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_geeetech_common", "printer_model": "Geeetech Thunder", - "default_filament_profile": ["Generic PLA @Geeetech_FastSpeed"], + "default_filament_profile": ["Generic PLA @System"], "extruder_type": ["Bowden"], "nozzle_diameter": ["0.8"], "printer_variant": "0.8", diff --git a/resources/profiles/Geeetech/machine/Geeetech Thunder.json b/resources/profiles/Geeetech/machine/Geeetech Thunder.json index 1367b4a768d..65f1822127a 100644 --- a/resources/profiles/Geeetech/machine/Geeetech Thunder.json +++ b/resources/profiles/Geeetech/machine/Geeetech Thunder.json @@ -8,5 +8,5 @@ "bed_model": "250x250.stl", "bed_texture": "Geeetech_buildplate_texture.png", "hotend_model": "", - "default_materials": "Generic PLA @Geeetech_FastSpeed;Generic PLA-CF @Geeetech;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech" + "default_materials": "Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Geeetech/machine/fdm_Geeetech_HS_common.json b/resources/profiles/Geeetech/machine/fdm_Geeetech_HS_common.json index b4dda323fc2..fc727da831a 100644 --- a/resources/profiles/Geeetech/machine/fdm_Geeetech_HS_common.json +++ b/resources/profiles/Geeetech/machine/fdm_Geeetech_HS_common.json @@ -67,7 +67,7 @@ "2" ], "default_filament_profile": [ - "Generic PLA @Geeetech_FastSpeed" + "Generic PLA @System" ], "change_filament_gcode": "", "machine_pause_gcode": "M0", diff --git a/resources/profiles/Geeetech/machine/fdm_geeetech_common.json b/resources/profiles/Geeetech/machine/fdm_geeetech_common.json index 7f21963b543..82020cf268d 100644 --- a/resources/profiles/Geeetech/machine/fdm_geeetech_common.json +++ b/resources/profiles/Geeetech/machine/fdm_geeetech_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Generic PLA @Geeetech" + "Generic PLA @System" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/Ginger Additive/machine/fdm_machine_common.json b/resources/profiles/Ginger Additive/machine/fdm_machine_common.json index c1e54edfbbb..a26021c545e 100644 --- a/resources/profiles/Ginger Additive/machine/fdm_machine_common.json +++ b/resources/profiles/Ginger Additive/machine/fdm_machine_common.json @@ -14,7 +14,7 @@ "change_filament_gcode": "", "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", - "default_filament_profile": ["My Generic ABS"], + "default_filament_profile": ["Generic PLA @System"], "default_print_profile": "0.20mm Standard @MyKlipper", "deretraction_speed": ["30"], "disable_m73": "0", diff --git a/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json b/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json index 3cd0c7ec030..7cfdb6a4bb9 100644 --- a/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json +++ b/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json @@ -16,7 +16,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "InfiMech PLA" + "InfiMech Generic PLA" ], "default_print_profile": "0.20mm Standard @InfiMech TX", "deretraction_speed": [ diff --git a/resources/profiles/InfiMech/machine/fdm_klipper_common.json b/resources/profiles/InfiMech/machine/fdm_klipper_common.json index 9d09be715d5..59a7eb869ee 100644 --- a/resources/profiles/InfiMech/machine/fdm_klipper_common.json +++ b/resources/profiles/InfiMech/machine/fdm_klipper_common.json @@ -16,7 +16,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "InfiMech PLA" + "InfiMech Generic PLA" ], "default_print_profile": "0.20mm Standard @InfiMech TX", "deretraction_speed": [ diff --git a/resources/profiles/Kingroon/machine/Kingroon KLP1 0.4 nozzle.json b/resources/profiles/Kingroon/machine/Kingroon KLP1 0.4 nozzle.json index 84d12a50c14..69b774ddb6f 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KLP1 0.4 nozzle.json +++ b/resources/profiles/Kingroon/machine/Kingroon KLP1 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Kingroon KLP1", - "default_filament_profile": "Kingroon Generic PLA", + "default_filament_profile": "Generic PLA @System", "default_print_profile": "0.20mm Standard @Kingroon KLP1", "thumbnails": [ "100x100" ], diff --git a/resources/profiles/Kingroon/machine/Kingroon KLP1.json b/resources/profiles/Kingroon/machine/Kingroon KLP1.json index 2e0964289d0..a937760b960 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KLP1.json +++ b/resources/profiles/Kingroon/machine/Kingroon KLP1.json @@ -6,5 +6,5 @@ "machine_tech": "FFF", "family": "Kingroon", "hotend_model": "", - "default_materials": "Kingroon Generic ABS;Kingroon Generic PLA;Kingroon Generic PLA-CF;Kingroon Generic PETG;Kingroon Generic TPU;Kingroon Generic ASA;Kingroon Generic PC;Kingroon Generic PVA;Kingroon Generic PA;Kingroon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Kingroon/machine/Kingroon KP3S 3.0.json b/resources/profiles/Kingroon/machine/Kingroon KP3S 3.0.json index 8b5b020dac9..2b1e1e378fb 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KP3S 3.0.json +++ b/resources/profiles/Kingroon/machine/Kingroon KP3S 3.0.json @@ -8,5 +8,5 @@ "bed_model": "kp3s_bed.stl", "bed_texture": "Kingroon_buildplate.png", "hotend_model": "", - "default_materials": "Kingroon Generic ABS;Kingroon Generic PLA;Kingroon Generic PLA-CF;Kingroon Generic PETG;Kingroon Generic TPU;Kingroon Generic ASA;Kingroon Generic PC;Kingroon Generic PVA;Kingroon Generic PA;Kingroon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Kingroon/machine/Kingroon KP3S PRO S1.json b/resources/profiles/Kingroon/machine/Kingroon KP3S PRO S1.json index 7a3b2c62ee5..b138db442e4 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KP3S PRO S1.json +++ b/resources/profiles/Kingroon/machine/Kingroon KP3S PRO S1.json @@ -8,5 +8,5 @@ "bed_model": "kp3s_bed.stl", "bed_texture": "Kingroon_buildplate.png", "hotend_model": "", - "default_materials": "Kingroon Generic ABS;Kingroon Generic PLA;Kingroon Generic PLA-CF;Kingroon Generic PETG;Kingroon Generic TPU;Kingroon Generic ASA;Kingroon Generic PC;Kingroon Generic PVA;Kingroon Generic PA;Kingroon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2 0.4 nozzle.json b/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2 0.4 nozzle.json index f9b9d316ae8..864129020b3 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2 0.4 nozzle.json +++ b/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Kingroon KP3S PRO V2", - "default_filament_profile": "Kingroon Generic PLA", + "default_filament_profile": "Generic PLA @System", "default_print_profile": "0.20mm Standard @Kingroon KP3S PRO V2", "bed_exclude_area": ["0x0"], "extruder_colour": ["#FCE94F"], diff --git a/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2.json b/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2.json index 4bd64acbac4..aa89a6e33cd 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2.json +++ b/resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2.json @@ -8,5 +8,5 @@ "bed_model": "kp3s_bed.stl", "bed_texture": "Kingroon_buildplate.png", "hotend_model": "", - "default_materials": "Kingroon Generic ABS;Kingroon Generic PLA;Kingroon Generic PLA-CF;Kingroon Generic PETG;Kingroon Generic TPU;Kingroon Generic ASA;Kingroon Generic PC;Kingroon Generic PVA;Kingroon Generic PA;Kingroon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Kingroon/machine/Kingroon KP3S V1 0.4 nozzle.json b/resources/profiles/Kingroon/machine/Kingroon KP3S V1 0.4 nozzle.json index e836c3e08eb..bad9fbdfbf2 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KP3S V1 0.4 nozzle.json +++ b/resources/profiles/Kingroon/machine/Kingroon KP3S V1 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Kingroon KP3S V1", - "default_filament_profile": "Kingroon Generic PLA", + "default_filament_profile": "Generic PLA @System", "default_print_profile": "0.20mm Standard @Kingroon KP3S V1", "thumbnails": [ "100x100" ], diff --git a/resources/profiles/Kingroon/machine/Kingroon KP3S V1.json b/resources/profiles/Kingroon/machine/Kingroon KP3S V1.json index 9b92571019f..c9e745bf92c 100644 --- a/resources/profiles/Kingroon/machine/Kingroon KP3S V1.json +++ b/resources/profiles/Kingroon/machine/Kingroon KP3S V1.json @@ -6,5 +6,5 @@ "machine_tech": "FFF", "family": "Kingroon", "hotend_model": "", - "default_materials": "Kingroon Generic ABS;Kingroon Generic PLA;Kingroon Generic PLA-CF;Kingroon Generic PETG;Kingroon Generic TPU;Kingroon Generic ASA;Kingroon Generic PC;Kingroon Generic PVA;Kingroon Generic PA;Kingroon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json index 4bc95f80918..7315b9924d5 100644 --- a/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM BoneKing 0.4 nozzle.json @@ -90,7 +90,7 @@ "Spiral Lift" ], "default_filament_profile": [ - "MM Generic PLA" + "Generic PLA @System" ], "is_custom_defined": "0", "machine_max_acceleration_e": [ diff --git a/resources/profiles/MagicMaker/machine/MM BoneKing.json b/resources/profiles/MagicMaker/machine/MM BoneKing.json index 31167c41d6e..54b561f3342 100644 --- a/resources/profiles/MagicMaker/machine/MM BoneKing.json +++ b/resources/profiles/MagicMaker/machine/MM BoneKing.json @@ -8,5 +8,5 @@ "bed_model": "310_buildplate_model.stl", "bed_texture": "MM_buildplate_texture.png", "hotend_model": "MM_hotend.stl", - "default_materials": "MM Generic PLA;MM Generic PETG;MM Generic ABS;MM Generic TPU;MM Generic PC;MM Generic PA;MM Generic PEEK" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System;Generic PC @System;Generic PA @System;MM Generic PEEK" } diff --git a/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json index 0f22e90e471..45d8bbdcc7d 100644 --- a/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM hj SK 0.4 nozzle.json @@ -132,7 +132,7 @@ "Spiral Lift" ], "default_filament_profile": [ - "MM Generic PLA" + "Generic PLA @System" ], "version": "2.0.0.0" } \ No newline at end of file diff --git a/resources/profiles/MagicMaker/machine/MM hj SK.json b/resources/profiles/MagicMaker/machine/MM hj SK.json index 1cefdfb9061..a2237df0245 100644 --- a/resources/profiles/MagicMaker/machine/MM hj SK.json +++ b/resources/profiles/MagicMaker/machine/MM hj SK.json @@ -8,5 +8,5 @@ "bed_model": "220210_buildplate_model.stl", "bed_texture": "MM_buildplate_texture.png", "hotend_model": "MM_hotend.stl", - "default_materials": "MM Generic PLA;MM Generic PETG;MM Generic ABS;MM Generic TPU" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json index 17cfbf1c1d5..299b558df74 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM hqs SF 0.4 nozzle.json @@ -131,7 +131,7 @@ "Spiral Lift" ], "default_filament_profile": [ - "MM Generic PLA" + "Generic PLA @System" ], "version": "2.0.0.0" } \ No newline at end of file diff --git a/resources/profiles/MagicMaker/machine/MM hqs SF.json b/resources/profiles/MagicMaker/machine/MM hqs SF.json index e3240b22638..d5b65e55bdc 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs SF.json +++ b/resources/profiles/MagicMaker/machine/MM hqs SF.json @@ -8,5 +8,5 @@ "bed_model": "220210_buildplate_model.stl", "bed_texture": "MM_buildplate_texture.png", "hotend_model": "MM_hotend.stl", - "default_materials": "MM Generic PLA;MM Generic PETG;MM Generic ABS;MM Generic TPU" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json index 95a623649b4..c968ba6b443 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM hqs hj 0.4 nozzle.json @@ -123,7 +123,7 @@ "220x220" ], "default_filament_profile": [ - "MM Generic PLA" + "Generic PLA @System" ], "version": "2.0.0.0" } \ No newline at end of file diff --git a/resources/profiles/MagicMaker/machine/MM hqs hj.json b/resources/profiles/MagicMaker/machine/MM hqs hj.json index aac0ee20cba..adb47ff3018 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs hj.json +++ b/resources/profiles/MagicMaker/machine/MM hqs hj.json @@ -8,5 +8,5 @@ "bed_model": "220210_buildplate_model.stl", "bed_texture": "MM_buildplate_texture.png", "hotend_model": "MM_hotend.stl", - "default_materials": "MM Generic PLA;MM Generic PETG;MM Generic ABS;MM Generic TPU" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json b/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json index c6e32b7e0cf..e6b4d0377f7 100644 --- a/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json +++ b/resources/profiles/MagicMaker/machine/MM slb 0.4 nozzle.json @@ -62,7 +62,7 @@ "25" ], "default_filament_profile": [ - "MM Generic PLA" + "Generic PLA @System" ], "is_custom_defined": "0", "machine_end_gcode": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 X0\nG0 Y120\nG1 E-10 F9000\nM84 ;steppers off\nG90 ;absolute positioning\nPRINT_END", diff --git a/resources/profiles/MagicMaker/machine/MM slb.json b/resources/profiles/MagicMaker/machine/MM slb.json index 83f4b574991..72a17a073e9 100644 --- a/resources/profiles/MagicMaker/machine/MM slb.json +++ b/resources/profiles/MagicMaker/machine/MM slb.json @@ -8,5 +8,5 @@ "bed_model": "125_buildplate_model.stl", "bed_texture": "MM_buildplate_texture.png", "hotend_model": "MM_hotend.stl", - "default_materials": "MM Generic PLA;MM Generic PETG;MM Generic ABS;MM Generic TPU" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Mellow/machine/M1.json b/resources/profiles/Mellow/machine/M1.json index eb7547b3a8c..ee633b68f39 100644 --- a/resources/profiles/Mellow/machine/M1.json +++ b/resources/profiles/Mellow/machine/M1.json @@ -8,5 +8,5 @@ "bed_model": "M1_bed_model.stl", "bed_texture": "mellow_bed_texture.png", "hotend_model": "", - "default_materials": "Generic ABS @M1;Generic PLA @M1;Generic PLA-CF @M1;Generic PETG @M1;Generic TPU @M1;Generic ASA @M1;Generic PC @M1;Generic PVA @M1;Generic PA @M1;Generic PA-CF @M1" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Mellow/machine/fdm_common_M1.json b/resources/profiles/Mellow/machine/fdm_common_M1.json index ac5a32f7440..26361d1a5ab 100644 --- a/resources/profiles/Mellow/machine/fdm_common_M1.json +++ b/resources/profiles/Mellow/machine/fdm_common_M1.json @@ -46,7 +46,7 @@ "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": ["1"], - "default_filament_profile": ["Generic ABS @M1"], + "default_filament_profile": ["Generic PLA @System"], "default_print_profile": "0.20mm Standard @M1", "bed_exclude_area": ["0x0"], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", diff --git a/resources/profiles/Positron3D/machine/The Positron.json b/resources/profiles/Positron3D/machine/The Positron.json index 9902c9b9483..275c0957b4d 100644 --- a/resources/profiles/Positron3D/machine/The Positron.json +++ b/resources/profiles/Positron3D/machine/The Positron.json @@ -8,5 +8,5 @@ "bed_model": "ThePositron_bed_model.stl", "bed_texture": "ThePositron_bed_texture.svg", "hotend_model": "", - "default_materials": "Positron Generic ABS;Positron Generic PLA;Positron Generic PLA-CF;Positron Generic PETG;Positron Generic TPU;Positron Generic ASA;Positron Generic PC;Positron Generic PVA;Positron Generic PA;Positron Generic PA-CF" + "default_materials": "Generic PLA @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Positron3D/machine/fdm_common_the_positron.json b/resources/profiles/Positron3D/machine/fdm_common_the_positron.json index 3c3a74959b7..2b4119e49d8 100644 --- a/resources/profiles/Positron3D/machine/fdm_common_the_positron.json +++ b/resources/profiles/Positron3D/machine/fdm_common_the_positron.json @@ -46,7 +46,7 @@ "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": ["1"], - "default_filament_profile": ["Positron Generic ABS"], + "default_filament_profile": ["Generic PLA @System"], "default_print_profile": "0.20mm Standard @The Positron", "bed_exclude_area": ["0x0"], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json index 7e4eb97553a..8c4e13c1e6f 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json @@ -1,5 +1,5 @@ { - "default_filament_profile": "Prusament PLA @MK4S", + "default_filament_profile": "Prusa Generic PLA @MK4S", "default_print_profile": "0.20mm SPEED @MK4S 0.4", "from": "system", "inherits": "fdm_machine_common_mk4s", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json index 327807c5eb1..948e13c3c16 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json @@ -1,5 +1,5 @@ { - "default_filament_profile": "Prusament PLA @MK4S 0.6", + "default_filament_profile": "Prusa Generic PLA @MK4S 0.6", "default_print_profile": "0.25mm SPEED @MK4S 0.6", "from": "system", "inherits": "Prusa MK4S 0.4 nozzle", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json index cb50b1464e8..ecbcad08f03 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json @@ -1,5 +1,5 @@ { - "default_filament_profile": "Prusament PLA @MK4S 0.8", + "default_filament_profile": "Prusa Generic PLA @MK4S 0.8", "default_print_profile": "0.40mm QUALITY @MK4S 0.8", "deretraction_speed": "15", "from": "system", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json index 24aa1db4dd5..caedc3b561a 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json @@ -1,5 +1,5 @@ { - "default_filament_profile": "Prusament PLA @HF0.4", + "default_filament_profile": "Prusa Generic PLA @MK4S HF0.4", "default_print_profile": "0.20mm SPEED @MK4S HF0.4", "from": "system", "inherits": "Prusa MK4S 0.4 nozzle", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json index 29ce071ddb1..55afc653a9c 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json @@ -1,5 +1,5 @@ { - "default_filament_profile": "Prusament PLA @HF0.8", + "default_filament_profile": "Prusa Generic PLA @MK4S HF0.8", "default_print_profile": "0.40mm STRUCTURAL @MK4S HF0.8", "deretraction_speed": "15", "from": "system", diff --git a/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json b/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json index 5e8cf14f23d..2aa11047919 100644 --- a/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json +++ b/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json @@ -5,7 +5,7 @@ "change_filament_gcode": [ "" ], - "default_filament_profile": "Prusament PLA @PGIS", + "default_filament_profile": "Prusa Generic PLA @MK4S", "default_print_profile": "0.20mm SPEED @MK4IS 0.4", "deretraction_speed": "25", "extruder_clearance_height_to_lid": "220", diff --git a/resources/profiles/Qidi/machine/fdm_qidi_common.json b/resources/profiles/Qidi/machine/fdm_qidi_common.json index 412423dc3c8..57cb79872c0 100644 --- a/resources/profiles/Qidi/machine/fdm_qidi_common.json +++ b/resources/profiles/Qidi/machine/fdm_qidi_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Generic PLA @QIDI" + "Qidi Generic PLA" ], "default_print_profile": "0.20mm Standard @QIDI", "bed_exclude_area": [ diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json index 5ad72854312..8c92c16a6f9 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json @@ -141,7 +141,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "; pause print\nM2000", "default_filament_profile": [ - "Raise3D Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": ";Bounding Box: {digits(first_layer_print_min[0],0,2)} {if(first_layer_print_max[0]>300)}{300}{else}{digits(first_layer_print_max[0],0,2)}{endif} {digits(first_layer_print_min[1],0,2)} {if(first_layer_print_max[1]>300)}{300}{else}{digits(first_layer_print_max[1],0,2)}{endif}\n\nM104 T0 S{nozzle_temperature_initial_layer[0] - 30} ; raise extruder one temp\nM104 T1 S{nozzle_temperature_initial_layer[1] - 30} ; raise extruder two temp\nM190 S{max(bed_temperature_initial_layer_single, bed_temperature_initial_layer_single)} ; wait for bed temp\nM109 T1 S{nozzle_temperature_initial_layer[1]} ; wait for extruder two temp\nT1\nG21\nG90\nM82\nM107\nM106 P2 S0\nG1 Z0.3 F500\nG92 E0\nG1 Z0.3 F400\nG1 X60 Y{random(2,8)} F1000\nG1 X110 Y{random(2,8)} E30 F200\nG1 Z0.3 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 X170 F2000 ; move away from purge line\nM104 T1 S{nozzle_temperature_initial_layer[1] - 30} ; lower extruder two temp\nM109 T0 S{nozzle_temperature_initial_layer[0]} ; wait for extruder one temp\nT0\nG1 Z0.3 F400\nG1 X220 Y{random(2,8)} F1000\nG1 X270 Y{random(2,8)} E18 F200\nG1 Z5 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 Y30 F2000 ; move away from purge line\nM104 T0 S{nozzle_temperature_initial_layer[1] - 30} ; lower extruder one temp\nG92 E0\nG1 X{(first_layer_print_max[0] + first_layer_print_min[0])/2} Y{(first_layer_print_max[1] + first_layer_print_min[1])/2} Z{initial_layer_print_height} ; move to center of print\nM117 Printing...", "machine_end_gcode": "M221 T0 S100\nM104 S0\nM140 S0\nM107\nM106 P2 S0\nG91\nG1 E-1 F300\nG1 Z+0.5 E-5 X-20 Y-20 F9000.00\nG28 X0 Y0\nM84\nG90", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json index b112eea0d58..f26123d1b9e 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json @@ -141,7 +141,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "; pause print\nM2000", "default_filament_profile": [ - "Raise3D Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": ";Bounding Box: {digits(first_layer_print_min[0],0,2)} {if(first_layer_print_max[0]>300)}{300}{else}{digits(first_layer_print_max[0],0,2)}{endif} {digits(first_layer_print_min[1],0,2)} {if(first_layer_print_max[1]>300)}{300}{else}{digits(first_layer_print_max[1],0,2)}{endif}\n\nM104 T0 S{nozzle_temperature_initial_layer[0] - 20} ; raise left extruder temp\nM140 S[bed_temperature_initial_layer_single] ; raise bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 T0 S{nozzle_temperature_initial_layer[0] - 20} ; wait for left extruder temp\nM104 T0 S[nozzle_temperature_initial_layer] ; set left extruder temp\nM109 T0 S[nozzle_temperature_initial_layer] ; wait for left extruder temp\nT0\nG21\nG90\nM82\nM107\nM106 P2 S0\nG1 Z0.3 F500\nG92 E0\nG1 Z0.3 F400\nG1 X100 Y{random(2,8)} F1000\nG1 X170 Y{random(2,8)} E15 F200\nG1 Z5 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 Y30 F2000 ; move away from purge line\nG1 X{(first_layer_print_max[0] + first_layer_print_min[0])/2} Y{(first_layer_print_max[1] + first_layer_print_min[1])/2} Z{initial_layer_print_height} ; move to center of print\nM117 Printing...\nM1001", "machine_end_gcode": "M1002\nM221 T0 S100\nM104 S0\nM140 S0\nM107\nM106 P2 S0\nG91\nG1 E-1 F300\nG1 Z+0.5 E-5 X-20 Y-20 F9000.00\nG28 X0 Y0\nM84\nG90\n", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json index a1c85c44b35..0c7753250df 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json @@ -141,7 +141,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "; pause print\nM2000", "default_filament_profile": [ - "Raise3D Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": ";Bounding Box: {digits(first_layer_print_min[0],0,2)} {if(first_layer_print_max[0]>300)}{300}{else}{digits(first_layer_print_max[0],0,2)}{endif} {digits(first_layer_print_min[1],0,2)} {if(first_layer_print_max[1]>300)}{300}{else}{digits(first_layer_print_max[1],0,2)}{endif}\n\nM104 T1 S{nozzle_temperature_initial_layer[1] - 20} ; raise right extruder temp\nM140 S[bed_temperature_initial_layer_single] ; raise bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 T1 S{nozzle_temperature_initial_layer[1] - 20} ; wait for right extruder temp\nM104 T1 S{nozzle_temperature_initial_layer[1]} ; set right extruder temp\nM109 T1 S{nozzle_temperature_initial_layer[1]} ; wait for right extruder temp\nT1\nG21\nG90\nM82\nM107\nM106 P2 S0\nG1 Z0.3 F500\nG92 E0\nG1 Z0.3 F400\nG1 X100 Y{random(2,8)} F1000\nG1 X170 Y{random(2,8)} E15 F200\nG1 Z5 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 Y30 F2000 ; move away from purge line\nG1 X{(first_layer_print_max[0] + first_layer_print_min[0])/2} Y{(first_layer_print_max[1] + first_layer_print_min[1])/2} Z{initial_layer_print_height} ; move to center of print\nM117 Printing...\nM1001", "machine_end_gcode": "M1002\nM221 T0 S100\nM104 S0\nM140 S0\nM107\nM106 P2 S0\nG91\nG1 E-1 F300\nG1 Z+0.5 E-5 X-20 Y-20 F9000.00\nG28 X0 Y0\nM84\nG90\nM106 P2 S0\n", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json index dd127639e6a..4b38b5277ac 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json @@ -141,7 +141,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "; pause print\nM2000", "default_filament_profile": [ - "Raise3D Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": ";Bounding Box: {digits(first_layer_print_min[0],0,2)} {if(first_layer_print_max[0]>300)}{300}{else}{digits(first_layer_print_max[0],0,2)}{endif} {digits(first_layer_print_min[1],0,2)} {if(first_layer_print_max[1]>300)}{300}{else}{digits(first_layer_print_max[1],0,2)}{endif}\n\nM104 T0 S{nozzle_temperature_initial_layer[0] - 30} ; raise extruder one temp\nM104 T1 S{nozzle_temperature_initial_layer[1] - 30} ; raise extruder two temp\nM190 S{max(bed_temperature_initial_layer_single, bed_temperature_initial_layer_single)} ; wait for bed temp\nM109 T1 S{nozzle_temperature_initial_layer[1]} ; wait for extruder two temp\nT1\nG21\nG90\nM82\nM107\nM106 P2 S0\nG1 Z0.3 F500\nG92 E0\nG1 Z0.3 F400\nG1 X60 Y{random(2,8)} F1000\nG1 X110 Y{random(2,8)} E30 F200\nG1 Z0.3 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 X170 F2000 ; move away from purge line\nM104 T1 S{nozzle_temperature_initial_layer[1] - 30} ; lower extruder two temp\nM109 T0 S{nozzle_temperature_initial_layer[0]} ; wait for extruder one temp\nT0\nG1 Z0.3 F400\nG1 X220 Y{random(2,8)} F1000\nG1 X270 Y{random(2,8)} E18 F200\nG1 Z5 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 Y30 F2000 ; move away from purge line\nM104 T0 S{nozzle_temperature_initial_layer[1] - 30} ; lower extruder one temp\nG92 E0\nG1 X{(first_layer_print_max[0] + first_layer_print_min[0])/2} Y{(first_layer_print_max[1] + first_layer_print_min[1])/2} Z{initial_layer_print_height} ; move to center of print\nM117 Printing...", "machine_end_gcode": "M221 T0 S100\nM104 S0\nM140 S0\nM107\nM106 P2 S0\nG91\nG1 E-1 F300\nG1 Z+0.5 E-5 X-20 Y-20 F9000.00\nG28 X0 Y0\nM84\nG90", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json index bdc1583d90e..bb7873ff44c 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json @@ -141,7 +141,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "; pause print\nM2000", "default_filament_profile": [ - "Raise3D Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": ";Bounding Box: {digits(first_layer_print_min[0],0,2)} {if(first_layer_print_max[0]>300)}{300}{else}{digits(first_layer_print_max[0],0,2)}{endif} {digits(first_layer_print_min[1],0,2)} {if(first_layer_print_max[1]>300)}{300}{else}{digits(first_layer_print_max[1],0,2)}{endif}\n\nM104 T0 S{nozzle_temperature_initial_layer[0] - 20} ; raise left extruder temp\nM140 S[bed_temperature_initial_layer_single] ; raise bed temp\nM190 S{bed_temperature_initial_layer_single} ; wait for bed temp\nM109 T0 S{nozzle_temperature_initial_layer[0] - 20} ; wait for left extruder temp\nM104 T0 S[nozzle_temperature_initial_layer] ; set left extruder temp\nM109 T0 S[nozzle_temperature_initial_layer] ; wait for left extruder temp\nT0\nG21\nG90\nM82\nM107\nM106 P2 S0\nG1 Z0.3 F500\nG92 E0\nG1 Z0.3 F400\nG1 X100 Y{random(2,8)} F1000\nG1 X170 Y{random(2,8)} E15 F200\nG1 Z5 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 Y30 F2000 ; move away from purge line\nG1 X{(first_layer_print_max[0] + first_layer_print_min[0])/2} Y{(first_layer_print_max[1] + first_layer_print_min[1])/2} Z{initial_layer_print_height} ; move to center of print\nM117 Printing...\nM1001", "machine_end_gcode": "M1002\nM221 T0 S100\nM104 S0\nM140 S0\nM107\nM106 P2 S0\nG91\nG1 E-1 F300\nG1 Z+0.5 E-5 X-20 Y-20 F9000.00\nG28 X0 Y0\nM84\nG90\n", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json index a341ff76f80..10f9130146e 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json @@ -141,7 +141,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "; pause print\nM2000", "default_filament_profile": [ - "Raise3D Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": ";Bounding Box: {digits(first_layer_print_min[0],0,2)} {if(first_layer_print_max[0]>300)}{300}{else}{digits(first_layer_print_max[0],0,2)}{endif} {digits(first_layer_print_min[1],0,2)} {if(first_layer_print_max[1]>300)}{300}{else}{digits(first_layer_print_max[1],0,2)}{endif}\n\nM104 T1 S{nozzle_temperature_initial_layer[1] - 20} ; raise right extruder temp\nM140 S[bed_temperature_initial_layer_single] ; raise bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 T1 S{nozzle_temperature_initial_layer[1] - 20} ; wait for right extruder temp\nM104 T1 S{nozzle_temperature_initial_layer[1]} ; set right extruder temp\nM109 T1 S{nozzle_temperature_initial_layer[1]} ; wait for right extruder temp\nT1\nG21\nG90\nM82\nM107\nM106 P2 S0\nG1 Z0.3 F500\nG92 E0\nG1 Z0.3 F400\nG1 X100 Y{random(2,8)} F1000\nG1 X170 Y{random(2,8)} E15 F200\nG1 Z5 E15 F200\nG92 E0\nG1 Z10 F2000 ; move up from purge line\nG1 Y30 F2000 ; move away from purge line\nG1 X{(first_layer_print_max[0] + first_layer_print_min[0])/2} Y{(first_layer_print_max[1] + first_layer_print_min[1])/2} Z{initial_layer_print_height} ; move to center of print\nM117 Printing...\nM1001", "machine_end_gcode": "M1002\nM221 T0 S100\nM104 S0\nM140 S0\nM107\nM106 P2 S0\nG91\nG1 E-1 F300\nG1 Z+0.5 E-5 X-20 Y-20 F9000.00\nG28 X0 Y0\nM84\nG90\nM106 P2 S0\n", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json index 6606ec0e624..00eb1f92ac0 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json @@ -8,5 +8,5 @@ "bed_model": "raise3d_pro3plus_buildplate_model.stl", "bed_texture": "raise3d_pro3plus_buildplate_texture.png", "hotend_model": "", - "default_materials": "Raise3D Generic ASA;Raise3D Generic PETG;Raise3D Generic PLA;Raise3D Generic PVA;Raise3D Generic TPU" + "default_materials": "Generic ASA @System;Generic PETG @System;Generic PLA @System;Generic PVA @System;Generic TPU @System" } diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3.json b/resources/profiles/Raise3D/machine/Raise3D Pro3.json index bcfc8bc7697..263a8fbe3e9 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3.json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3.json @@ -8,5 +8,5 @@ "bed_model": "raise3d_pro3_buildplate_model.stl", "bed_texture": "raise3d_pro3_buildplate_texture.png", "hotend_model": "", - "default_materials": "Raise3D Generic ASA;Raise3D Generic PETG;Raise3D Generic PLA;Raise3D Generic PVA;Raise3D Generic TPU" + "default_materials": "Generic ASA @System;Generic PETG @System;Generic PLA @System;Generic PVA @System;Generic TPU @System" } diff --git a/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json b/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json index a443790e58f..f0fd11c069a 100644 --- a/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json +++ b/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "bedtexture-rook-green-120.png", "hotend_model": "", - "default_materials": "Generic ABS @Rook MK1 LDO;Generic PLA @Rook MK1 LDO;Generic PLA-CF @Rook MK1 LDO;Generic PETG @Rook MK1 LDO;Generic TPU @Rook MK1 LDO;Generic ASA @Rook MK1 LDO;Generic PC @Rook MK1 LDO;Generic PVA @Rook MK1 LDO;Generic PA @Rook MK1 LDO;Generic PA-CF @Rook MK1 LDO" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/RolohaunDesign/machine/fdm_common_Rook MK1 LDO.json b/resources/profiles/RolohaunDesign/machine/fdm_common_Rook MK1 LDO.json index 6246e9e8a8c..96e0e2bd6c5 100644 --- a/resources/profiles/RolohaunDesign/machine/fdm_common_Rook MK1 LDO.json +++ b/resources/profiles/RolohaunDesign/machine/fdm_common_Rook MK1 LDO.json @@ -46,7 +46,7 @@ "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": ["1"], - "default_filament_profile": ["Generic ABS @Rook MK1 LDO"], + "default_filament_profile": ["Generic PLA @System"], "default_print_profile": "0.20mm Standard @Rook MK1 LDO", "bed_exclude_area": ["0x0"], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", diff --git a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json index 09f5c85d6a9..2782ad06ee3 100644 --- a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json +++ b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_machine_common", "printer_model": "Tronxy X5SA 400 Marlin Firmware", - "default_filament_profile": "Tronxy Generic PLA", + "default_filament_profile": "Generic PLA @System", "default_print_profile": "0.20mm Standard @Tronxy", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json index 2a599797385..f5d5cae440e 100644 --- a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json +++ b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "tronxy_logo.png", "hotend_model": "", - "default_materials": "Tronxy Generic ABS;Tronxy Generic PLA;Tronxy Generic PLA-CF;Tronxy Generic PETG;Tronxy Generic TPU;Tronxy Generic ASA;Tronxy Generic PC;Tronxy Generic PVA;Tronxy Generic PA;Tronxy Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } \ No newline at end of file diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json index 70f54edf1bd..069735c82b3 100644 --- a/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json @@ -107,7 +107,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "UltiMaker Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": "; # # # # # # START Header\nG21; metric values\nG90; absolute positioning\nM82 ; set extruder to absolute mode\nM107; start with the fan off\n\nM140 S[bed_temperature_initial_layer_single]; start bed heating\n\nG28 X0 Y0 Z0; move X/Y/Z to endstops\nG1 X1 Y6 F15000; move X/Y to start position\nG1 Z35 F9000; move Z to start position\n\n; Wait for bed and nozzle temperatures\nM190 S{hot_plate_temp_initial_layer[0] - 5}; wait for bed temperature - 5\nM140 S[bed_temperature_initial_layer_single]; continue bed heating\nM109 S[nozzle_temperature_initial_layer]; wait for nozzle temperature\n\n; Purge and prime\nM83; set extruder to relative mode\nG92 E0; reset extrusion distance\nG0 X0 Y1 F10000\nG1 F150 E20 ; compress the bowden tube\nG1 E-8 F1200\nG0 X30 Y1 F5000\nG0 F1200 Z{initial_layer_print_height/2}; Cut the connection to priming blob\nG0 X100 F10000; disconnect with the prime blob\nG0 X50; Avoid the metal clip holding the Ultimaker glass plate\nG0 Z0.2 F720\nG1 E8 F1200\nG1 X80 E3 F1000; intro line 1\nG1 X110 E4 F1000 ; intro line 2\nG1 X140 F600; drag filament to decompress bowden tube\nG1 X100 F3200; wipe backwards a bit\nG1 X150 F3200; back to where there is no plastic: avoid dragging\nG92 E0; reset extruder reference\nM82; set extruder to absolute mode\n\n; # # # # # # END Header", "machine_end_gcode": "; # # # # # # START Footer\nG91; relative coordinates\n;G1 E-1 F1200; retract the filament\nG1 Z+15 X-10 Y-10 E-7 F6000; move Z a bit\n; G1 X-10 Y-10 F6000; move XY a bit\nG1 E-5.5 F300; retract the filament\nG28 X0 Y0; move X/Y to min endstops, so the head is out of the way\nM104 S0; extruder heater off\nM140 S0; heated bed heater off (if you have it)\nM84; disable motors\n; # # # # # # END Footer\n", diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2.json b/resources/profiles/UltiMaker/machine/UltiMaker 2.json index 6679d57cacc..da7eeebe860 100644 --- a/resources/profiles/UltiMaker/machine/UltiMaker 2.json +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2.json @@ -8,5 +8,5 @@ "bed_model": "ultimaker_2_buildplate_model.stl", "bed_texture": "ultimaker_2_buildplate_texture.png", "hotend_model": "ultimaker_hotend.stl", - "default_materials": "UltiMaker Generic ABS;UltiMaker Generic PETG;UltiMaker Generic PLA" + "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Vivedino/machine/Troodon2Klipper.json b/resources/profiles/Vivedino/machine/Troodon2Klipper.json index 69a53625c8f..fa6cb5d8002 100644 --- a/resources/profiles/Vivedino/machine/Troodon2Klipper.json +++ b/resources/profiles/Vivedino/machine/Troodon2Klipper.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "OrcaSlicer-Troodon2-Bed-Texture.png", "hotend_model": "", - "default_materials": "Troodon Generic ABS;Troodon Generic PLA;Troodon Generic PLA-CF;Troodon Generic PETG;Troodon Generic TPU;Troodon Generic ASA;Troodon Generic PC;Troodon Generic PVA;Troodon Generic PA;Troodon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Vivedino/machine/Troodon2RRF.json b/resources/profiles/Vivedino/machine/Troodon2RRF.json index 76e8f54b1b4..eeb53e56952 100644 --- a/resources/profiles/Vivedino/machine/Troodon2RRF.json +++ b/resources/profiles/Vivedino/machine/Troodon2RRF.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "OrcaSlicer-Troodon2-Bed-Texture.png", "hotend_model": "", - "default_materials": "Troodon Generic ABS;Troodon Generic PLA;Troodon Generic PLA-CF;Troodon Generic PETG;Troodon Generic TPU;Troodon Generic ASA;Troodon Generic PC;Troodon Generic PVA;Troodon Generic PA;Troodon Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Vivedino/machine/fdm_klipper_common.json b/resources/profiles/Vivedino/machine/fdm_klipper_common.json index d7a84deba5b..f99a6229af3 100644 --- a/resources/profiles/Vivedino/machine/fdm_klipper_common.json +++ b/resources/profiles/Vivedino/machine/fdm_klipper_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Troodon Generic ABS" + "Generic ABS @System" ], "default_print_profile": "0.20mm Standard @Troodon2", "bed_exclude_area": [ diff --git a/resources/profiles/Vivedino/machine/fdm_rrf_common.json b/resources/profiles/Vivedino/machine/fdm_rrf_common.json index 740146688cd..b9861f1cec7 100644 --- a/resources/profiles/Vivedino/machine/fdm_rrf_common.json +++ b/resources/profiles/Vivedino/machine/fdm_rrf_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Troodon Generic ABS" + "Generic ABS @System" ], "default_print_profile": "0.20mm Standard @Troodon2", "bed_exclude_area": [ diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json index a773f78eda2..de243d73f25 100644 --- a/resources/profiles/Voron/machine/Voron 0.1.json +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -8,5 +8,5 @@ "bed_model": "Voron_120_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json index b032e4e7794..5495046781e 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250.json @@ -8,5 +8,5 @@ "bed_model": "Voron_250_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json index 094357baa46..2e1b5c362af 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300.json @@ -8,5 +8,5 @@ "bed_model": "Voron_300_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json index 785831a3a15..a98f84b23cc 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350.json @@ -8,5 +8,5 @@ "bed_model": "Voron_350_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250.json b/resources/profiles/Voron/machine/Voron Switchwire 250.json index 9955eaa057d..a4d76d2c203 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "voron_switchwire_logo.png", "hotend_model": "", - "default_materials": "Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json index 614aa804e2b..c1fe6938fbb 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250.json +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -8,5 +8,5 @@ "bed_model": "Voron_250_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json index 9f5ca659ea2..34ad1f38167 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300.json +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -8,5 +8,5 @@ "bed_model": "Voron_300_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json index 7be86f54356..36728f51464 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350.json +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -8,5 +8,5 @@ "bed_model": "Voron_350_build_plate.stl", "bed_texture": "voron_logo.png", "hotend_model": "", - "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Voron/machine/fdm_klipper_common.json b/resources/profiles/Voron/machine/fdm_klipper_common.json index 4b16b80ad97..f5d40395c0b 100644 --- a/resources/profiles/Voron/machine/fdm_klipper_common.json +++ b/resources/profiles/Voron/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Voron Generic ABS" + "Generic PLA @System" ], "default_print_profile": "0.20mm Standard @Voron", "bed_exclude_area": [ diff --git a/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json b/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json index 9fbb7e6cdae..48f874a2641 100644 --- a/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json +++ b/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json @@ -101,7 +101,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Voxelab Generic PLA" + "Generic PLA @System" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", diff --git a/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json b/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json index 0f4b349267d..b9e7ba18a8c 100644 --- a/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json +++ b/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json @@ -8,5 +8,5 @@ "bed_model": "voxelab_aquilax2_buildplate_model.stl", "bed_texture": "voxelab_aquilax2_buildplate_texture.png", "hotend_model": "", - "default_materials": "Voxelab Generic ABS;Voxelab Generic PETG;Voxelab Generic PLA" + "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Wanhao/machine/Wanhao D12-300.json b/resources/profiles/Wanhao/machine/Wanhao D12-300.json index 5464ab7d0f7..115de650786 100644 --- a/resources/profiles/Wanhao/machine/Wanhao D12-300.json +++ b/resources/profiles/Wanhao/machine/Wanhao D12-300.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "Wanhao D12-300_buildplate_texture.png", "hotend_model": "Wanaho D12-300_hotend.stl", - "default_materials": "Wanhao Generic PLA;Wanhao Generic PETG;Wanhao Generic TPU;" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic TPU @System;" } diff --git a/resources/profiles/Wanhao/machine/fdm_wanhao_common.json b/resources/profiles/Wanhao/machine/fdm_wanhao_common.json index 0b23d2ddbc9..085cb50bd6a 100644 --- a/resources/profiles/Wanhao/machine/fdm_wanhao_common.json +++ b/resources/profiles/Wanhao/machine/fdm_wanhao_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Generic PLA @BIQU" + "Generic PLA @System" ], "default_print_profile": "0.20mm Standard @BIQU", "bed_exclude_area": [ diff --git a/scripts/orca_extra_profile_check.py b/scripts/orca_extra_profile_check.py index 105bf154aec..33d8c0acc41 100644 --- a/scripts/orca_extra_profile_check.py +++ b/scripts/orca_extra_profile_check.py @@ -49,10 +49,102 @@ def check_filament_compatible_printers(vendor_folder): error += 1 return error +def load_available_filament_profiles(profiles_dir, vendor_name): + """ + Load all available filament profiles from a vendor's directory. + + Parameters: + profiles_dir (Path): The directory containing vendor profile directories + vendor_name (str): The name of the vendor directory + + Returns: + set: A set of filament profile names + """ + profiles = set() + vendor_path = profiles_dir / vendor_name / "filament" + + if not vendor_path.exists(): + return profiles + + for file_path in vendor_path.rglob("*.json"): + try: + with open(file_path, 'r') as fp: + data = json.load(fp) + if "name" in data: + profiles.add(data["name"]) + except Exception as e: + print(f"Error loading filament profile {file_path}: {e}") + + return profiles + +def check_machine_default_materials(profiles_dir, vendor_name): + """ + Checks if default materials referenced in machine profiles exist in + the vendor's filament library or in the global OrcaFilamentLibrary. + + Parameters: + profiles_dir (Path): The base profiles directory + vendor_name (str): The vendor name to check + + Returns: + int: Number of missing filament references found + """ + error_count = 0 + machine_dir = profiles_dir / vendor_name / "machine" + + if not machine_dir.exists(): + print(f"No machine profiles found for vendor: {vendor_name}") + return 0 + + # Load available filament profiles + vendor_filaments = load_available_filament_profiles(profiles_dir, vendor_name) + global_filaments = load_available_filament_profiles(profiles_dir, "OrcaFilamentLibrary") + all_available_filaments = vendor_filaments.union(global_filaments) + + # Check each machine profile + for file_path in machine_dir.rglob("*.json"): + try: + with open(file_path, 'r') as fp: + data = json.load(fp) + + default_materials = None + if "default_materials" in data: + default_materials = data["default_materials"] + elif "default_filament_profile" in data: + default_materials = data["default_filament_profile"] + + if default_materials: + if isinstance(default_materials, list): + for material in default_materials: + if material not in all_available_filaments: + print(f"Missing filament profile: '{material}' referenced in {file_path.relative_to(profiles_dir)}") + error_count += 1 + else: + # Handle semicolon-separated list of materials in a string + if ";" in default_materials: + for material in default_materials.split(";"): + material = material.strip() + if material and material not in all_available_filaments: + print(f"Missing filament profile: '{material}' referenced in {file_path.relative_to(profiles_dir)}") + error_count += 1 + else: + # Single material in a string + if default_materials not in all_available_filaments: + print(f"Missing filament profile: '{default_materials}' referenced in {file_path.relative_to(profiles_dir)}") + error_count += 1 + + except Exception as e: + print(f"Error processing machine profile {file_path}: {e}") + error_count += 1 + + return error_count + def main(): print("Checking compatible_printers ...") - parser = argparse.ArgumentParser(description="Check compatible_printers") + parser = argparse.ArgumentParser(description="Check profiles for issues") parser.add_argument("--vendor", type=str, required=False, help="Vendor name") + parser.add_argument("--check-filaments", default=True, action="store_true", help="Check compatible_printers in filament profiles") + parser.add_argument("--check-materials", action="store_true", help="Check default materials in machine profiles") args = parser.parse_args() script_dir = Path(__file__).resolve().parent @@ -61,7 +153,10 @@ def main(): errors_found = 0 if args.vendor: - errors_found += check_filament_compatible_printers(profiles_dir / args.vendor / "filament") + if args.check_filaments or not (args.check_materials and not args.check_filaments): + errors_found += check_filament_compatible_printers(profiles_dir / args.vendor / "filament") + if args.check_materials: + errors_found += check_machine_default_materials(profiles_dir, args.vendor) checked_vendor_count += 1 else: for vendor_dir in profiles_dir.iterdir(): @@ -69,7 +164,10 @@ def main(): if vendor_dir.name == "OrcaFilamentLibrary": continue if vendor_dir.is_dir(): - errors_found += check_filament_compatible_printers(vendor_dir / "filament") + if args.check_filaments or not (args.check_materials and not args.check_filaments): + errors_found += check_filament_compatible_printers(vendor_dir / "filament") + if args.check_materials: + errors_found += check_machine_default_materials(profiles_dir, vendor_dir.name) checked_vendor_count += 1 if errors_found > 0: diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 0f27210b48f..f3a3adba44f 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -48,7 +48,7 @@ static std::vector s_project_options { const char *PresetBundle::ORCA_DEFAULT_BUNDLE = "Custom"; const char *PresetBundle::ORCA_DEFAULT_PRINTER_MODEL = "MyKlipper 0.4 nozzle"; const char *PresetBundle::ORCA_DEFAULT_PRINTER_VARIANT = "0.4"; -const char *PresetBundle::ORCA_DEFAULT_FILAMENT = "My Generic PLA"; +const char *PresetBundle::ORCA_DEFAULT_FILAMENT = "Generic PLA @System"; const char *PresetBundle::ORCA_FILAMENT_LIBRARY = "OrcaFilamentLibrary"; PresetBundle::PresetBundle()