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

Merge remote-tracking branch 'upstream/main' into dev/p2s-pr

Browse Source
This commit is contained in:
Noisyfox
2025-11-07 10:42:06 +08:00
parent 55f677ef21 e8464dd69c
commit 0115cfbdd0
7 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_all.yml vendored
View File

@@ -93,7 +93,7 @@ jobs:
- name: Apt-Install Dependencies - name: Apt-Install Dependencies
uses: ./.github/actions/apt-install-deps uses: ./.github/actions/apt-install-deps
- name: Restore Test Artifact - name: Restore Test Artifact
uses: actions/download-artifact@v4 uses: actions/download-artifact@v6
with: with:
name: ${{ github.sha }}-tests name: ${{ github.sha }}-tests
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
@@ -105,7 +105,7 @@ jobs:
tar -xvf build_tests.tar tar -xvf build_tests.tar
scripts/run_unit_tests.sh scripts/run_unit_tests.sh
- name: Upload Test Logs - name: Upload Test Logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
if: ${{ failure() }} if: ${{ failure() }}
with: with:
name: unit-test-logs name: unit-test-logs
@@ -169,7 +169,7 @@ jobs:
arch: ${{ matrix.variant.arch }} arch: ${{ matrix.variant.arch }}
upload-artifact: false upload-artifact: false
- name: Upload artifacts Flatpak - name: Upload artifacts Flatpak
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak' path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'

6
.github/workflows/build_deps.yml vendored
View File

@@ -105,14 +105,14 @@ jobs:
# Upload Artifacts # Upload Artifacts
# - name: Upload Mac ${{ inputs.arch }} artifacts # - name: Upload Mac ${{ inputs.arch }} artifacts
# if: inputs.os == 'macos-14' # if: inputs.os == 'macos-14'
# uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v5
# with: # with:
# name: OrcaSlicer_dep_mac_${{ env.date }} # name: OrcaSlicer_dep_mac_${{ env.date }}
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz
- name: Upload Windows artifacts - name: Upload Windows artifacts
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_dep_win64_${{ env.date }} name: OrcaSlicer_dep_win64_${{ env.date }}
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
@@ -121,7 +121,7 @@ jobs:
if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
env: env:
ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz

18
.github/workflows/build_orca.yml vendored
View File

@@ -181,14 +181,14 @@ jobs:
- name: Upload artifacts mac - name: Upload artifacts mac
if: inputs.os == 'macos-14' if: inputs.os == 'macos-14'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_Mac_universal_${{ env.ver }} name: OrcaSlicer_Mac_universal_${{ env.ver }}
path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
- name: Upload OrcaSlicer_profile_validator DMG mac - name: Upload OrcaSlicer_profile_validator DMG mac
if: inputs.os == 'macos-14' if: inputs.os == 'macos-14'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }} name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }}
path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
@@ -255,28 +255,28 @@ jobs:
- name: Upload artifacts Win zip - name: Upload artifacts Win zip
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_Windows_${{ env.ver }}_portable name: OrcaSlicer_Windows_${{ env.ver }}_portable
path: ${{ github.workspace }}/build/OrcaSlicer path: ${{ github.workspace }}/build/OrcaSlicer
- name: Upload artifacts Win installer - name: Upload artifacts Win installer
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_Windows_${{ env.ver }} name: OrcaSlicer_Windows_${{ env.ver }}
path: ${{ github.workspace }}/build/OrcaSlicer*.exe path: ${{ github.workspace }}/build/OrcaSlicer*.exe
- name: Upload artifacts Win PDB - name: Upload artifacts Win PDB
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: PDB name: PDB
path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
- name: Upload OrcaSlicer_profile_validator Win - name: Upload OrcaSlicer_profile_validator Win
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_profile_validator_Windows_${{ env.ver }} name: OrcaSlicer_profile_validator_Windows_${{ env.ver }}
path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe
@@ -336,7 +336,7 @@ jobs:
# and doesn't preserve file permissions # and doesn't preserve file permissions
- name: Upload Test Artifact - name: Upload Test Artifact
if: inputs.os == 'ubuntu-24.04' if: inputs.os == 'ubuntu-24.04'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: ${{ github.sha }}-tests name: ${{ github.sha }}-tests
overwrite: true overwrite: true
@@ -358,7 +358,7 @@ jobs:
env: env:
ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage' path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage'
@@ -367,7 +367,7 @@ jobs:
if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
env: env:
ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
path: './build/src/Release/OrcaSlicer_profile_validator' path: './build/src/Release/OrcaSlicer_profile_validator'

