From 436a8a292f31c3818eb77d6b2dca4fd276427eb9 Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Sun, 7 May 2023 11:58:49 +0800 Subject: [PATCH] Fix a regression: Generic filament profiles conflicts #981 --- resources/profiles/OrcaArena.json | 110 +++++++++--------- ...=> OrcaArena Generic ABS @0.2 nozzle.json} | 4 +- ....json => OrcaArena Generic ABS @base.json} | 2 +- ...ic ABS.json => OrcaArena Generic ABS.json} | 4 +- ...=> OrcaArena Generic ASA @0.2 nozzle.json} | 4 +- ....json => OrcaArena Generic ASA @base.json} | 2 +- ...ic ASA.json => OrcaArena Generic ASA.json} | 4 +- ...A-CF.json => OrcaArena Generic PA-CF.json} | 2 +- ...eric PA.json => OrcaArena Generic PA.json} | 2 +- ... => OrcaArena Generic PC @0.2 nozzle.json} | 4 +- ...e.json => OrcaArena Generic PC @base.json} | 2 +- ...eric PC.json => OrcaArena Generic PC.json} | 4 +- ...> OrcaArena Generic PETG @0.2 nozzle.json} | 4 +- ...json => OrcaArena Generic PETG @base.json} | 2 +- ...OrcaArena Generic PETG-CF @Arena X1C.json} | 4 +- ...n => OrcaArena Generic PETG-CF @base.json} | 2 +- ... PETG.json => OrcaArena Generic PETG.json} | 4 +- ...=> OrcaArena Generic PLA @0.2 nozzle.json} | 4 +- ....json => OrcaArena Generic PLA @base.json} | 2 +- ... => OrcaArena Generic PLA Silk @base.json} | 2 +- ...k.json => OrcaArena Generic PLA Silk.json} | 4 +- ...on => OrcaArena Generic PLA-CF @base.json} | 2 +- ...-CF.json => OrcaArena Generic PLA-CF.json} | 4 +- ...ic PLA.json => OrcaArena Generic PLA.json} | 4 +- ...=> OrcaArena Generic PVA @0.2 nozzle.json} | 4 +- ....json => OrcaArena Generic PVA @base.json} | 2 +- ...ic PVA.json => OrcaArena Generic PVA.json} | 4 +- ...ic TPU.json => OrcaArena Generic TPU.json} | 2 +- .../machine/Orca Arena X1 Carbon.json | 2 +- 29 files changed, 98 insertions(+), 98 deletions(-) rename resources/profiles/OrcaArena/filament/{Generic ABS @0.2 nozzle.json => OrcaArena Generic ABS @0.2 nozzle.json} (71%) rename resources/profiles/OrcaArena/filament/{Generic ABS @base.json => OrcaArena Generic ABS @base.json} (85%) rename resources/profiles/OrcaArena/filament/{Generic ABS.json => OrcaArena Generic ABS.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic ASA @0.2 nozzle.json => OrcaArena Generic ASA @0.2 nozzle.json} (71%) rename resources/profiles/OrcaArena/filament/{Generic ASA @base.json => OrcaArena Generic ASA @base.json} (85%) rename resources/profiles/OrcaArena/filament/{Generic ASA.json => OrcaArena Generic ASA.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic PA-CF.json => OrcaArena Generic PA-CF.json} (95%) rename resources/profiles/OrcaArena/filament/{Generic PA.json => OrcaArena Generic PA.json} (93%) rename resources/profiles/OrcaArena/filament/{Generic PC @0.2 nozzle.json => OrcaArena Generic PC @0.2 nozzle.json} (72%) rename resources/profiles/OrcaArena/filament/{Generic PC @base.json => OrcaArena Generic PC @base.json} (85%) rename resources/profiles/OrcaArena/filament/{Generic PC.json => OrcaArena Generic PC.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic PETG @0.2 nozzle.json => OrcaArena Generic PETG @0.2 nozzle.json} (71%) rename resources/profiles/OrcaArena/filament/{Generic PETG @base.json => OrcaArena Generic PETG @base.json} (97%) rename resources/profiles/OrcaArena/filament/{Generic PETG-CF @Arena X1C.json => OrcaArena Generic PETG-CF @Arena X1C.json} (71%) rename resources/profiles/OrcaArena/filament/{Generic PETG-CF @base.json => OrcaArena Generic PETG-CF @base.json} (96%) rename resources/profiles/OrcaArena/filament/{Generic PETG.json => OrcaArena Generic PETG.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic PLA @0.2 nozzle.json => OrcaArena Generic PLA @0.2 nozzle.json} (85%) rename resources/profiles/OrcaArena/filament/{Generic PLA @base.json => OrcaArena Generic PLA @base.json} (93%) rename resources/profiles/OrcaArena/filament/{Generic PLA Silk @base.json => OrcaArena Generic PLA Silk @base.json} (92%) rename resources/profiles/OrcaArena/filament/{Generic PLA Silk.json => OrcaArena Generic PLA Silk.json} (80%) rename resources/profiles/OrcaArena/filament/{Generic PLA-CF @base.json => OrcaArena Generic PLA-CF @base.json} (95%) rename resources/profiles/OrcaArena/filament/{Generic PLA-CF.json => OrcaArena Generic PLA-CF.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic PLA.json => OrcaArena Generic PLA.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic PVA @0.2 nozzle.json => OrcaArena Generic PVA @0.2 nozzle.json} (71%) rename resources/profiles/OrcaArena/filament/{Generic PVA @base.json => OrcaArena Generic PVA @base.json} (89%) rename resources/profiles/OrcaArena/filament/{Generic PVA.json => OrcaArena Generic PVA.json} (75%) rename resources/profiles/OrcaArena/filament/{Generic TPU.json => OrcaArena Generic TPU.json} (94%) diff --git a/resources/profiles/OrcaArena.json b/resources/profiles/OrcaArena.json index e1dc5d09c66..ce133523498 100644 --- a/resources/profiles/OrcaArena.json +++ b/resources/profiles/OrcaArena.json @@ -1,7 +1,7 @@ { "name": "Orca Arena Printer", "url": "", - "version": "01.06.00.03", + "version": "01.06.01.00", "force_update": "0", "description": "Orca Arena configuration files", "machine_model_list": [ @@ -306,92 +306,92 @@ "sub_path": "filament/PolyLite PLA @base.json" }, { - "name": "Generic PLA @base", - "sub_path": "filament/Generic PLA @base.json" + "name": "OrcaArena Generic PLA @base", + "sub_path": "filament/OrcaArena Generic PLA @base.json" }, { - "name": "Generic PLA", - "sub_path": "filament/Generic PLA.json" + "name": "OrcaArena Generic PLA", + "sub_path": "filament/OrcaArena Generic PLA.json" }, { - "name": "Generic PLA Silk @base", - "sub_path": "filament/Generic PLA Silk @base.json" + "name": "OrcaArena Generic PLA Silk @base", + "sub_path": "filament/OrcaArena Generic PLA Silk @base.json" }, { - "name": "Generic PLA Silk", - "sub_path": "filament/Generic PLA Silk.json" + "name": "OrcaArena Generic PLA Silk", + "sub_path": "filament/OrcaArena Generic PLA Silk.json" }, { - "name": "Generic PLA @0.2 nozzle", - "sub_path": "filament/Generic PLA @0.2 nozzle.json" + "name": "OrcaArena Generic PLA @0.2 nozzle", + "sub_path": "filament/OrcaArena Generic PLA @0.2 nozzle.json" }, { - "name": "Generic PLA-CF @base", - "sub_path": "filament/Generic PLA-CF @base.json" + "name": "OrcaArena Generic PLA-CF @base", + "sub_path": "filament/OrcaArena Generic PLA-CF @base.json" }, { - "name": "Generic PLA-CF", - "sub_path": "filament/Generic PLA-CF.json" + "name": "OrcaArena Generic PLA-CF", + "sub_path": "filament/OrcaArena Generic PLA-CF.json" }, { - "name": "Generic PETG @base", - "sub_path": "filament/Generic PETG @base.json" + "name": "OrcaArena Generic PETG @base", + "sub_path": "filament/OrcaArena Generic PETG @base.json" }, { - "name": "Generic PETG", - "sub_path": "filament/Generic PETG.json" + "name": "OrcaArena Generic PETG", + "sub_path": "filament/OrcaArena Generic PETG.json" }, { - "name": "Generic ABS @base", - "sub_path": "filament/Generic ABS @base.json" + "name": "OrcaArena Generic ABS @base", + "sub_path": "filament/OrcaArena Generic ABS @base.json" }, { - "name": "Generic ABS", - "sub_path": "filament/Generic ABS.json" + "name": "OrcaArena Generic ABS", + "sub_path": "filament/OrcaArena Generic ABS.json" }, { - "name": "Generic ABS @0.2 nozzle", - "sub_path": "filament/Generic ABS @0.2 nozzle.json" + "name": "OrcaArena Generic ABS @0.2 nozzle", + "sub_path": "filament/OrcaArena Generic ABS @0.2 nozzle.json" }, { - "name": "Generic TPU", - "sub_path": "filament/Generic TPU.json" + "name": "OrcaArena Generic TPU", + "sub_path": "filament/OrcaArena Generic TPU.json" }, { - "name": "Generic ASA @base", - "sub_path": "filament/Generic ASA @base.json" + "name": "OrcaArena Generic ASA @base", + "sub_path": "filament/OrcaArena Generic ASA @base.json" }, { - "name": "Generic ASA @0.2 nozzle", - "sub_path": "filament/Generic ASA @0.2 nozzle.json" + "name": "OrcaArena Generic ASA @0.2 nozzle", + "sub_path": "filament/OrcaArena Generic ASA @0.2 nozzle.json" }, { - "name": "Generic ASA", - "sub_path": "filament/Generic ASA.json" + "name": "OrcaArena Generic ASA", + "sub_path": "filament/OrcaArena Generic ASA.json" }, { - "name": "Generic PC @base", - "sub_path": "filament/Generic PC @base.json" + "name": "OrcaArena Generic PC @base", + "sub_path": "filament/OrcaArena Generic PC @base.json" }, { - "name": "Generic PC @0.2 nozzle", - "sub_path": "filament/Generic PC @0.2 nozzle.json" + "name": "OrcaArena Generic PC @0.2 nozzle", + "sub_path": "filament/OrcaArena Generic PC @0.2 nozzle.json" }, { - "name": "Generic PC", - "sub_path": "filament/Generic PC.json" + "name": "OrcaArena Generic PC", + "sub_path": "filament/OrcaArena Generic PC.json" }, { - "name": "Generic PVA @base", - "sub_path": "filament/Generic PVA @base.json" + "name": "OrcaArena Generic PVA @base", + "sub_path": "filament/OrcaArena Generic PVA @base.json" }, { - "name": "Generic PETG-CF @base", - "sub_path": "filament/Generic PETG-CF @base.json" + "name": "OrcaArena Generic PETG-CF @base", + "sub_path": "filament/OrcaArena Generic PETG-CF @base.json" }, { - "name": "Generic PETG-CF @Arena X1C", - "sub_path": "filament/Generic PETG-CF @Arena X1C.json" + "name": "OrcaArena Generic PETG-CF @Arena X1C", + "sub_path": "filament/OrcaArena Generic PETG-CF @Arena X1C.json" }, { "name": "Arena PETG-CF @base", @@ -402,20 +402,20 @@ "sub_path": "filament/Arena PETG-CF @Arena X1C.json" }, { - "name": "Generic PVA @0.2 nozzle", - "sub_path": "filament/Generic PVA @0.2 nozzle.json" + "name": "OrcaArena Generic PVA @0.2 nozzle", + "sub_path": "filament/OrcaArena Generic PVA @0.2 nozzle.json" }, { - "name": "Generic PVA", - "sub_path": "filament/Generic PVA.json" + "name": "OrcaArena Generic PVA", + "sub_path": "filament/OrcaArena Generic PVA.json" }, { - "name": "Generic PA", - "sub_path": "filament/Generic PA.json" + "name": "OrcaArena Generic PA", + "sub_path": "filament/OrcaArena Generic PA.json" }, { - "name": "Generic PA-CF", - "sub_path": "filament/Generic PA-CF.json" + "name": "OrcaArena Generic PA-CF", + "sub_path": "filament/OrcaArena Generic PA-CF.json" }, { "name": "Arena TPU 95A @Arena X1C", @@ -542,8 +542,8 @@ "sub_path": "filament/PolyLite PLA @Arena X1C 0.2 nozzle.json" }, { - "name":"Generic PETG @0.2 nozzle", - "sub_path":"filament/Generic PETG @0.2 nozzle.json" + "name":"OrcaArena Generic PETG @0.2 nozzle", + "sub_path":"filament/OrcaArena Generic PETG @0.2 nozzle.json" }, { "name":"Arena PLA Metal @Arena X1C 0.2 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json similarity index 71% rename from resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json index bccc573e80d..6ac7b4ed852 100644 --- a/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSB99_00", - "name": "Generic ABS @0.2 nozzle", + "name": "OrcaArena Generic ABS @0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ABS @base", + "inherits": "OrcaArena Generic ABS @base", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json similarity index 85% rename from resources/profiles/OrcaArena/filament/Generic ABS @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json index 044703f6a93..43284e8f5ba 100644 --- a/resources/profiles/OrcaArena/filament/Generic ABS @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB99", - "name": "Generic ABS @base", + "name": "OrcaArena Generic ABS @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/OrcaArena/filament/Generic ABS.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic ABS.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json index e37b104d620..1b1314994d3 100644 --- a/resources/profiles/OrcaArena/filament/Generic ABS.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSB99", - "name": "Generic ABS", + "name": "OrcaArena Generic ABS", "from": "system", "instantiation": "true", - "inherits": "Generic ABS @base", + "inherits": "OrcaArena Generic ABS @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json similarity index 71% rename from resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json index 667287b51b8..9356809a5d1 100644 --- a/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSB98_00", - "name": "Generic ASA @0.2 nozzle", + "name": "OrcaArena Generic ASA @0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ASA @base", + "inherits": "OrcaArena Generic ASA @base", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json similarity index 85% rename from resources/profiles/OrcaArena/filament/Generic ASA @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json index ac74598de75..82b98379441 100644 --- a/resources/profiles/OrcaArena/filament/Generic ASA @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB98", - "name": "Generic ASA @base", + "name": "OrcaArena Generic ASA @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_asa", diff --git a/resources/profiles/OrcaArena/filament/Generic ASA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic ASA.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json index 1155e485ac5..3be7360a35f 100644 --- a/resources/profiles/OrcaArena/filament/Generic ASA.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSB98", - "name": "Generic ASA", + "name": "OrcaArena Generic ASA", "from": "system", "instantiation": "true", - "inherits": "Generic ASA @base", + "inherits": "OrcaArena Generic ASA @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic PA-CF.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json similarity index 95% rename from resources/profiles/OrcaArena/filament/Generic PA-CF.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json index 24756fe1c67..3e22d39802b 100644 --- a/resources/profiles/OrcaArena/filament/Generic PA-CF.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFN98", "setting_id": "GFSN99", - "name": "Generic PA-CF", + "name": "OrcaArena Generic PA-CF", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pa", diff --git a/resources/profiles/OrcaArena/filament/Generic PA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json similarity index 93% rename from resources/profiles/OrcaArena/filament/Generic PA.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json index ae32f871137..40e7fc75663 100644 --- a/resources/profiles/OrcaArena/filament/Generic PA.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFN99", "setting_id": "GFSN98", - "name": "Generic PA", + "name": "OrcaArena Generic PA", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pa", diff --git a/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json similarity index 72% rename from resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json index 1e4998246ff..5fcda827822 100644 --- a/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSC99_00", - "name": "Generic PC @0.2 nozzle", + "name": "OrcaArena Generic PC @0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PC @base", + "inherits": "OrcaArena Generic PC @base", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/OrcaArena/filament/Generic PC @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json similarity index 85% rename from resources/profiles/OrcaArena/filament/Generic PC @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json index dc053680d14..d6b4dead3ef 100644 --- a/resources/profiles/OrcaArena/filament/Generic PC @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFC99", - "name": "Generic PC @base", + "name": "OrcaArena Generic PC @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pc", diff --git a/resources/profiles/OrcaArena/filament/Generic PC.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic PC.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json index 6e40cc6a44e..1dfdab1bf96 100644 --- a/resources/profiles/OrcaArena/filament/Generic PC.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSC99", - "name": "Generic PC", + "name": "OrcaArena Generic PC", "from": "system", "instantiation": "true", - "inherits": "Generic PC @base", + "inherits": "OrcaArena Generic PC @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json similarity index 71% rename from resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json index ff6d76438da..d95c4e3843c 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSG99_01", - "name": "Generic PETG @0.2 nozzle", + "name": "OrcaArena Generic PETG @0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PETG @base", + "inherits": "OrcaArena Generic PETG @base", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json similarity index 97% rename from resources/profiles/OrcaArena/filament/Generic PETG @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json index 6a0a6ec4d78..edf0fdd6d8f 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG99", - "name": "Generic PETG @base", + "name": "OrcaArena Generic PETG @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pet", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json similarity index 71% rename from resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json index f4e0c713d42..61e7cafef17 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSG50", - "name": "Generic PETG-CF @Arena X1C", + "name": "OrcaArena Generic PETG-CF @Arena X1C", "from": "system", "instantiation": "true", - "inherits": "Generic PETG-CF @base", + "inherits": "OrcaArena Generic PETG-CF @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json similarity index 96% rename from resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json index e33cdd0aa69..cc77cf8c931 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG98", - "name": "Generic PETG-CF @base", + "name": "OrcaArena Generic PETG-CF @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pet", diff --git a/resources/profiles/OrcaArena/filament/Generic PETG.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic PETG.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json index 6c180bd2d2d..e37fcf7ba30 100644 --- a/resources/profiles/OrcaArena/filament/Generic PETG.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSG99", - "name": "Generic PETG", + "name": "OrcaArena Generic PETG", "from": "system", "instantiation": "true", - "inherits": "Generic PETG @base", + "inherits": "OrcaArena Generic PETG @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json similarity index 85% rename from resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json index 6695ad062d0..542ffae426d 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSL99_00", - "name": "Generic PLA @0.2 nozzle", + "name": "OrcaArena Generic PLA @0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PLA @base", + "inherits": "OrcaArena Generic PLA @base", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json similarity index 93% rename from resources/profiles/OrcaArena/filament/Generic PLA @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json index 43de916b4a3..c3abe2465a5 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL99", - "name": "Generic PLA @base", + "name": "OrcaArena Generic PLA @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json similarity index 92% rename from resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json index cf7e7b080a8..43d37d01f4b 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFA05", - "name": "Generic PLA Silk @base", + "name": "OrcaArena Generic PLA Silk @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA Silk.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json similarity index 80% rename from resources/profiles/OrcaArena/filament/Generic PLA Silk.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json index 80d06431a2c..2548433549e 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA Silk.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSL99_01", - "name": "Generic PLA Silk", + "name": "OrcaArena Generic PLA Silk", "from": "system", "instantiation": "true", - "inherits": "Generic PLA Silk @base", + "inherits": "OrcaArena Generic PLA Silk @base", "filament_max_volumetric_speed": [ "7.5" ], diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json similarity index 95% rename from resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json index aebf40321ef..f9a0a195829 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL98", - "name": "Generic PLA-CF @base", + "name": "OrcaArena Generic PLA-CF @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic PLA-CF.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json index fe217605ca4..6975276e9ab 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA-CF.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSL98", - "name": "Generic PLA-CF", + "name": "OrcaArena Generic PLA-CF", "from": "system", "instantiation": "true", - "inherits": "Generic PLA-CF @base", + "inherits": "OrcaArena Generic PLA-CF @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic PLA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic PLA.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json index d8d2983ad13..e69be4831c5 100644 --- a/resources/profiles/OrcaArena/filament/Generic PLA.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSL99", - "name": "Generic PLA", + "name": "OrcaArena Generic PLA", "from": "system", "instantiation": "true", - "inherits": "Generic PLA @base", + "inherits": "OrcaArena Generic PLA @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json similarity index 71% rename from resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json index 9988ae406a3..c82eb3e788c 100644 --- a/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSS99_00", - "name": "Generic PVA @0.2 nozzle", + "name": "OrcaArena Generic PVA @0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PVA @base", + "inherits": "OrcaArena Generic PVA @base", "filament_max_volumetric_speed": [ "0.5" ], diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json similarity index 89% rename from resources/profiles/OrcaArena/filament/Generic PVA @base.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json index 87f3d3a4225..a8bf7e3c1a9 100644 --- a/resources/profiles/OrcaArena/filament/Generic PVA @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFS99", - "name": "Generic PVA @base", + "name": "OrcaArena Generic PVA @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pva", diff --git a/resources/profiles/OrcaArena/filament/Generic PVA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json similarity index 75% rename from resources/profiles/OrcaArena/filament/Generic PVA.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json index 1d6dd63cdfd..9d14b44dff9 100644 --- a/resources/profiles/OrcaArena/filament/Generic PVA.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json @@ -1,10 +1,10 @@ { "type": "filament", "setting_id": "GFSS99", - "name": "Generic PVA", + "name": "OrcaArena Generic PVA", "from": "system", "instantiation": "true", - "inherits": "Generic PVA @base", + "inherits": "OrcaArena Generic PVA @base", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", "Orca Arena X1 Carbon 0.6 nozzle", diff --git a/resources/profiles/OrcaArena/filament/Generic TPU.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json similarity index 94% rename from resources/profiles/OrcaArena/filament/Generic TPU.json rename to resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json index 3c6b2e90e64..c0644851e5e 100644 --- a/resources/profiles/OrcaArena/filament/Generic TPU.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFU99", "setting_id": "GFSR99", - "name": "Generic TPU", + "name": "OrcaArena Generic TPU", "from": "system", "instantiation": "true", "inherits": "fdm_filament_tpu", diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json index 6c8a74d4aa9..84009b104cd 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "", "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;" + "default_materials": "OrcaArena Generic PLA Silk;OrcaArena 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;" }