juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-01 12:51:12 +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
resources/profiles/Flashforge.json
+24
View File
@@ -20,6 +20,10 @@
{
"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": [
@@ -86,6 +90,22 @@
{
"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": [
@@ -310,6 +330,10 @@
{
"name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
"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"
}
]
}
resources/profiles/Flashforge/filament/Flashforge Generic ABS.json
+2 -1
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"
]
}
resources/profiles/Flashforge/filament/Flashforge Generic ASA.json
+2 -1
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": [],
resources/profiles/Flashforge/filament/Flashforge Generic PETG.json
+2 -1
View File
@@ -87,6 +87,7 @@
"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"
]
}
resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json
+2 -1
View File
@@ -26,7 +26,8 @@
"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 Guider 3 Ultra 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json
+2 -1
View File
@@ -26,7 +26,8 @@
"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 Guider 3 Ultra 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],