juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts part 1

Browse Source
This commit is contained in:
cochcoder
2024-05-06 14:50:49 -04:00
parent 0995896a38
commit 2d6132a01d
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
resources/profiles/Flashforge.json
View File

@@ -20,10 +20,6 @@
{ {
"name": "Flashforge Guider 3 Ultra", "name": "Flashforge Guider 3 Ultra",
"sub_path": "machine/Flashforge Guider 3 Ultra.json" "sub_path": "machine/Flashforge Guider 3 Ultra.json"
},
{
"name": "Flashforge Guider 2s",
"sub_path": "machine/Flashforge Guider 2s.json"
} }
], ],
"process_list": [ "process_list": [
@@ -74,22 +70,6 @@
{ {
"name": "0.20mm Standard @Flashforge G3U 0.4 Nozzle", "name": "0.20mm Standard @Flashforge G3U 0.4 Nozzle",
"sub_path": "process/0.20mm Standard @Flashforge G3U 0.4 Nozzle.json" "sub_path": "process/0.20mm Standard @Flashforge G3U 0.4 Nozzle.json"
},
{
"name": "0.30mm Draft @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json"
},
{
"name": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json"
},
{
"name": "0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json"
},
{
"name": "0.12mm Detail @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json"
} }
], ],
"filament_list": [ "filament_list": [
@@ -270,10 +250,6 @@
{ {
"name": "Flashforge Guider 3 Ultra 0.4 Nozzle", "name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
"sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json" "sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
},
{
"name": "Flashforge Guider 2s 0.4 nozzle",
"sub_path": "machine/Flashforge Guider 2s 0.4 nozzle.json"
} }
] ]
} }