diff --git a/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.png deleted file mode 100644 index 9c18cff6e1..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png new file mode 100644 index 0000000000..87965e7c40 Binary files /dev/null and b/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png differ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json index a7c765272d..1a4e152f31 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune3max_buildplate_model.stl", - "bed_texture": "elegoo_neptune3max_buildplate_texture.png", + "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "hotend_model": "", "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json index 5b4bb74450..0fa4bdef74 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune4max_buildplate_model.stl", - "bed_texture": "elegoo_neptune4max_buildplate_texture.png", + "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "bed_exclude_area": ["0x0"], "hotend_model": "", "default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle" diff --git a/resources/profiles/Prusa/mk4is.svg b/resources/profiles/Prusa/mk4is.svg index 2c99da4f8a..1e1a192ee3 100644 --- a/resources/profiles/Prusa/mk4is.svg +++ b/resources/profiles/Prusa/mk4is.svg @@ -1,45 +1,155 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index f242419bb0..bf9938bd85 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -462,7 +462,7 @@ std::string PresetBundle::get_texture_for_printer_model(std::string model_name) { for (auto vendor_model: vendor_profile.second.models) { - if (vendor_model.name == model_name) + if (vendor_model.name == model_name || vendor_model.id == model_name) { texture_name = vendor_model.bed_texture; vendor_name = vendor_profile.first; diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 306939bba8..b2e393f528 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -4604,6 +4604,7 @@ void PartPlateList::update_logo_texture_filename(const std::string &texture_file return !texture.empty() && (boost::algorithm::iends_with(texture, ".png") || boost::algorithm::iends_with(texture, ".svg")) && boost::filesystem::exists(texture, ec); }; if (!texture_filename.empty() && !check_texture(texture_filename)) { + m_logo_texture_filename = ""; BOOST_LOG_TRIVIAL(error) << "Unable to load bed texture: " << texture_filename; } else m_logo_texture_filename = texture_filename;