fix filament names

This commit is contained in:
SoftFever
2026-09-01 17:44:12 +08:00
parent 6ec904074b
commit ab21af6b08
83 changed files with 570 additions and 769 deletions

View File

@@ -1,7 +1,7 @@
{ {
"name": "Chuanying", "name": "Chuanying",
"url": "", "url": "",
"version": "02.04.00.03", "version": "02.04.00.04",
"force_update": "0", "force_update": "0",
"description": "Chuanying configurations", "description": "Chuanying configurations",
"machine_model_list": [ "machine_model_list": [
@@ -70,36 +70,36 @@
"sub_path": "filament/Generic PLA-Silk @Chuanying.json" "sub_path": "filament/Generic PLA-Silk @Chuanying.json"
}, },
{ {
"name": "Chuanying ABS @Chuanying X1 0.25 Nozzle", "name": "Generic ABS @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json" "sub_path": "filament/Generic ABS @Chuanying X1 0.25 Nozzle.json"
}, },
{ {
"name": "Generic HIPS @Chuanying", "name": "Generic HIPS @Chuanying",
"sub_path": "filament/Generic HIPS @Chuanying.json" "sub_path": "filament/Generic HIPS @Chuanying.json"
}, },
{ {
"name": "Chuanying ASA @Chuanying X1 0.25 Nozzle", "name": "Generic ASA @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json" "sub_path": "filament/Generic ASA @Chuanying X1 0.25 Nozzle.json"
}, },
{ {
"name": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle", "name": "Generic HS PLA @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json" "sub_path": "filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json"
}, },
{ {
"name": "Chuanying PETG @Chuanying X1 0.25 Nozzle", "name": "Generic PETG @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json" "sub_path": "filament/Generic PETG @Chuanying X1 0.25 Nozzle.json"
}, },
{ {
"name": "Generic PVA @Chuanying", "name": "Generic PVA @Chuanying",
"sub_path": "filament/Generic PVA @Chuanying.json" "sub_path": "filament/Generic PVA @Chuanying.json"
}, },
{ {
"name": "Chuanying PLA @Chuanying X1 0.25 Nozzle", "name": "Generic PLA @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json" "sub_path": "filament/Generic PLA @Chuanying X1 0.25 Nozzle.json"
}, },
{ {
"name": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", "name": "Generic PLA-Silk @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json" "sub_path": "filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json"
}, },
{ {
"name": "Generic PETG-CF10 @Chuanying", "name": "Generic PETG-CF10 @Chuanying",

View File

@@ -1,16 +1,16 @@
{ {
"type": "filament", "type": "filament",
"name": "Chuanying ABS @Chuanying X1 0.25 Nozzle", "name": "Generic ABS @Chuanying X1 0.25 Nozzle",
"inherits": "Generic ABS @Chuanying", "inherits": "Generic ABS @Chuanying",
"renamed_from": "Chuanying ABS @Chuanying X1 0.25 Nozzle;Chuanying ABS Chuanying X1 0.25 Nozzle",
"from": "system", "from": "system",
"setting_id": "VkCgo0e4KR24DX28", "setting_id": "uHqfv6eUDzoxEkEj",
"filament_id": "OFs1sNLz",
"instantiation": "true", "instantiation": "true",
"compatible_printers": [ "compatible_printers": [
"Chuanying X1 0.25 Nozzle" "Chuanying X1 0.25 Nozzle"
], ],
"filament_settings_id": [ "filament_settings_id": [
"Chuanying ABS @Chuanying X1 0.25 Nozzle" "Generic ABS @Chuanying X1 0.25 Nozzle"
], ],
"fan_max_speed": [ "fan_max_speed": [
"50" "50"

View File

@@ -1,15 +1,16 @@
{ {
"type": "filament", "type": "filament",
"name": "Chuanying ASA @Chuanying X1 0.25 Nozzle", "name": "Generic ASA @Chuanying X1 0.25 Nozzle",
"inherits": "Generic ASA @Chuanying", "inherits": "Generic ASA @Chuanying",
"renamed_from": "Chuanying ASA @Chuanying X1 0.25 Nozzle;Chuanying ASA Chuanying X1 0.25 Nozzle",
"from": "system", "from": "system",
"setting_id": "px1EPCDgOG8eE81V", "setting_id": "bVxY01TC9sAM9KQW",
"instantiation": "true", "instantiation": "true",
"compatible_printers": [ "compatible_printers": [
"Chuanying X1 0.25 Nozzle" "Chuanying X1 0.25 Nozzle"
], ],
"filament_settings_id": [ "filament_settings_id": [
"Chuanying ASA @Chuanying X1 0.25 Nozzle" "Generic ASA @Chuanying X1 0.25 Nozzle"
], ],
"fan_max_speed": [ "fan_max_speed": [
"50" "50"

View File

@@ -1,15 +1,16 @@
{ {
"type": "filament", "type": "filament",
"name": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle", "name": "Generic HS PLA @Chuanying X1 0.25 Nozzle",
"inherits": "Generic HS PLA @Chuanying", "inherits": "Generic HS PLA @Chuanying",
"renamed_from": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle;Chuanying HS PLA Chuanying X1 0.25 Nozzle",
"from": "system", "from": "system",
"setting_id": "CAdli5S8JIFafvRG", "setting_id": "gdW1LIVf6BecAtpa",
"instantiation": "true", "instantiation": "true",
"compatible_printers": [ "compatible_printers": [
"Chuanying X1 0.25 Nozzle" "Chuanying X1 0.25 Nozzle"
], ],
"filament_settings_id": [ "filament_settings_id": [
"Chuanying HS PLA @Chuanying X1 0.25 Nozzle" "Generic HS PLA @Chuanying X1 0.25 Nozzle"
], ],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"

View File

@@ -1,16 +1,16 @@
{ {
"type": "filament", "type": "filament",
"name": "Chuanying PETG @Chuanying X1 0.25 Nozzle", "name": "Generic PETG @Chuanying X1 0.25 Nozzle",
"inherits": "Generic PETG @Chuanying", "inherits": "Generic PETG @Chuanying",
"renamed_from": "Chuanying PETG @Chuanying X1 0.25 Nozzle;Chuanying PETG Chuanying X1 0.25 Nozzle",
"from": "system", "from": "system",
"setting_id": "9xxP8YWj4hnWQoVZ", "setting_id": "YQ0HAxEDmMQgqNGY",
"filament_id": "OFlXJxX1",
"instantiation": "true", "instantiation": "true",
"compatible_printers": [ "compatible_printers": [
"Chuanying X1 0.25 Nozzle" "Chuanying X1 0.25 Nozzle"
], ],
"filament_settings_id": [ "filament_settings_id": [
"Chuanying PETG @Chuanying X1 0.25 Nozzle" "Generic PETG @Chuanying X1 0.25 Nozzle"
], ],
"fan_max_speed": [ "fan_max_speed": [
"80" "80"

View File

@@ -1,15 +1,16 @@
{ {
"type": "filament", "type": "filament",
"name": "Chuanying PLA @Chuanying X1 0.25 Nozzle", "name": "Generic PLA @Chuanying X1 0.25 Nozzle",
"inherits": "Generic PLA @Chuanying", "inherits": "Generic PLA @Chuanying",
"renamed_from": "Chuanying PLA @Chuanying X1 0.25 Nozzle;Chuanying PLA Chuanying X1 0.25 Nozzle",
"from": "system", "from": "system",
"setting_id": "3WDFe1uKTOTiRtPE", "setting_id": "XsPEVGHYiyAX4YXy",
"instantiation": "true", "instantiation": "true",
"compatible_printers": [ "compatible_printers": [
"Chuanying X1 0.25 Nozzle" "Chuanying X1 0.25 Nozzle"
], ],
"filament_settings_id": [ "filament_settings_id": [
"Chuanying PLA @Chuanying X1 0.25 Nozzle" "Generic PLA @Chuanying X1 0.25 Nozzle"
], ],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"

View File

@@ -1,15 +1,16 @@
{ {
"type": "filament", "type": "filament",
"name": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", "name": "Generic PLA-Silk @Chuanying X1 0.25 Nozzle",
"inherits": "Generic PLA-Silk @Chuanying", "inherits": "Generic PLA-Silk @Chuanying",
"renamed_from": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle;Chuanying PLA-SILK Chuanying X1 0.25 Nozzle",
"from": "system", "from": "system",
"setting_id": "kph5feBjhPi0oo0G", "setting_id": "XaGDKARkuGTTabMN",
"instantiation": "true", "instantiation": "true",
"compatible_printers": [ "compatible_printers": [
"Chuanying X1 0.25 Nozzle" "Chuanying X1 0.25 Nozzle"
], ],
"filament_settings_id": [ "filament_settings_id": [
"Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle" "Generic PLA-Silk @Chuanying X1 0.25 Nozzle"
], ],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"

View File

@@ -1,6 +1,6 @@
{ {
"name": "Comgrow", "name": "Comgrow",
"version": "02.04.00.04", "version": "02.04.00.05",
"force_update": "0", "force_update": "0",
"description": "Comgrow configurations", "description": "Comgrow configurations",
"machine_model_list": [ "machine_model_list": [
@@ -117,8 +117,8 @@
"sub_path": "filament/Generic PLA @Comgrow.json" "sub_path": "filament/Generic PLA @Comgrow.json"
}, },
{ {
"name": "Comgrow T300 PLA", "name": "Generic PLA @Comgrow T300",
"sub_path": "filament/Comgrow T300 PLA.json" "sub_path": "filament/Generic PLA @Comgrow T300.json"
} }
], ],
"machine_list": [ "machine_list": [

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Comgrow T300 PLA", "name": "Generic PLA @Comgrow T300",
"inherits": "Generic PLA @Comgrow", "inherits": "Generic PLA @Comgrow",
"renamed_from": "Comgrow T300 PLA",
"from": "system", "from": "system",
"setting_id": "TnHaf2TSHVfuwbVg", "setting_id": "3N6gPGkzpE9CvkVz",
"filament_id": "OFNWcJsM",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -8,5 +8,5 @@
"bed_model": "comgrow_t300_buildplate_model.stl", "bed_model": "comgrow_t300_buildplate_model.stl",
"bed_texture": "comgrow_t300_buildplate_texture.svg", "bed_texture": "comgrow_t300_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Comgrow T300 PLA" "default_materials": "Generic PLA @Comgrow T300"
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "FLSun", "name": "FLSun",
"version": "02.04.00.03", "version": "02.04.00.04",
"force_update": "0", "force_update": "0",
"description": "FLSun configurations", "description": "FLSun configurations",
"machine_model_list": [ "machine_model_list": [
@@ -217,60 +217,60 @@
"sub_path": "filament/Generic TPU @FLSun.json" "sub_path": "filament/Generic TPU @FLSun.json"
}, },
{ {
"name": "FLSun S1 ABS", "name": "Generic ABS @FLSun S1",
"sub_path": "filament/FLSun S1 ABS.json" "sub_path": "filament/Generic ABS @FLSun S1.json"
}, },
{ {
"name": "FLSun T1 ABS", "name": "Generic ABS @FLSun T1",
"sub_path": "filament/FLSun T1 ABS.json" "sub_path": "filament/Generic ABS @FLSun T1.json"
}, },
{ {
"name": "FLSun S1 ASA", "name": "Generic ASA @FLSun S1",
"sub_path": "filament/FLSun S1 ASA.json" "sub_path": "filament/Generic ASA @FLSun S1.json"
}, },
{ {
"name": "FLSun T1 ASA", "name": "Generic ASA @FLSun T1",
"sub_path": "filament/FLSun T1 ASA.json" "sub_path": "filament/Generic ASA @FLSun T1.json"
}, },
{ {
"name": "FLSun S1 PETG", "name": "Generic PETG @FLSun S1",
"sub_path": "filament/FLSun S1 PETG.json" "sub_path": "filament/Generic PETG @FLSun S1.json"
}, },
{ {
"name": "FLSun T1 PETG", "name": "Generic PETG @FLSun T1",
"sub_path": "filament/FLSun T1 PETG.json" "sub_path": "filament/Generic PETG @FLSun T1.json"
}, },
{ {
"name": "Generic PLA @FLSun S1", "name": "Generic PLA @FLSun S1",
"sub_path": "filament/Generic PLA @FLSun S1.json" "sub_path": "filament/Generic PLA @FLSun S1.json"
}, },
{ {
"name": "FLSun S1 PLA High Speed", "name": "Generic PLA High Speed @FLSun S1",
"sub_path": "filament/FLSun S1 PLA High Speed.json" "sub_path": "filament/Generic PLA High Speed @FLSun S1.json"
}, },
{ {
"name": "FLSun S1 PLA Silk", "name": "Generic PLA Silk @FLSun S1",
"sub_path": "filament/FLSun S1 PLA Silk.json" "sub_path": "filament/Generic PLA Silk @FLSun S1.json"
}, },
{ {
"name": "Generic PLA @FLSun T1", "name": "Generic PLA @FLSun T1",
"sub_path": "filament/Generic PLA @FLSun T1.json" "sub_path": "filament/Generic PLA @FLSun T1.json"
}, },
{ {
"name": "FLSun T1 PLA High Speed", "name": "Generic PLA High Speed @FLSun T1",
"sub_path": "filament/FLSun T1 PLA High Speed.json" "sub_path": "filament/Generic PLA High Speed @FLSun T1.json"
}, },
{ {
"name": "FLSun T1 PLA Silk", "name": "Generic PLA Silk @FLSun T1",
"sub_path": "filament/FLSun T1 PLA Silk.json" "sub_path": "filament/Generic PLA Silk @FLSun T1.json"
}, },
{ {
"name": "FLSun S1 TPU", "name": "Generic TPU @FLSun S1",
"sub_path": "filament/FLSun S1 TPU.json" "sub_path": "filament/Generic TPU @FLSun S1.json"
}, },
{ {
"name": "FLSun T1 TPU", "name": "Generic TPU @FLSun T1",
"sub_path": "filament/FLSun T1 TPU.json" "sub_path": "filament/Generic TPU @FLSun T1.json"
} }
], ],
"machine_list": [ "machine_list": [

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun S1 ABS", "name": "Generic ABS @FLSun S1",
"inherits": "Generic ABS @FLSun", "inherits": "Generic ABS @FLSun",
"renamed_from": "FLSun S1 ABS",
"from": "system", "from": "system",
"setting_id": "tvpZ28Oe4Al7hlgj", "setting_id": "a7U3u888FlJ6CSFb",
"filament_id": "OFzzmK2Q",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"50" "50"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun T1 ABS", "name": "Generic ABS @FLSun T1",
"inherits": "Generic ABS @FLSun", "inherits": "Generic ABS @FLSun",
"renamed_from": "FLSun T1 ABS",
"from": "system", "from": "system",
"setting_id": "GP8VqRfidKOdj0ZJ", "setting_id": "j185WWfVulPxWJvQ",
"filament_id": "OFV0KrAG",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"50" "50"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun S1 ASA", "name": "Generic ASA @FLSun S1",
"inherits": "Generic ASA @FLSun", "inherits": "Generic ASA @FLSun",
"renamed_from": "FLSun S1 ASA",
"from": "system", "from": "system",
"setting_id": "C5oyaWw3YVEz0CgE", "setting_id": "qJeJII6CgHuaC4Iz",
"filament_id": "OFIK0xFa",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"50" "50"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun T1 ASA", "name": "Generic ASA @FLSun T1",
"inherits": "Generic ASA @FLSun", "inherits": "Generic ASA @FLSun",
"renamed_from": "FLSun T1 ASA",
"from": "system", "from": "system",
"setting_id": "YmJbWfCQpNk9nxB7", "setting_id": "kj4PPnvuvvGDrDwA",
"filament_id": "OFbjtPQy",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"50" "50"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun S1 PETG", "name": "Generic PETG @FLSun S1",
"inherits": "Generic PETG @FLSun", "inherits": "Generic PETG @FLSun",
"renamed_from": "FLSun S1 PETG",
"from": "system", "from": "system",
"setting_id": "Ac6q0FtMFMLesFdU", "setting_id": "LxDenrdsmz0QjMDE",
"filament_id": "OF9z5LZ9",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"60" "60"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun T1 PETG", "name": "Generic PETG @FLSun T1",
"inherits": "Generic PETG @FLSun", "inherits": "Generic PETG @FLSun",
"renamed_from": "FLSun T1 PETG",
"from": "system", "from": "system",
"setting_id": "A2aA7xcmqgz8ERyY", "setting_id": "n9wpUe32lTtq2iSS",
"filament_id": "OFJ80y1e",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"60" "60"

View File

@@ -1,11 +1,14 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun S1 PLA High Speed", "name": "Generic PLA High Speed @FLSun S1",
"inherits": "Generic PLA @FLSun", "inherits": "Generic PLA High Speed @System",
"renamed_from": "FLSun S1 PLA High Speed",
"from": "system", "from": "system",
"setting_id": "v2clpNXXo8m6dV33", "setting_id": "ONz6C8a3AMGWxqdK",
"filament_id": "OFoqrHTw",
"instantiation": "true", "instantiation": "true",
"filament_multitool_ramming_flow": [
"10"
],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"
], ],

View File

@@ -1,11 +1,14 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun T1 PLA High Speed", "name": "Generic PLA High Speed @FLSun T1",
"inherits": "Generic PLA @FLSun", "inherits": "Generic PLA High Speed @System",
"renamed_from": "FLSun T1 PLA High Speed",
"from": "system", "from": "system",
"setting_id": "E4lpSLLlAxUW04ik", "setting_id": "en1l0jgFX97t6qUi",
"filament_id": "OFQ9qnkd",
"instantiation": "true", "instantiation": "true",
"filament_multitool_ramming_flow": [
"10"
],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"
], ],

View File

@@ -1,11 +1,14 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun S1 PLA Silk", "name": "Generic PLA Silk @FLSun S1",
"inherits": "Generic PLA @FLSun", "inherits": "Generic PLA Silk @System",
"renamed_from": "FLSun S1 PLA Silk",
"from": "system", "from": "system",
"setting_id": "164Bn4YchxJAaLsa", "setting_id": "NTJw0fbcn3JoOr0R",
"filament_id": "OFSStjay",
"instantiation": "true", "instantiation": "true",
"filament_retraction_length": [
"nil"
],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"
], ],

View File

@@ -1,11 +1,14 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun T1 PLA Silk", "name": "Generic PLA Silk @FLSun T1",
"inherits": "Generic PLA @FLSun", "inherits": "Generic PLA Silk @System",
"renamed_from": "FLSun T1 PLA Silk",
"from": "system", "from": "system",
"setting_id": "gElUb4GnCoEfVlEd", "setting_id": "y2p7TTGI8XWIeiQY",
"filament_id": "OFuUJyRx",
"instantiation": "true", "instantiation": "true",
"filament_retraction_length": [
"nil"
],
"activate_air_filtration": [ "activate_air_filtration": [
"1" "1"
], ],

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun S1 TPU", "name": "Generic TPU @FLSun S1",
"inherits": "Generic TPU @FLSun", "inherits": "Generic TPU @FLSun",
"renamed_from": "FLSun S1 TPU",
"from": "system", "from": "system",
"setting_id": "yzPvNqIo7mfWAwNS", "setting_id": "xDnQih17nXmGPoPc",
"filament_id": "OF6ooviO",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"100" "100"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "FLSun T1 TPU", "name": "Generic TPU @FLSun T1",
"inherits": "Generic TPU @FLSun", "inherits": "Generic TPU @FLSun",
"renamed_from": "FLSun T1 TPU",
"from": "system", "from": "system",
"setting_id": "34Ux18VB4d6R6G40", "setting_id": "TEakmydLXxrHti3G",
"filament_id": "OFENzGSm",
"instantiation": "true", "instantiation": "true",
"fan_max_speed": [ "fan_max_speed": [
"100" "100"

View File

@@ -8,5 +8,5 @@
"bed_model": "flsun_s1_buildplate_model.stl", "bed_model": "flsun_s1_buildplate_model.stl",
"bed_texture": "FLSun_S1_buildplate_texture.svg", "bed_texture": "FLSun_S1_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "FLSun S1 PLA High Speed;FLSun S1 PLA Silk;Generic PLA @FLSun S1;FLSun S1 PETG;FLSun S1 ASA;FLSun S1 TPU;FLSun S1 ABS" "default_materials": "Generic PLA High Speed @FLSun S1;Generic PLA Silk @FLSun S1;Generic PLA @FLSun S1;Generic PETG @FLSun S1;Generic ASA @FLSun S1;Generic TPU @FLSun S1;Generic ABS @FLSun S1"
} }

View File

@@ -8,5 +8,5 @@
"bed_model": "flsun_T1_buildplate_model.stl", "bed_model": "flsun_T1_buildplate_model.stl",
"bed_texture": "FLSun_T1_buildplate_texture.svg", "bed_texture": "FLSun_T1_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "FLSun T1 PLA High Speed;FLSun T1 PLA Silk;Generic PLA @FLSun T1;FLSun T1 PETG;FLSun T1 ASA;FLSun T1 TPU;FLSun T1 ABS" "default_materials": "Generic PLA High Speed @FLSun T1;Generic PLA Silk @FLSun T1;Generic PLA @FLSun T1;Generic PETG @FLSun T1;Generic ASA @FLSun T1;Generic TPU @FLSun T1;Generic ABS @FLSun T1"
} }

View File

@@ -1,7 +1,7 @@
{ {
"name": "Lulzbot", "name": "Lulzbot",
"url": "https://ohai.lulzbot.com/group/taz-6/", "url": "https://ohai.lulzbot.com/group/taz-6/",
"version": "02.04.00.01", "version": "02.04.00.02",
"force_update": "0", "force_update": "0",
"description": "Lulzbot configurations", "description": "Lulzbot configurations",
"machine_model_list": [ "machine_model_list": [
@@ -62,16 +62,16 @@
], ],
"filament_list": [ "filament_list": [
{ {
"name": "Lulzbot 2.85mm ABS", "name": "Generic ABS @Lulzbot",
"sub_path": "filament/Lulzbot 2.85mm ABS.json" "sub_path": "filament/Generic ABS @Lulzbot.json"
}, },
{ {
"name": "Lulzbot 2.85mm PETG", "name": "Generic PETG @Lulzbot",
"sub_path": "filament/Lulzbot 2.85mm PETG.json" "sub_path": "filament/Generic PETG @Lulzbot.json"
}, },
{ {
"name": "Lulzbot 2.85mm PLA", "name": "Generic PLA @Lulzbot",
"sub_path": "filament/Lulzbot 2.85mm PLA.json" "sub_path": "filament/Generic PLA @Lulzbot.json"
} }
], ],
"machine_list": [ "machine_list": [

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Lulzbot 2.85mm ABS", "name": "Generic ABS @Lulzbot",
"inherits": "Generic ABS @System", "inherits": "Generic ABS @System",
"renamed_from": "Lulzbot 2.85mm ABS",
"from": "system", "from": "system",
"setting_id": "XwsWBVH2xIwyRMm4", "setting_id": "Mtn4Fh3Lp6KlAxjo",
"filament_id": "OF6O67Xk",
"instantiation": "true", "instantiation": "true",
"filament_diameter": [ "filament_diameter": [
"2.85" "2.85"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Lulzbot 2.85mm PETG", "name": "Generic PETG @Lulzbot",
"inherits": "Generic PETG @System", "inherits": "Generic PETG @System",
"renamed_from": "Lulzbot 2.85mm PETG",
"from": "system", "from": "system",
"setting_id": "7aS9fdn94lEOU1gJ", "setting_id": "dqj6O9NIPAaq8wWz",
"filament_id": "OF8eQjjt",
"instantiation": "true", "instantiation": "true",
"filament_diameter": [ "filament_diameter": [
"2.85" "2.85"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Lulzbot 2.85mm PLA", "name": "Generic PLA @Lulzbot",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Lulzbot 2.85mm PLA",
"from": "system", "from": "system",
"setting_id": "1pyzsOWeVPCxWlqQ", "setting_id": "3evRjso1wNxd9nV3",
"filament_id": "OFPryWt5",
"instantiation": "true", "instantiation": "true",
"filament_diameter": [ "filament_diameter": [
"2.85" "2.85"

View File

@@ -104,7 +104,7 @@
], ],
"single_extruder_multi_material": "1", "single_extruder_multi_material": "1",
"default_filament_profile": [ "default_filament_profile": [
"Lulzbot 2.85mm PLA" "Generic PLA @Lulzbot"
], ],
"machine_start_gcode": ";This G-Code has been generated specifically for the Lulzbot Taz 4 and 5 - translated from CuraLE 4.13.10 by Wrathernaut\nM73 P0; clear GLCD progress bar\nM75; start GLCD timer\nM140 S{bed_temperature_initial_layer[0]}; start bed heating up\nG90; absolute positioning\nM107; disable fans\nM82; set extruder to absolute mode\nG28 X0 Y0; home X and Y\nG28 Z0; home Z\nG1 Z15.0 F175; move extruder up\nM117 Heating...; progress indicator message on LCD\nM109 R{nozzle_temperature_initial_layer[0]}; wait for extruder to reach printing temp\nM190 R{bed_temperature_initial_layer[0]}; wait for bed to reach printing temp\nG92 E0; set extruder position to 0\nG1 F200 E0; prime the nozzle with filament\nG92 E0; re-set extruder position to 0\nG1 F175; set travel speed\nM203 X192 Y208 Z3; set limits on travel speed\nM117 TAZ Printing...; progress indicator message on LCD\n;Start G-Code End", "machine_start_gcode": ";This G-Code has been generated specifically for the Lulzbot Taz 4 and 5 - translated from CuraLE 4.13.10 by Wrathernaut\nM73 P0; clear GLCD progress bar\nM75; start GLCD timer\nM140 S{bed_temperature_initial_layer[0]}; start bed heating up\nG90; absolute positioning\nM107; disable fans\nM82; set extruder to absolute mode\nG28 X0 Y0; home X and Y\nG28 Z0; home Z\nG1 Z15.0 F175; move extruder up\nM117 Heating...; progress indicator message on LCD\nM109 R{nozzle_temperature_initial_layer[0]}; wait for extruder to reach printing temp\nM190 R{bed_temperature_initial_layer[0]}; wait for bed to reach printing temp\nG92 E0; set extruder position to 0\nG1 F200 E0; prime the nozzle with filament\nG92 E0; re-set extruder position to 0\nG1 F175; set travel speed\nM203 X192 Y208 Z3; set limits on travel speed\nM117 TAZ Printing...; progress indicator message on LCD\n;Start G-Code End",
"machine_end_gcode": ";End G-Code Begin\nM400; wait for moves to finish\nM140 S0; disable hotend\nM104 S0; disable bed heater\nM107; disable fans\nG91; relative positioning\nG1 E-1 F300; filament retraction to release pressure\nG1 Z0.5 E-5 X-20 Y-20 F3000; lift up and retract even more filament\nM77;stopGLCD timer\nG90;absolute positioning\nG1 X0 Y250;move to cooling position\nM84;disable steppers\nM117 Print Complete.;print complete message", "machine_end_gcode": ";End G-Code Begin\nM400; wait for moves to finish\nM140 S0; disable hotend\nM104 S0; disable bed heater\nM107; disable fans\nG91; relative positioning\nG1 E-1 F300; filament retraction to release pressure\nG1 Z0.5 E-5 X-20 Y-20 F3000; lift up and retract even more filament\nM77;stopGLCD timer\nG90;absolute positioning\nG1 X0 Y250;move to cooling position\nM84;disable steppers\nM117 Print Complete.;print complete message",

View File

@@ -8,5 +8,5 @@
"bed_model": "taz_4_or_5_build_plate.stl", "bed_model": "taz_4_or_5_build_plate.stl",
"bed_texture": "lulzbot_logo.svg", "bed_texture": "lulzbot_logo.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" "default_materials": "Generic ABS @Lulzbot;Generic PETG @Lulzbot;Generic PLA @Lulzbot"
} }

File diff suppressed because one or more lines are too long

View File

@@ -8,5 +8,5 @@
"bed_model": "taz_6_build_plate.stl", "bed_model": "taz_6_build_plate.stl",
"bed_texture": "lulzbot_logo.svg", "bed_texture": "lulzbot_logo.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" "default_materials": "Generic ABS @Lulzbot;Generic PETG @Lulzbot;Generic PLA @Lulzbot"
} }

File diff suppressed because one or more lines are too long

View File

@@ -8,5 +8,5 @@
"bed_model": "taz_pro_dual_build_plate.stl", "bed_model": "taz_pro_dual_build_plate.stl",
"bed_texture": "Taz_Pro_Dual_printbed.svg", "bed_texture": "Taz_Pro_Dual_printbed.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" "default_materials": "Generic ABS @Lulzbot;Generic PETG @Lulzbot;Generic PLA @Lulzbot"
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "Phrozen", "name": "Phrozen",
"version": "02.04.00.02", "version": "02.04.00.03",
"force_update": "0", "force_update": "0",
"description": "Phrozen configurations", "description": "Phrozen configurations",
"machine_model_list": [ "machine_model_list": [
@@ -57,8 +57,8 @@
"sub_path": "filament/fdm_filament_tpu.json" "sub_path": "filament/fdm_filament_tpu.json"
}, },
{ {
"name": "Phrozen PLA @Phrozen Arco 0.4 nozzle", "name": "Generic PLA @Phrozen Arco 0.4 nozzle",
"sub_path": "filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json" "sub_path": "filament/Generic PLA @Phrozen Arco 0.4 nozzle.json"
} }
], ],
"machine_list": [ "machine_list": [

View File

@@ -1,13 +1,13 @@
{ {
"type": "filament", "type": "filament",
"name": "Phrozen PLA @Phrozen Arco 0.4 nozzle", "name": "Generic PLA @Phrozen Arco 0.4 nozzle",
"inherits": "fdm_filament_pla", "inherits": "Generic PLA @System",
"renamed_from": "Phrozen PLA @Phrozen Arco 0.4 nozzle;Phrozen PLA Phrozen Arco 0.4 nozzle",
"from": "system", "from": "system",
"setting_id": "Cc3ULDFzvoHwh8bV", "setting_id": "xTeHmDOY48Bik10J",
"filament_id": "OF6VgL2U",
"instantiation": "true", "instantiation": "true",
"filament_settings_id": [ "filament_settings_id": [
"Phrozen PLA @Phrozen Arco 0.4 nozzle" "Generic PLA @Phrozen Arco 0.4 nozzle"
], ],
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -14,7 +14,7 @@
], ],
"default_print_profile": "0.20mm Standard @Phrozen Arco 0.4 nozzle", "default_print_profile": "0.20mm Standard @Phrozen Arco 0.4 nozzle",
"default_filament_profile": [ "default_filament_profile": [
"Phrozen PLA @Phrozen Arco 0.4 nozzle" "Generic PLA @Phrozen Arco 0.4 nozzle"
], ],
"disable_m73": "1", "disable_m73": "1",
"gcode_flavor": "klipper", "gcode_flavor": "klipper",

View File

@@ -8,5 +8,5 @@
"bed_model": "Phrozen Arco_buildplate_model.stl", "bed_model": "Phrozen Arco_buildplate_model.stl",
"bed_texture": "Phrozen Arco_buildplate_texture.svg", "bed_texture": "Phrozen Arco_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Phrozen PLA @Phrozen Arco 0.4 nozzle" "default_materials": "Generic PLA @Phrozen Arco 0.4 nozzle"
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "Qidi", "name": "Qidi",
"version": "02.04.00.13", "version": "02.04.00.14",
"force_update": "0", "force_update": "0",
"description": "Qidi configurations", "description": "Qidi configurations",
"machine_model_list": [ "machine_model_list": [

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pet", "inherits": "fdm_filament_pet",
"from": "system", "from": "system",
"setting_id": "uVa250OrqClMz41k", "setting_id": "uVa250OrqClMz41k",
"filament_id": "OFpBV2Ma", "filament_id": "OFYE7YZw",
"instantiation": "true", "instantiation": "true",
"reduce_fan_stop_start_freq": [ "reduce_fan_stop_start_freq": [
"1" "1"
@@ -52,7 +52,7 @@
"235" "235"
], ],
"filament_vendor": [ "filament_vendor": [
"Generic" "Tinmorry"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",

View File

@@ -1,6 +1,6 @@
{ {
"name": "Snapmaker", "name": "Snapmaker",
"version": "02.04.00.10", "version": "02.04.00.11",
"force_update": "0", "force_update": "0",
"description": "Snapmaker configurations", "description": "Snapmaker configurations",
"machine_model_list": [ "machine_model_list": [

View File

@@ -2,7 +2,7 @@
"type": "filament", "type": "filament",
"name": "Snapmaker TPU 95A @U1 base", "name": "Snapmaker TPU 95A @U1 base",
"from": "system", "from": "system",
"filament_id": "OFKo87c6", "filament_id": "OFvmwTZE",
"instantiation": "false", "instantiation": "false",
"overhang_fan_threshold": [ "overhang_fan_threshold": [
"95%" "95%"
@@ -47,7 +47,7 @@
"0" "0"
], ],
"filament_vendor": [ "filament_vendor": [
"Generic" "Snapmaker"
], ],
"filament_wipe": [ "filament_wipe": [
"nil" "nil"

View File

@@ -195,7 +195,7 @@
"100" "100"
], ],
"filament_vendor": [ "filament_vendor": [
"Generic" "Snapmaker"
], ],
"filament_wipe": [ "filament_wipe": [
"nil" "nil"

View File

@@ -1,7 +1,7 @@
{ {
"name": "Sovol", "name": "Sovol",
"url": "", "url": "",
"version": "02.04.00.01", "version": "02.04.00.02",
"force_update": "0", "force_update": "0",
"description": "Sovol configurations", "description": "Sovol configurations",
"machine_model_list": [ "machine_model_list": [
@@ -234,96 +234,96 @@
"sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json" "sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json"
}, },
{ {
"name": "Sovol SV06 ACE ABS", "name": "Generic ABS @Sovol SV06 ACE",
"sub_path": "filament/Sovol SV06 ACE ABS.json" "sub_path": "filament/Generic ABS @Sovol SV06 ACE.json"
}, },
{ {
"name": "Sovol SV06 ACE PETG", "name": "Generic PETG @Sovol SV06 ACE",
"sub_path": "filament/Sovol SV06 ACE PETG.json" "sub_path": "filament/Generic PETG @Sovol SV06 ACE.json"
}, },
{ {
"name": "Sovol SV06 ACE PLA", "name": "Generic PLA @Sovol SV06 ACE",
"sub_path": "filament/Sovol SV06 ACE PLA.json" "sub_path": "filament/Generic PLA @Sovol SV06 ACE.json"
}, },
{ {
"name": "Sovol SV06 ACE TPU", "name": "Generic TPU @Sovol SV06 ACE",
"sub_path": "filament/Sovol SV06 ACE TPU.json" "sub_path": "filament/Generic TPU @Sovol SV06 ACE.json"
}, },
{ {
"name": "Sovol SV06 Plus ACE ABS", "name": "Generic ABS @Sovol SV06 Plus ACE",
"sub_path": "filament/Sovol SV06 Plus ACE ABS.json" "sub_path": "filament/Generic ABS @Sovol SV06 Plus ACE.json"
}, },
{ {
"name": "Sovol SV06 Plus ACE PETG", "name": "Generic PETG @Sovol SV06 Plus ACE",
"sub_path": "filament/Sovol SV06 Plus ACE PETG.json" "sub_path": "filament/Generic PETG @Sovol SV06 Plus ACE.json"
}, },
{ {
"name": "Sovol SV06 Plus ACE PLA", "name": "Generic PLA @Sovol SV06 Plus ACE",
"sub_path": "filament/Sovol SV06 Plus ACE PLA.json" "sub_path": "filament/Generic PLA @Sovol SV06 Plus ACE.json"
}, },
{ {
"name": "Sovol SV06 Plus ACE TPU", "name": "Generic TPU @Sovol SV06 Plus ACE",
"sub_path": "filament/Sovol SV06 Plus ACE TPU.json" "sub_path": "filament/Generic TPU @Sovol SV06 Plus ACE.json"
}, },
{ {
"name": "Sovol SV07 PLA", "name": "Generic PLA @Sovol SV07",
"sub_path": "filament/Sovol SV07 PLA.json" "sub_path": "filament/Generic PLA @Sovol SV07.json"
}, },
{ {
"name": "Sovol SV08 ABS", "name": "Generic ABS @Sovol SV08",
"sub_path": "filament/Sovol SV08 ABS.json" "sub_path": "filament/Generic ABS @Sovol SV08.json"
}, },
{ {
"name": "Sovol SV08 PETG", "name": "Generic PETG @Sovol SV08",
"sub_path": "filament/Sovol SV08 PETG.json" "sub_path": "filament/Generic PETG @Sovol SV08.json"
}, },
{ {
"name": "Sovol SV08 PLA", "name": "Generic PLA @Sovol SV08",
"sub_path": "filament/Sovol SV08 PLA.json" "sub_path": "filament/Generic PLA @Sovol SV08.json"
}, },
{ {
"name": "Sovol SV08 PLA @SV08 0.2 nozzle", "name": "Generic PLA @Sovol SV08 0.2 nozzle",
"sub_path": "filament/Sovol SV08 PLA @SV08 0.2 nozzle.json" "sub_path": "filament/Generic PLA @Sovol SV08 0.2 nozzle.json"
}, },
{ {
"name": "Sovol SV08 TPU", "name": "Generic TPU @Sovol SV08",
"sub_path": "filament/Sovol SV08 TPU.json" "sub_path": "filament/Generic TPU @Sovol SV08.json"
}, },
{ {
"name": "Sovol Zero ABS", "name": "Generic ABS @Sovol Zero",
"sub_path": "filament/Sovol Zero ABS.json" "sub_path": "filament/Generic ABS @Sovol Zero.json"
}, },
{ {
"name": "Sovol Zero PC", "name": "Generic PC @Sovol Zero",
"sub_path": "filament/Sovol Zero PC.json" "sub_path": "filament/Generic PC @Sovol Zero.json"
}, },
{ {
"name": "Sovol Zero PETG", "name": "Generic PETG @Sovol Zero",
"sub_path": "filament/Sovol Zero PETG.json" "sub_path": "filament/Generic PETG @Sovol Zero.json"
}, },
{ {
"name": "Sovol Zero PETG HS Nozzle", "name": "Sovol Zero PETG HS Nozzle",
"sub_path": "filament/Sovol Zero PETG HS Nozzle.json" "sub_path": "filament/Sovol Zero PETG HS Nozzle.json"
}, },
{ {
"name": "Sovol Zero PLA Basic", "name": "Generic PLA @Sovol Zero",
"sub_path": "filament/Sovol Zero PLA Basic.json" "sub_path": "filament/Generic PLA @Sovol Zero.json"
}, },
{ {
"name": "Sovol Zero PLA Basic HS Nozzle", "name": "Sovol Zero PLA Basic HS Nozzle",
"sub_path": "filament/Sovol Zero PLA Basic HS Nozzle.json" "sub_path": "filament/Sovol Zero PLA Basic HS Nozzle.json"
}, },
{ {
"name": "Sovol Zero PLA Silk", "name": "Generic PLA Silk @Sovol Zero",
"sub_path": "filament/Sovol Zero PLA Silk.json" "sub_path": "filament/Generic PLA Silk @Sovol Zero.json"
}, },
{ {
"name": "Sovol Zero PLA Silk HS Nozzle", "name": "Sovol Zero PLA Silk HS Nozzle",
"sub_path": "filament/Sovol Zero PLA Silk HS Nozzle.json" "sub_path": "filament/Sovol Zero PLA Silk HS Nozzle.json"
}, },
{ {
"name": "Sovol Zero TPU", "name": "Generic TPU @Sovol Zero",
"sub_path": "filament/Sovol Zero TPU.json" "sub_path": "filament/Generic TPU @Sovol Zero.json"
} }
], ],
"machine_list": [ "machine_list": [

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 ACE ABS", "name": "Generic ABS @Sovol SV06 ACE",
"inherits": "Generic ABS @System", "inherits": "Generic ABS @System",
"renamed_from": "Sovol SV06 ACE ABS",
"from": "system", "from": "system",
"setting_id": "okqqqm0P8ehlQuDY", "setting_id": "exjBdPPCgk53gipu",
"filament_id": "OF67EdL5",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 Plus ACE ABS", "name": "Generic ABS @Sovol SV06 Plus ACE",
"inherits": "Generic ABS @System", "inherits": "Generic ABS @System",
"renamed_from": "Sovol SV06 Plus ACE ABS",
"from": "system", "from": "system",
"setting_id": "Me1iSJmocW35ClmN", "setting_id": "sg9HXvKEoKD4pw7v",
"filament_id": "OFCEA7Nt",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV08 ABS", "name": "Generic ABS @Sovol SV08",
"inherits": "Generic ABS @System", "inherits": "Generic ABS @System",
"renamed_from": "Sovol SV08 ABS",
"from": "system", "from": "system",
"setting_id": "nq4vvrWqKjWKELEz", "setting_id": "aZx3ePr3Id1jPJG9",
"filament_id": "OF016CJw",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol Zero ABS", "name": "Generic ABS @Sovol Zero",
"inherits": "Generic ABS @System", "inherits": "Generic ABS @System",
"renamed_from": "Sovol Zero ABS",
"from": "system", "from": "system",
"setting_id": "9pI7op6U4azpfNfb", "setting_id": "g6sSyyIFYJUzlXsp",
"filament_id": "OFNX8GI1",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol Zero PC", "name": "Generic PC @Sovol Zero",
"inherits": "Generic PC @System", "inherits": "Generic PC @System",
"renamed_from": "Sovol Zero PC",
"from": "system", "from": "system",
"setting_id": "vuuZXnlrMgUKtSI0", "setting_id": "yRKCiPMN6fxibcyg",
"filament_id": "OFcdqaWI",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 ACE PETG", "name": "Generic PETG @Sovol SV06 ACE",
"inherits": "Generic PETG @System", "inherits": "Generic PETG @System",
"renamed_from": "Sovol SV06 ACE PETG",
"from": "system", "from": "system",
"setting_id": "5mtng0PM8CMglpD7", "setting_id": "p8fGWNVkT6n5Dv9P",
"filament_id": "OFe7Sx5B",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 Plus ACE PETG", "name": "Generic PETG @Sovol SV06 Plus ACE",
"inherits": "Generic PETG @System", "inherits": "Generic PETG @System",
"renamed_from": "Sovol SV06 Plus ACE PETG",
"from": "system", "from": "system",
"setting_id": "ZrAm6Nm4FI7p4PgC", "setting_id": "I7IzLMYw7iDUUJwc",
"filament_id": "OFl7nOAf",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV08 PETG", "name": "Generic PETG @Sovol SV08",
"inherits": "Generic PETG @System", "inherits": "Generic PETG @System",
"renamed_from": "Sovol SV08 PETG",
"from": "system", "from": "system",
"setting_id": "CWd7KULbXvJeTTEy", "setting_id": "7vDZKIKJW5fy1EGG",
"filament_id": "OFRi7v0b",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol Zero PETG", "name": "Generic PETG @Sovol Zero",
"inherits": "Generic PETG @System", "inherits": "Generic PETG @System",
"renamed_from": "Sovol Zero PETG",
"from": "system", "from": "system",
"setting_id": "75OJvkXlmbcaHQfW", "setting_id": "i4OW2eAtXOKdtVNj",
"filament_id": "OFHTVfaU",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"1.0348" "1.0348"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 ACE PLA", "name": "Generic PLA @Sovol SV06 ACE",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Sovol SV06 ACE PLA",
"from": "system", "from": "system",
"setting_id": "kgtcANsbfwSbdgOh", "setting_id": "UEEwpetmmxpxM4vV",
"filament_id": "OFTvvox9",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 Plus ACE PLA", "name": "Generic PLA @Sovol SV06 Plus ACE",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Sovol SV06 Plus ACE PLA",
"from": "system", "from": "system",
"setting_id": "YEEOGJYm4Z8W4vGV", "setting_id": "yzv5Kwe3OivHxNUI",
"filament_id": "OFNZjrLo",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV07 PLA", "name": "Generic PLA @Sovol SV07",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Sovol SV07 PLA",
"from": "system", "from": "system",
"setting_id": "IHicmU5gzVf6G4F1", "setting_id": "sNGno8XCSsgmwjvH",
"filament_id": "OFaFNP2U",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV08 PLA @SV08 0.2 nozzle", "name": "Generic PLA @Sovol SV08 0.2 nozzle",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Sovol SV08 PLA @SV08 0.2 nozzle;Sovol SV08 PLA SV08 0.2 nozzle",
"from": "system", "from": "system",
"setting_id": "qmnuve3FgzrXgjPA", "setting_id": "W7oQNGWqiPMUlzhw",
"filament_id": "OFcJ7AKd",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV08 PLA", "name": "Generic PLA @Sovol SV08",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Sovol SV08 PLA",
"from": "system", "from": "system",
"setting_id": "nnU0222BS0F1c5ki", "setting_id": "4fSYcvbFXNRHnlEw",
"filament_id": "OFcJ7AKd",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol Zero PLA Basic", "name": "Generic PLA @Sovol Zero",
"inherits": "Generic PLA @System", "inherits": "Generic PLA @System",
"renamed_from": "Sovol Zero PLA Basic",
"from": "system", "from": "system",
"setting_id": "ZVvOaMwZ7noevsYf", "setting_id": "NNDerIjh7qtuh1I3",
"filament_id": "OF7VJMYM",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,11 +1,17 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol Zero PLA Silk", "name": "Generic PLA Silk @Sovol Zero",
"inherits": "Generic PLA @System", "inherits": "Generic PLA Silk @System",
"renamed_from": "Sovol Zero PLA Silk",
"from": "system", "from": "system",
"setting_id": "QowhGzqSwGQoAp1a", "setting_id": "Se2yKerHRStYtWf5",
"filament_id": "OFJVFpJz",
"instantiation": "true", "instantiation": "true",
"filament_multitool_ramming_flow": [
"20"
],
"filament_retraction_length": [
"nil"
],
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"
], ],

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 ACE TPU", "name": "Generic TPU @Sovol SV06 ACE",
"inherits": "Generic TPU @System", "inherits": "Generic TPU @System",
"renamed_from": "Sovol SV06 ACE TPU",
"from": "system", "from": "system",
"setting_id": "ERN0ozxmPhIMze0i", "setting_id": "jBAo7stLaaQxKFsp",
"filament_id": "OFJfv07m",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV06 Plus ACE TPU", "name": "Generic TPU @Sovol SV06 Plus ACE",
"inherits": "Generic TPU @System", "inherits": "Generic TPU @System",
"renamed_from": "Sovol SV06 Plus ACE TPU",
"from": "system", "from": "system",
"setting_id": "oNucKLcIdxwBPpUN", "setting_id": "MUXz0JSHdT66Mti1",
"filament_id": "OFkWaWRo",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol SV08 TPU", "name": "Generic TPU @Sovol SV08",
"inherits": "Generic TPU @System", "inherits": "Generic TPU @System",
"renamed_from": "Sovol SV08 TPU",
"from": "system", "from": "system",
"setting_id": "tpBbCQhcSJsBesnG", "setting_id": "vFPYMoNvgjn1aSKA",
"filament_id": "OFyCToOV",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -1,10 +1,10 @@
{ {
"type": "filament", "type": "filament",
"name": "Sovol Zero TPU", "name": "Generic TPU @Sovol Zero",
"inherits": "Generic TPU @System", "inherits": "Generic TPU @System",
"renamed_from": "Sovol Zero TPU",
"from": "system", "from": "system",
"setting_id": "iZHXx0RyRO096L0z", "setting_id": "MlY6WQ41FE8zDPSV",
"filament_id": "OF6zAVFj",
"instantiation": "true", "instantiation": "true",
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.98" "0.98"

View File

@@ -126,6 +126,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV06 ACE PLA" "Generic PLA @Sovol SV06 ACE"
] ]
} }

View File

@@ -126,6 +126,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV06 ACE PLA" "Generic PLA @Sovol SV06 ACE"
] ]
} }

View File

@@ -126,6 +126,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV06 ACE PLA" "Generic PLA @Sovol SV06 ACE"
] ]
} }

View File

@@ -126,6 +126,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV06 ACE PLA" "Generic PLA @Sovol SV06 ACE"
] ]
} }

View File

@@ -8,5 +8,5 @@
"bed_model": "sovol_sv06_ace_buildplate_model.stl", "bed_model": "sovol_sv06_ace_buildplate_model.stl",
"bed_texture": "sovol_sv06_ace_buildplate_texture.svg", "bed_texture": "sovol_sv06_ace_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Sovol SV06 ACE PLA" "default_materials": "Generic PLA @Sovol SV06 ACE"
} }

View File

@@ -124,6 +124,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV06 Plus ACE PLA" "Generic PLA @Sovol SV06 Plus ACE"
] ]
} }

View File

@@ -8,5 +8,5 @@
"bed_model": "sovol_sv06plus_ace_buildplate_model.stl", "bed_model": "sovol_sv06plus_ace_buildplate_model.stl",
"bed_texture": "sovol_sv06plus_ace_buildplate_texture.svg", "bed_texture": "sovol_sv06plus_ace_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Sovol SV06 Plus ACE PLA" "default_materials": "Generic PLA @Sovol SV06 Plus ACE"
} }

View File

@@ -8,5 +8,5 @@
"bed_model": "sovol_sv07_buildplate_model.stl", "bed_model": "sovol_sv07_buildplate_model.stl",
"bed_texture": "sovol_sv07_buildplate_texture.svg", "bed_texture": "sovol_sv07_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Sovol SV07 PLA" "default_materials": "Generic PLA @Sovol SV07"
} }

View File

@@ -108,6 +108,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV08 PLA @SV08 0.2 nozzle" "Generic PLA @Sovol SV08 0.2 nozzle"
] ]
} }

View File

@@ -102,6 +102,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV08 PLA" "Generic PLA @Sovol SV08"
] ]
} }

