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

Fix merge conflicts part 2

Browse Source
This commit is contained in:
cochcoder
2024-05-06 15:05:17 -04:00
parent 15cf8a2251
commit 66e27d1f40
6 changed files with 69 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -19,7 +19,8 @@
"compatible_printers": [
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],

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

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

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

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

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

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