Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Artillery New Models #4086

Closed
wants to merge 14 commits into from
Closed

Add Artillery New Models #4086

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4693092
Added Artillery X3 and X4 NEW Models
urtziDV Feb 11, 2024
9023ca8
Add files via upload
urtziDV Feb 11, 2024
748cd0e
Add files via upload
urtziDV Feb 11, 2024
8c28f90
Update README.md
urtziDV Feb 11, 2024
254388c
Update README.md
urtziDV Feb 14, 2024
074cc9e
Merge branch 'SoftFever:main' into main
urtziDV Feb 17, 2024
a184e2a
Add files via upload
urtziDV Feb 17, 2024
07342f5
Add files via upload
urtziDV Feb 17, 2024
60f0fe5
Merge branch 'main' into main
urtziDV Feb 18, 2024
1b5df08
Merge branch 'main' into main
urtziDV Feb 21, 2024
cc12d24
Profiles
urtziDV Feb 21, 2024
7e17a19
Merge branch 'main' into main
urtziDV Feb 26, 2024
4aa4d3d
Merge branch 'main' into main
SoftFever Feb 28, 2024
42d5bcb
Merge branch 'main' into main
urtziDV Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
# Orca Slicer
# Orca Slicer (MOD with Artillery X3 & X4)
urtziDV marked this conversation as resolved.
Show resolved Hide resolved
Orca Slicer is an open source slicer for FDM printers.

