diff --git a/resources/profiles/Anker/machine/Anker M5.json b/resources/profiles/Anker/machine/Anker M5.json index 23f96de300..38c1e10f87 100644 --- a/resources/profiles/Anker/machine/Anker M5.json +++ b/resources/profiles/Anker/machine/Anker M5.json @@ -7,6 +7,6 @@ "family": "Anker", "bed_model": "", "bed_texture": "", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PC;Anker Generic PVA;Anker Generic PA;Anker Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json index acb451e1c2..31a10f5640 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json @@ -7,6 +7,6 @@ "family": "Anycubic", "bed_model": "", "bed_texture": "", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json index dc4d2be6f9..7dae3dfa6d 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json @@ -7,6 +7,6 @@ "family": "Artillery", "bed_model": "", "bed_texture": "SW-x2.png", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/Creality/hotend.stl b/resources/profiles/Creality/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/Creality/hotend.stl and /dev/null differ diff --git a/resources/profiles/Creality/machine/Creality CR-10 Max.json b/resources/profiles/Creality/machine/Creality CR-10 Max.json index 77a0ed0ba5..015077e905 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Max.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Max.json @@ -7,6 +7,6 @@ "family": "Creality-CR", "bed_model": "", "bed_texture": "", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "Generic PLA @CREALITY;Generic PETG @CREALITY;Generic ABS @CREALITY;" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2.json b/resources/profiles/Creality/machine/Creality Ender-3 V2.json index 90449b5951..93734a5c7d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2.json @@ -7,6 +7,6 @@ "family": "ENDER", "bed_model": "", "bed_texture": "ender3v2.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "Generic PLA @CREALITY;Generic PETG @CREALITY;Generic ABS @CREALITY;" } diff --git a/resources/profiles/Custom/machine/MyKlipper.json b/resources/profiles/Custom/machine/MyKlipper.json index 5df3500881..3a89008b21 100644 --- a/resources/profiles/Custom/machine/MyKlipper.json +++ b/resources/profiles/Custom/machine/MyKlipper.json @@ -7,6 +7,6 @@ "family": "MyPrinter", "bed_model": "", "bed_texture": "", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "My Generic ABS;My Generic PLA;My Generic PLA-CF;My Generic PETG;My Generic TPU;My Generic ASA;My Generic PC;My Generic PVA;My Generic PA;My Generic PA-CF" } diff --git a/resources/profiles/Custom/machine/MyMarlin.json b/resources/profiles/Custom/machine/MyMarlin.json index c9b1f3167c..2a29bf4924 100644 --- a/resources/profiles/Custom/machine/MyMarlin.json +++ b/resources/profiles/Custom/machine/MyMarlin.json @@ -7,6 +7,6 @@ "family": "MyPrinter", "bed_model": "", "bed_texture": "", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "My Generic ABS;My Generic PLA;My Generic PLA-CF;My Generic PETG;My Generic TPU;My Generic ASA;My Generic PC;My Generic PVA;My Generic PA;My Generic PA-CF" } diff --git a/resources/profiles/FLSun/V400_bed.stl b/resources/profiles/FLSun/V400_bed.stl index a97ab48233..e58bcdb574 100644 Binary files a/resources/profiles/FLSun/V400_bed.stl and b/resources/profiles/FLSun/V400_bed.stl differ diff --git a/resources/profiles/OrcaArena/bbl-3dp-X1.stl b/resources/profiles/OrcaArena/bbl-3dp-X1.stl deleted file mode 100644 index 6823cdb229..0000000000 Binary files a/resources/profiles/OrcaArena/bbl-3dp-X1.stl and /dev/null differ diff --git a/resources/profiles/OrcaArena/bbl-3dp-hotend.stl b/resources/profiles/OrcaArena/bbl-3dp-hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/OrcaArena/bbl-3dp-hotend.stl and /dev/null differ diff --git a/resources/profiles/OrcaArena/bbl-3dp-logo.svg b/resources/profiles/OrcaArena/bbl-3dp-logo.svg deleted file mode 100644 index d17daf639a..0000000000 --- a/resources/profiles/OrcaArena/bbl-3dp-logo.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/profiles/OrcaArena/bbl-3dp-logo_cali_lines.svg b/resources/profiles/OrcaArena/bbl-3dp-logo_cali_lines.svg deleted file mode 100644 index 9e40f62c03..0000000000 --- a/resources/profiles/OrcaArena/bbl-3dp-logo_cali_lines.svg +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/profiles/OrcaArena/machine/Orca Arena P1P.json b/resources/profiles/OrcaArena/machine/Orca Arena P1P.json index 50bdade35d..d6876bba95 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena P1P.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena P1P.json @@ -6,8 +6,8 @@ "nozzle_diameter": "0.4;0.2;0.6;0.8", "machine_tech": "FFF", "family": "ARENA-3DP", - "bed_model": "bbl-3dp-X1.stl", - "bed_texture": "bbl-3dp-logo.svg", - "hotend_model": "bbl-3dp-hotend.stl", + "bed_model": "", + "bed_texture": "", + "hotend_model": "", "default_materials": "Generic PLA @Arena P1P;Generic PLA Silk @Arena P1P;Arena PLA Matte @Arena P1P;Arena PLA Basic @Arena P1P;Arena ABS @Arena P1P;Arena PC @Arena P1P;Arena Support W @Arena P1P;Arena TPU 95A @Arena P1P;PolyTerra PLA @Arena P1P;PolyLite PLA @Arena P1P;" } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json index 1bcb96c30d..6c8a74d4aa 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json @@ -8,6 +8,6 @@ "family": "ARENA-3DP", "bed_model": "", "bed_texture": "", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Generic PLA Silk;Generic PLA;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;" } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1.json b/resources/profiles/OrcaArena/machine/Orca Arena X1.json index 972019a253..90f6b27f56 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1.json @@ -8,6 +8,6 @@ "family": "ARENA-3DP", "bed_model": "bbl-3dp-X1.stl", "bed_texture": "bbl-3dp-logo_cali_lines.svg", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Generic PLA Silk;Generic PLA;Arena PLA Matte @Arena X1;Arena PLA Basic @Arena X1;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1;Arena TPU 95A @Arena X1;PolyTerra PLA @Arena X1;PolyLite PLA @Arena X1;" } diff --git a/resources/profiles/Prusa/machine/Prusa MINI.json b/resources/profiles/Prusa/machine/Prusa MINI.json index 6cdd89a5a5..199cab4e9c 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI.json +++ b/resources/profiles/Prusa/machine/Prusa MINI.json @@ -7,6 +7,6 @@ "family": "Prusa", "bed_model": "mini_bed.stl", "bed_texture": "mini.svg", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Prusa Generic ABS;Prusa Generic PLA;Prusa Generic PLA-CF;Prusa Generic PETG;Prusa Generic TPU;Prusa Generic ASA;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF" } diff --git a/resources/profiles/Prusa/machine/Prusa MK3S.json b/resources/profiles/Prusa/machine/Prusa MK3S.json index d279367a2f..3cb76e93c8 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S.json @@ -7,6 +7,6 @@ "family": "Prusa", "bed_model": "mk3_bed.stl", "bed_texture": "mk3.svg", - "hotend_model": "bbl-3dp-hotend.stl", + "hotend_model": "", "default_materials": "Prusa Generic ABS;Prusa Generic PLA;Prusa Generic PLA-CF;Prusa Generic PETG;Prusa Generic TPU;Prusa Generic ASA;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF" } diff --git a/resources/profiles/Ratrig/hotend.stl b/resources/profiles/Ratrig/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/Ratrig/hotend.stl and /dev/null differ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Cast.json b/resources/profiles/Ratrig/machine/RatRig V-Cast.json index f608dc52bc..19f2cf1d4d 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Cast.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Cast.json @@ -7,6 +7,6 @@ "family": "RatRig_V-Cast", "bed_model": "ratrig-vcast-bed.stl", "bed_texture": "ratrig_logo.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json index dd7692c380..17d7e3fafc 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json @@ -7,6 +7,6 @@ "family": "RatRig_V-Core", "bed_model": "ratrig-vcore-bed-200.stl", "bed_texture": "ratrig_logo.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json index 8d4c1895de..4f37d4178d 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json @@ -7,6 +7,6 @@ "family": "RatRig_V-Core", "bed_model": "ratrig-vcore-bed-300.stl", "bed_texture": "ratrig_logo.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json index 746ec0f3be..40b9e6713c 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json @@ -7,6 +7,6 @@ "family": "RatRig_V-Core", "bed_model": "ratrig-vcore-bed-400.stl", "bed_texture": "ratrig_logo.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json index 48d7bcda27..442842b08f 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json @@ -7,6 +7,6 @@ "family": "RatRig_V-Core", "bed_model": "ratrig-vcore-bed-500.stl", "bed_texture": "ratrig_logo.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Minion.json b/resources/profiles/Ratrig/machine/RatRig V-Minion.json index a851e00da9..d15326c842 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Minion.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Minion.json @@ -7,6 +7,6 @@ "family": "RatRig_V-Minion", "bed_model": "ratrig-vminion-bed.stl", "bed_texture": "ratrig_logo.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" } diff --git a/resources/profiles/Snapmaker/hotend.stl b/resources/profiles/Snapmaker/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/Snapmaker/hotend.stl and /dev/null differ diff --git a/resources/profiles/Snapmaker/machine/Snapmaker A250.json b/resources/profiles/Snapmaker/machine/Snapmaker A250.json index e3b0a4cd82..7824400213 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker A250.json +++ b/resources/profiles/Snapmaker/machine/Snapmaker A250.json @@ -7,6 +7,6 @@ "family": "Snapmaker", "bed_model": "", "bed_texture": "", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "Snapmaker Generic ABS;Snapmaker Generic PLA;Snapmaker Generic PLA-CF;Snapmaker Generic PETG;Snapmaker Generic TPU;Snapmaker Generic ASA;Snapmaker Generic PC;Snapmaker Generic PVA;Snapmaker Generic PA;Snapmaker Generic PA-CF" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/machine/Snapmaker A350.json b/resources/profiles/Snapmaker/machine/Snapmaker A350.json index 218d679e30..f9f89abaca 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker A350.json +++ b/resources/profiles/Snapmaker/machine/Snapmaker A350.json @@ -7,6 +7,6 @@ "family": "Snapmaker", "bed_model": "", "bed_texture": "", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "Snapmaker Generic ABS;Snapmaker Generic PLA;Snapmaker Generic PLA-CF;Snapmaker Generic PETG;Snapmaker Generic TPU;Snapmaker Generic ASA;Snapmaker Generic PC;Snapmaker Generic PVA;Snapmaker Generic PA;Snapmaker Generic PA-CF" } diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1.json b/resources/profiles/Snapmaker/machine/Snapmaker J1.json index 18fcc0d114..019ba7251e 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker J1.json +++ b/resources/profiles/Snapmaker/machine/Snapmaker J1.json @@ -7,6 +7,6 @@ "family": "Snapmaker", "bed_model": "", "bed_texture": "j1_texture.svg", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "Snapmaker J1 ABS;Snapmaker J1 PLA;Snapmaker J1 PLA-CF;Snapmaker J1 PETG;Snapmaker J1 TPU;Snapmaker J1 ASA;Snapmaker J1 PC;Snapmaker J1 PVA;Snapmaker J1 PA;Snapmaker J1 PA-CF" } diff --git a/resources/profiles/Tronxy/hotend.stl b/resources/profiles/Tronxy/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/Tronxy/hotend.stl and /dev/null differ 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 23648526cc..2a59979738 100644 --- a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json +++ b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json @@ -7,6 +7,6 @@ "family": "TronxyDesign", "bed_model": "", "bed_texture": "tronxy_logo.png", - "hotend_model": "hotend.stl", + "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" } \ No newline at end of file diff --git a/resources/profiles/TwoTrees/SP-5_bed.stl b/resources/profiles/TwoTrees/SP-5_bed.stl index 41554098cc..cb9b5bc274 100644 Binary files a/resources/profiles/TwoTrees/SP-5_bed.stl and b/resources/profiles/TwoTrees/SP-5_bed.stl differ diff --git a/resources/profiles/TwoTrees/SP5_texture.png b/resources/profiles/TwoTrees/SP5_texture.png index 74c521898b..cba2851156 100644 Binary files a/resources/profiles/TwoTrees/SP5_texture.png and b/resources/profiles/TwoTrees/SP5_texture.png differ diff --git a/resources/profiles/TwoTrees/hotend.stl b/resources/profiles/TwoTrees/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/TwoTrees/hotend.stl and /dev/null differ diff --git a/resources/profiles/TwoTrees/machine/TwoTrees SP-5 Klipper.json b/resources/profiles/TwoTrees/machine/TwoTrees SP-5 Klipper.json index e1a77c24a4..f0da16e1c4 100644 --- a/resources/profiles/TwoTrees/machine/TwoTrees SP-5 Klipper.json +++ b/resources/profiles/TwoTrees/machine/TwoTrees SP-5 Klipper.json @@ -7,6 +7,6 @@ "family": "TwoTreesDesign", "bed_model": "SP-5_bed.stl", "bed_texture": "SP5_texture.png", - "hotend_model": "hotend.stl", + "hotend_model": "", "default_materials": "TwoTrees Generic ABS;TwoTrees Generic PLA;TwoTrees Generic PLA-CF;TwoTrees Generic PETG;TwoTrees Generic TPU;TwoTrees Generic ASA;TwoTrees Generic PC;TwoTrees Generic PVA;TwoTrees Generic PA;TwoTrees Generic PA-CF" } \ No newline at end of file diff --git a/resources/profiles/Voron/hotend.stl b/resources/profiles/Voron/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/Voron/hotend.stl and /dev/null differ diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json index 160ee037bb..6a3d37f839 100644 --- a/resources/profiles/Voron/machine/Voron 0.1.json +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_v0_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json index 26e8f241d4..5099f066d4 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json index b32bd22a9f..37d3632e0f 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json index 0e165df533..228bfbc8fa 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json index 424229cc9e..0fd8baac18 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250.json +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json index 68aac7a999..a84801a9f5 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300.json +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json index 51b9e14c2d..2cce35b6a8 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350.json +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -7,6 +7,6 @@ "family": "VoronDesign", "bed_model": "", "bed_texture": "voron_logo.png", - "hotend_model": "hotend.stl", + "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" } diff --git a/resources/profiles/Vzbot/hotend.stl b/resources/profiles/Vzbot/hotend.stl deleted file mode 100644 index 4138160ec0..0000000000 Binary files a/resources/profiles/Vzbot/hotend.stl and /dev/null differ diff --git a/resources/profiles/hotend.stl b/resources/profiles/hotend.stl new file mode 100644 index 0000000000..b5555446b6 Binary files /dev/null and b/resources/profiles/hotend.stl differ diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 499f4e1d1c..224f8ad9b4 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -3187,6 +3187,9 @@ namespace PresetUtils { if (!boost::filesystem::exists(boost::filesystem::path(out))) out = Slic3r::resources_dir() + "/profiles/" + preset.vendor->id + "/" + pm->hotend_model; } + + if(out.empty()) + out = Slic3r::resources_dir() + "/profiles/hotend.stl"; return out; } } // namespace PresetUtils diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 609da0a945..30a89c79ab 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -504,6 +504,9 @@ std::string PresetBundle::get_hotend_model_for_printer_model(std::string model_n out = Slic3r::resources_dir() + "/profiles/" + vendor_name + "/" + hotend_stl; } + if (out.empty()) + out = Slic3r::resources_dir() + "/profiles/hotend.stl"; + return out; }