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 fc608ab3a1..a65d66156a 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 7e3deb0aa7..3744416477 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 62800f76a8..6f1c87edad 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 04dcaf1cd3..3715401e9f 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 65e093d8dc..f087023a97 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 1aa1fd9771..e1d8881e09 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 a82eb93fc9..107998c7ec 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 2bbd4fdd91..e17ce804eb 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 b67874dfb5..4a320f3c50 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 57300b19b0..27911c79d0 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 eb1938040e..565b832375 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 9b27254381..1177b0138f 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 12ad73c809..ff4bae252f 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 9baee1faa0..d3d034151b 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 6848fa4ca3..d38ca3dc40 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 d35d2ab024..bc7b1c87c9 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 1038c68a4b..b31b124082 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 5575d6c83e..b9efa84306 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 101a18725f..3fd5d000ff 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 ded44bffcd..7a2a4610ef 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 6628ff2020..68a74d15c1 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 adbc776fb1..3266959db6 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 93935a5f48..b28bec9410 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 361d8950f8..3953a58e9c 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 23bb3c1d69..ff83c0ec4e 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 690b77a141..2eaa2bf34d 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 b963cf05b5..13991aad2c 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 3d283a74e6..aa8556bcca 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 1a057c7d63..33a1a112ca 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 4f99465a59..7651c3afc5 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 3c155219d7..bf58f0271a 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 68054402de..7634b23165 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 7566103eaa..f92b633cc2 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 8e5299644f..40d9a94106 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 6376487ed3..661eba9ad5 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 ae943a819d..05359b934e 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 15b33d4da1..3e23d7014f 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 b697df88b8..d8b222241a 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 e270c3fa74..3efbfe4c08 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 0bb6c6b332..aada576906 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 0c1a96c5d6..5468d6f806 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 49d987d62a..60c77c5b5a 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 21598accb9..d9bcf05c67 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 9b97a43bf7..8ae44bcd32 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 e96dce87aa..89df94ee40 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 55866e6605..79e9e1f194 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 eef186b257..cced57d758 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 e16ef38771..5ee4bdb704 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 cd89c328ff..617dc2adc3 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 98fb280809..b5c61a0a78 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 1cbaa9703c..ea83344376 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 de97efe856..d0349e0c1c 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 b274d81735..a3a7c9446b 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 3b66a2f7d4..65a0cdc012 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 012d74e52d..6a253ce865 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 6167a8668f..b3b9c6719b 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 6f62c46ba1..8aa9ad420a 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 cef82598ac..4d73b73f2b 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 f360cac7bc..13e1e7f953 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 fb65c0a59c..0d05960e1f 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 1283f53401..5a05b45113 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 5353ad9adb..bdf028e408 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 2796576ab7..bf1bf35ddd 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 23890ca49d..772c4f307c 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 145840d650..0bcf5991c9 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 46ec3f9710..3f24172e6b 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 85839be793..ad8cbc0b1d 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 b8a7d826a1..86f6fafbf3 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 53ce822f2b..3459d4584b 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 ce9ce8bc02..bfd7347b2d 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 e77d2fc571..cb2de09bbd 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 9c7a4b2709..48d0e127bd 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 11c95366c9..7884fc5bb9 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 eccee2b426..c9a784eb78 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 027d1e1def..0f6d0c719b 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 955b3e70cf..ba1db126d4 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 a60c84cc13..5900e250dd 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 bc96205135..8291488159 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 5f576f1620..dd9c4813da 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 b456342d93..1ba3ff8008 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 fe74a231f9..4464fd09a2 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 b2ce2ce049..7d2bf2bd17 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 8e0153982c..efcf3b71af 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",