diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index a0475e5bcf..b58dbefe0d 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -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" } ] } diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json index da81245fb8..d0560d5e8c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json @@ -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" ] } diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json index 21c8408a8e..457a13c2fb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json @@ -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": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json index 753287e61b..643b4c10c1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json @@ -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" ] } diff --git a/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json index 438f7ca70d..ceeb2e7db1 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json @@ -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": [], diff --git a/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json index 07ec56bb82..7239d7d22d 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json @@ -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": [],