Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed typo "Confing" #4071

Merged
merged 2 commits into from
Feb 13, 2024
Merged

Fixed typo "Confing" #4071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d35c0e
Fixed typo "Confing"
bistory Feb 13, 2024
83c673c
Merge branch 'main' into Fix-typo
bistory Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libslic3r/Format/3mf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2413,7 +2413,7 @@ ModelVolumeType type_from_string(const std::string &s)
}

// Adds slic3r print config file ("Metadata/Slic3r_PE.config").
// This file contains the content of FullPrintConfing / SLAFullPrintConfig.
// This file contains the content of FullPrintConfig / SLAFullPrintConfig.
if (config != nullptr) {
if (!_add_print_config_file_to_archive(archive, *config)) {
close_zip_writer(&archive);
Expand Down
2 changes: 1 addition & 1 deletion src/libslic3r/Format/bbs_3mf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5900,7 +5900,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
}

// Adds slic3r print config file ("Metadata/Slic3r_PE.config").
// This file contains the content of FullPrintConfing / SLAFullPrintConfig.
// This file contains the content of FullPrintConfig / SLAFullPrintConfig.
if (config != nullptr) {
// BBS: change to json format
// if (!_add_print_config_file_to_archive(archive, *config)) {
Expand Down
6 changes: 3 additions & 3 deletions src/libslic3r/PresetBundle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2996,7 +2996,7 @@ void PresetBundle::load_config_file_config(const std::string &name_or_path, bool
const Preset *preset_existing = presets->find_preset(section.first, false);
if (preset_existing != nullptr) {
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
section.first << "\" has already been loaded from another Confing Bundle.";
section.first << "\" has already been loaded from another Config Bundle.";
continue;
}
} else if (! flags.has(LoadConfigBundleAttribute::LoadSystem)) {
Expand Down Expand Up @@ -3076,7 +3076,7 @@ void PresetBundle::load_config_file_config(const std::string &name_or_path, bool
const PhysicalPrinter* ph_printer_existing = ph_printers->find_printer(ph_printer_name, false);
if (ph_printer_existing != nullptr) {
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The physical printer \"" <<
section.first << "\" has already been loaded from another Confing Bundle.";
section.first << "\" has already been loaded from another Config Bundle.";
continue;
}

Expand Down Expand Up @@ -3455,7 +3455,7 @@ std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_vendor_configs_
const Preset *preset_existing = presets_collection->find_preset(preset_name, false);
if (preset_existing != nullptr) {
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
preset_name << "\" has already been loaded from another Confing Bundle.";
preset_name << "\" has already been loaded from another Config Bundle.";
reason = std::string("duplicated defines");
return reason;
}
Expand Down
Loading