View File

@@ -108,6 +108,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV08 PLA" "Generic PLA @Sovol SV08"
] ]
} }

View File

@@ -108,6 +108,6 @@
"machine_end_gcode": "END_PRINT\n", "machine_end_gcode": "END_PRINT\n",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": [ "default_filament_profile": [
"Sovol SV08 PLA" "Generic PLA @Sovol SV08"
] ]
} }

View File

@@ -8,5 +8,5 @@
"bed_model": "sovol_sv08_buildplate_model.stl", "bed_model": "sovol_sv08_buildplate_model.stl",
"bed_texture": "sovol_sv08_buildplate_texture.svg", "bed_texture": "sovol_sv08_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Sovol SV08 PLA;Sovol SV08 PLA @SV08 0.2 nozzle;Sovol SV08 ABS;Sovol SV08 PETG;Sovol SV08 TPU" "default_materials": "Generic PLA @Sovol SV08;Generic PLA @Sovol SV08 0.2 nozzle;Generic ABS @Sovol SV08;Generic PETG @Sovol SV08;Generic TPU @Sovol SV08"
} }

File diff suppressed because one or more lines are too long

View File

@@ -8,5 +8,5 @@
"bed_model": "sovol_zero_buildplate_model.stl", "bed_model": "sovol_zero_buildplate_model.stl",
"bed_texture": "sovol_zero_buildplate_texture.svg", "bed_texture": "sovol_zero_buildplate_texture.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "Sovol Zero PLA Basic;Sovol Zero PLA Basic HS Nozzle;Sovol Zero PLA Silk;Sovol Zero PLA Silk HS Nozzle;Sovol Zero ABS;Sovol Zero PETG;Sovol Zero PETG HS Nozzle;Sovol Zero TPU;Sovol Zero PC" "default_materials": "Generic PLA @Sovol Zero;Sovol Zero PLA Basic HS Nozzle;Generic PLA Silk @Sovol Zero;Sovol Zero PLA Silk HS Nozzle;Generic ABS @Sovol Zero;Generic PETG @Sovol Zero;Sovol Zero PETG HS Nozzle;Generic TPU @Sovol Zero;Generic PC @Sovol Zero"
} }

