Skip to content

Commit

Permalink
fix profile syncing issue
Browse files Browse the repository at this point in the history 
SoftFever#74
  • Loading branch information
@SoftFever
SoftFever committed Dec 30, 2022
1 parent 4803263 commit 8d482ed
Show file tree
Hide file tree
Showing 83 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions build_release.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic.json
View file
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB99",
"setting_id": "GFSB99",
"setting_id": "GFSA04",
"name": "Anycubic Generic ABS",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB98",
"setting_id": "GFSB98",
"setting_id": "GFSA04",
"name": "Anycubic Generic ASA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFN98",
"setting_id": "GFSN99",
"setting_id": "GFSA04",
"name": "Anycubic Generic PA-CF",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFN99",
"setting_id": "GFSN98",
"setting_id": "GFSA04",
"name": "Anycubic Generic PA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PC.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFC99",
"setting_id": "GFSC99",
"setting_id": "GFSA04",
"name": "Anycubic Generic PC",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"setting_id": "GFSA04",
"name": "Anycubic Generic PETG",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL98",
"setting_id": "GFSL98",
"setting_id": "GFSA04",
"name": "Anycubic Generic PLA-CF",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL99",
"setting_id": "GFSL99",
"setting_id": "GFSA04",
"name": "Anycubic Generic PLA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFS99",
"setting_id": "GFSS99",
"setting_id": "GFSA04",
"name": "Anycubic Generic PVA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFU99",
"setting_id": "GFSR99",
"setting_id": "GFSA04",
"name": "Anycubic Generic TPU",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "Anycubic-1",
"setting_id": "GP004",
"name": "0.20mm Standard @4MaxPro",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality.json
View file
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/filament/Generic ABS @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/filament/Generic PETG @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/filament/Generic PLA @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/process/0.12mm Fine @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP_CREALITY_002",
"setting_id": "GP004",
"name": "0.12mm Fine @Creality",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/process/0.15mm Optimal @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP_CREALITY_003",
"setting_id": "GP004",
"name": "0.15mm Optimal @Creality",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/process/0.20mm Standard @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality/process/0.24mm Draft @Creality.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP_CREALITY_005",
"setting_id": "GP004",
"name": "0.24mm Draft @Creality",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa.json
View file
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic ABS.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB99",
"setting_id": "GFSB99",
"setting_id": "GFSA04",
"name": "Prusa Generic ABS",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic ASA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB98",
"setting_id": "GFSB98",
"setting_id": "GFSA04",
"name": "Prusa Generic ASA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PA-CF.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFN98",
"setting_id": "GFSN99",
"setting_id": "GFSA04",
"name": "Prusa Generic PA-CF",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFN99",
"setting_id": "GFSN98",
"setting_id": "GFSA04",
"name": "Prusa Generic PA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PC.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFC99",
"setting_id": "GFSC99",
"setting_id": "GFSA04",
"name": "Prusa Generic PC",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PETG.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"setting_id": "GFSA04",
"name": "Prusa Generic PETG",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL98",
"setting_id": "GFSL98",
"setting_id": "GFSA04",
"name": "Prusa Generic PLA-CF",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PLA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL99",
"setting_id": "GFSL99",
"setting_id": "GFSA04",
"name": "Prusa Generic PLA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PVA.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFS99",
"setting_id": "GFSS99",
"setting_id": "GFSA04",
"name": "Prusa Generic PVA",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/filament/Prusa Generic TPU.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFU99",
"setting_id": "GFSR99",
"setting_id": "GFSA04",
"name": "Prusa Generic TPU",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/process/0.20mm Standard @MINI.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "MINI-1",
"setting_id": "GP004",
"name": "0.20mm Standard @MINI",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa/process/0.20mm Standard @MK3S.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "MK3S-2",
"setting_id": "GP004",
"name": "0.20mm Standard @MK3S",
"from": "system",
"instantiation": "true",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig.json
View file
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic ABS.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic ASA.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PA.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PC.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PETG.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PLA.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig/filament/RatRig Generic PVA.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading

0 comments on commit 8d482ed

Please sign in to comment.