juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/orca_network_refactor

Browse Source
This commit is contained in:
SoftFever
2026-01-27 20:59:07 +08:00
committed by GitHub
parent 9233005725 b9ada2542a
commit 570d0ec7b6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/data/hints.ini
View File

@@ -64,26 +64,26 @@
[hint:Precise wall] [hint:Precise wall]
text = Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency? text = Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency?
documentation_link = https://github.com/OrcaSlicer/OrcaSlicer/wiki/quality_settings_precision documentation_link = https://www.orcaslicer.com/wiki/quality_settings_precision#precise-wall
[hint:Sandwich mode] [hint:Sandwich mode]
text = Sandwich mode\nDid you know that you can use sandwich mode (inner-outer-inner) to improve precision and layer consistency if your model doesn't have very steep overhangs? text = Sandwich mode\nDid you know that you can use sandwich mode (inner-outer-inner) to improve precision and layer consistency if your model doesn't have very steep overhangs?
[hint:Chamber temperature] [hint:Chamber temperature]
text = Chamber temperature\nDid you know that OrcaSlicer supports chamber temperature? text = Chamber temperature\nDid you know that OrcaSlicer supports chamber temperature?
documentation_link = https://github.com/OrcaSlicer/OrcaSlicer/wiki/Chamber-temperature documentation_link = https://www.orcaslicer.com/wiki/material_temperatures#print-chamber-temperature
[hint:Calibration] [hint:Calibration]
text = Calibration\nDid you know that calibrating your printer can do wonders? Check out our beloved calibration solution in OrcaSlicer. text = Calibration\nDid you know that calibrating your printer can do wonders? Check out our beloved calibration solution in OrcaSlicer.
documentation_link = https://github.com/OrcaSlicer/OrcaSlicer/wiki/Calibration documentation_link = https://www.orcaslicer.com/wiki/calibration
[hint:Auxiliary fan] [hint:Auxiliary fan]
text = Auxiliary fan\nDid you know that OrcaSlicer supports Auxiliary part cooling fan? text = Auxiliary fan\nDid you know that OrcaSlicer supports Auxiliary part cooling fan?
documentation_link = https://github.com/OrcaSlicer/OrcaSlicer/wiki/Auxiliary-fan documentation_link = https://www.orcaslicer.com/wiki/material_cooling#auxiliary-part-cooling-fan
[hint:Air filtration] [hint:Air filtration]
text = Air filtration/Exhaust Fan\nDid you know that OrcaSlicer can support Air filtration/Exhaust Fan? text = Air filtration/Exhaust Fan\nDid you know that OrcaSlicer can support Air filtration/Exhaust Fan?
documentation_link = https://github.com/OrcaSlicer/OrcaSlicer/wiki/air-filtration documentation_link = https://www.orcaslicer.com/wiki/material_cooling#activate-air-filtration
[hint:G-code window] [hint:G-code window]
text = G-code window\nYou can turn on/off the G-code window by pressing the <b>C</b> key. text = G-code window\nYou can turn on/off the G-code window by pressing the <b>C</b> key.

2
src/libslic3r/Print.cpp
View File

@@ -1194,7 +1194,7 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons*
} }
} }
if (m_config.print_sequence == PrintSequence::ByObject && m_objects.size() > 1) { if (m_config.print_sequence == PrintSequence::ByObject && (m_objects.size() > 1 || m_objects[0]->instances().size() > 1)) {
if (m_config.timelapse_type == TimelapseType::tlSmooth) if (m_config.timelapse_type == TimelapseType::tlSmooth)
return {L("Smooth mode of timelapse is not supported when \"by object\" sequence is enabled.")}; return {L("Smooth mode of timelapse is not supported when \"by object\" sequence is enabled.")};

6
src/libslic3r/Slicing.cpp
View File

@@ -260,7 +260,7 @@ std::vector<double> layer_height_profile_adaptive(const SlicingParameters& slici
// last facet visited by the as.next_layer_height() function, where the facets are sorted by their increasing Z span. // last facet visited by the as.next_layer_height() function, where the facets are sorted by their increasing Z span.
size_t current_facet = 0; size_t current_facet = 0;
// loop until we have at least one layer and the max slice_z reaches the object height // loop until we have at least one layer and the max slice_z reaches the object height
while (print_z + EPSILON < slicing_params.object_print_z_height()) { while (print_z + EPSILON < slicing_params.object_print_z_uncompensated_height()) {
float height = slicing_params.max_layer_height; float height = slicing_params.max_layer_height;
// Slic3r::debugf "\n Slice layer: %d\n", $id; // Slic3r::debugf "\n Slice layer: %d\n", $id;
// determine next layer height // determine next layer height
@@ -331,10 +331,10 @@ std::vector<double> layer_height_profile_adaptive(const SlicingParameters& slici
print_z += height; print_z += height;
} }
double z_gap = slicing_params.object_print_z_height() - *(layer_height_profile.end() - 2); double z_gap = slicing_params.object_print_z_uncompensated_height() - *(layer_height_profile.end() - 2);
if (z_gap > 0.0) if (z_gap > 0.0)
{ {
layer_height_profile.push_back(slicing_params.object_print_z_height()); layer_height_profile.push_back(slicing_params.object_print_z_uncompensated_height());
layer_height_profile.push_back(std::clamp(z_gap, slicing_params.min_layer_height, slicing_params.max_layer_height)); layer_height_profile.push_back(std::clamp(z_gap, slicing_params.min_layer_height, slicing_params.max_layer_height));
} }