View File

@@ -2322,6 +2322,12 @@
], ],
"successor": "OFmhJs5V" "successor": "OFmhJs5V"
}, },
"OF016CJw": {
"claims": [
"Sovol/Sovol SV08 ABS"
],
"successor": "OFY9muEs"
},
"OF0GIkJm": { "OF0GIkJm": {
"claims": [ "claims": [
"Tiertime/Tiertime Generic PLA Silk" "Tiertime/Tiertime Generic PLA Silk"
@@ -2457,6 +2463,12 @@
], ],
"successor": "OFDSrzZ8" "successor": "OFDSrzZ8"
}, },
"OF67EdL5": {
"claims": [
"Sovol/Sovol SV06 ACE ABS"
],
"successor": "OFY9muEs"
},
"OF6Fpw1E": { "OF6Fpw1E": {
"claims": [ "claims": [
"Comgrow/Comgrow Generic PETG" "Comgrow/Comgrow Generic PETG"
@@ -2475,12 +2487,30 @@
], ],
"successor": "OFDSrzZ8" "successor": "OFDSrzZ8"
}, },
"OF6O67Xk": {
"claims": [
"Lulzbot/Lulzbot 2.85mm ABS"
],
"successor": "OFY9muEs"
},
"OF6VgL2U": {
"claims": [
"Phrozen/Phrozen PLA"
],
"successor": "OFDSrzZ8"
},
"OF6WddJ1": { "OF6WddJ1": {
"claims": [ "claims": [
"Flashforge/FusRock S-PAHT" "Flashforge/FusRock S-PAHT"
], ],
"successor": "OFCn83wF" "successor": "OFCn83wF"
}, },
"OF6ooviO": {
"claims": [
"FLSun/FLSun S1 TPU"
],
"successor": "OFgbpcy9"
},
"OF6rMr3U": { "OF6rMr3U": {
"claims": [ "claims": [
"Flashforge/FusRock Generic S-Multi" "Flashforge/FusRock Generic S-Multi"
@@ -2505,6 +2535,18 @@
], ],
"successor": "OFLakOUI" "successor": "OFLakOUI"
}, },
"OF6zAVFj": {
"claims": [
"Sovol/Sovol Zero TPU"
],
"successor": "OFgbpcy9"
},
"OF7VJMYM": {
"claims": [
"Sovol/Sovol Zero PLA Basic"
],
"successor": "OFDSrzZ8"
},
"OF7g2vYQ": { "OF7g2vYQ": {
"claims": [ "claims": [
"Co Print/CoPrint Generic TPU" "Co Print/CoPrint Generic TPU"
@@ -2529,6 +2571,12 @@
], ],
"successor": "OFQLcbps" "successor": "OFQLcbps"
}, },
"OF8eQjjt": {
"claims": [
"Lulzbot/Lulzbot 2.85mm PETG"
],
"successor": "OFYPdQJh"
},
"OF97ru74": { "OF97ru74": {
"claims": [ "claims": [
"Prusa/Prusa Generic PC" "Prusa/Prusa Generic PC"
@@ -2541,6 +2589,12 @@
], ],
"successor": "OFLakOUI" "successor": "OFLakOUI"
}, },
"OF9z5LZ9": {
"claims": [
"FLSun/FLSun S1 PETG"
],
"successor": "OFYPdQJh"
},
"OFACSw9O": { "OFACSw9O": {
"claims": [ "claims": [
"Creality/Creality Generic PLA" "Creality/Creality Generic PLA"
@@ -2608,6 +2662,12 @@
], ],
"successor": "OFgbpcy9" "successor": "OFgbpcy9"
}, },
"OFCEA7Nt": {
"claims": [
"Sovol/Sovol SV06 Plus ACE ABS"
],
"successor": "OFY9muEs"
},
"OFCVUEaV": { "OFCVUEaV": {
"claims": [ "claims": [
"Tiertime/Tiertime Generic TPU" "Tiertime/Tiertime Generic TPU"
@@ -2654,6 +2714,12 @@
], ],
"successor": "OFgbpcy9" "successor": "OFgbpcy9"
}, },
"OFENzGSm": {
"claims": [
"FLSun/FLSun T1 TPU"
],
"successor": "OFgbpcy9"
},
"OFETFWx7": { "OFETFWx7": {
"claims": [ "claims": [
"SecKit/SecKit Generic PLA" "SecKit/SecKit Generic PLA"
@@ -2732,6 +2798,12 @@
], ],
"successor": "OFQLcbps" "successor": "OFQLcbps"
}, },
"OFHTVfaU": {
"claims": [
"Sovol/Sovol Zero PETG"
],
"successor": "OFYPdQJh"
},
"OFHUnLY2": { "OFHUnLY2": {
"claims": [ "claims": [
"Vzbot/Vzbot Generic PETG" "Vzbot/Vzbot Generic PETG"
@@ -2750,6 +2822,12 @@
], ],
"successor": "OFLPAxz3" "successor": "OFLPAxz3"
}, },
"OFIK0xFa": {
"claims": [
"FLSun/FLSun S1 ASA"
],
"successor": "OFLPAxz3"
},
"OFIYTy8S": { "OFIYTy8S": {
"claims": [ "claims": [
"Anker/Anker Generic PLA+", "Anker/Anker Generic PLA+",
@@ -2782,6 +2860,12 @@
], ],
"successor": "OFg8ndtj" "successor": "OFg8ndtj"
}, },
"OFJ80y1e": {
"claims": [
"FLSun/FLSun T1 PETG"
],
"successor": "OFYPdQJh"
},
"OFJJpaLS": { "OFJJpaLS": {
"claims": [ "claims": [
"FLSun/FLSun Generic PETG" "FLSun/FLSun Generic PETG"
@@ -2794,6 +2878,18 @@
], ],
"successor": "OFDSrzZ8" "successor": "OFDSrzZ8"
}, },
"OFJVFpJz": {
"claims": [
"Sovol/Sovol Zero PLA Silk"
],
"successor": "OFesA6rF"
},
"OFJfv07m": {
"claims": [
"Sovol/Sovol SV06 ACE TPU"
],
"successor": "OFgbpcy9"
},
"OFK01afJ": { "OFK01afJ": {
"claims": [ "claims": [
"Qidi/Qidi Generic PC" "Qidi/Qidi Generic PC"
@@ -2812,6 +2908,12 @@
], ],
"successor": "OFYPdQJh" "successor": "OFYPdQJh"
}, },
"OFKo87c6": {
"claims": [
"Snapmaker/Snapmaker TPU 95A"
],
"successor": "OFvmwTZE"
},
"OFKuTr12": { "OFKuTr12": {
"claims": [ "claims": [
"Tiertime/Tiertime Generic PE" "Tiertime/Tiertime Generic PE"
@@ -2928,6 +3030,18 @@
], ],
"successor": "OFIKZxPF" "successor": "OFIKZxPF"
}, },
"OFNWcJsM": {
"claims": [
"Comgrow/Comgrow T300 PLA"
],
"successor": "OFDSrzZ8"
},
"OFNX8GI1": {
"claims": [
"Sovol/Sovol Zero ABS"
],
"successor": "OFY9muEs"
},
"OFNYewRS": { "OFNYewRS": {
"claims": [ "claims": [
"Blocks/Blocks Generic PLA" "Blocks/Blocks Generic PLA"
@@ -2940,6 +3054,12 @@
], ],
"successor": "OFDvXujf" "successor": "OFDvXujf"
}, },
"OFNZjrLo": {
"claims": [
"Sovol/Sovol SV06 Plus ACE PLA"
],
"successor": "OFDSrzZ8"
},
"OFNcdCrm": { "OFNcdCrm": {
"claims": [ "claims": [
"Anycubic/Anycubic Generic PLA-CF" "Anycubic/Anycubic Generic PLA-CF"
@@ -2976,6 +3096,12 @@
], ],
"successor": "OFKW5hEW" "successor": "OFKW5hEW"
}, },
"OFPryWt5": {
"claims": [
"Lulzbot/Lulzbot 2.85mm PLA"
],
"successor": "OFDSrzZ8"
},
"OFPy0Ogq": { "OFPy0Ogq": {
"claims": [ "claims": [
"Qidi/Qidi Generic PA-CF" "Qidi/Qidi Generic PA-CF"
@@ -2988,6 +3114,12 @@
], ],
"successor": "OFWbdGsC" "successor": "OFWbdGsC"
}, },
"OFQ9qnkd": {
"claims": [
"FLSun/FLSun T1 PLA High Speed"
],
"successor": "OFmpMwxS"
},
"OFQC8Vna": { "OFQC8Vna": {
"claims": [ "claims": [
"Flashforge/Flashforge Generic PETG-CF" "Flashforge/Flashforge Generic PETG-CF"
@@ -3024,6 +3156,12 @@
], ],
"successor": "OFLPAxz3" "successor": "OFLPAxz3"
}, },
"OFRi7v0b": {
"claims": [
"Sovol/Sovol SV08 PETG"
],
"successor": "OFYPdQJh"
},
"OFRiyes1": { "OFRiyes1": {
"claims": [ "claims": [
"Anker/Anker Generic ASA", "Anker/Anker Generic ASA",
@@ -3074,6 +3212,12 @@
], ],
"successor": "OF8tPByX" "successor": "OF8tPByX"
}, },
"OFSStjay": {
"claims": [
"FLSun/FLSun S1 PLA Silk"
],
"successor": "OFesA6rF"
},
"OFSTCno1": { "OFSTCno1": {
"claims": [ "claims": [
"re3D/re3D Greengate rPETG" "re3D/re3D Greengate rPETG"
@@ -3086,6 +3230,12 @@
], ],
"successor": "OFu1evlr" "successor": "OFu1evlr"
}, },
"OFTvvox9": {
"claims": [
"Sovol/Sovol SV06 ACE PLA"
],
"successor": "OFDSrzZ8"
},
"OFU0n0zW": { "OFU0n0zW": {
"claims": [ "claims": [
"FLSun/FLSun T1 PLA Generic" "FLSun/FLSun T1 PLA Generic"
@@ -3140,6 +3290,12 @@
], ],
"successor": "OFWbdGsC" "successor": "OFWbdGsC"
}, },
"OFV0KrAG": {
"claims": [
"FLSun/FLSun T1 ABS"
],
"successor": "OFY9muEs"
},
"OFVKADz5": { "OFVKADz5": {
"claims": [ "claims": [
"Comgrow/Comgrow Generic PLA" "Comgrow/Comgrow Generic PLA"
@@ -3304,6 +3460,12 @@
], ],
"successor": "OFCn83wF" "successor": "OFCn83wF"
}, },
"OFaFNP2U": {
"claims": [
"Sovol/Sovol SV07 PLA"
],
"successor": "OFDSrzZ8"
},
"OFaU2JxD": { "OFaU2JxD": {
"claims": [ "claims": [
"Dremel/Dremel Generic PLA" "Dremel/Dremel Generic PLA"
@@ -3328,6 +3490,12 @@
], ],
"successor": "OFgbpcy9" "successor": "OFgbpcy9"
}, },
"OFbjtPQy": {
"claims": [
"FLSun/FLSun T1 ASA"
],
"successor": "OFLPAxz3"
},
"OFbt04e0": { "OFbt04e0": {
"claims": [ "claims": [
"DeltaMaker/DeltaMaker Generic TPU" "DeltaMaker/DeltaMaker Generic TPU"
@@ -3346,6 +3514,18 @@
], ],
"successor": "OFDvXujf" "successor": "OFDvXujf"
}, },
"OFcJ7AKd": {
"claims": [
"Sovol/Sovol SV08 PLA"
],
"successor": "OFDSrzZ8"
},
"OFcdqaWI": {
"claims": [
"Sovol/Sovol Zero PC"
],
"successor": "OFLakOUI"
},
"OFctbSkL": { "OFctbSkL": {
"claims": [ "claims": [
"Blocks/Blocks Generic ASA-CF" "Blocks/Blocks Generic ASA-CF"
@@ -3395,6 +3575,12 @@
], ],
"successor": "OFgbpcy9" "successor": "OFgbpcy9"
}, },
"OFe7Sx5B": {
"claims": [
"Sovol/Sovol SV06 ACE PETG"
],
"successor": "OFYPdQJh"
},
"OFe8UJXH": { "OFe8UJXH": {
"claims": [ "claims": [
"Creality/Creality Generic PC" "Creality/Creality Generic PC"
@@ -3524,6 +3710,12 @@
], ],
"successor": "OFd0Fv0k" "successor": "OFd0Fv0k"
}, },
"OFkWaWRo": {
"claims": [
"Sovol/Sovol SV06 Plus ACE TPU"
],
"successor": "OFgbpcy9"
},
"OFkYkQGO": { "OFkYkQGO": {
"claims": [ "claims": [
"Tiertime/Tiertime Generic PP-GF" "Tiertime/Tiertime Generic PP-GF"
@@ -3542,6 +3734,12 @@
], ],
"successor": "OFZr862X" "successor": "OFZr862X"
}, },
"OFl7nOAf": {
"claims": [
"Sovol/Sovol SV06 Plus ACE PETG"
],
"successor": "OFYPdQJh"
},
"OFlLmUeV": { "OFlLmUeV": {
"claims": [ "claims": [
"Ginger Additive/Ginger Generic PLA" "Ginger Additive/Ginger Generic PLA"
@@ -3554,6 +3752,12 @@
], ],
"successor": "OFO5djrM" "successor": "OFO5djrM"
}, },
"OFlXJxX1": {
"claims": [
"Chuanying/Chuanying PETG"
],
"successor": "OFYPdQJh"
},
"OFlx52rn": { "OFlx52rn": {
"claims": [ "claims": [
"Ratrig/RatRig Generic PLA-CF" "Ratrig/RatRig Generic PLA-CF"
@@ -3634,6 +3838,12 @@
], ],
"successor": "OFmpMwxS" "successor": "OFmpMwxS"
}, },
"OFoqrHTw": {
"claims": [
"FLSun/FLSun S1 PLA High Speed"
],
"successor": "OFmpMwxS"
},
"OFp8gtPH": { "OFp8gtPH": {
"claims": [ "claims": [
"Creality/Creality Generic PLA Silk" "Creality/Creality Generic PLA Silk"
@@ -3646,6 +3856,12 @@
], ],
"successor": "OFLPAxz3" "successor": "OFLPAxz3"
}, },
"OFpBV2Ma": {
"claims": [
"Qidi/Tinmorry PETG-ECO"
],
"successor": "OFYE7YZw"
},
"OFpSYJLI": { "OFpSYJLI": {
"claims": [ "claims": [
"Creality/Creality Generic PLA Matte" "Creality/Creality Generic PLA Matte"
@@ -3718,6 +3934,12 @@
], ],
"successor": "OFkf1HHw" "successor": "OFkf1HHw"
}, },
"OFs1sNLz": {
"claims": [
"Chuanying/Chuanying ABS"
],
"successor": "OFY9muEs"
},
"OFs2ReMr": { "OFs2ReMr": {
"claims": [ "claims": [
"InfiMech/InfiMech Generic PETG" "InfiMech/InfiMech Generic PETG"
@@ -3796,6 +4018,12 @@
], ],
"successor": "OFDSrzZ8" "successor": "OFDSrzZ8"
}, },
"OFuUJyRx": {
"claims": [
"FLSun/FLSun T1 PLA Silk"
],
"successor": "OFesA6rF"
},
"OFupq0tY": { "OFupq0tY": {
"claims": [ "claims": [
"Blocks/Blocks Generic PLA-CF" "Blocks/Blocks Generic PLA-CF"
@@ -3868,6 +4096,12 @@
], ],
"successor": "OFesA6rF" "successor": "OFesA6rF"
}, },
"OFyCToOV": {
"claims": [
"Sovol/Sovol SV08 TPU"
],
"successor": "OFgbpcy9"
},
"OFyFRojy": { "OFyFRojy": {
"claims": [ "claims": [
"Ratrig/RatRig Generic ABS" "Ratrig/RatRig Generic ABS"
@@ -3904,6 +4138,12 @@
], ],
"successor": "OFYPdQJh" "successor": "OFYPdQJh"
}, },
"OFzzmK2Q": {
"claims": [
"FLSun/FLSun S1 ABS"
],
"successor": "OFY9muEs"
},
"OGFA00": { "OGFA00": {
"claims": [ "claims": [
"OrcaFilamentLibrary/Bambu PLA Basic" "OrcaFilamentLibrary/Bambu PLA Basic"

View File

@@ -234,6 +234,7 @@ def load_vendor_filaments(profiles_dir, vendor):
"compatible_printers": data.get("compatible_printers") or [], "compatible_printers": data.get("compatible_printers") or [],
"filament_vendor": data.get("filament_vendor"), "filament_vendor": data.get("filament_vendor"),
"filament_type": data.get("filament_type"), "filament_type": data.get("filament_type"),
"renamed_from": data.get("renamed_from"),
} }
return presets, errors return presets, errors
@@ -378,6 +379,7 @@ def analyze_tree(profiles_dir):
triples = {} # fid -> set of triples of its non-island declarers triples = {} # fid -> set of triples of its non-island declarers
declarer_triples = [] # (vendor, rec, fid, triple) per non-island declarer declarer_triples = [] # (vendor, rec, fid, triple) per non-island declarer
family_triples = {} # (vendor, family) -> {triple: [declarer names]} family_triples = {} # (vendor, family) -> {triple: [declarer names]}
renamed_claims = {} # "Vendor/OldFamily" -> set of ids the rename now carries
for vendor, filaments in vendors.items(): for vendor, filaments in vendors.items():
occurring = vendor_ids.setdefault(vendor, set()) occurring = vendor_ids.setdefault(vendor, set())
@@ -411,6 +413,13 @@ def analyze_tree(profiles_dir):
continue continue
occurring.add(eff) occurring.add(eff)
ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}") ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}")
# A renamed preset keeps voting under the names it used to have, so
# the id its old family carried retires to the id the rename minted.
renamed = rec.get("renamed_from")
for old in (renamed if isinstance(renamed, str) else "").split(";"):
if old.strip():
renamed_claims.setdefault(
f"{vendor}/{base_name(old.strip())}", set()).add(eff)
if rec.get("filament_id"): if rec.get("filament_id"):
instantiated_with_id.append(f"{vendor}/{rec['name']}") instantiated_with_id.append(f"{vendor}/{rec['name']}")
if vendor != OFL and rec["ofl_entry"] and eff in ofl_declared: if vendor != OFL and rec["ofl_entry"] and eff in ofl_declared:
@@ -459,6 +468,7 @@ def analyze_tree(profiles_dir):
"vendors": vendors, "vendors": vendors,
"read_errors": read_errors, "read_errors": read_errors,
"ids": {fid: sorted(claims) for fid, claims in ids.items()}, "ids": {fid: sorted(claims) for fid, claims in ids.items()},
"renamed_claims": {claim: sorted(fids) for claim, fids in renamed_claims.items()},
"vendor_ids": vendor_ids, "vendor_ids": vendor_ids,
"declared_ids": declared_ids, "declared_ids": declared_ids,
"instantiated_with_id": sorted(instantiated_with_id), "instantiated_with_id": sorted(instantiated_with_id),
@@ -529,11 +539,18 @@ def write_ledger(path, obj):
def claim_effective_ids(analysis): def claim_effective_ids(analysis):
"""Reverse of analysis["ids"]: claim "Vendor/Family" -> set of effective ids.""" """Reverse of analysis["ids"]: claim "Vendor/Family" -> set of effective ids.
A preset's "renamed_from" names count as claims of that preset too, so an id
whose family was renamed still finds a successor in the claim vote.
"""
claim_ids = {} claim_ids = {}
for fid, claims in analysis["ids"].items(): for fid, claims in analysis["ids"].items():
for claim in claims: for claim in claims:
claim_ids.setdefault(claim, set()).add(fid) claim_ids.setdefault(claim, set()).add(fid)
for claim, fids in analysis.get("renamed_claims", {}).items():
if claim not in claim_ids:
claim_ids[claim] = set(fids)
return claim_ids return claim_ids

File diff suppressed because it is too large Load Diff