GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 20:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fs_svg_SPE-1517

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-09-15 14:00:23 +02:00
commit 309ec878dd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/GCode/Thumbnails.cpp
View File

@ -4,6 +4,7 @@
///|/ ///|/
#include "Thumbnails.hpp" #include "Thumbnails.hpp"
#include "../miniz_extension.hpp" #include "../miniz_extension.hpp"
#include "../format.hpp"
#include <qoi/qoi.h> #include <qoi/qoi.h>
#include <jpeglib.h> #include <jpeglib.h>

5
src/libslic3r/PrintConfig.cpp
View File

@ -22,6 +22,7 @@
#include "PrintConfig.hpp" #include "PrintConfig.hpp"
#include "Config.hpp" #include "Config.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include "format.hpp"
#include "SLA/SupportTree.hpp" #include "SLA/SupportTree.hpp"
#include "GCode/Thumbnails.hpp" #include "GCode/Thumbnails.hpp"
@ -3175,8 +3176,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("use_firmware_retraction", coBool); def = this->add("use_firmware_retraction", coBool);
def->label = L("Use firmware retraction"); def->label = L("Use firmware retraction");
def->tooltip = L("This experimental setting uses G10 and G11 commands to have the firmware " def->tooltip = L("This setting uses G10 and G11 commands to have the firmware "
"handle the retraction. This is only supported in recent Marlin."); "handle the retraction. Note that this has to be supported by firmware.");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));

2
src/slic3r/GUI/OptionsGroup.cpp
View File

@ -113,7 +113,7 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
if (!m_disabled) if (!m_disabled)
this->edit_custom_gcode(opt_id); this->edit_custom_gcode(opt_id);
}; };
field->set_edit_tooltip(_L("Edit CustomG-code")); field->set_edit_tooltip(_L("Edit Custom G-code"));
} }
field->m_back_to_initial_value = [this](std::string opt_id) { field->m_back_to_initial_value = [this](std::string opt_id) {