From 8d482eddd32f3547c68940704ddd46acecbd6eac Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 30 Dec 2022 15:45:15 +0800 Subject: [PATCH] fix profile syncing issue #74 --- build_release.bat | 4 ++-- resources/profiles/Anycubic.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic ABS.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic ASA.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic PA-CF.json | 2 +- resources/profiles/Anycubic/filament/Anycubic Generic PA.json | 2 +- resources/profiles/Anycubic/filament/Anycubic Generic PC.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic PETG.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic PLA-CF.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic PLA.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic PVA.json | 2 +- .../profiles/Anycubic/filament/Anycubic Generic TPU.json | 2 +- .../profiles/Anycubic/process/0.20mm Standard @4MaxPro.json | 2 +- resources/profiles/Creality.json | 2 +- .../profiles/Creality/filament/Generic ABS @Creality.json | 2 +- .../profiles/Creality/filament/Generic PETG @Creality.json | 2 +- .../profiles/Creality/filament/Generic PLA @Creality.json | 2 +- .../Creality/machine/Creality Ender-3 V2 0.4 nozzle.json | 2 +- .../profiles/Creality/process/0.12mm Fine @Creality.json | 2 +- .../profiles/Creality/process/0.15mm Optimal @Creality.json | 2 +- .../profiles/Creality/process/0.20mm Standard @Creality.json | 2 +- .../profiles/Creality/process/0.24mm Draft @Creality.json | 2 +- resources/profiles/Prusa.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic ABS.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic ASA.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PA-CF.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PA.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PC.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PETG.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PLA.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic PVA.json | 2 +- resources/profiles/Prusa/filament/Prusa Generic TPU.json | 2 +- resources/profiles/Prusa/process/0.20mm Standard @MINI.json | 2 +- resources/profiles/Prusa/process/0.20mm Standard @MK3S.json | 2 +- resources/profiles/Ratrig.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic ABS.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic ASA.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PA.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PC.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PETG.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PLA.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic PVA.json | 2 +- resources/profiles/Ratrig/filament/RatRig Generic TPU.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 200 0.4 nozzle.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 300 0.4 nozzle.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 400 0.4 nozzle.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 500 0.4 nozzle.json | 2 +- .../profiles/Ratrig/machine/RatRig V-Minion 0.4 nozzle.json | 2 +- .../profiles/Ratrig/process/0.08mm Extra Fine @RatRig.json | 2 +- resources/profiles/Ratrig/process/0.12mm Fine @RatRig.json | 2 +- resources/profiles/Ratrig/process/0.15mm Optimal @RatRig.json | 2 +- .../Ratrig/process/0.20mm Bambu Support W @RatRig.json | 2 +- .../profiles/Ratrig/process/0.20mm Standard @RatRig.json | 2 +- resources/profiles/Ratrig/process/0.24mm Draft @RatRig.json | 2 +- .../profiles/Ratrig/process/0.28mm Extra Draft @RatRig.json | 2 +- resources/profiles/Voron.json | 2 +- resources/profiles/Voron/filament/Voron Generic ABS.json | 2 +- resources/profiles/Voron/filament/Voron Generic ASA.json | 2 +- resources/profiles/Voron/filament/Voron Generic PA-CF.json | 2 +- resources/profiles/Voron/filament/Voron Generic PA.json | 2 +- resources/profiles/Voron/filament/Voron Generic PC.json | 2 +- resources/profiles/Voron/filament/Voron Generic PETG.json | 2 +- resources/profiles/Voron/filament/Voron Generic PLA-CF.json | 2 +- resources/profiles/Voron/filament/Voron Generic PLA.json | 2 +- resources/profiles/Voron/filament/Voron Generic PVA.json | 2 +- resources/profiles/Voron/filament/Voron Generic TPU.json | 2 +- resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json | 2 +- .../profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json | 2 +- .../profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json | 2 +- .../profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json | 2 +- .../profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json | 2 +- .../profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json | 2 +- .../profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json | 2 +- .../profiles/Voron/process/0.08mm Extra Fine @Voron.json | 2 +- resources/profiles/Voron/process/0.12mm Fine @Voron.json | 2 +- resources/profiles/Voron/process/0.15mm Optimal @Voron.json | 2 +- .../profiles/Voron/process/0.20mm Bambu Support W @Voron.json | 2 +- resources/profiles/Voron/process/0.20mm Standard @Voron.json | 2 +- resources/profiles/Voron/process/0.24mm Draft @Voron.json | 2 +- .../profiles/Voron/process/0.28mm Extra Draft @Voron.json | 2 +- 83 files changed, 84 insertions(+), 84 deletions(-) diff --git a/build_release.bat b/build_release.bat index fc608ab3a17..a65d66156a9 100644 --- a/build_release.bat +++ b/build_release.bat @@ -3,8 +3,8 @@ cd deps mkdir build cd build set DEPS=%CD%/BambuStudio_dep -cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release -cmake --build . --config Release --target ALL_BUILD -- -m +@REM cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release +@REM cmake --build . --config Release --target ALL_BUILD -- -m cd %WP% mkdir build diff --git a/resources/profiles/Anycubic.json b/resources/profiles/Anycubic.json index 7e3deb0aa74..3744416477c 100644 --- a/resources/profiles/Anycubic.json +++ b/resources/profiles/Anycubic.json @@ -1,6 +1,6 @@ { "name": "Anycubic", - "version": "01.04.00.00", + "version": "01.04.00.01", "force_update": "0", "description": "Anycubic configurations", "machine_model_list": [ diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json b/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json index 62800f76a83..6f1c87edad1 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB99", - "setting_id": "GFSB99", + "setting_id": "GFSA04", "name": "Anycubic Generic ABS", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json b/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json index 04dcaf1cd39..3715401e9f4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB98", - "setting_id": "GFSB98", + "setting_id": "GFSA04", "name": "Anycubic Generic ASA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json b/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json index 65e093d8dc3..f087023a97b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN98", - "setting_id": "GFSN99", + "setting_id": "GFSA04", "name": "Anycubic Generic PA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json b/resources/profiles/Anycubic/filament/Anycubic Generic PA.json index 1aa1fd97718..e1d8881e09c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN99", - "setting_id": "GFSN98", + "setting_id": "GFSA04", "name": "Anycubic Generic PA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json b/resources/profiles/Anycubic/filament/Anycubic Generic PC.json index a82eb93fc99..107998c7ec5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PC.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFC99", - "setting_id": "GFSC99", + "setting_id": "GFSA04", "name": "Anycubic Generic PC", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json b/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json index 2bbd4fdd91a..e17ce804ebb 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG99", - "setting_id": "GFSG99", + "setting_id": "GFSA04", "name": "Anycubic Generic PETG", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json b/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json index b67874dfb5b..4a320f3c50b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL98", - "setting_id": "GFSL98", + "setting_id": "GFSA04", "name": "Anycubic Generic PLA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json b/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json index 57300b19b06..27911c79d04 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL99", - "setting_id": "GFSL99", + "setting_id": "GFSA04", "name": "Anycubic Generic PLA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json b/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json index eb1938040ed..565b8323755 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFS99", - "setting_id": "GFSS99", + "setting_id": "GFSA04", "name": "Anycubic Generic PVA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json b/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json index 9b272543812..1177b0138fa 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFU99", - "setting_id": "GFSR99", + "setting_id": "GFSA04", "name": "Anycubic Generic TPU", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json b/resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json index 12ad73c809f..ff4bae252fc 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "Anycubic-1", + "setting_id": "GP004", "name": "0.20mm Standard @4MaxPro", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 9baee1faa0f..d3d034151b5 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "01.04.00.01", + "version": "01.04.00.02", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality.json b/resources/profiles/Creality/filament/Generic ABS @Creality.json index 6848fa4ca3e..d38ca3dc40e 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB99", - "setting_id": "GFSB99_CREALITY_00", + "setting_id": "GFSA04", "name": "Generic ABS @Creality", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality.json b/resources/profiles/Creality/filament/Generic PETG @Creality.json index d35d2ab0249..bc7b1c87c9e 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG99", - "setting_id": "GFSG99_CREALITY_00", + "setting_id": "GFSA04", "name": "Generic PETG @Creality", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Generic PLA @Creality.json b/resources/profiles/Creality/filament/Generic PLA @Creality.json index 1038c68a4b8..b31b1240820 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Creality.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL99", - "setting_id": "GFSL99_CREALITY_00", + "setting_id": "GFSA04", "name": "Generic PLA @Creality", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json index 5575d6c83ec..b9efa843061 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_CREALITY_001", + "setting_id": "GM001", "name": "Creality Ender-3 V2 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality.json b/resources/profiles/Creality/process/0.12mm Fine @Creality.json index 101a18725f9..3fd5d000ffd 100644 --- a/resources/profiles/Creality/process/0.12mm Fine @Creality.json +++ b/resources/profiles/Creality/process/0.12mm Fine @Creality.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_CREALITY_002", + "setting_id": "GP004", "name": "0.12mm Fine @Creality", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality/process/0.15mm Optimal @Creality.json b/resources/profiles/Creality/process/0.15mm Optimal @Creality.json index ded44bffcd2..7a2a4610eff 100644 --- a/resources/profiles/Creality/process/0.15mm Optimal @Creality.json +++ b/resources/profiles/Creality/process/0.15mm Optimal @Creality.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_CREALITY_003", + "setting_id": "GP004", "name": "0.15mm Optimal @Creality", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality.json b/resources/profiles/Creality/process/0.20mm Standard @Creality.json index 6628ff2020b..68a74d15c1a 100644 --- a/resources/profiles/Creality/process/0.20mm Standard @Creality.json +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_CREALITY_004", + "setting_id": "GP004", "name": "0.20mm Standard @Creality", "from": "system", "inherits": "fdm_process_creality_common", diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality.json b/resources/profiles/Creality/process/0.24mm Draft @Creality.json index adbc776fb12..3266959db67 100644 --- a/resources/profiles/Creality/process/0.24mm Draft @Creality.json +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_CREALITY_005", + "setting_id": "GP004", "name": "0.24mm Draft @Creality", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 93935a5f487..b28bec94109 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1,6 +1,6 @@ { "name": "Prusa", - "version": "01.04.00.10", + "version": "01.04.00.11", "force_update": "0", "description": "Prusa configurations", "machine_model_list": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS.json index 361d8950f87..3953a58e9c0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB99", - "setting_id": "GFSB99", + "setting_id": "GFSA04", "name": "Prusa Generic ABS", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA.json b/resources/profiles/Prusa/filament/Prusa Generic ASA.json index 23bb3c1d690..ff83c0ec4e7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB98", - "setting_id": "GFSB98", + "setting_id": "GFSA04", "name": "Prusa Generic ASA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json index 690b77a1417..2eaa2bf34d1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN98", - "setting_id": "GFSN99", + "setting_id": "GFSA04", "name": "Prusa Generic PA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Prusa Generic PA.json index b963cf05b57..13991aad2ca 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN99", - "setting_id": "GFSN98", + "setting_id": "GFSA04", "name": "Prusa Generic PA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC.json b/resources/profiles/Prusa/filament/Prusa Generic PC.json index 3d283a74e6a..aa8556bcca8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFC99", - "setting_id": "GFSC99", + "setting_id": "GFSA04", "name": "Prusa Generic PC", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG.json b/resources/profiles/Prusa/filament/Prusa Generic PETG.json index 1a057c7d63d..33a1a112ca1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG99", - "setting_id": "GFSG99", + "setting_id": "GFSA04", "name": "Prusa Generic PETG", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json index 4f99465a59c..7651c3afc5c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL98", - "setting_id": "GFSL98", + "setting_id": "GFSA04", "name": "Prusa Generic PLA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA.json b/resources/profiles/Prusa/filament/Prusa Generic PLA.json index 3c155219d7f..bf58f0271af 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL99", - "setting_id": "GFSL99", + "setting_id": "GFSA04", "name": "Prusa Generic PLA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA.json b/resources/profiles/Prusa/filament/Prusa Generic PVA.json index 68054402de2..7634b23165f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFS99", - "setting_id": "GFSS99", + "setting_id": "GFSA04", "name": "Prusa Generic PVA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU.json b/resources/profiles/Prusa/filament/Prusa Generic TPU.json index 7566103eaa8..f92b633cc2d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFU99", - "setting_id": "GFSR99", + "setting_id": "GFSA04", "name": "Prusa Generic TPU", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MINI.json b/resources/profiles/Prusa/process/0.20mm Standard @MINI.json index 8e5299644f5..40d9a941069 100644 --- a/resources/profiles/Prusa/process/0.20mm Standard @MINI.json +++ b/resources/profiles/Prusa/process/0.20mm Standard @MINI.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "MINI-1", + "setting_id": "GP004", "name": "0.20mm Standard @MINI", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json index 6376487ed3e..661eba9ad55 100644 --- a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json +++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "MK3S-2", + "setting_id": "GP004", "name": "0.20mm Standard @MK3S", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index ae943a819d4..05359b934e6 100644 --- a/resources/profiles/Ratrig.json +++ b/resources/profiles/Ratrig.json @@ -1,6 +1,6 @@ { "name": "RatRig", - "version": "01.04.00.01", + "version": "01.04.00.02", "force_update": "0", "description": "RatRig configurations", "machine_model_list": [ diff --git a/resources/profiles/Ratrig/filament/RatRig Generic ABS.json b/resources/profiles/Ratrig/filament/RatRig Generic ABS.json index 15b33d4da1f..3e23d7014fc 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB99", - "setting_id": "GFSB99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic ABS", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic ASA.json b/resources/profiles/Ratrig/filament/RatRig Generic ASA.json index b697df88b81..d8b222241aa 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic ASA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic ASA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB98", - "setting_id": "GFSB98_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic ASA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json b/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json index e270c3fa746..3efbfe4c083 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN98", - "setting_id": "GFSN98_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PA.json b/resources/profiles/Ratrig/filament/RatRig Generic PA.json index 0bb6c6b3325..aada5769062 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN99", - "setting_id": "GFSN99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PC.json b/resources/profiles/Ratrig/filament/RatRig Generic PC.json index 0c1a96c5d6a..5468d6f806c 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PC.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PC.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFC99", - "setting_id": "GFSC99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PC", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PETG.json b/resources/profiles/Ratrig/filament/RatRig Generic PETG.json index 49d987d62a0..60c77c5b5a3 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG99", - "setting_id": "GFSG99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PETG", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json b/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json index 21598accb9e..d9bcf05c67e 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL98", - "setting_id": "GFSL98_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PLA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PLA.json b/resources/profiles/Ratrig/filament/RatRig Generic PLA.json index 9b97a43bf77..8ae44bcd328 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PLA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL99", - "setting_id": "GFSL99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PLA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PVA.json b/resources/profiles/Ratrig/filament/RatRig Generic PVA.json index e96dce87aaa..89df94ee40a 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PVA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PVA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFS99", - "setting_id": "GFSS99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic PVA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/filament/RatRig Generic TPU.json b/resources/profiles/Ratrig/filament/RatRig Generic TPU.json index 55866e66059..79e9e1f1945 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic TPU.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFU99", - "setting_id": "GFSU99_RATRIG_00", + "setting_id": "GFSA04", "name": "RatRig Generic TPU", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 200 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 200 0.4 nozzle.json index eef186b2577..cced57d7585 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 200 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 200 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_RATRIG_001", + "setting_id": "GM001", "name": "RatRig V-Core 3 200 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 300 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 300 0.4 nozzle.json index e16ef38771e..5ee4bdb704e 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 300 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 300 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_RATRIG_002", + "setting_id": "GM001", "name": "RatRig V-Core 3 300 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 400 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 400 0.4 nozzle.json index cd89c328ff2..617dc2adc3b 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 400 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 400 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_RATRIG_003", + "setting_id": "GM001", "name": "RatRig V-Core 3 400 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 500 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 500 0.4 nozzle.json index 98fb2808099..b5c61a0a783 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 500 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 500 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_RATRIG_004", + "setting_id": "GM001", "name": "RatRig V-Core 3 500 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/machine/RatRig V-Minion 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Minion 0.4 nozzle.json index 1cbaa9703c6..ea833443760 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Minion 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Minion 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_RATRIG_005", + "setting_id": "GM001", "name": "RatRig V-Minion 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/process/0.08mm Extra Fine @RatRig.json b/resources/profiles/Ratrig/process/0.08mm Extra Fine @RatRig.json index de97efe8564..d0349e0c1cf 100644 --- a/resources/profiles/Ratrig/process/0.08mm Extra Fine @RatRig.json +++ b/resources/profiles/Ratrig/process/0.08mm Extra Fine @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_RATRIG_001", + "setting_id": "GP004", "name": "0.08mm Extra Fine @RatRig", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/process/0.12mm Fine @RatRig.json b/resources/profiles/Ratrig/process/0.12mm Fine @RatRig.json index b274d817354..a3a7c9446b4 100644 --- a/resources/profiles/Ratrig/process/0.12mm Fine @RatRig.json +++ b/resources/profiles/Ratrig/process/0.12mm Fine @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_RATRIG_002", + "setting_id": "GP004", "name": "0.12mm Fine @RatRig", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/process/0.15mm Optimal @RatRig.json b/resources/profiles/Ratrig/process/0.15mm Optimal @RatRig.json index 3b66a2f7d41..65a0cdc0124 100644 --- a/resources/profiles/Ratrig/process/0.15mm Optimal @RatRig.json +++ b/resources/profiles/Ratrig/process/0.15mm Optimal @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_RATRIG_003", + "setting_id": "GP004", "name": "0.15mm Optimal @RatRig", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/process/0.20mm Bambu Support W @RatRig.json b/resources/profiles/Ratrig/process/0.20mm Bambu Support W @RatRig.json index 012d74e52de..6a253ce8653 100644 --- a/resources/profiles/Ratrig/process/0.20mm Bambu Support W @RatRig.json +++ b/resources/profiles/Ratrig/process/0.20mm Bambu Support W @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP008", + "setting_id": "GP004", "name": "0.20mm Bambu Support W @RatRig", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/process/0.20mm Standard @RatRig.json b/resources/profiles/Ratrig/process/0.20mm Standard @RatRig.json index 6167a8668f6..b3b9c6719b3 100644 --- a/resources/profiles/Ratrig/process/0.20mm Standard @RatRig.json +++ b/resources/profiles/Ratrig/process/0.20mm Standard @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_RATRIG_004", + "setting_id": "GP004", "name": "0.20mm Standard @RatRig", "from": "system", "inherits": "fdm_process_ratrig_common", diff --git a/resources/profiles/Ratrig/process/0.24mm Draft @RatRig.json b/resources/profiles/Ratrig/process/0.24mm Draft @RatRig.json index 6f62c46ba1f..8aa9ad420a3 100644 --- a/resources/profiles/Ratrig/process/0.24mm Draft @RatRig.json +++ b/resources/profiles/Ratrig/process/0.24mm Draft @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_RATRIG_005", + "setting_id": "GP004", "name": "0.24mm Draft @RatRig", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Ratrig/process/0.28mm Extra Draft @RatRig.json b/resources/profiles/Ratrig/process/0.28mm Extra Draft @RatRig.json index cef82598ac3..4d73b73f2b8 100644 --- a/resources/profiles/Ratrig/process/0.28mm Extra Draft @RatRig.json +++ b/resources/profiles/Ratrig/process/0.28mm Extra Draft @RatRig.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_RATRIG_006", + "setting_id": "GP004", "name": "0.28mm Extra Draft @RatRig", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json index f360cac7bc4..13e1e7f953b 100644 --- a/resources/profiles/Voron.json +++ b/resources/profiles/Voron.json @@ -1,6 +1,6 @@ { "name": "Voron", - "version": "01.04.00.01", + "version": "01.04.00.02", "force_update": "0", "description": "Voron configurations", "machine_model_list": [ diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json index fb65c0a59cd..0d05960e1fa 100644 --- a/resources/profiles/Voron/filament/Voron Generic ABS.json +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB99", - "setting_id": "GFSB99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic ABS", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json index 1283f534010..5a05b451137 100644 --- a/resources/profiles/Voron/filament/Voron Generic ASA.json +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB98", - "setting_id": "GFSB98_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic ASA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json index 5353ad9adba..bdf028e4082 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN98", - "setting_id": "GFSN98_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json index 2796576ab75..bf1bf35dddf 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA.json +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFN99", - "setting_id": "GFSN99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json index 23890ca49df..772c4f307c6 100644 --- a/resources/profiles/Voron/filament/Voron Generic PC.json +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFC99", - "setting_id": "GFSC99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PC", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json index 145840d6509..0bcf5991c90 100644 --- a/resources/profiles/Voron/filament/Voron Generic PETG.json +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFG99", - "setting_id": "GFSG99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PETG", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json index 46ec3f97102..3f24172e6bf 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL98", - "setting_id": "GFSL98_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PLA-CF", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json index 85839be7936..ad8cbc0b1d7 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFL99", - "setting_id": "GFSL99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PLA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json index b8a7d826a1d..86f6fafbf34 100644 --- a/resources/profiles/Voron/filament/Voron Generic PVA.json +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFS99", - "setting_id": "GFSS99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic PVA", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json index 53ce822f2be..3459d4584bb 100644 --- a/resources/profiles/Voron/filament/Voron Generic TPU.json +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFU99", - "setting_id": "GFSU99_VORON_00", + "setting_id": "GFSA04", "name": "Voron Generic TPU", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json index ce9ce8bc02f..bfd7347b2d2 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_001", + "setting_id": "GM001", "name": "Voron 0.1 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json index e77d2fc571b..cb2de09bbdb 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_002", + "setting_id": "GM001", "name": "Voron 2.4 250 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json index 9c7a4b2709a..48d0e127bd3 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_003", + "setting_id": "GM001", "name": "Voron 2.4 300 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json index 11c95366c95..7884fc5bb96 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_004", + "setting_id": "GM001", "name": "Voron 2.4 350 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json index eccee2b4269..c9a784eb780 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_005", + "setting_id": "GM001", "name": "Voron Trident 250 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json index 027d1e1def0..0f6d0c719bd 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_006", + "setting_id": "GM001", "name": "Voron Trident 300 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json index 955b3e70cfe..ba1db126d47 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_VORON_007", + "setting_id": "GM001", "name": "Voron Trident 350 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json b/resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json index a60c84cc132..5900e250dd4 100644 --- a/resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json +++ b/resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_VORON_001", + "setting_id": "GP004", "name": "0.08mm Extra Fine @Voron", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/process/0.12mm Fine @Voron.json b/resources/profiles/Voron/process/0.12mm Fine @Voron.json index bc96205135b..82914881594 100644 --- a/resources/profiles/Voron/process/0.12mm Fine @Voron.json +++ b/resources/profiles/Voron/process/0.12mm Fine @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_VORON_002", + "setting_id": "GP004", "name": "0.12mm Fine @Voron", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/process/0.15mm Optimal @Voron.json b/resources/profiles/Voron/process/0.15mm Optimal @Voron.json index 5f576f16207..dd9c4813da7 100644 --- a/resources/profiles/Voron/process/0.15mm Optimal @Voron.json +++ b/resources/profiles/Voron/process/0.15mm Optimal @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_VORON_003", + "setting_id": "GP004", "name": "0.15mm Optimal @Voron", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json b/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json index b456342d935..1ba3ff8008f 100644 --- a/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json +++ b/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP008", + "setting_id": "GP004", "name": "0.20mm Bambu Support W @Voron", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/process/0.20mm Standard @Voron.json b/resources/profiles/Voron/process/0.20mm Standard @Voron.json index fe74a231f95..4464fd09a26 100644 --- a/resources/profiles/Voron/process/0.20mm Standard @Voron.json +++ b/resources/profiles/Voron/process/0.20mm Standard @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_VORON_004", + "setting_id": "GP004", "name": "0.20mm Standard @Voron", "from": "system", "inherits": "fdm_process_voron_common", diff --git a/resources/profiles/Voron/process/0.24mm Draft @Voron.json b/resources/profiles/Voron/process/0.24mm Draft @Voron.json index b2ce2ce049f..7d2bf2bd171 100644 --- a/resources/profiles/Voron/process/0.24mm Draft @Voron.json +++ b/resources/profiles/Voron/process/0.24mm Draft @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_VORON_005", + "setting_id": "GP004", "name": "0.24mm Draft @Voron", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json b/resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json index 8e0153982c0..efcf3b71af8 100644 --- a/resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json +++ b/resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP_VORON_006", + "setting_id": "GP004", "name": "0.28mm Extra Draft @Voron", "from": "system", "instantiation": "true",