juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-12 13:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict part 1.5

Browse Source
This commit is contained in:
cochcoder
2024-05-06 14:55:48 -04:00
parent 5b181150c6
commit 5f16dfd8f2
6 changed files with 79 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
resources/profiles/Flashforge.json
View File

@@ -13,17 +13,13 @@
"name": "Flashforge Adventurer 5M Pro",
"sub_path": "machine/Flashforge Adventurer 5M Pro.json"
},
{
{
"name": "Flashforge Adventurer 3 Series",
"sub_path": "machine/Flashforge Adventurer 3 Series.json"
},
{
"name": "Flashforge Guider 3 Ultra",
"sub_path": "machine/Flashforge Guider 3 Ultra.json"
},
{
"name": "Flashforge Guider 2s",
"sub_path": "machine/Flashforge Guider 2s.json"
}
],
"process_list": [
@@ -59,11 +55,27 @@
"name": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle",
"sub_path": "process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json"
},
{
{
"name": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle",
"sub_path": "process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json"
},
{
"name": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle",
"sub_path": "process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json"
},
{
"name": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle",
"sub_path": "process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json"
},
{
"name": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle",
"sub_path": "process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json"
},
{
"name": "0.20mm Standard @Flashforge AD3 0.4 Nozzle",
"sub_path": "process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json"
},
{
{
"name": "0.30mm Fast @Flashforge AD3 0.4 Nozzle",
"sub_path": "process/0.30mm Fast @Flashforge AD3 0.4 Nozzle.json"
},
@@ -74,22 +86,6 @@
{
"name": "0.20mm Standard @Flashforge G3U 0.4 Nozzle",
"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": [
@@ -121,14 +117,26 @@
"name": "Flashforge Generic ABS",
"sub_path": "filament/Flashforge Generic ABS.json"
},
{
"name": "Flashforge ABS @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Generic PETG",
"sub_path": "filament/Flashforge Generic PETG.json"
},
{
"name": "Flashforge PETG @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Generic PLA",
"sub_path": "filament/Flashforge Generic PLA.json"
},
{
"name": "Flashforge PLA @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Generic PLA-CF10",
"sub_path": "filament/Flashforge Generic PLA-CF10.json"
@@ -137,14 +145,26 @@
"name": "Flashforge Generic PLA-Silk",
"sub_path": "filament/Flashforge Generic PLA-Silk.json"
},
{
"name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Generic HS PLA",
"sub_path": "filament/Flashforge Generic HS PLA.json"
},
{
"name": "Flashforge HS PLA @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Generic ASA",
"sub_path": "filament/Flashforge Generic ASA.json"
},
{
"name": "Flashforge ASA @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Generic PETG-CF10",
"sub_path": "filament/Flashforge Generic PETG-CF10.json"
@@ -235,13 +255,13 @@
"name": "fdm_flashforge_common",
"sub_path": "machine/fdm_flashforge_common.json"
},
{
"name": "fdm_guider3_common",
"sub_path": "machine/fdm_guider3_common.json"
{
"name": "fdm_adventurer5m_common",
"sub_path": "machine/fdm_adventurer5m_common.json"
},
{
"name": "fdm_flashforge_common",
"sub_path": "machine/fdm_adventurer3_common.json"
{
"name": "Flashforge Adventurer 5M 0.25 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M 0.25 Nozzle.json"
},
{
"name": "Flashforge Adventurer 5M 0.4 Nozzle",
@@ -250,6 +270,14 @@
{
"name": "Flashforge Adventurer 5M 0.6 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M 0.6 Nozzle.json"
},
{
"name": "Flashforge Adventurer 5M 0.8 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M 0.8 Nozzle.json"
},
{
"name": "Flashforge Adventurer 5M Pro 0.25 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json"
},
{
"name": "Flashforge Adventurer 5M Pro 0.4 Nozzle",
@@ -259,7 +287,15 @@
"name": "Flashforge Adventurer 5M Pro 0.6 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json"
},
{
{
"name": "Flashforge Adventurer 5M Pro 0.8 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json"
},
{
"name": "fdm_flashforge_common",
"sub_path": "machine/fdm_adventurer3_common.json"
},
{
"name": "Flashforge Adventurer 3 Series 0.4 Nozzle",
"sub_path": "machine/Flashforge Adventurer 3 Series 0.4 nozzle.json"
},
@@ -268,12 +304,12 @@
"sub_path": "machine/Flashforge Adventurer 3 Series 0.6 nozzle.json"
},
{
"name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
"sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
"name": "fdm_guider3_common",
"sub_path": "machine/fdm_guider3_common.json"
},
{
"name": "Flashforge Guider 2s 0.4 nozzle",
"sub_path": "machine/Flashforge Guider 2s 0.4 nozzle.json"
"name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
"sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
}
]
}

2
resources/profiles/Flashforge/filament/Flashforge Generic ABS.json
View File

@@ -51,6 +51,6 @@
"compatible_printers": [
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
]
}

2
resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json
View File

@@ -20,8 +20,6 @@
"2"
],
"compatible_printers": [
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle"
],
"compatible_printers_condition": "",

3
resources/profiles/Flashforge/filament/Flashforge Generic PETG.json
View File

@@ -84,8 +84,9 @@
"compatible_printers": [
"Flashforge Adventurer 5M 0.4 Nozzle",
"Flashforge Adventurer 5M 0.6 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
]
}

5
resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json
View File

@@ -22,10 +22,11 @@
"compatible_printers": [
"Flashforge Adventurer 5M 0.4 Nozzle",
"Flashforge Adventurer 5M 0.6 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],

5
resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json
View File

@@ -22,10 +22,11 @@
"compatible_printers": [
"Flashforge Adventurer 5M 0.4 Nozzle",
"Flashforge Adventurer 5M 0.6 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],