-
-
Notifications
You must be signed in to change notification settings - Fork 939
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into anker_nozzles
- Loading branch information
Showing
75 changed files
with
2,940 additions
and
173 deletions.
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -244,7 +244,16 @@ jobs: | |
| ./BuildLinux.sh -isr | ||
| mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| - name: Build orca_custom_preset_tests | ||
| if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' | ||
| working-directory: ${{ github.workspace }}/build/src | ||
| shell: bash | ||
| run: | | ||
| OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -g 1 | ||
| cd ${{ github.workspace }}/resources/profiles | ||
| zip -r orca_custom_preset_tests.zip user/ | ||
| - name: Upload artifacts Ubuntu | ||
| if: inputs.os == 'ubuntu-20.04' | ||
| uses: actions/upload-artifact@v3 | ||
|
|
@@ -262,3 +271,14 @@ jobs: | |
| asset_name: OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| asset_content_type: application/octet-stream | ||
| max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted | ||
|
|
||
| - name: Deploy orca_custom_preset_tests | ||
| if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' | ||
| uses: WebFreak001/[email protected] | ||
| with: | ||
| upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} | ||
| release_id: 137995723 | ||
| asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip | ||
| asset_name: orca_custom_preset_tests | ||
| asset_content_type: application/octet-stream | ||
| max_releases: 1 | ||
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
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 |
|---|---|---|
|
|
@@ -32,3 +32,4 @@ src/OrcaSlicer-doc/ | |
| **/filament_full/ | ||
| /deps/DL_CACHE/ | ||
| /deps/DL_CACHE | ||
| resources/profiles/user/default | ||
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
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,94 @@ | ||
| { | ||
| "name": "CONSTRUCT3D", | ||
| "version": "01.09.00.02", | ||
| "force_update": "0", | ||
| "description": "Construct3D configurations", | ||
| "machine_model_list": [ | ||
| { | ||
| "name": "Construct 1 XL", | ||
| "sub_path": "machine/Construct 1 XL.json" | ||
| }, | ||
| { | ||
| "name": "Construct 1", | ||
| "sub_path": "machine/Construct 1.json" | ||
| } | ||
| ], | ||
| "process_list": [ | ||
| { | ||
| "name": "fdm_process_common", | ||
| "sub_path": "process/fdm_process_common.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Quality @Construct 1 XL", | ||
| "sub_path": "process/0.20mm Quality @Construct 1 XL.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Industrial @Construct 1 XL", | ||
| "sub_path": "process/0.30mm Industrial @Construct 1 XL.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Standard @Construct 1 XL", | ||
| "sub_path": "process/0.30mm Standard @Construct 1 XL.json" | ||
| }, | ||
| { | ||
| "name": "0.38mm Draft @Construct 1 XL", | ||
| "sub_path": "process/0.38mm Draft @Construct 1 XL.json" | ||
| }, | ||
| { | ||
| "name": "0.14mm Quality @Construct 1", | ||
| "sub_path": "process/0.14mm Quality @Construct 1.json" | ||
| }, | ||
| { | ||
| "name": "0.25mm Industrial @Construct 1", | ||
| "sub_path": "process/0.25mm Industrial @Construct 1.json" | ||
| }, | ||
| { | ||
| "name": "0.22mm Standard @Construct 1", | ||
| "sub_path": "process/0.22mm Standard @Construct 1.json" | ||
| }, | ||
| { | ||
| "name": "0.30mm Draft @Construct 1 XL", | ||
| "sub_path": "process/0.30mm Draft @Construct 1.json" | ||
| } | ||
| ], | ||
| "filament_list": [ | ||
| { | ||
| "name": "fdm_filament_common", | ||
| "sub_path": "filament/fdm_filament_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pet", | ||
| "sub_path": "filament/fdm_filament_pet.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pla", | ||
| "sub_path": "filament/fdm_filament_pla.json" | ||
| }, | ||
| { | ||
| "name": "C1 Generic PLA", | ||
| "sub_path": "filament/C1 Generic PLA.json" | ||
| }, | ||
| { | ||
| "name": "C1 Generic PETG", | ||
| "sub_path": "filament/C1 Generic PETG.json" | ||
| }, | ||
| { | ||
| "name": "C1 Generic High Flow PETG", | ||
| "sub_path": "filament/C1 Generic High Flow PETG.json" | ||
| } | ||
| ], | ||
| "machine_list": [ | ||
| { | ||
| "name": "fdm_machine_common", | ||
| "sub_path": "machine/fdm_machine_common.json" | ||
| }, | ||
| { | ||
| "name": "Construct 1 XL 0.6 nozzle", | ||
| "sub_path": "machine/Construct 1 XL 0.6 nozzle.json" | ||
| }, | ||
| { | ||
| "name": "Construct 1 0.4 nozzle", | ||
| "sub_path": "machine/Construct 1 0.4 nozzle.json" | ||
| } | ||
| ] | ||
| } |
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.
Binary file not shown.
58 changes: 58 additions & 0 deletions
58
resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.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,58 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "GFG99", | ||
| "setting_id": "GFSG99", | ||
| "name": "C1 Generic High Flow PETG", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_pet", | ||
| "reduce_fan_stop_start_freq": [ | ||
| "1" | ||
| ], | ||
| "slow_down_for_layer_cooling": [ | ||
| "1" | ||
| ], | ||
| "fan_cooling_layer_time": [ | ||
| "20" | ||
| ], | ||
| "overhang_fan_speed": [ | ||
| "100" | ||
| ], | ||
| "fan_max_speed": [ | ||
| "100" | ||
| ], | ||
| "fan_min_speed": [ | ||
| "30" | ||
| ], | ||
| "slow_down_min_speed": [ | ||
| "15" | ||
| ], | ||
| "slow_down_layer_time": [ | ||
| "6" | ||
| ], | ||
| "filament_flow_ratio": [ | ||
| "0.98" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "43" | ||
| ], | ||
| "nozzle_temperature": [ | ||
| "270" | ||
| ], | ||
| "nozzle_temperature_initial_layer": [ | ||
| "270" | ||
| ], | ||
| "nozzle_temperature_range_high": [ | ||
| "275" | ||
| ], | ||
| "nozzle_temperature_range_low": [ | ||
| "230" | ||
| ], | ||
| "filament_start_gcode": [ | ||
| "; filament start gcode\n" | ||
| ], | ||
| "compatible_printers": [ | ||
| "Construct 1 0.4 nozzle", | ||
| "Construct 1 XL 0.6 nozzle" | ||
| ] | ||
| } |
46 changes: 46 additions & 0 deletions
46
resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.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,46 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "GFG99", | ||
| "setting_id": "GFSG99", | ||
| "name": "C1 Generic PETG", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_pet", | ||
| "reduce_fan_stop_start_freq": [ | ||
| "1" | ||
| ], | ||
| "slow_down_for_layer_cooling": [ | ||
| "1" | ||
| ], | ||
| "fan_cooling_layer_time": [ | ||
| "20" | ||
| ], | ||
| "overhang_fan_speed": [ | ||
| "80" | ||
| ], | ||
| "fan_max_speed": [ | ||
| "100" | ||
| ], | ||
| "fan_min_speed": [ | ||
| "30" | ||
| ], | ||
| "slow_down_min_speed": [ | ||
| "15" | ||
| ], | ||
| "slow_down_layer_time": [ | ||
| "6" | ||
| ], | ||
| "filament_flow_ratio": [ | ||
| "0.98" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "35" | ||
| ], | ||
| "filament_start_gcode": [ | ||
| "; filament start gcode\n" | ||
| ], | ||
| "compatible_printers": [ | ||
| "Construct 1 0.4 nozzle", | ||
| "Construct 1 XL 0.6 nozzle" | ||
| ] | ||
| } |
28 changes: 28 additions & 0 deletions
28
resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.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,28 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "GFL99", | ||
| "setting_id": "GFSL99", | ||
| "name": "C1 Generic PLA", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_pla", | ||
| "filament_flow_ratio": [ | ||
| "0.98" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "30" | ||
| ], | ||
| "slow_down_layer_time": [ | ||
| "4" | ||
| ], | ||
| "hot_plate_temp": [ | ||
| "62" | ||
| ], | ||
| "hot_plate_temp_initial_layer": [ | ||
| "68" | ||
| ], | ||
| "compatible_printers": [ | ||
| "Construct 1 0.4 nozzle", | ||
| "Construct 1 XL 0.6 nozzle" | ||
| ] | ||
| } |
Oops, something went wrong.