![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/P4VE9UY9gJ)
Expand Down
384 changes: 222 additions & 162 deletions resources/profiles/Artillery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,162 +1,222 @@
{
"name": "Artillery",
"version": "01.09.00.02",
"force_update": "0",
"description": "Artillery configurations",
"machine_model_list": [
{
"name": "Artillery Sidewinder X1",
"sub_path": "machine/Artillery Sidewinder X1.json"
},
{
"name": "Artillery Genius",
"sub_path": "machine/Artillery Genius.json"
},
{
"name": "Artillery Genius Pro",
"sub_path": "machine/Artillery Genius Pro.json"
},
{
"name": "Artillery Sidewinder X2",
"sub_path": "machine/Artillery Sidewinder X2.json"
},
{
"name": "Artillery Hornet",
"sub_path": "machine/Artillery Hornet.json"
}
],
"process_list": [
{
"name": "fdm_process_common",
"sub_path": "process/fdm_process_common.json"
},
{
"name": "0.16mm Optimal @Artillery X1",
"sub_path": "process/0.16mm Optimal @Artillery X1.json"
},
{
"name": "0.15mm Optimal @Artillery Genius",
"sub_path": "process/0.15mm Optimal @Artillery Genius.json"
},
{
"name": "0.15mm Optimal @Artillery Genius Pro",
"sub_path": "process/0.15mm Optimal @Artillery Genius Pro.json"
},
{
"name": "0.16mm Optimal @Artillery Hornet",
"sub_path": "process/0.16mm Optimal @Artillery Hornet.json"
},
{
"name": "0.20mm Standard @Artillery X1",
"sub_path": "process/0.20mm Standard @Artillery X1.json"
},
{
"name": "0.20mm Standard @Artillery Genius",
"sub_path": "process/0.20mm Standard @Artillery Genius.json"
},
{
"name": "0.20mm Standard @Artillery Genius Pro",
"sub_path": "process/0.20mm Standard @Artillery Genius Pro.json"
},
{
"name": "0.20mm Standard @Artillery X2",
"sub_path": "process/0.20mm Standard @Artillery X2.json"
},
{
"name": "0.20mm Standard @Artillery Hornet",
"sub_path": "process/0.20mm Standard @Artillery Hornet.json"
},
{
"name": "0.24mm Draft @Artillery X1",
"sub_path": "process/0.24mm Draft @Artillery X1.json"
},
{
"name": "0.25mm Draft @Artillery Genius",
"sub_path": "process/0.25mm Draft @Artillery Genius.json"
},
{
"name": "0.25mm Draft @Artillery Genius Pro",
"sub_path": "process/0.25mm Draft @Artillery Genius Pro.json"
},
{
"name": "0.24mm Draft @Artillery Hornet",
"sub_path": "process/0.24mm Draft @Artillery Hornet.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_tpu",
"sub_path": "filament/fdm_filament_tpu.json"
},
{
"name": "fdm_filament_pet",
"sub_path": "filament/fdm_filament_pet.json"
},
{
"name": "fdm_filament_abs",
"sub_path": "filament/fdm_filament_abs.json"
},
{
"name": "fdm_filament_asa",
"sub_path": "filament/fdm_filament_asa.json"
},
{
"name": "Artillery Generic PLA",
"sub_path": "filament/Artillery Generic PLA.json"
},
{
"name": "Artillery Generic PLA-CF",
"sub_path": "filament/Artillery Generic PLA-CF.json"
},
{
"name": "Artillery Generic PETG",
"sub_path": "filament/Artillery Generic PETG.json"
},
{
"name": "Artillery Generic ABS",
"sub_path": "filament/Artillery Generic ABS.json"
},
{
"name": "Artillery Generic TPU",
"sub_path": "filament/Artillery Generic TPU.json"
},
{
"name": "Artillery Generic ASA",
"sub_path": "filament/Artillery Generic ASA.json"
}
],
"machine_list": [
{
"name": "fdm_machine_common",
"sub_path": "machine/fdm_machine_common.json"
},
{
"name": "Artillery Sidewinder X1 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X1 0.4 nozzle.json"
},
{
"name": "Artillery Genius 0.4 nozzle",
"sub_path": "machine/Artillery Genius 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X2 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json"
},
{
"name": "Artillery Genius Pro 0.4 nozzle",
"sub_path": "machine/Artillery Genius Pro 0.4 nozzle.json"
},
{
"name": "Artillery Hornet 0.4 nozzle",
"sub_path": "machine/Artillery Hornet 0.4 nozzle.json"
}
]
}
{
"name": "Artillery",
"version": "01.09.00.02",
"force_update": "0",
"description": "Artillery configurations",
"machine_model_list": [
{
"name": "Artillery Sidewinder X1",
"sub_path": "machine/Artillery Sidewinder X1.json"
},
{
"name": "Artillery Genius",
"sub_path": "machine/Artillery Genius.json"
},
{
"name": "Artillery Genius Pro",
"sub_path": "machine/Artillery Genius Pro.json"
},
{
"name": "Artillery Sidewinder X2",
"sub_path": "machine/Artillery Sidewinder X2.json"
},
{
"name": "Artillery Sidewinder X3 Pro",
"sub_path": "machine/Artillery Sidewinder X3 Pro.json"
},
{
"name": "Artillery Sidewinder X3 Plus",
"sub_path": "machine/Artillery Sidewinder X3 Plus.json"
},
{
"name": "Artillery Sidewinder X4 Pro",
"sub_path": "machine/Artillery Sidewinder X4 Pro.json"
},
{
"name": "Artillery Sidewinder X4 Plus",
"sub_path": "machine/Artillery Sidewinder X4 Plus.json"
},
{
"name": "Artillery Sidewinder X4 Max",
"sub_path": "machine/Artillery Sidewinder X4 Max.json"
},
{
"name": "Artillery Hornet",
"sub_path": "machine/Artillery Hornet.json"
}
],
"process_list": [
{
"name": "fdm_process_common",
"sub_path": "process/fdm_process_common.json"
},
{
"name": "0.16mm Optimal @Artillery X1",
"sub_path": "process/0.16mm Optimal @Artillery X1.json"
},
{
"name": "0.15mm Optimal @Artillery Genius",
"sub_path": "process/0.15mm Optimal @Artillery Genius.json"
},
{
"name": "0.15mm Optimal @Artillery Genius Pro",
"sub_path": "process/0.15mm Optimal @Artillery Genius Pro.json"
},
{
"name": "0.16mm Optimal @Artillery Hornet",
"sub_path": "process/0.16mm Optimal @Artillery Hornet.json"
},
{
"name": "0.20mm Standard @Artillery Genius",
"sub_path": "process/0.20mm Standard @Artillery Genius.json"
},
{
"name": "0.20mm Standard @Artillery Genius Pro",
"sub_path": "process/0.20mm Standard @Artillery Genius Pro.json"
},
{
"name": "0.20mm Standard @Artillery Hornet",
"sub_path": "process/0.20mm Standard @Artillery Hornet.json"
},
{
"name": "0.20mm Standard @Artillery X1",
"sub_path": "process/0.20mm Standard @Artillery X1.json"
},
{
"name": "0.20mm Standard @Artillery X2",
"sub_path": "process/0.20mm Standard @Artillery X2.json"
},
{
"name": "0.20mm Standard @Artillery X3 Pro",
"sub_path": "process/0.20mm Standard @Artillery X3 Pro.json"
},
{
"name": "0.20mm Standard @Artillery X3 Plus",
"sub_path": "process/0.20mm Standard @Artillery X3 Plus.json"
},
{
"name": "0.20mm Standard @Artillery X4 Pro",
"sub_path": "process/0.20mm Standard @Artillery X4 Pro.json"
},
{
"name": "0.20mm Standard @Artillery X4 Plus",
"sub_path": "process/0.20mm Standard @Artillery X4 Plus.json"
},
{
"name": "0.20mm Standard @Artillery X4 Max",
"sub_path": "process/0.20mm Standard @Artillery X4 Max.json"
},
{
"name": "0.24mm Draft @Artillery X1",
"sub_path": "process/0.24mm Draft @Artillery X1.json"
},
{
"name": "0.25mm Draft @Artillery Genius",
"sub_path": "process/0.25mm Draft @Artillery Genius.json"
},
{
"name": "0.25mm Draft @Artillery Genius Pro",
"sub_path": "process/0.25mm Draft @Artillery Genius Pro.json"
},
{
"name": "0.24mm Draft @Artillery Hornet",
"sub_path": "process/0.24mm Draft @Artillery Hornet.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_tpu",
"sub_path": "filament/fdm_filament_tpu.json"
},
{
"name": "fdm_filament_pet",
"sub_path": "filament/fdm_filament_pet.json"
},
{
"name": "fdm_filament_abs",
"sub_path": "filament/fdm_filament_abs.json"
},
{
"name": "fdm_filament_asa",
"sub_path": "filament/fdm_filament_asa.json"
},
{
"name": "Artillery Generic PLA",
"sub_path": "filament/Artillery Generic PLA.json"
},
{
"name": "Artillery Generic PLA-CF",
"sub_path": "filament/Artillery Generic PLA-CF.json"
},
{
"name": "Artillery Generic PETG",
"sub_path": "filament/Artillery Generic PETG.json"
},
{
"name": "Artillery Generic ABS",
"sub_path": "filament/Artillery Generic ABS.json"
},
{
"name": "Artillery Generic TPU",
"sub_path": "filament/Artillery Generic TPU.json"
},
{
"name": "Artillery Generic ASA",
"sub_path": "filament/Artillery Generic ASA.json"
}
],
"machine_list": [
{
"name": "fdm_machine_common",
"sub_path": "machine/fdm_machine_common.json"
},
{
"name": "Artillery Genius 0.4 nozzle",
"sub_path": "machine/Artillery Genius 0.4 nozzle.json"
},
{
"name": "Artillery Genius Pro 0.4 nozzle",
"sub_path": "machine/Artillery Genius Pro 0.4 nozzle.json"
},
{
"name": "Artillery Hornet 0.4 nozzle",
"sub_path": "machine/Artillery Hornet 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X1 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X1 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X2 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X3 Pro 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X3 Plus 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X4 Pro 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X4 Pus 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json"
},
{
"name": "Artillery Sidewinder X4 Max 0.4 nozzle",
"sub_path": "machine/Artillery Sidewinder X4 Max 0.4 nozzle.json"
}
]
}
Binary file added resources/profiles/Artillery/Artillery Sidewinder X3 Plus_cover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/Artillery Sidewinder X3 Pro_cover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/Artillery Sidewinder X4 Max_cover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/Artillery Sidewinder X4 Plus_cover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/Artillery Sidewinder X4 Pro_cover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x3_plus_buildplate_model.stl
View file
Open in desktop
Binary file not shown.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x3_plus_buildplate_texture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x3_pro_buildplate_model.stl
View file
Open in desktop
Binary file not shown.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x3_pro_buildplate_texture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x4_max_buildplate_model.stl
View file
Open in desktop
Binary file not shown.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x4_max_buildplate_texture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x4_plus_buildplate_model.stl
View file
Open in desktop
Binary file not shown.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x4_plus_buildplate_texture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x4_pro_buildplate_model.stl
View file
Open in desktop
Binary file not shown.
Binary file added resources/profiles/Artillery/artillery_sidewinder_x4_pro_buildplate_texture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.