diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 86fc5335be..fccd796c1e 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -165,7 +165,7 @@ class CuraContainerRegistry(ContainerRegistry): profile_or_list = profile_reader.read(file_name) # Try to open the file with the profile reader. except Exception as e: # Note that this will fail quickly. That is, if any profile reader throws an exception, it will stop reading. It will only continue reading if the reader returned None. - Logger.log("e", "Failed to import profile from %s: %s while using profile reader", file_name, str(e), profile_reader.getPluginId()) + Logger.log("e", "Failed to import profile from %s: %s while using profile reader [%s]", file_name, str(e), profile_reader.getPluginId()) return { "status": "error", "message": catalog.i18nc("@info:status", "Failed to import profile from {0}: {1}", file_name, str(e))} if profile_or_list: # Success! name_seed = os.path.splitext(os.path.basename(file_name))[0] diff --git a/resources/materials/generic_abs.xml.fdm_material b/resources/materials/generic_abs.xml.fdm_material index ef2db0b7fd..fb24cd22f1 100644 --- a/resources/materials/generic_abs.xml.fdm_material +++ b/resources/materials/generic_abs.xml.fdm_material @@ -31,5 +31,13 @@ Generic ABS profile. Serves as an example file, data in this file is not correct + + + + + + yes + + diff --git a/resources/materials/generic_cpe.xml.fdm_material b/resources/materials/generic_cpe.xml.fdm_material index 1fa878e466..8472f95bd7 100644 --- a/resources/materials/generic_cpe.xml.fdm_material +++ b/resources/materials/generic_cpe.xml.fdm_material @@ -31,5 +31,13 @@ Generic CPE profile. Serves as an example file, data in this file is not correct + + + + + + yes + + diff --git a/resources/materials/generic_nylon.xml.fdm_material b/resources/materials/generic_nylon.xml.fdm_material index 7fdeef8645..c351215b8a 100644 --- a/resources/materials/generic_nylon.xml.fdm_material +++ b/resources/materials/generic_nylon.xml.fdm_material @@ -22,10 +22,16 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre 60 175 + + + + + yes + + - yes diff --git a/resources/materials/generic_pla.xml.fdm_material b/resources/materials/generic_pla.xml.fdm_material index a98e0e469c..75b6271fe7 100644 --- a/resources/materials/generic_pla.xml.fdm_material +++ b/resources/materials/generic_pla.xml.fdm_material @@ -47,5 +47,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 150 + + + + + + yes + + diff --git a/resources/materials/ultimaker_abs_black.xml.fdm_material b/resources/materials/ultimaker_abs_black.xml.fdm_material index 2993ae3133..da95f437c8 100644 --- a/resources/materials/ultimaker_abs_black.xml.fdm_material +++ b/resources/materials/ultimaker_abs_black.xml.fdm_material @@ -31,5 +31,12 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + diff --git a/resources/materials/ultimaker_abs_blue.xml.fdm_material b/resources/materials/ultimaker_abs_blue.xml.fdm_material index 4273ec8f9f..859bf74023 100644 --- a/resources/materials/ultimaker_abs_blue.xml.fdm_material +++ b/resources/materials/ultimaker_abs_blue.xml.fdm_material @@ -31,5 +31,12 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + diff --git a/resources/materials/ultimaker_abs_green.xml.fdm_material b/resources/materials/ultimaker_abs_green.xml.fdm_material index 87c178fb01..97e5828ff7 100644 --- a/resources/materials/ultimaker_abs_green.xml.fdm_material +++ b/resources/materials/ultimaker_abs_green.xml.fdm_material @@ -31,5 +31,12 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + diff --git a/resources/materials/ultimaker_abs_grey.xml.fdm_material b/resources/materials/ultimaker_abs_grey.xml.fdm_material index f8b67c7a41..4a02a309cd 100644 --- a/resources/materials/ultimaker_abs_grey.xml.fdm_material +++ b/resources/materials/ultimaker_abs_grey.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_abs_orange.xml.fdm_material b/resources/materials/ultimaker_abs_orange.xml.fdm_material index af3369ca97..b53ea76ab9 100644 --- a/resources/materials/ultimaker_abs_orange.xml.fdm_material +++ b/resources/materials/ultimaker_abs_orange.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material b/resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material index 29bec52466..7c1e29d3e9 100644 --- a/resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material +++ b/resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_abs_red.xml.fdm_material b/resources/materials/ultimaker_abs_red.xml.fdm_material index 0d0dc3f098..1fb165d397 100644 --- a/resources/materials/ultimaker_abs_red.xml.fdm_material +++ b/resources/materials/ultimaker_abs_red.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material b/resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material index fc7fb1c2b5..c8c5d7a6d7 100644 --- a/resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material +++ b/resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_abs_white.xml.fdm_material b/resources/materials/ultimaker_abs_white.xml.fdm_material index fbf4518c90..f0a0defc54 100644 --- a/resources/materials/ultimaker_abs_white.xml.fdm_material +++ b/resources/materials/ultimaker_abs_white.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_abs_yellow.xml.fdm_material b/resources/materials/ultimaker_abs_yellow.xml.fdm_material index 2b1a0a2784..2d0768b7c6 100644 --- a/resources/materials/ultimaker_abs_yellow.xml.fdm_material +++ b/resources/materials/ultimaker_abs_yellow.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated ABS profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_black.xml.fdm_material b/resources/materials/ultimaker_cpe_black.xml.fdm_material index 8e06ad7176..2fd8926016 100644 --- a/resources/materials/ultimaker_cpe_black.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_black.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_blue.xml.fdm_material b/resources/materials/ultimaker_cpe_blue.xml.fdm_material index f4675c7876..794e247755 100644 --- a/resources/materials/ultimaker_cpe_blue.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_blue.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material b/resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material index aa22712d08..1a375fcb4b 100644 --- a/resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_green.xml.fdm_material b/resources/materials/ultimaker_cpe_green.xml.fdm_material index f22425f658..766769e4ff 100644 --- a/resources/materials/ultimaker_cpe_green.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_green.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_light-grey.xml.fdm_material b/resources/materials/ultimaker_cpe_light-grey.xml.fdm_material index 1a996e9bf2..f8a12084ff 100644 --- a/resources/materials/ultimaker_cpe_light-grey.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_light-grey.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_red.xml.fdm_material b/resources/materials/ultimaker_cpe_red.xml.fdm_material index 77a9caa196..c9bc66af8e 100644 --- a/resources/materials/ultimaker_cpe_red.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_red.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_transparent.xml.fdm_material b/resources/materials/ultimaker_cpe_transparent.xml.fdm_material index ff3cbce64b..aa703ac1c3 100644 --- a/resources/materials/ultimaker_cpe_transparent.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_transparent.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_white.xml.fdm_material b/resources/materials/ultimaker_cpe_white.xml.fdm_material index bb72152d09..a473c441f5 100644 --- a/resources/materials/ultimaker_cpe_white.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_white.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_cpe_yellow.xml.fdm_material b/resources/materials/ultimaker_cpe_yellow.xml.fdm_material index 8fe699277d..d00520c948 100644 --- a/resources/materials/ultimaker_cpe_yellow.xml.fdm_material +++ b/resources/materials/ultimaker_cpe_yellow.xml.fdm_material @@ -31,5 +31,13 @@ Automatically generated CPE profile. Data in this file may not be not correct. + + + + + yes + + + diff --git a/resources/materials/ultimaker_nylon_black.xml.fdm_material b/resources/materials/ultimaker_nylon_black.xml.fdm_material index 4eed0b025c..0e4f0d5464 100644 --- a/resources/materials/ultimaker_nylon_black.xml.fdm_material +++ b/resources/materials/ultimaker_nylon_black.xml.fdm_material @@ -11,7 +11,7 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre c64c2dbe-5691-4363-a7d9-66b2dc12837f 1 - #000000 + #27292b 1.14 @@ -21,5 +21,23 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre 250 60 175 + + + + + + + + + + + + + + + yes + + + diff --git a/resources/materials/ultimaker_nylon_transparent.xml.fdm_material b/resources/materials/ultimaker_nylon_transparent.xml.fdm_material index 7d80a0568c..0c3e2a245c 100644 --- a/resources/materials/ultimaker_nylon_transparent.xml.fdm_material +++ b/resources/materials/ultimaker_nylon_transparent.xml.fdm_material @@ -11,7 +11,7 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre e256615d-a04e-4f53-b311-114b90560af9 1 - #FFFFFF + #d0d0d0 1.14 @@ -21,5 +21,23 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre 250 60 175 + + + + + + + + + + + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_black.xml.fdm_material b/resources/materials/ultimaker_pla_black.xml.fdm_material index 257f9b3235..d461cee3b4 100644 --- a/resources/materials/ultimaker_pla_black.xml.fdm_material +++ b/resources/materials/ultimaker_pla_black.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_blue.xml.fdm_material b/resources/materials/ultimaker_pla_blue.xml.fdm_material index e75b9fada1..e96469ded9 100644 --- a/resources/materials/ultimaker_pla_blue.xml.fdm_material +++ b/resources/materials/ultimaker_pla_blue.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_green.xml.fdm_material b/resources/materials/ultimaker_pla_green.xml.fdm_material index 41b015b216..0c17ed2455 100644 --- a/resources/materials/ultimaker_pla_green.xml.fdm_material +++ b/resources/materials/ultimaker_pla_green.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_magenta.xml.fdm_material b/resources/materials/ultimaker_pla_magenta.xml.fdm_material index 4f821337dc..8c25c4235f 100644 --- a/resources/materials/ultimaker_pla_magenta.xml.fdm_material +++ b/resources/materials/ultimaker_pla_magenta.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_orange.xml.fdm_material b/resources/materials/ultimaker_pla_orange.xml.fdm_material index 1cd028efad..2680850212 100644 --- a/resources/materials/ultimaker_pla_orange.xml.fdm_material +++ b/resources/materials/ultimaker_pla_orange.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_pearl-white.xml.fdm_material b/resources/materials/ultimaker_pla_pearl-white.xml.fdm_material index 7e23606f65..beb9bcbded 100644 --- a/resources/materials/ultimaker_pla_pearl-white.xml.fdm_material +++ b/resources/materials/ultimaker_pla_pearl-white.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_red.xml.fdm_material b/resources/materials/ultimaker_pla_red.xml.fdm_material index f4e381c815..44c3d76bbf 100644 --- a/resources/materials/ultimaker_pla_red.xml.fdm_material +++ b/resources/materials/ultimaker_pla_red.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material b/resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material index fd829abf6c..08b571cfc3 100644 --- a/resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material +++ b/resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_transparent.xml.fdm_material b/resources/materials/ultimaker_pla_transparent.xml.fdm_material index 773828b620..f323838855 100644 --- a/resources/materials/ultimaker_pla_transparent.xml.fdm_material +++ b/resources/materials/ultimaker_pla_transparent.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_white.xml.fdm_material b/resources/materials/ultimaker_pla_white.xml.fdm_material index acd5059cef..890ed3f965 100644 --- a/resources/materials/ultimaker_pla_white.xml.fdm_material +++ b/resources/materials/ultimaker_pla_white.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + yes + + + diff --git a/resources/materials/ultimaker_pla_yellow.xml.fdm_material b/resources/materials/ultimaker_pla_yellow.xml.fdm_material index 92d947e555..5004d7fff2 100644 --- a/resources/materials/ultimaker_pla_yellow.xml.fdm_material +++ b/resources/materials/ultimaker_pla_yellow.xml.fdm_material @@ -47,5 +47,13 @@ Automatically generated PLA profile. Data in this file may not be not correct. 150 + + + + + + yes + +