6
resources/profiles/Sovol/process/0.18mm Optimal @Sovol SV08.json
View File

@@ -112,5 +112,7 @@
"wall_generator": "classic", "wall_generator": "classic",
"gcode_label_objects": "1", "gcode_label_objects": "1",
"slow_down_layers": "3", "slow_down_layers": "3",
"compatible_printers": [] "compatible_printers": [
} "Sovol SV08 0.4 nozzle"
]
}

9
src/libslic3r/PrintConfig.cpp
View File

@@ -1164,12 +1164,15 @@ void PrintConfigDef::init_fff_params()
def = this->add("bridge_density", coPercent); def = this->add("bridge_density", coPercent);
def->label = L("External bridge density"); def->label = L("External bridge density");
def->category = L("Strength"); def->category = L("Strength");
def->tooltip = L("Controls the density (spacing) of external bridge lines. 100% means solid bridge. Default is 100%.\n\n" def->tooltip = L("Controls the density (spacing) of external bridge lines. Default is 100%.\n\n"
"Lower density external bridges can help improve reliability as there is more space for air to circulate " "Lower density external bridges can help improve reliability as there is more space for air to circulate "
"around the extruded bridge, improving its cooling speed."); "around the extruded bridge, improving its cooling speed. Minimum is 10%.\n\n"
"Higher densities can produce smoother bridge surfaces, as overlapping lines provide "
"additional support during printing. Maximum is 120%. \n"
"Note: Bridge density that is too high can cause warping or overextrusion.");
def->sidetext = "%"; def->sidetext = "%";
def->min = 10; def->min = 10;
def->max = 100; def->max = 120;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercent(100)); def->set_default_value(new ConfigOptionPercent(100));

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

@@ -858,7 +858,7 @@ static void _collect_filament_info(const wxString& shown_name,
unordered_map<wxString, wxString>& query_filament_types) unordered_map<wxString, wxString>& query_filament_types)
{ {
query_filament_vendors[shown_name] = filament.config.get_filament_vendor(); query_filament_vendors[shown_name] = filament.config.get_filament_vendor();
query_filament_vendors[shown_name] = filament.config.get_filament_type(); query_filament_types[shown_name] = filament.config.get_filament_type();
} }
void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max, wxString k, wxString n) void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max, wxString k, wxString n)

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

@@ -789,7 +789,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
toggle_field(el, have_support_material && !(support_is_normal_tree && !have_raft)); toggle_field(el, have_support_material && !(support_is_normal_tree && !have_raft));
bool has_ironing = (config->opt_enum<IroningType>("ironing_type") != IroningType::NoIroning); bool has_ironing = (config->opt_enum<IroningType>("ironing_type") != IroningType::NoIroning);
for (auto el : { "ironing_pattern", "ironing_flow", "ironing_spacing", "ironing_angle", "ironing_inset"}) for (auto el : { "ironing_pattern", "ironing_flow", "ironing_spacing", "ironing_angle", "ironing_inset", "ironing_angle_fixed" })
toggle_line(el, has_ironing); toggle_line(el, has_ironing);
toggle_line("ironing_speed", has_ironing || has_support_ironing); toggle_line("ironing_speed", has_ironing || has_support_ironing);