forked from SoftFever/OrcaSlicer
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'SoftFever:main' into scarf-seams
- Loading branch information
Showing
103 changed files
with
4,192 additions
and
135 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,343 @@ | ||
| { | ||
| "name": "Blocks", | ||
| "version": "02.01.00.00", | ||
| "force_update": "0", | ||
| "description": "Blocks configurations", | ||
| "machine_model_list": [ | ||
| { | ||
| "name": "BLOCKS Pro S100", | ||
| "sub_path": "machine/BLOCKS Pro S100.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RD50 V2", | ||
| "sub_path": "machine/BLOCKS RD50 V2.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RF50", | ||
| "sub_path": "machine/BLOCKS RF50.json" | ||
| } | ||
|
|
||
| ], | ||
| "process_list": [ | ||
| { | ||
| "name": "fdm_process_common", | ||
| "sub_path": "process/fdm_process_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_process_blocks_common", | ||
| "sub_path": "process/fdm_process_blocks_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_process_common 0.6 nozzle", | ||
| "sub_path": "process/fdm_process_common 0.6 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "fdm_process_common 0.8 nozzle", | ||
| "sub_path": "process/fdm_process_common 0.8 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "fdm_process_common 1.0 nozzle", | ||
| "sub_path": "process/fdm_process_common 1.0 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "fdm_process_common 1.2 nozzle", | ||
| "sub_path": "process/fdm_process_common 1.2 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Standard 0.4 nozzle @Blocks", | ||
| "sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.24mm Draft 0.4 nozzle @Blocks", | ||
| "sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Extra Draft 0.4 nozzle @Blocks", | ||
| "sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Standard 0.6 nozzle @Blocks", | ||
| "sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.40mm Draft 0.6 nozzle @Blocks", | ||
| "sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Optimal 0.8 nozzle @Blocks", | ||
| "sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.40mm Standard 0.8 nozzle @Blocks", | ||
| "sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.50mm Draft 0.8 nozzle @Blocks", | ||
| "sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.50mm Standard 1.0 nozzle @Blocks", | ||
| "sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.60mm Draft 1.0 nozzle @Blocks", | ||
| "sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.70mm Extra Draft 1.0 nozzle @Blocks", | ||
| "sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.50mm Optimal 1.2 nozzle @Blocks", | ||
| "sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.60mm Standard 1.2 nozzle @Blocks", | ||
| "sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.70mm Draft 1.2 nozzle @Blocks", | ||
| "sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.80mm Extra Draft 1.2 nozzle @Blocks", | ||
| "sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks.json" | ||
| }, | ||
| { | ||
| "name": "0.12mm Fine 0.4 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.12mm Fine 0.4 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.16mm Optimal 0.4 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.16mm Optimal 0.4 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Standard 0.4 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.24mm Draft 0.4 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.28mm Extra Draft 0.4 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.28mm Extra Draft 0.4 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Optimal 0.6 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.20mm Optimal 0.6 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.26mm Standard 0.6 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.26mm Standard 0.6 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.32mm Draft 0.6 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.32mm Draft 0.6 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.38mm Extra Draft 0.6 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.38mm Extra Draft 0.6 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.38mm Standard 0.8 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.38mm Standard 0.8 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.46mm Draft 0.8 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.46mm Draft 0.8 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2", | ||
| "sub_path": "process/0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2.json" | ||
| }, | ||
| { | ||
| "name": "0.12mm Fine 0.4 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.16mm Optimal 0.4 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Standard 0.4 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.24mm Draft 0.4 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.28mm Extra Draft 0.4 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Optimal 0.6 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.26mm Standard 0.6 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.32mm Draft 0.6 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.38mm Extra Draft 0.6 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Optimal 0.8 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.38mm Standard 0.8 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.46mm Draft 0.8 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json" | ||
| }, | ||
| { | ||
| "name": "0.54mm Extra Draft 0.8 nozzle @Blocks_RF50", | ||
| "sub_path": "process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json" | ||
| } | ||
| ], | ||
| "filament_list": [ | ||
| { | ||
| "name": "fdm_filament_common", | ||
| "sub_path": "filament/fdm_filament_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pla", | ||
| "sub_path": "filament/fdm_filament_pla.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_petg", | ||
| "sub_path": "filament/fdm_filament_petg.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_tpu", | ||
| "sub_path": "filament/fdm_filament_tpu.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_abs", | ||
| "sub_path": "filament/fdm_filament_abs.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_asa", | ||
| "sub_path": "filament/fdm_filament_asa.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pa", | ||
| "sub_path": "filament/fdm_filament_pa.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pc", | ||
| "sub_path": "filament/fdm_filament_pc.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pva", | ||
| "sub_path": "filament/fdm_filament_pva.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PLA", | ||
| "sub_path": "filament/Blocks Generic PLA.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PETG", | ||
| "sub_path": "filament/Blocks Generic PETG.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic TPU", | ||
| "sub_path": "filament/Blocks Generic TPU.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic ABS", | ||
| "sub_path": "filament/Blocks Generic ABS.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic ASA", | ||
| "sub_path": "filament/Blocks Generic ASA.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PA", | ||
| "sub_path": "filament/Blocks Generic PA.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PA-CF", | ||
| "sub_path": "filament/Blocks Generic PA-CF.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PC", | ||
| "sub_path": "filament/Blocks Generic PC.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PVA", | ||
| "sub_path": "filament/Blocks Generic PVA.json" | ||
| }, | ||
| { | ||
| "name": "Blocks Generic PLA-CF", | ||
| "sub_path": "filament/Blocks Generic PLA-CF.json" | ||
| } | ||
| ], | ||
| "machine_list": [ | ||
| { | ||
| "name": "fdm_machine_common", | ||
| "sub_path": "machine/fdm_machine_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_klipper_common", | ||
| "sub_path": "machine/fdm_klipper_common.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS Pro S100 0.4 nozzle", | ||
| "sub_path": "machine/BLOCKS Pro S100 0.4 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS Pro S100 0.6 nozzle", | ||
| "sub_path": "machine/BLOCKS Pro S100 0.6 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS Pro S100 0.8 nozzle", | ||
| "sub_path": "machine/BLOCKS Pro S100 0.8 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS Pro S100 1.0 nozzle", | ||
| "sub_path": "machine/BLOCKS Pro S100 1.0 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS Pro S100 1.2 nozzle", | ||
| "sub_path": "machine/BLOCKS Pro S100 1.2 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RD50 V2 0.4 nozzle", | ||
| "sub_path": "machine/BLOCKS RD50 V2 0.4 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RD50 V2 0.6 nozzle", | ||
| "sub_path": "machine/BLOCKS RD50 V2 0.6 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RD50 V2 0.8 nozzle", | ||
| "sub_path": "machine/BLOCKS RD50 V2 0.8 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RF50 0.4 nozzle", | ||
| "sub_path": "machine/BLOCKS RF50 0.4 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RF50 0.6 nozzle", | ||
| "sub_path": "machine/BLOCKS RF50 0.6 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "BLOCKS RF50 0.8 nozzle", | ||
| "sub_path": "machine/BLOCKS RF50 0.8 nozzle.json" | ||
| } | ||
| ] | ||
| } |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions
25
resources/profiles/Blocks/filament/Blocks Generic ABS.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "BSFI004", | ||
| "setting_id": "BSSI004", | ||
| "name": "Blocks Generic ABS", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_abs", | ||
| "filament_flow_ratio": [ | ||
| "0.926" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "20" | ||
| ], | ||
| "compatible_printers": [ | ||
| "BLOCKS RD50 V2 0.4 nozzle", | ||
| "BLOCKS RD50 V2 0.6 nozzle", | ||
| "BLOCKS RD50 V2 0.8 nozzle", | ||
| "BLOCKS RD50 V2", | ||
| "BLOCKS RF50 0.4 nozzle", | ||
| "BLOCKS RF50 0.6 nozzle", | ||
| "BLOCKS RF50 0.8 nozzle", | ||
| "BLOCKS RF50" | ||
| ] | ||
| } |
25 changes: 25 additions & 0 deletions
25
resources/profiles/Blocks/filament/Blocks Generic ASA.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "BSFI005", | ||
| "setting_id": "BSSI005", | ||
| "name": "Blocks Generic ASA", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_asa", | ||
| "filament_flow_ratio": [ | ||
| "0.93" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "20" | ||
| ], | ||
| "compatible_printers": [ | ||
| "BLOCKS RD50 V2 0.4 nozzle", | ||
| "BLOCKS RD50 V2 0.6 nozzle", | ||
| "BLOCKS RD50 V2 0.8 nozzle", | ||
| "BLOCKS RD50 V2", | ||
| "BLOCKS RF50 0.4 nozzle", | ||
| "BLOCKS RF50 0.6 nozzle", | ||
| "BLOCKS RF50 0.8 nozzle", | ||
| "BLOCKS RF50" | ||
| ] | ||
| } |
Oops, something went wrong.