Merge remote-tracking branch 'origin/master'

This commit is contained in:
tamasmeszaros 2018-12-12 14:25:27 +01:00
commit dfc92fb5cf
20 changed files with 439 additions and 176 deletions
src/libslic3r

View file

@ -1297,10 +1297,11 @@ void PrintConfigDef::init_fff_params()
def->default_value = new ConfigOptionString("");
def = this->add("printhost_cafile", coString);
def->label = "HTTPS CA file";
def->label = "HTTPS CA File";
def->tooltip = "Custom CA certificate file can be specified for HTTPS OctoPrint connections, in crt/pem format. "
"If left blank, the default OS CA certificate repository is used.";
def->cli = "printhost-cafile=s";
def->mode = comAdvanced;
def->default_value = new ConfigOptionString("");
def = this->add("print_host", coString);