juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-22 18:32:16 +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

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": [],