diff --git a/resources/profiles/Blocks.json b/resources/profiles/Blocks.json index f24bcb81da..4c4936ab28 100644 --- a/resources/profiles/Blocks.json +++ b/resources/profiles/Blocks.json @@ -1,6 +1,6 @@ { "name": "Blocks", - "version": "02.04.00.04", + "version": "02.04.00.13", "force_update": "0", "description": "Blocks configurations", "machine_model_list": [ @@ -43,8 +43,8 @@ "sub_path": "process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json" }, { - "name": "0.20mm Standard 0.4 nozzle @Blocks", - "sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks.json" + "name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json" }, { "name": "0.20mm Standard 0.4 nozzle @Blocks_RD50_V2", @@ -55,8 +55,8 @@ "sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json" }, { - "name": "0.24mm Draft 0.4 nozzle @Blocks", - "sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks.json" + "name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json" }, { "name": "0.24mm Draft 0.4 nozzle @Blocks_RD50_V2", @@ -75,8 +75,8 @@ "sub_path": "process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json" }, { - "name": "0.30mm Extra Draft 0.4 nozzle @Blocks", - "sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks.json" + "name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json" }, { "name": "fdm_process_common 0.6 nozzle", @@ -111,8 +111,8 @@ "sub_path": "process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json" }, { - "name": "0.30mm Standard 0.6 nozzle @Blocks", - "sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks.json" + "name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json" }, { "name": "0.32mm Draft 0.6 nozzle @Blocks_RD50_V2", @@ -131,12 +131,12 @@ "sub_path": "process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json" }, { - "name": "0.40mm Draft 0.6 nozzle @Blocks", - "sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks.json" + "name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.30mm Optimal 0.8 nozzle @Blocks", - "sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks.json" + "name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json" }, { "name": "0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2", @@ -155,8 +155,8 @@ "sub_path": "process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json" }, { - "name": "0.40mm Standard 0.8 nozzle @Blocks", - "sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks.json" + "name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json" }, { "name": "0.46mm Draft 0.8 nozzle @Blocks_RD50_V2", @@ -167,8 +167,8 @@ "sub_path": "process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json" }, { - "name": "0.50mm Draft 0.8 nozzle @Blocks", - "sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks.json" + "name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json" }, { "name": "0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2", @@ -179,36 +179,36 @@ "sub_path": "process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json" }, { - "name": "0.30mm Optimal 1.0 nozzle @Blocks", - "sub_path": "process/0.30mm Optimal 1.0 nozzle @Blocks.json" + "name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.50mm Standard 1.0 nozzle @Blocks", - "sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks.json" + "name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.60mm Draft 1.0 nozzle @Blocks", - "sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks.json" + "name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.70mm Extra Draft 1.0 nozzle @Blocks", - "sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks.json" + "name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.50mm Optimal 1.2 nozzle @Blocks", - "sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks.json" + "name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.60mm Standard 1.2 nozzle @Blocks", - "sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks.json" + "name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.70mm Draft 1.2 nozzle @Blocks", - "sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks.json" + "name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json" }, { - "name": "0.80mm Extra Draft 1.2 nozzle @Blocks", - "sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks.json" + "name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100", + "sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json" } ], "filament_list": [ @@ -249,48 +249,148 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Generic ABS @Blocks", - "sub_path": "filament/Generic ABS @Blocks.json" + "name": "Blocks ABS @base", + "sub_path": "filament/Blocks ABS @base.json" }, { - "name": "Generic ASA @Blocks", - "sub_path": "filament/Generic ASA @Blocks.json" + "name": "Blocks ASA @base", + "sub_path": "filament/Blocks ASA @base.json" }, { - "name": "Generic ASA-CF @Blocks", - "sub_path": "filament/Generic ASA-CF @Blocks.json" + "name": "Blocks ASA-CF @base", + "sub_path": "filament/Blocks ASA-CF @base.json" }, { - "name": "Generic PA @Blocks", - "sub_path": "filament/Generic PA @Blocks.json" + "name": "Blocks PA @base", + "sub_path": "filament/Blocks PA @base.json" }, { - "name": "Generic PA-CF @Blocks", - "sub_path": "filament/Generic PA-CF @Blocks.json" + "name": "Blocks PA-CF @base", + "sub_path": "filament/Blocks PA-CF @base.json" }, { - "name": "Generic PC @Blocks", - "sub_path": "filament/Generic PC @Blocks.json" + "name": "Blocks PC @base", + "sub_path": "filament/Blocks PC @base.json" }, { - "name": "Generic PETG @Blocks", - "sub_path": "filament/Generic PETG @Blocks.json" + "name": "Blocks PETG @base", + "sub_path": "filament/Blocks PETG @base.json" }, { - "name": "Generic PLA @Blocks", - "sub_path": "filament/Generic PLA @Blocks.json" + "name": "Blocks PLA @base", + "sub_path": "filament/Blocks PLA @base.json" }, { - "name": "Generic PLA-CF @Blocks", - "sub_path": "filament/Generic PLA-CF @Blocks.json" + "name": "Blocks PLA-CF @base", + "sub_path": "filament/Blocks PLA-CF @base.json" }, { - "name": "Generic PVA @Blocks", - "sub_path": "filament/Generic PVA @Blocks.json" + "name": "Blocks PVA @base", + "sub_path": "filament/Blocks PVA @base.json" }, { - "name": "Generic TPU @Blocks", - "sub_path": "filament/Generic TPU @Blocks.json" + "name": "Blocks TPU @base", + "sub_path": "filament/Blocks TPU @base.json" + }, + { + "name": "Blocks ABS @Blocks_RD50_V2", + "sub_path": "filament/Blocks ABS @Blocks_RD50_V2.json" + }, + { + "name": "Blocks ABS @Blocks_RF50", + "sub_path": "filament/Blocks ABS @Blocks_RF50.json" + }, + { + "name": "Blocks ASA @Blocks_RD50_V2", + "sub_path": "filament/Blocks ASA @Blocks_RD50_V2.json" + }, + { + "name": "Blocks ASA @Blocks_RF50", + "sub_path": "filament/Blocks ASA @Blocks_RF50.json" + }, + { + "name": "Blocks ASA-CF @Blocks_RD50_V2", + "sub_path": "filament/Blocks ASA-CF @Blocks_RD50_V2.json" + }, + { + "name": "Blocks ASA-CF @Blocks_RF50", + "sub_path": "filament/Blocks ASA-CF @Blocks_RF50.json" + }, + { + "name": "Blocks PA @Blocks_RD50_V2", + "sub_path": "filament/Blocks PA @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PA @Blocks_RF50", + "sub_path": "filament/Blocks PA @Blocks_RF50.json" + }, + { + "name": "Blocks PA-CF @Blocks_RD50_V2", + "sub_path": "filament/Blocks PA-CF @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PA-CF @Blocks_RF50", + "sub_path": "filament/Blocks PA-CF @Blocks_RF50.json" + }, + { + "name": "Blocks PC @Blocks_RD50_V2", + "sub_path": "filament/Blocks PC @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PC @Blocks_RF50", + "sub_path": "filament/Blocks PC @Blocks_RF50.json" + }, + { + "name": "Blocks PETG @Blocks_Pro_S100", + "sub_path": "filament/Blocks PETG @Blocks_Pro_S100.json" + }, + { + "name": "Blocks PETG @Blocks_RD50_V2", + "sub_path": "filament/Blocks PETG @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PETG @Blocks_RF50", + "sub_path": "filament/Blocks PETG @Blocks_RF50.json" + }, + { + "name": "Blocks PLA @Blocks_Pro_S100", + "sub_path": "filament/Blocks PLA @Blocks_Pro_S100.json" + }, + { + "name": "Blocks PLA @Blocks_RD50_V2", + "sub_path": "filament/Blocks PLA @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PLA @Blocks_RF50", + "sub_path": "filament/Blocks PLA @Blocks_RF50.json" + }, + { + "name": "Blocks PLA-CF @Blocks_RD50_V2", + "sub_path": "filament/Blocks PLA-CF @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PLA-CF @Blocks_RF50", + "sub_path": "filament/Blocks PLA-CF @Blocks_RF50.json" + }, + { + "name": "Blocks PVA @Blocks_RD50_V2", + "sub_path": "filament/Blocks PVA @Blocks_RD50_V2.json" + }, + { + "name": "Blocks PVA @Blocks_RF50", + "sub_path": "filament/Blocks PVA @Blocks_RF50.json" + }, + { + "name": "Blocks TPU @Blocks_Pro_S100", + "sub_path": "filament/Blocks TPU @Blocks_Pro_S100.json" + }, + { + "name": "Blocks TPU @Blocks_RD50_V2", + "sub_path": "filament/Blocks TPU @Blocks_RD50_V2.json" + }, + { + "name": "Blocks TPU @Blocks_RF50", + "sub_path": "filament/Blocks TPU @Blocks_RF50.json" } ], "machine_list": [ diff --git a/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json new file mode 100644 index 0000000000..7ce4729e96 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks ABS @Blocks_RD50_V2", + "inherits": "Blocks ABS @base", + "from": "system", + "setting_id": "qhQ0qQDGJgsueCAF", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic ABS;Generic ABS @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RF50.json new file mode 100644 index 0000000000..3f418a8d6b --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks ABS @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks ABS @Blocks_RF50", + "inherits": "Blocks ABS @base", + "from": "system", + "setting_id": "bGYMFFdKiROKuSiY", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic ABS @Blocks.json b/resources/profiles/Blocks/filament/Blocks ABS @base.json similarity index 75% rename from resources/profiles/Blocks/filament/Generic ABS @Blocks.json rename to resources/profiles/Blocks/filament/Blocks ABS @base.json index c3d09cfd18..e475770f64 100644 --- a/resources/profiles/Blocks/filament/Generic ABS @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks ABS @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic ABS @Blocks", + "name": "Blocks ABS @base", "inherits": "fdm_filament_abs", - "renamed_from": "Blocks Generic ABS", "from": "system", - "setting_id": "TL1Q1kA4t36GGObG", - "filament_id": "OFY9muEs", - "instantiation": "true", + "filament_id": "OFBBhiX8", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_flow_ratio": [ "0.95" ], @@ -81,13 +82,5 @@ ], "during_print_exhaust_fan_speed": [ "100" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json new file mode 100644 index 0000000000..bab020171f --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks ASA @Blocks_RD50_V2", + "inherits": "Blocks ASA @base", + "from": "system", + "setting_id": "HW7xDXThvpVFbMq5", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic ASA;Generic ASA @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RF50.json new file mode 100644 index 0000000000..603c2d7dfa --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks ASA @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks ASA @Blocks_RF50", + "inherits": "Blocks ASA @base", + "from": "system", + "setting_id": "lBW7SCsvawi4icNU", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic ASA @Blocks.json b/resources/profiles/Blocks/filament/Blocks ASA @base.json similarity index 75% rename from resources/profiles/Blocks/filament/Generic ASA @Blocks.json rename to resources/profiles/Blocks/filament/Blocks ASA @base.json index 0c1ee32085..8fed35b779 100644 --- a/resources/profiles/Blocks/filament/Generic ASA @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks ASA @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic ASA @Blocks", + "name": "Blocks ASA @base", "inherits": "fdm_filament_asa", - "renamed_from": "Blocks Generic ASA", "from": "system", - "setting_id": "xP7cB4RHgbm4cYDD", - "filament_id": "OFLPAxz3", - "instantiation": "true", + "filament_id": "OFTz2YXa", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_flow_ratio": [ "0.95" ], @@ -81,13 +82,5 @@ ], "during_print_exhaust_fan_speed": [ "100" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json new file mode 100644 index 0000000000..bdfb288047 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks ASA-CF @Blocks_RD50_V2", + "inherits": "Blocks ASA-CF @base", + "from": "system", + "setting_id": "x5ksnGLGGy1PgDns", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic ASA-CF;Generic ASA-CF @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RF50.json new file mode 100644 index 0000000000..1304f52400 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks ASA-CF @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks ASA-CF @Blocks_RF50", + "inherits": "Blocks ASA-CF @base", + "from": "system", + "setting_id": "pcbd5qFiMZAvDPg1", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic ASA-CF @Blocks.json b/resources/profiles/Blocks/filament/Blocks ASA-CF @base.json similarity index 75% rename from resources/profiles/Blocks/filament/Generic ASA-CF @Blocks.json rename to resources/profiles/Blocks/filament/Blocks ASA-CF @base.json index 0d9f0aa862..fb1cdeb998 100644 --- a/resources/profiles/Blocks/filament/Generic ASA-CF @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks ASA-CF @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic ASA-CF @Blocks", + "name": "Blocks ASA-CF @base", "inherits": "fdm_filament_asa", - "renamed_from": "Blocks Generic ASA-CF", "from": "system", - "setting_id": "ju4ue7yJoz3ujny6", - "filament_id": "OF53eLVD", - "instantiation": "true", + "filament_id": "OF8b9I7o", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_type": [ "ASA-CF" ], @@ -84,13 +85,5 @@ ], "during_print_exhaust_fan_speed": [ "100" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json new file mode 100644 index 0000000000..6486ec0ed8 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PA @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks PA @Blocks_RD50_V2", + "inherits": "Blocks PA @base", + "from": "system", + "setting_id": "gxD81n2jjrReLD29", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic PA;Generic PA @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PA @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PA @Blocks_RF50.json new file mode 100644 index 0000000000..6b11df1a22 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PA @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PA @Blocks_RF50", + "inherits": "Blocks PA @base", + "from": "system", + "setting_id": "PzKxRMDnQUzVWRer", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PA @base.json b/resources/profiles/Blocks/filament/Blocks PA @base.json new file mode 100644 index 0000000000..ff6ca4b599 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PA @base.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Blocks PA @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFidOgK4", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json new file mode 100644 index 0000000000..1946ce16b6 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks PA-CF @Blocks_RD50_V2", + "inherits": "Blocks PA-CF @base", + "from": "system", + "setting_id": "EtbeKx3rbhUo1TtM", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic PA-CF;Generic PA-CF @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RF50.json new file mode 100644 index 0000000000..1b1e02f58e --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PA-CF @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PA-CF @Blocks_RF50", + "inherits": "Blocks PA-CF @base", + "from": "system", + "setting_id": "udI8Q4X7HaPIaPt4", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic PA-CF @Blocks.json b/resources/profiles/Blocks/filament/Blocks PA-CF @base.json similarity index 76% rename from resources/profiles/Blocks/filament/Generic PA-CF @Blocks.json rename to resources/profiles/Blocks/filament/Blocks PA-CF @base.json index 7ec957f6d1..360a090042 100644 --- a/resources/profiles/Blocks/filament/Generic PA-CF @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks PA-CF @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic PA-CF @Blocks", + "name": "Blocks PA-CF @base", "inherits": "fdm_filament_pa", - "renamed_from": "Blocks Generic PA-CF", "from": "system", - "setting_id": "T6SO0WRdnG6wcyG8", - "filament_id": "OFQLcbps", - "instantiation": "true", + "filament_id": "OFdWrXpL", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_type": [ "PA-CF" ], @@ -87,13 +88,5 @@ ], "during_print_exhaust_fan_speed": [ "80" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json new file mode 100644 index 0000000000..cdeec3a9aa --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PC @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks PC @Blocks_RD50_V2", + "inherits": "Blocks PC @base", + "from": "system", + "setting_id": "HLc0shWnKwJzSFyW", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic PC;Generic PC @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PC @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PC @Blocks_RF50.json new file mode 100644 index 0000000000..ad23b4ba03 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PC @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PC @Blocks_RF50", + "inherits": "Blocks PC @base", + "from": "system", + "setting_id": "9a6bccZopMTeNHYu", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PC @base.json b/resources/profiles/Blocks/filament/Blocks PC @base.json new file mode 100644 index 0000000000..83b3d75300 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PC @base.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Blocks PC @base", + "inherits": "fdm_filament_pc", + "from": "system", + "filament_id": "OFlGY0MN", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json new file mode 100644 index 0000000000..3a6619c8ef --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_Pro_S100.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Blocks PETG @Blocks_Pro_S100", + "inherits": "Blocks PETG @base", + "from": "system", + "setting_id": "AhMR49fcFqtrQ6hI", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS Pro S100 0.4 nozzle", + "BLOCKS Pro S100 0.6 nozzle", + "BLOCKS Pro S100 0.8 nozzle", + "BLOCKS Pro S100 1.0 nozzle", + "BLOCKS Pro S100 1.2 nozzle" + ], + "renamed_from": "Blocks Generic PETG;Generic PETG @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PETG @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_RD50_V2.json new file mode 100644 index 0000000000..e48e2d8145 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_RD50_V2.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PETG @Blocks_RD50_V2", + "inherits": "Blocks PETG @base", + "from": "system", + "setting_id": "3v7ah1zVG8MERPSJ", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PETG @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_RF50.json new file mode 100644 index 0000000000..c810cf0e8f --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PETG @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PETG @Blocks_RF50", + "inherits": "Blocks PETG @base", + "from": "system", + "setting_id": "S7weR19wo9meJ6Yz", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic PETG @Blocks.json b/resources/profiles/Blocks/filament/Blocks PETG @base.json similarity index 68% rename from resources/profiles/Blocks/filament/Generic PETG @Blocks.json rename to resources/profiles/Blocks/filament/Blocks PETG @base.json index 45a2a13e9b..f272fa9049 100644 --- a/resources/profiles/Blocks/filament/Generic PETG @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks PETG @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic PETG @Blocks", + "name": "Blocks PETG @base", "inherits": "fdm_filament_petg", - "renamed_from": "Blocks Generic PETG", "from": "system", - "setting_id": "NgzPlYItKHbmGgv3", - "filament_id": "OFYPdQJh", - "instantiation": "true", + "filament_id": "OF9t1Ga0", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_flow_ratio": [ "0.94" ], @@ -81,18 +82,5 @@ ], "slow_down_layer_time": [ "5" - ], - "compatible_printers": [ - "BLOCKS Pro S100 0.4 nozzle", - "BLOCKS Pro S100 0.6 nozzle", - "BLOCKS Pro S100 0.8 nozzle", - "BLOCKS Pro S100 1.0 nozzle", - "BLOCKS Pro S100 1.2 nozzle", - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json new file mode 100644 index 0000000000..64f6bbefa0 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_Pro_S100.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Blocks PLA @Blocks_Pro_S100", + "inherits": "Blocks PLA @base", + "from": "system", + "setting_id": "vWojuLYIfduLGFLL", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS Pro S100 0.4 nozzle", + "BLOCKS Pro S100 0.6 nozzle", + "BLOCKS Pro S100 0.8 nozzle", + "BLOCKS Pro S100 1.0 nozzle", + "BLOCKS Pro S100 1.2 nozzle" + ], + "renamed_from": "Blocks Generic PLA;Generic PLA @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PLA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_RD50_V2.json new file mode 100644 index 0000000000..ac283bbe06 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_RD50_V2.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PLA @Blocks_RD50_V2", + "inherits": "Blocks PLA @base", + "from": "system", + "setting_id": "y7y8NcXNdp17sJUs", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PLA @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_RF50.json new file mode 100644 index 0000000000..c59a35df74 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PLA @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PLA @Blocks_RF50", + "inherits": "Blocks PLA @base", + "from": "system", + "setting_id": "jt1MJF4eZzkkscEJ", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic PLA @Blocks.json b/resources/profiles/Blocks/filament/Blocks PLA @base.json similarity index 52% rename from resources/profiles/Blocks/filament/Generic PLA @Blocks.json rename to resources/profiles/Blocks/filament/Blocks PLA @base.json index 3a5c942899..c4051967af 100644 --- a/resources/profiles/Blocks/filament/Generic PLA @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks PLA @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic PLA @Blocks", + "name": "Blocks PLA @base", "inherits": "fdm_filament_pla", - "renamed_from": "Blocks Generic PLA", "from": "system", - "setting_id": "kjhuttx4T8OtTNmV", - "filament_id": "OFDSrzZ8", - "instantiation": "true", + "filament_id": "OFVGAC8g", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_flow_ratio": [ "0.95" ], @@ -39,18 +40,5 @@ ], "during_print_exhaust_fan_speed": [ "100" - ], - "compatible_printers": [ - "BLOCKS Pro S100 0.4 nozzle", - "BLOCKS Pro S100 0.6 nozzle", - "BLOCKS Pro S100 0.8 nozzle", - "BLOCKS Pro S100 1.0 nozzle", - "BLOCKS Pro S100 1.2 nozzle", - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json new file mode 100644 index 0000000000..08050266b7 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks PLA-CF @Blocks_RD50_V2", + "inherits": "Blocks PLA-CF @base", + "from": "system", + "setting_id": "lhBtMKP1DmOB3HOI", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic PLA-CF;Generic PLA-CF @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RF50.json new file mode 100644 index 0000000000..1f27f49fdf --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PLA-CF @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PLA-CF @Blocks_RF50", + "inherits": "Blocks PLA-CF @base", + "from": "system", + "setting_id": "6CU83mAyhcZ4FCPI", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PLA-CF @base.json b/resources/profiles/Blocks/filament/Blocks PLA-CF @base.json new file mode 100644 index 0000000000..989a427df4 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PLA-CF @base.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Blocks PLA-CF @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OF6FfwOP", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_type": [ + "PLA-CF" + ], + "slow_down_layer_time": [ + "7" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json new file mode 100644 index 0000000000..f1beff3b23 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RD50_V2.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Blocks PVA @Blocks_RD50_V2", + "inherits": "Blocks PVA @base", + "from": "system", + "setting_id": "hREDqwKF6qyKkakp", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ], + "renamed_from": "Blocks Generic PVA;Generic PVA @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RF50.json new file mode 100644 index 0000000000..91a0a0e5e6 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PVA @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks PVA @Blocks_RF50", + "inherits": "Blocks PVA @base", + "from": "system", + "setting_id": "q6pKqHY7Iz4OZaAC", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks PVA @base.json b/resources/profiles/Blocks/filament/Blocks PVA @base.json new file mode 100644 index 0000000000..326e61b362 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks PVA @base.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Blocks PVA @base", + "inherits": "fdm_filament_pva", + "from": "system", + "filament_id": "OFqcNuE1", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json new file mode 100644 index 0000000000..d186e824ef --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_Pro_S100.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Blocks TPU @Blocks_Pro_S100", + "inherits": "Blocks TPU @base", + "from": "system", + "setting_id": "6Rkz2je91JRTRoTi", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS Pro S100 0.4 nozzle", + "BLOCKS Pro S100 0.6 nozzle", + "BLOCKS Pro S100 0.8 nozzle", + "BLOCKS Pro S100 1.0 nozzle", + "BLOCKS Pro S100 1.2 nozzle" + ], + "renamed_from": "Blocks Generic TPU;Generic TPU @Blocks" +} diff --git a/resources/profiles/Blocks/filament/Blocks TPU @Blocks_RD50_V2.json b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_RD50_V2.json new file mode 100644 index 0000000000..088ad69bbb --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_RD50_V2.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks TPU @Blocks_RD50_V2", + "inherits": "Blocks TPU @base", + "from": "system", + "setting_id": "mkCqRQTtXldzoEUg", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RD50 V2 0.4 nozzle", + "BLOCKS RD50 V2 0.6 nozzle", + "BLOCKS RD50 V2 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Blocks TPU @Blocks_RF50.json b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_RF50.json new file mode 100644 index 0000000000..53773dd813 --- /dev/null +++ b/resources/profiles/Blocks/filament/Blocks TPU @Blocks_RF50.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Blocks TPU @Blocks_RF50", + "inherits": "Blocks TPU @base", + "from": "system", + "setting_id": "bCCvu5Ow1JkwIrRR", + "instantiation": "true", + "compatible_printers": [ + "BLOCKS RF50 0.4 nozzle", + "BLOCKS RF50 0.6 nozzle", + "BLOCKS RF50 0.8 nozzle" + ] +} diff --git a/resources/profiles/Blocks/filament/Generic TPU @Blocks.json b/resources/profiles/Blocks/filament/Blocks TPU @base.json similarity index 58% rename from resources/profiles/Blocks/filament/Generic TPU @Blocks.json rename to resources/profiles/Blocks/filament/Blocks TPU @base.json index 8b5873a745..9b26d57636 100644 --- a/resources/profiles/Blocks/filament/Generic TPU @Blocks.json +++ b/resources/profiles/Blocks/filament/Blocks TPU @base.json @@ -1,12 +1,13 @@ { "type": "filament", - "name": "Generic TPU @Blocks", + "name": "Blocks TPU @base", "inherits": "fdm_filament_tpu", - "renamed_from": "Blocks Generic TPU", "from": "system", - "setting_id": "6iVYOCZo8ugs4JA0", - "filament_id": "OFgbpcy9", - "instantiation": "true", + "filament_id": "OFYnedOZ", + "instantiation": "false", + "filament_vendor": [ + "Blocks" + ], "filament_max_volumetric_speed": [ "4" ], @@ -54,18 +55,5 @@ ], "during_print_exhaust_fan_speed": [ "80" - ], - "compatible_printers": [ - "BLOCKS Pro S100 0.4 nozzle", - "BLOCKS Pro S100 0.6 nozzle", - "BLOCKS Pro S100 0.8 nozzle", - "BLOCKS Pro S100 1.0 nozzle", - "BLOCKS Pro S100 1.2 nozzle", - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" ] } diff --git a/resources/profiles/Blocks/filament/Generic PA @Blocks.json b/resources/profiles/Blocks/filament/Generic PA @Blocks.json deleted file mode 100644 index e624226ded..0000000000 --- a/resources/profiles/Blocks/filament/Generic PA @Blocks.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "Generic PA @Blocks", - "inherits": "fdm_filament_pa", - "renamed_from": "Blocks Generic PA", - "from": "system", - "setting_id": "hL3p8gAeciwDkjNK", - "filament_id": "OFg8ndtj", - "instantiation": "true", - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "10" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" - ] -} diff --git a/resources/profiles/Blocks/filament/Generic PC @Blocks.json b/resources/profiles/Blocks/filament/Generic PC @Blocks.json deleted file mode 100644 index 7b5df77bc5..0000000000 --- a/resources/profiles/Blocks/filament/Generic PC @Blocks.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "Generic PC @Blocks", - "inherits": "fdm_filament_pc", - "renamed_from": "Blocks Generic PC", - "from": "system", - "setting_id": "Xhs8PjtmwwVj0ksE", - "filament_id": "OFLakOUI", - "instantiation": "true", - "filament_flow_ratio": [ - "0.94" - ], - "filament_max_volumetric_speed": [ - "10" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" - ] -} diff --git a/resources/profiles/Blocks/filament/Generic PLA-CF @Blocks.json b/resources/profiles/Blocks/filament/Generic PLA-CF @Blocks.json deleted file mode 100644 index 3a3ac5daba..0000000000 --- a/resources/profiles/Blocks/filament/Generic PLA-CF @Blocks.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "filament", - "name": "Generic PLA-CF @Blocks", - "inherits": "fdm_filament_pla", - "renamed_from": "Blocks Generic PLA-CF", - "from": "system", - "setting_id": "oKUqzwAWMrpiyGLf", - "filament_id": "OFWbdGsC", - "instantiation": "true", - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_type": [ - "PLA-CF" - ], - "slow_down_layer_time": [ - "7" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" - ] -} diff --git a/resources/profiles/Blocks/filament/Generic PVA @Blocks.json b/resources/profiles/Blocks/filament/Generic PVA @Blocks.json deleted file mode 100644 index 5b6a3ad368..0000000000 --- a/resources/profiles/Blocks/filament/Generic PVA @Blocks.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "Generic PVA @Blocks", - "inherits": "fdm_filament_pva", - "renamed_from": "Blocks Generic PVA", - "from": "system", - "setting_id": "tNw3oe7VovLkgUbB", - "filament_id": "OFDvXujf", - "instantiation": "true", - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "compatible_printers": [ - "BLOCKS RD50 V2 0.4 nozzle", - "BLOCKS RD50 V2 0.6 nozzle", - "BLOCKS RD50 V2 0.8 nozzle", - "BLOCKS RF50 0.4 nozzle", - "BLOCKS RF50 0.6 nozzle", - "BLOCKS RF50 0.8 nozzle" - ] -} diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.4 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.4 nozzle.json index e8cc1893c7..43951cf9c5 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.4 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.4 nozzle.json @@ -6,7 +6,7 @@ "setting_id": "G7HQgaspHXduDM8O", "instantiation": "true", "printer_model": "BLOCKS Pro S100", - "default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks", + "default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100", "max_layer_height": [ "0.30" ], @@ -25,5 +25,8 @@ "printable_height": "900", "upward_compatible_machine": [ "BLOCKS Pro S100" + ], + "default_filament_profile": [ + "Blocks PLA @Blocks_Pro_S100" ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.6 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.6 nozzle.json index 49e519d2ec..a55153bab7 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.6 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.6 nozzle.json @@ -6,7 +6,7 @@ "setting_id": "XkWdS210oUMQN17N", "instantiation": "true", "printer_model": "BLOCKS Pro S100", - "default_print_profile": "0.30mm Standard 0.6 nozzle @Blocks", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100", "max_layer_height": [ "0.50" ], @@ -26,5 +26,8 @@ "upward_compatible_machine": [ "BLOCKS Pro S100" ], - "printer_variant": "0.6" + "printer_variant": "0.6", + "default_filament_profile": [ + "Blocks PLA @Blocks_Pro_S100" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.8 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.8 nozzle.json index 3c3a29f111..7e889bbf14 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.8 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100 0.8 nozzle.json @@ -6,7 +6,7 @@ "setting_id": "I6PdeCS7SbvIlkZf", "instantiation": "true", "printer_model": "BLOCKS Pro S100", - "default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100", "max_layer_height": [ "0.56" ], @@ -26,5 +26,8 @@ "upward_compatible_machine": [ "BLOCKS Pro S100" ], - "printer_variant": "0.8" + "printer_variant": "0.8", + "default_filament_profile": [ + "Blocks PLA @Blocks_Pro_S100" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.0 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.0 nozzle.json index 1be375c34b..c84ad8c227 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.0 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.0 nozzle.json @@ -6,7 +6,7 @@ "setting_id": "elLdUyy9RhUoa37o", "instantiation": "true", "printer_model": "BLOCKS Pro S100", - "default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100", "max_layer_height": [ "0.7" ], @@ -26,5 +26,8 @@ "upward_compatible_machine": [ "BLOCKS Pro S100" ], - "printer_variant": "1.0" + "printer_variant": "1.0", + "default_filament_profile": [ + "Blocks PLA @Blocks_Pro_S100" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.2 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.2 nozzle.json index 426fdafd55..11aab094cf 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.2 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100 1.2 nozzle.json @@ -6,7 +6,7 @@ "setting_id": "xtsGSJ4JkbHTPi44", "instantiation": "true", "printer_model": "BLOCKS Pro S100", - "default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks", + "default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100", "max_layer_height": [ "0.8" ], @@ -26,5 +26,8 @@ "upward_compatible_machine": [ "BLOCKS Pro S100" ], - "printer_variant": "1.2" + "printer_variant": "1.2", + "default_filament_profile": [ + "Blocks PLA @Blocks_Pro_S100" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100.json index de9ea3756c..e034ffd9b1 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100.json @@ -8,5 +8,5 @@ "bed_model": "PRO S100 HotBed model.stl", "bed_texture": "PRO S100 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", - "default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks" + "default_materials": "Blocks PLA @Blocks_Pro_S100;Blocks PETG @Blocks_Pro_S100;Blocks TPU @Blocks_Pro_S100" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.4 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.4 nozzle.json index 3d2908a403..c5613b39ec 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.4 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.4 nozzle.json @@ -34,5 +34,9 @@ "printable_height": "500", "upward_compatible_machine": [ "BLOCKS RD50 V2" + ], + "printer_variant": "0.4", + "default_filament_profile": [ + "Blocks PLA @Blocks_RD50_V2" ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.6 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.6 nozzle.json index bf41f1070f..92cde6244c 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.6 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.6 nozzle.json @@ -35,5 +35,8 @@ "deretraction_speed": [ "80" ], - "printer_variant": "0.6" + "printer_variant": "0.6", + "default_filament_profile": [ + "Blocks PLA @Blocks_RD50_V2" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.8 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.8 nozzle.json index 23c0808be2..756e77efb7 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.8 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RD50 V2 0.8 nozzle.json @@ -35,5 +35,8 @@ "deretraction_speed": [ "80" ], - "printer_variant": "0.8" + "printer_variant": "0.8", + "default_filament_profile": [ + "Blocks PLA @Blocks_RD50_V2" + ] } diff --git a/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json b/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json index 76dafd429e..1cc75448ac 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json +++ b/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json @@ -8,5 +8,5 @@ "bed_model": "RD50 V2 HotBed model.stl", "bed_texture": "RD50 V2 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", - "default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks" + "default_materials": "Blocks PLA @Blocks_RD50_V2;Blocks PETG @Blocks_RD50_V2;Blocks TPU @Blocks_RD50_V2" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json index a589b6620b..9e523ef843 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50 0.4 nozzle.json @@ -51,7 +51,7 @@ "12" ], "retraction_length": [ - "1" + "1.2" ], "retraction_speed": [ "60" @@ -79,5 +79,10 @@ ], "retract_before_wipe": [ "0" - ] + ], + "default_filament_profile": [ + "Blocks PLA @Blocks_RF50" + ], + "support_multi_bed_types": "1", + "default_bed_type": "Textured PEI Plate" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json index fea3007abc..b0dbc7d2b9 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50 0.6 nozzle.json @@ -51,7 +51,7 @@ "12" ], "retraction_length": [ - "1" + "1.2" ], "retraction_speed": [ "60" @@ -75,8 +75,8 @@ "BLOCKS RF50" ], "machine_start_gcode": [ - "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]", - "SET_PRESSURE_ADVANCE ADVANCE=0.046" + "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]\n", + "SET_PRESSURE_ADVANCE ADVANCE=0.046\n" ], "printer_variant": "0.6", "wipe_distance": [ @@ -84,5 +84,10 @@ ], "retract_before_wipe": [ "0" - ] + ], + "default_filament_profile": [ + "Blocks PLA @Blocks_RF50" + ], + "support_multi_bed_types": "1", + "default_bed_type": "Textured PEI Plate" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json b/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json index c8d6cec882..c361a8da16 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50 0.8 nozzle.json @@ -51,7 +51,7 @@ "12" ], "retraction_length": [ - "1" + "1.2" ], "retraction_speed": [ "60" @@ -80,5 +80,10 @@ ], "retract_before_wipe": [ "0" - ] + ], + "default_filament_profile": [ + "Blocks PLA @Blocks_RF50" + ], + "support_multi_bed_types": "1", + "default_bed_type": "Textured PEI Plate" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50.json b/resources/profiles/Blocks/machine/BLOCKS RF50.json index 14ae8bc5f4..79aeec9ebc 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50.json @@ -8,5 +8,6 @@ "bed_model": "RF50 HotBed model.stl", "bed_texture": "RF50 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", - "default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks" + "default_materials": "Blocks PLA @Blocks_RF50;Blocks PETG @Blocks_RF50;Blocks TPU @Blocks_RF50", + "not_support_bed_type": "Smooth Cool Plate;Engineering Plate;Textured Cool Plate;Cool Plate (SuperTack)" } diff --git a/resources/profiles/Blocks/machine/fdm_klipper_common.json b/resources/profiles/Blocks/machine/fdm_klipper_common.json index 5372b42547..eab501bf4b 100644 --- a/resources/profiles/Blocks/machine/fdm_klipper_common.json +++ b/resources/profiles/Blocks/machine/fdm_klipper_common.json @@ -123,9 +123,6 @@ "wipe": [ "1" ], - "default_filament_profile": [ - "Generic PLA @Blocks" - ], "bed_exclude_area": [ "0x0" ], diff --git a/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json index 315256dcab..43474f76c1 100644 --- a/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json index ca6facb720..b7351a4996 100644 --- a/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json index b80b051a71..aa2b2c8e4a 100644 --- a/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json similarity index 62% rename from resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json index 9f66196279..d5a27fa23b 100644 --- a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.20mm Standard 0.4 nozzle @Blocks", + "name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_blocks_common", "from": "system", - "setting_id": "47aDtVL6E5DVr7Mt", + "setting_id": "QSEguMMChNFZsK5H", "instantiation": "true", "layer_height": "0.2", "bottom_shell_layers": "4", "top_shell_layers": "5", "compatible_printers": [ "BLOCKS Pro S100 0.4 nozzle" - ] + ], + "renamed_from": "0.20mm Standard 0.4 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json index 5c88e00c2a..901f3f811d 100644 --- a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json @@ -25,7 +25,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -61,5 +61,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json index 2bc124f2dc..2716ce0c66 100644 --- a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.24mm Draft 0.4 nozzle @Blocks", + "name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_blocks_common", "from": "system", - "setting_id": "ETADjxV6ViJQdnHA", + "setting_id": "uALfEFHGmup6vBYI", "instantiation": "true", "layer_height": "0.24", "bottom_shell_layers": "4", "top_shell_layers": "5", "compatible_printers": [ "BLOCKS Pro S100 0.4 nozzle" - ] + ], + "renamed_from": "0.24mm Draft 0.4 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json index edb1bfcc2d..ab911910b9 100644 --- a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json index d2f853b638..739b4f7168 100644 --- a/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json index dd6b60d371..7c9a108287 100644 --- a/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json @@ -22,7 +22,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json similarity index 61% rename from resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json index 0cef66fb5a..c67ebf9341 100644 --- a/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.30mm Extra Draft 0.4 nozzle @Blocks", + "name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_blocks_common", "from": "system", - "setting_id": "UbuICsmppKDsaaZ4", + "setting_id": "HYKF5l2OGvpugSQy", "instantiation": "true", "bottom_shell_layers": "3", "top_shell_layers": "4", "layer_height": "0.30", "compatible_printers": [ "BLOCKS Pro S100 0.4 nozzle" - ] + ], + "renamed_from": "0.30mm Extra Draft 0.4 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json index bbb74c97a9..bbd486176f 100644 --- a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.30mm Optimal 0.8 nozzle @Blocks", + "name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 0.8 nozzle", "from": "system", - "setting_id": "YqkYzp5zdH4R5upm", + "setting_id": "OUfZvizM5MGnvHfp", "instantiation": "true", "bottom_shell_layers": "3", "top_shell_layers": "3", "layer_height": "0.3", "compatible_printers": [ "BLOCKS Pro S100 0.8 nozzle" - ] + ], + "renamed_from": "0.30mm Optimal 0.8 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json index 9d909c1dd4..f6763c9494 100644 --- a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json index 8820018b9d..e7ce874a77 100644 --- a/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.30mm Optimal 1.0 nozzle @Blocks", + "name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", - "setting_id": "8pBawPScHkyQu0SW", + "setting_id": "HGG9WxKVr89qNFDx", "instantiation": "true", "bottom_shell_layers": "4", "top_shell_layers": "4", "layer_height": "0.30", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ] + ], + "renamed_from": "0.30mm Optimal 1.0 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json similarity index 62% rename from resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json index d2a815e849..00e37a7860 100644 --- a/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.30mm Standard 0.6 nozzle @Blocks", + "name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 0.6 nozzle", "from": "system", - "setting_id": "EPI3PAVK9LpJOZWO", + "setting_id": "gO2I1YjBl4nf8yzr", "instantiation": "true", "bottom_shell_layers": "3", "top_shell_layers": "3", "layer_height": "0.30", "compatible_printers": [ "BLOCKS Pro S100 0.6 nozzle" - ] + ], + "renamed_from": "0.30mm Standard 0.6 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json index 60c6eae19e..b19346e30a 100644 --- a/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json @@ -22,7 +22,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json index f28a975208..12922fa105 100644 --- a/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json index 7b94febc1c..5c2245f114 100644 --- a/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json @@ -22,7 +22,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json index 45fdd61179..915d160b6c 100644 --- a/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.40mm Draft 0.6 nozzle @Blocks", + "name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 0.6 nozzle", "from": "system", - "setting_id": "CShVKoGspbMJNPw8", + "setting_id": "OjsLUl1heqv1cevs", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "2", "layer_height": "0.40", "compatible_printers": [ "BLOCKS Pro S100 0.6 nozzle" - ] + ], + "renamed_from": "0.40mm Draft 0.6 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json similarity index 62% rename from resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json index 177b620e51..20f02ff7af 100644 --- a/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.40mm Standard 0.8 nozzle @Blocks", + "name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 0.8 nozzle", "from": "system", - "setting_id": "TSRjmfWaatY7oLJB", + "setting_id": "laOTioBGySeudJpl", "instantiation": "true", "bottom_shell_layers": "3", "top_shell_layers": "4", "layer_height": "0.40", "compatible_printers": [ "BLOCKS Pro S100 0.8 nozzle" - ] + ], + "renamed_from": "0.40mm Standard 0.8 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json index d49633e89d..be66641b28 100644 --- a/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json @@ -22,7 +22,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json index fc1a875d67..8f358e60e2 100644 --- a/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.50mm Draft 0.8 nozzle @Blocks", + "name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 0.8 nozzle", "from": "system", - "setting_id": "vOtZHrDS88Shmf2m", + "setting_id": "oAhgUZdADR7kP87e", "instantiation": "true", "bottom_shell_layers": "3", "top_shell_layers": "4", "layer_height": "0.50", "compatible_printers": [ "BLOCKS Pro S100 0.8 nozzle" - ] + ], + "renamed_from": "0.50mm Draft 0.8 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json index 6b59b1c101..11c79d1a65 100644 --- a/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.50mm Optimal 1.2 nozzle @Blocks", + "name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", - "setting_id": "BKrEAKqDYzdH43wc", + "setting_id": "0eqNgX26jemsBfV5", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "3", "layer_height": "0.50", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ] + ], + "renamed_from": "0.50mm Optimal 1.2 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json similarity index 62% rename from resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json index 80e3ba5649..0bd91d3405 100644 --- a/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.50mm Standard 1.0 nozzle @Blocks", + "name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", - "setting_id": "D40iksDm7mFjhSKn", + "setting_id": "z1qCW1cEMc4QvBbV", "instantiation": "true", "bottom_shell_layers": "3", "top_shell_layers": "3", "layer_height": "0.50", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ] + ], + "renamed_from": "0.50mm Standard 1.0 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json index a0e9121ceb..6700893916 100644 --- a/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json +++ b/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json @@ -21,7 +21,7 @@ "top_solid_infill_flow_ratio": "0.97", "bottom_solid_infill_flow_ratio": "1.08", "seam_position": "aligned", - "sparse_infill_patter": "grid", + "sparse_infill_pattern": "grid", "initial_layer_speed": "60", "initial_layer_infill_speed": "80", "initial_travel_speed": "100%", @@ -57,5 +57,7 @@ "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "elefant_foot_compensation": "0.25", - "elefant_foot_compensation_layers": "1" + "elefant_foot_compensation_layers": "1", + "skirt_loops": "2", + "skirt_type": "perobject" } diff --git a/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json index e59174620f..f63ebde1bc 100644 --- a/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.60mm Draft 1.0 nozzle @Blocks", + "name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", - "setting_id": "UJUe8XCBzZf8NyCL", + "setting_id": "gTTgtfG8qb9My3hH", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "3", "layer_height": "0.60", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ] + ], + "renamed_from": "0.60mm Draft 1.0 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json similarity index 62% rename from resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json index 598534c050..ba93c393a6 100644 --- a/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.60mm Standard 1.2 nozzle @Blocks", + "name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", - "setting_id": "PSBFrTykpkytPI2Q", + "setting_id": "ApcyToENCIANrI71", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "3", "layer_height": "0.60", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ] + ], + "renamed_from": "0.60mm Standard 1.2 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json similarity index 63% rename from resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json index 905bb32a48..7950bce0ca 100644 --- a/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.70mm Draft 1.2 nozzle @Blocks", + "name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", - "setting_id": "0ZQ0USGX9SwAKr29", + "setting_id": "DEv7X7zaTfxRQmjo", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "3", "layer_height": "0.70", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ] + ], + "renamed_from": "0.70mm Draft 1.2 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json similarity index 61% rename from resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json index 49eaf2c7b9..49d864ed8f 100644 --- a/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.70mm Extra Draft 1.0 nozzle @Blocks", + "name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.0 nozzle", "from": "system", - "setting_id": "69PFmjOVFBOIp3Qg", + "setting_id": "nUW7N9dJmTyQT4AG", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "3", "layer_height": "0.70", "compatible_printers": [ "BLOCKS Pro S100 1.0 nozzle" - ] + ], + "renamed_from": "0.70mm Extra Draft 1.0 nozzle @Blocks" } diff --git a/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json similarity index 61% rename from resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json rename to resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json index df6d97a9d7..22f7628081 100644 --- a/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json +++ b/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json @@ -1,14 +1,15 @@ { "type": "process", - "name": "0.80mm Extra Draft 1.2 nozzle @Blocks", + "name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100", "inherits": "fdm_process_common 1.2 nozzle", "from": "system", - "setting_id": "iBwRI5JJewW5HJSv", + "setting_id": "JMy62SonRfK0cAdL", "instantiation": "true", "bottom_shell_layers": "2", "top_shell_layers": "2", "layer_height": "0.80", "compatible_printers": [ "BLOCKS Pro S100 1.2 nozzle" - ] + ], + "renamed_from": "0.80mm Extra Draft 1.2 nozzle @Blocks" }