mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-15 12:25:55 +08:00
Merge branch 'master' into fs_svg_SPE-1517
This commit is contained in:
commit
309ec878dd
@ -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>
|
||||||
|
@ -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));
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user