diff --git a/.github/workflows/auto-close-duplicates.yml b/.github/workflows/auto-close-duplicates.yml index b6ca0563fe..6612c98a03 100644 --- a/.github/workflows/auto-close-duplicates.yml +++ b/.github/workflows/auto-close-duplicates.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Bun uses: oven-sh/setup-bun@v2 diff --git a/.github/workflows/backfill-duplicate-comments.yml b/.github/workflows/backfill-duplicate-comments.yml index acce8f9088..a4253e8ae0 100644 --- a/.github/workflows/backfill-duplicate-comments.yml +++ b/.github/workflows/backfill-duplicate-comments.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Bun uses: oven-sh/setup-bun@v2 diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 5c8e93d819..2257133d40 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -30,7 +30,6 @@ on: - 'build_release_vs2022.bat' - 'build_release_macos.sh' - 'scripts/flatpak/**' - - 'resources/**' schedule: @@ -85,11 +84,12 @@ jobs: if: ${{ !cancelled() && success() }} steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: sparse-checkout: | .github scripts + tests - name: Apt-Install Dependencies uses: ./.github/actions/apt-install-deps - name: Restore Test Artifact @@ -145,7 +145,7 @@ jobs: - name: "Remove unneeded stuff to free disk space" run: rm -rf /usr/local/lib/android/* /usr/share/dotnet/* /opt/ghc1/* "/usr/local/share/boost1/*" /opt/hostedtoolcache1/* - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Get the version and date run: | ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2) diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index a97962aa7e..00b5f71ecd 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -26,7 +26,7 @@ jobs: valid-cache: ${{ steps.cache_deps.outputs.cache-hit }} steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: lfs: 'true' diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 0267d22302..b255b6abf7 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -34,7 +34,7 @@ jobs: # Setup the environment - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: lfs: 'true' diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 1247937b08..aef491f006 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: lfs: 'true' diff --git a/.github/workflows/check_locale.yml b/.github/workflows/check_locale.yml index 5eed883792..f248ced29c 100644 --- a/.github/workflows/check_locale.yml +++ b/.github/workflows/check_locale.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Install gettext run: | diff --git a/.github/workflows/check_profiles.yml b/.github/workflows/check_profiles.yml index 512c08c7c8..2742fa63f0 100644 --- a/.github/workflows/check_profiles.yml +++ b/.github/workflows/check_profiles.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Run extra JSON check run: | diff --git a/.github/workflows/dedupe-issues.yml b/.github/workflows/dedupe-issues.yml index de46c82c81..abaf978d27 100644 --- a/.github/workflows/dedupe-issues.yml +++ b/.github/workflows/dedupe-issues.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Run Claude Code slash command uses: anthropics/claude-code-base-action@beta diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index db702f467f..336636bbcc 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -36,7 +36,7 @@ jobs: tar -xvf ~/sc.tar.xz -C ~ mv ~/shellcheck-"${INPUT_VERSION}"/shellcheck ~/shellcheck - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 1 diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml index aeae4a37b2..983e418b5b 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translation.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Setup Python uses: actions/setup-python@v6 diff --git a/.github/workflows/validate-documentation.yml b/.github/workflows/validate-documentation.yml deleted file mode 100644 index d4c4cfc9c0..0000000000 --- a/.github/workflows/validate-documentation.yml +++ /dev/null @@ -1,368 +0,0 @@ -name: Validate Documentation - -on: - pull_request: - paths: - - 'src/slic3r/GUI/Tab.cpp' - - 'doc/**/*.md' - workflow_dispatch: - -permissions: - contents: read - pull-requests: write - issues: write - -jobs: - validate: - runs-on: windows-latest - name: Check Documentation - - steps: - - name: Checkout - uses: actions/checkout@v5 - - - name: Get changed files - id: changed-files - uses: tj-actions/changed-files@v47 - with: - files: | - src/slic3r/GUI/Tab.cpp - doc/**/*.md - - - name: Run validation - if: steps.changed-files.outputs.any_changed == 'true' - shell: pwsh - run: | - # Helper Functions - function Normalize-Fragment($fragment) { - return $fragment.ToLower().Trim() -replace '[^a-z0-9\s-]', '' -replace ' ', '-' -replace '^-+|-+$', '' - } - - function Add-BrokenReference($sourceFile, $line, $target, $issue, $type) { - return @{ - SourceFile = $sourceFile - Line = $line - Target = $target - Issue = $issue - Type = $type - } - } - - function Validate-Fragment($fragment, $availableAnchors, $sourceFile, $line, $target, $type) { - $cleanFragment = $fragment.StartsWith('#') ? $fragment.Substring(1) : $fragment - $normalizedFragment = Normalize-Fragment $cleanFragment - - if ($availableAnchors -notcontains $normalizedFragment) { - return Add-BrokenReference $sourceFile $line $target "Fragment does not exist" $type - } - return $null - } - - function Get-ImagesFromLine($line) { - $images = @() - $lineForParsing = [regex]::Replace($line, '`[^`]*`', '') - - # Process markdown and HTML images - $imagePatterns = @( - @{ Pattern = "!\[([^\]]*)\]\(([^)]+)\)"; Type = "Markdown"; AltGroup = 1; UrlGroup = 2 } - @{ Pattern = ']*>'; Type = "HTML"; AltGroup = -1; UrlGroup = -1 } - ) - - foreach ($pattern in $imagePatterns) { - foreach ($match in [regex]::Matches($lineForParsing, $pattern.Pattern)) { - $altText = "" - $url = "" - - if ($pattern.Type -eq "Markdown") { - $altText = $match.Groups[$pattern.AltGroup].Value - $url = $match.Groups[$pattern.UrlGroup].Value - } else { - # Extract from HTML - $imgTag = $match.Value - if ($imgTag -match 'alt\s*=\s*[`"'']([^`"'']*)[`"'']') { $altText = $matches[1] } - if ($imgTag -match 'src\s*=\s*[`"'']([^`"'']*)[`"'']') { $url = $matches[1] } - } - - $images += @{ - Match = $match.Value - Type = $pattern.Type - AltText = $altText - Url = $url - StartIndex = $match.Index - Length = $match.Length - } - } - } - - return $images - } - - # Initialize - $tabFile = Join-Path $PWD "src/slic3r/GUI/Tab.cpp" - $docDir = Join-Path $PWD 'doc' - $brokenReferences = @() - $docIndex = @{} - - Write-Host "Validating documentation..." -ForegroundColor Blue - - # Validate paths - $hasTabFile = Test-Path $tabFile - if (-not $hasTabFile) { Write-Host "::warning::Tab.cpp file not found at: $tabFile" } - if (-not (Test-Path $docDir)) { Write-Host "::error::doc folder does not exist"; exit 1 } - - # Build documentation index - $mdFiles = Get-ChildItem -Path $docDir -Filter *.md -Recurse -File -ErrorAction SilentlyContinue - - foreach ($mdFile in $mdFiles) { - $baseName = [System.IO.Path]::GetFileNameWithoutExtension($mdFile.Name) - $relPath = (Resolve-Path $mdFile.FullName).Path.Substring($docDir.Length).TrimStart('\', '/') - $content = Get-Content -Path $mdFile.FullName -Encoding UTF8 -Raw - $lines = Get-Content -Path $mdFile.FullName -Encoding UTF8 - - # Extract anchors - $anchors = @() - $anchors += [regex]::Matches($content, '(?i)]*(?:name|id)\s*=\s*[`"'']([^`"'']+)[`"'']') | - ForEach-Object { $_.Groups[1].Value.ToLower() } - $anchors += [regex]::Matches($content, '(?m)^#+\s+(.+)$') | - ForEach-Object { Normalize-Fragment $_.Groups[1].Value.Trim() } - - # Parse links - $links = @() - $inCodeFence = $false - for ($i = 0; $i -lt $lines.Count; $i++) { - $line = $lines[$i] - if ($line.TrimStart() -match '^(```|~~~)') { - $inCodeFence = -not $inCodeFence - continue - } - if ($inCodeFence) { continue } - - $lineForParsing = [regex]::Replace($line, '`[^`]*`', '') - - # Get all images from this line to skip them in link processing - $imagesInLine = Get-ImagesFromLine $line - $imageRanges = @() - foreach ($img in $imagesInLine) { - # Exclude the entire image syntax from link processing - $imageRanges += @{ Start = $img.StartIndex; End = $img.StartIndex + $img.Length } - } - - # Find all markdown links, but exclude those that are part of images - foreach ($linkMatch in [regex]::Matches($lineForParsing, '(?append_single_option_line\s*\(\s*(?:"([^"]+)"|([^,]+?))\s*,\s*"([^"]+)"\s*\)' - $lines = Get-Content -Path $tabFile -Encoding UTF8 - - for ($i = 0; $i -lt $lines.Count; $i++) { - foreach ($match in [regex]::Matches($lines[$i], $regex)) { - $arg2Full = $match.Groups[3].Value.Trim() - - if ($arg2Full.Contains('##')) { - $brokenReferences += Add-BrokenReference "Tab.cpp" ($i + 1) $arg2Full "Use single # for fragments." "Link" - continue - } - - $arg2Parts = $arg2Full -split '#', 2 - $docBase = $arg2Parts[0].Trim() - $fragment = ($arg2Parts.Length -gt 1) ? $arg2Parts[1].Trim() : $null - - if (-not $docIndex.ContainsKey($docBase)) { - $brokenReferences += Add-BrokenReference "Tab.cpp" ($i + 1) $docBase "File does not exist" "Link" - } elseif ($fragment) { - $validationResult = Validate-Fragment $fragment $docIndex[$docBase].Anchors "Tab.cpp" ($i + 1) "$docBase#$fragment" "Link" - if ($validationResult) { $brokenReferences += $validationResult } - } - } - } - } - - # Validate markdown links - foreach ($baseName in $docIndex.Keys) { - foreach ($link in $docIndex[$baseName].Links) { - if (-not $docIndex.ContainsKey($link.TargetBase)) { - $brokenReferences += Add-BrokenReference $link.SourceFile $link.Line "$($link.TargetBase).md" "File does not exist" "Link" - } elseif ($link.Fragment) { - $validationResult = Validate-Fragment $link.Fragment $docIndex[$link.TargetBase].Anchors $link.SourceFile $link.Line "$($link.TargetBase)#$($link.Fragment)" "Link" - if ($validationResult) { $brokenReferences += $validationResult } - } - } - } - - # Validate images - Write-Host "Validating images..." -ForegroundColor Blue - $expectedUrlPattern = '^https://github\.com/OrcaSlicer/OrcaSlicer/blob/main/([^?]+)\?raw=true$' - - foreach ($file in $mdFiles) { - $lines = Get-Content $file.FullName -Encoding UTF8 - $relPath = (Resolve-Path $file.FullName).Path.Substring($docDir.Length).TrimStart('\', '/') - - $inCodeFence = $false - for ($lineNumber = 0; $lineNumber -lt $lines.Count; $lineNumber++) { - $line = $lines[$lineNumber] - if ($line.TrimStart() -match '^(```|~~~)') { - $inCodeFence = -not $inCodeFence - continue - } - if ($inCodeFence) { continue } - - # Use the unified image detection function - $imagesInLine = Get-ImagesFromLine $line - - foreach ($image in $imagesInLine) { - $altText = $image.AltText - $url = $image.Url - $imageMatch = $image.Match - $imageType = $image.Type - - if (-not $altText.Trim() -and $url) { - $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $imageMatch "[$imageType] Missing alt text for image" "Image" - } elseif ($url -and $altText) { - # Validate URL format and file existence - if ($url -match $expectedUrlPattern) { - $relativePathInUrl = $matches[1] - $fileNameFromUrl = [System.IO.Path]::GetFileNameWithoutExtension($relativePathInUrl) - - if ($altText -ne $fileNameFromUrl) { - $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $imageMatch "[$imageType] Alt text `"$altText`" ≠ filename `"$fileNameFromUrl`"" "Image" - } - - $expectedImagePath = Join-Path $PWD ($relativePathInUrl -replace "/", "\") - if (-not (Test-Path $expectedImagePath)) { - $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $imageMatch "[$imageType] Image not found at path: $relativePathInUrl" "Image" - } - } else { - $urlIssues = @() - if (-not $url.StartsWith('https://github.com/OrcaSlicer/OrcaSlicer/blob/main/')) { $urlIssues += "URL must start with expected prefix" } - if (-not $url.EndsWith('?raw=true')) { $urlIssues += "URL must end with '?raw=true'" } - if ($url -match '^https?://(?!github\.com/OrcaSlicer/OrcaSlicer)') { $urlIssues += "External URLs not allowed" } - - $issueText = "[$imageType] URL format issues: " + ($urlIssues -join '; ') - $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $imageMatch $issueText "Image" - } - } - } - } - } - - # Report results - $linkErrors = $brokenReferences | Where-Object { $_.Type -eq "Link" } - $imageErrors = $brokenReferences | Where-Object { $_.Type -eq "Image" } - - if ($brokenReferences.Count -gt 0) { - Write-Host "::error::Documentation validation failed" - - # Build error summary for PR comment - $errorSummary = "" - - # Report link errors - if ($linkErrors) { - Write-Host "::group::🔗 Link Validation Errors" - $errorSummary += "## 🔗 Link Validation Errors`n`n" - $linkErrors | Group-Object SourceFile | ForEach-Object { - Write-Host "📄 $($_.Name):" -ForegroundColor Yellow - $errorSummary += "**📄 doc/$($_.Name):**`n" - $_.Group | Sort-Object Line | ForEach-Object { - Write-Host " Line $($_.Line): $($_.Target) - $($_.Issue)" -ForegroundColor Red - Write-Host "::error file=doc/$($_.SourceFile),line=$($_.Line)::$($_.Target) - $($_.Issue)" - $errorSummary += "- Line $($_.Line): ``$($_.Target)`` - $($_.Issue)`n" - } - $errorSummary += "`n" - } - Write-Host "::endgroup::" - } - - # Report image errors - if ($imageErrors) { - Write-Host "::group::🖼️ Image Validation Errors" - $errorSummary += "## 🖼️ Image Validation Errors`n`n" - $imageErrors | Group-Object SourceFile | ForEach-Object { - Write-Host "📄 $($_.Name):" -ForegroundColor Yellow - $errorSummary += "**📄 doc/$($_.Name):**`n" - $_.Group | Sort-Object Line | ForEach-Object { - Write-Host " Line $($_.Line): $($_.Issue)" -ForegroundColor Red - Write-Host "::error file=doc/$($_.SourceFile),line=$($_.Line)::$($_.Issue)" - $errorSummary += "- Line $($_.Line): $($_.Issue)`n" - } - $errorSummary += "`n" - } - Write-Host "::endgroup::" - } - - # Export error summary for PR comment - Add-Content -Path $env:GITHUB_ENV -Value "VALIDATION_ERRORS<report them as Use varied infill [patterns](https://github.com/OrcaSlicer/OrcaSlicer/wiki/strength_settings_patterns) and accurate hole shapes for improved clarity. - **[Overhang](https://github.com/OrcaSlicer/OrcaSlicer/wiki/quality_settings_overhangs) and [Support Optimization](https://github.com/OrcaSlicer/OrcaSlicer/wiki#support-settings)** Modify geometry for printable overhangs with precise support placement. -- **[Granular Controls](https://github.com/OrcaSlicer/OrcaSlicer/wiki#process-settings) and Customization** +- **[Granular Controls and Customization](https://github.com/OrcaSlicer/OrcaSlicer/wiki#process-settings)** Fine-tune print speed, layer height, pressure, and temperature with precision. - **Network Printer Support** Seamless integration with Klipper, PrusaLink, and OctoPrint for remote control. -- **[Mouse Ear Brims](https://github.com/OrcaSlicer/OrcaSlicer/wiki/others_settings_brim) & Adaptive Bed Mesh** +- **[Mouse Ear Brims](https://github.com/OrcaSlicer/OrcaSlicer/wiki/others_settings_brim) & [Adaptive Bed Mesh](https://github.com/OrcaSlicer/OrcaSlicer/wiki/printer_basic_information_adaptive_bed_mesh)** Automatic brims and adaptive mesh calibration ensure consistent adhesion. - **User-Friendly Interface** Intuitive drag-and-drop design with pre-made profiles for popular printers. @@ -68,9 +68,7 @@ If you come across any of these in search results, please report them as # Wiki -The wiki below aims to provide a detailed explanation of the slicer settings, including how to maximize their use and how to calibrate and set up your printer. - -Please note that the wiki is a work in progress. We appreciate your patience as we continue to develop and improve it! +The [wiki](https://github.com/OrcaSlicer/OrcaSlicer/wiki) aims to provide a detailed explanation of the slicer settings, including how to maximize their use and how to calibrate and set up your printer. - **[Access the wiki here](https://github.com/OrcaSlicer/OrcaSlicer/wiki)** - **[Contribute to the wiki](https://github.com/OrcaSlicer/OrcaSlicer/wiki/How-to-wiki)** diff --git a/build_linux.sh b/build_linux.sh index 1f35b464f6..9a9a9160ba 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -27,7 +27,6 @@ function usage() { echo " -L: use ld.lld as linker (if available)" echo "For a first use, you want to './${SCRIPT_NAME} -u'" echo " and then './${SCRIPT_NAME} -dsi'" - echo "To build with tests: './${SCRIPT_NAME} -st' or './${SCRIPT_NAME} -dst'" } SLIC3R_PRECOMPILED_HEADERS="ON" @@ -102,11 +101,6 @@ if [ ${OPTIND} -eq 1 ] ; then exit 1 fi -if [[ -n "${BUILD_TESTS}" ]] && [[ -z "${BUILD_ORCA}" ]] ; then - echo "-t flag requires -s flag in the same invocation" - exit 1 -fi - function check_available_memory_and_disk() { FREE_MEM_GB=$(free --gibi --total | grep 'Mem' | rev | cut --delimiter=" " --fields=1 | rev) MIN_MEM_GB=10 @@ -221,7 +215,7 @@ if [[ -n "${BUILD_DEPS}" ]] ; then print_and_run cmake --build deps/$BUILD_DIR fi -if [[ -n "${BUILD_ORCA}" ]] ; then +if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then echo "Configuring OrcaSlicer..." if [[ -n "${CLEAN_BUILD}" ]] ; then print_and_run rm -fr $BUILD_DIR @@ -243,11 +237,13 @@ if [[ -n "${BUILD_ORCA}" ]] ; then "${COLORED_OUTPUT}" \ "${BUILD_ARGS[@]}" echo "done" - echo "Building OrcaSlicer ..." - print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer - echo "Building OrcaSlicer_profile_validator .." - print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer_profile_validator - ./scripts/run_gettext.sh + if [[ -n "${BUILD_ORCA}" ]]; then + echo "Building OrcaSlicer ..." + print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer + echo "Building OrcaSlicer_profile_validator .." + print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer_profile_validator + ./scripts/run_gettext.sh + fi if [[ -n "${BUILD_TESTS}" ]] ; then echo "Building tests ..." print_and_run cmake --build ${BUILD_DIR} --config "${BUILD_CONFIG}" --target tests/all diff --git a/cmake/modules/Catch2/Catch.cmake b/cmake/modules/Catch2/Catch.cmake deleted file mode 100644 index 0ffe978dc5..0000000000 --- a/cmake/modules/Catch2/Catch.cmake +++ /dev/null @@ -1,175 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -#[=======================================================================[.rst: -Catch ------ - -This module defines a function to help use the Catch test framework. - -The :command:`catch_discover_tests` discovers tests by asking the compiled test -executable to enumerate its tests. This does not require CMake to be re-run -when tests change. However, it may not work in a cross-compiling environment, -and setting test properties is less convenient. - -This command is intended to replace use of :command:`add_test` to register -tests, and will create a separate CTest test for each Catch test case. Note -that this is in some cases less efficient, as common set-up and tear-down logic -cannot be shared by multiple test cases executing in the same instance. -However, it provides more fine-grained pass/fail information to CTest, which is -usually considered as more beneficial. By default, the CTest test name is the -same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``. - -.. command:: catch_discover_tests - - Automatically add tests with CTest by querying the compiled test executable - for available tests:: - - catch_discover_tests(target - [TEST_SPEC arg1...] - [EXTRA_ARGS arg1...] - [WORKING_DIRECTORY dir] - [TEST_PREFIX prefix] - [TEST_SUFFIX suffix] - [PROPERTIES name1 value1...] - [TEST_LIST var] - ) - - ``catch_discover_tests`` sets up a post-build command on the test executable - that generates the list of tests by parsing the output from running the test - with the ``--list-test-names-only`` argument. This ensures that the full - list of tests is obtained. Since test discovery occurs at build time, it is - not necessary to re-run CMake when the list of tests changes. - However, it requires that :prop_tgt:`CROSSCOMPILING_EMULATOR` is properly set - in order to function in a cross-compiling environment. - - Additionally, setting properties on tests is somewhat less convenient, since - the tests are not available at CMake time. Additional test properties may be - assigned to the set of tests as a whole using the ``PROPERTIES`` option. If - more fine-grained test control is needed, custom content may be provided - through an external CTest script using the :prop_dir:`TEST_INCLUDE_FILES` - directory property. The set of discovered tests is made accessible to such a - script via the ``_TESTS`` variable. - - The options are: - - ``target`` - Specifies the Catch executable, which must be a known CMake executable - target. CMake will substitute the location of the built executable when - running the test. - - ``TEST_SPEC arg1...`` - Specifies test cases, wildcarded test cases, tags and tag expressions to - pass to the Catch executable with the ``--list-test-names-only`` argument. - - ``EXTRA_ARGS arg1...`` - Any extra arguments to pass on the command line to each test case. - - ``WORKING_DIRECTORY dir`` - Specifies the directory in which to run the discovered test cases. If this - option is not provided, the current binary directory is used. - - ``TEST_PREFIX prefix`` - Specifies a ``prefix`` to be prepended to the name of each discovered test - case. This can be useful when the same test executable is being used in - multiple calls to ``catch_discover_tests()`` but with different - ``TEST_SPEC`` or ``EXTRA_ARGS``. - - ``TEST_SUFFIX suffix`` - Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of - every discovered test case. Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may - be specified. - - ``PROPERTIES name1 value1...`` - Specifies additional properties to be set on all tests discovered by this - invocation of ``catch_discover_tests``. - - ``TEST_LIST var`` - Make the list of tests available in the variable ``var``, rather than the - default ``_TESTS``. This can be useful when the same test - executable is being used in multiple calls to ``catch_discover_tests()``. - Note that this variable is only available in CTest. - -#]=======================================================================] - -#------------------------------------------------------------------------------ -function(catch_discover_tests TARGET) - cmake_parse_arguments( - "" - "" - "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST" - "TEST_SPEC;EXTRA_ARGS;PROPERTIES" - ${ARGN} - ) - - if(NOT _WORKING_DIRECTORY) - set(_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") - endif() - if(NOT _TEST_LIST) - set(_TEST_LIST ${TARGET}_TESTS) - endif() - - ## Generate a unique name based on the extra arguments - string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS}") - string(SUBSTRING ${args_hash} 0 7 args_hash) - - # Define rule to generate test list for aforementioned test executable - set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake") - set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake") - get_property(crosscompiling_emulator - TARGET ${TARGET} - PROPERTY CROSSCOMPILING_EMULATOR - ) - add_custom_command( - TARGET ${TARGET} POST_BUILD - BYPRODUCTS "${ctest_tests_file}" - COMMAND "${CMAKE_COMMAND}" - -D "TEST_TARGET=${TARGET}" - -D "TEST_EXECUTABLE=$" - -D "TEST_EXECUTOR=${crosscompiling_emulator}" - -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}" - -D "TEST_SPEC=${_TEST_SPEC}" - -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}" - -D "TEST_PROPERTIES=${_PROPERTIES}" - -D "TEST_PREFIX='${_TEST_PREFIX}'" - -D "TEST_SUFFIX='${_TEST_SUFFIX}'" - -D "TEST_LIST=${_TEST_LIST}" - -D "CTEST_FILE=${ctest_tests_file}" - -P "${_CATCH_DISCOVER_TESTS_SCRIPT}" - VERBATIM - ) - - file(WRITE "${ctest_include_file}" - "if(EXISTS \"${ctest_tests_file}\")\n" - " include(\"${ctest_tests_file}\")\n" - "else()\n" - " add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n" - "endif()\n" - ) - - if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") - # Add discovered tests to directory TEST_INCLUDE_FILES - set_property(DIRECTORY - APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}" - ) - else() - # Add discovered tests as directory TEST_INCLUDE_FILE if possible - get_property(test_include_file_set DIRECTORY PROPERTY TEST_INCLUDE_FILE SET) - if (NOT ${test_include_file_set}) - set_property(DIRECTORY - PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}" - ) - else() - message(FATAL_ERROR - "Cannot set more than one TEST_INCLUDE_FILE" - ) - endif() - endif() - -endfunction() - -############################################################################### - -set(_CATCH_DISCOVER_TESTS_SCRIPT - ${CMAKE_CURRENT_LIST_DIR}/CatchAddTests.cmake -) diff --git a/cmake/modules/Catch2/CatchAddTests.cmake b/cmake/modules/Catch2/CatchAddTests.cmake deleted file mode 100644 index ca5ebc17e5..0000000000 --- a/cmake/modules/Catch2/CatchAddTests.cmake +++ /dev/null @@ -1,106 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -set(prefix "${TEST_PREFIX}") -set(suffix "${TEST_SUFFIX}") -set(spec ${TEST_SPEC}) -set(extra_args ${TEST_EXTRA_ARGS}) -set(properties ${TEST_PROPERTIES}) -set(script) -set(suite) -set(tests) - -function(add_command NAME) - set(_args "") - foreach(_arg ${ARGN}) - if(_arg MATCHES "[^-./:a-zA-Z0-9_]") - set(_args "${_args} [==[${_arg}]==]") # form a bracket_argument - else() - set(_args "${_args} ${_arg}") - endif() - endforeach() - set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE) -endfunction() - -macro(_add_catch_test_labels LINE) - # convert to list of tags - string(REPLACE "][" "]\\;[" tags ${line}) - - add_command( - set_tests_properties "${prefix}${test}${suffix}" - PROPERTIES - LABELS "${tags}" - ) -endmacro() - -macro(_add_catch_test LINE) - set(test ${line}) - # use escape commas to handle properly test cases with commans inside the name - string(REPLACE "," "\\," test_name ${test}) - # ...and add to script - add_command( - add_test "${prefix}${test}${suffix}" - ${TEST_EXECUTOR} - "${TEST_EXECUTABLE}" - "${test_name}" - ${extra_args} - ) - - add_command( - set_tests_properties "${prefix}${test}${suffix}" - PROPERTIES - WORKING_DIRECTORY "${TEST_WORKING_DIR}" - ${properties} - ) - list(APPEND tests "${prefix}${test}${suffix}") -endmacro() - -# Run test executable to get list of available tests -if(NOT EXISTS "${TEST_EXECUTABLE}") - message(FATAL_ERROR - "Specified test executable '${TEST_EXECUTABLE}' does not exist" - ) -endif() -execute_process( - COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-tests - OUTPUT_VARIABLE output - RESULT_VARIABLE result -) -# Catch --list-test-names-only reports the number of tests, so 0 is... surprising -if(${result} EQUAL 0) - message(WARNING - "Test executable '${TEST_EXECUTABLE}' contains no tests!\n" - ) -elseif(${result} LESS 0) - message(FATAL_ERROR - "Error running test executable '${TEST_EXECUTABLE}':\n" - " Result: ${result}\n" - " Output: ${output}\n" - ) -endif() - -string(REPLACE "\n" ";" output "${output}") -set(test) -set(tags_regex "(\\[([^\\[]*)\\])+$") - -# Parse output -foreach(line ${output}) - # lines without leading whitespaces are catch output not tests - if(${line} MATCHES "^[ \t]+") - # strip leading spaces and tabs - string(REGEX REPLACE "^[ \t]+" "" line ${line}) - - if(${line} MATCHES "${tags_regex}") - _add_catch_test_labels(${line}) - else() - _add_catch_test(${line}) - endif() - endif() -endforeach() - -# Create a list of all discovered tests, which users may use to e.g. set -# properties on the tests -add_command(set ${TEST_LIST} ${tests}) - -# Write CTest script -file(WRITE "${CTEST_FILE}" "${script}") diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake index dc45aad7b8..67758a8596 100644 --- a/deps/MPFR/MPFR.cmake +++ b/deps/MPFR/MPFR.cmake @@ -25,7 +25,8 @@ else () endif () ExternalProject_Add(dep_MPFR - URL https://www.mpfr.org/mpfr-4.2.2/mpfr-4.2.2.tar.bz2 + URL https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.2.tar.bz2 + https://www.mpfr.org/mpfr-4.2.2/mpfr-4.2.2.tar.bz2 URL_HASH SHA256=9ad62c7dc910303cd384ff8f1f4767a655124980bb6d8650fe62c815a231bb7b DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR BUILD_IN_SOURCE ON diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 0cc2afa02e..647f62ee13 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -14346,7 +14346,7 @@ msgid "" "\n" "Using a non-zero value is useful if the printer is set up to print without a " "prime line.\n" -"Final number of loops is not taking into account while arranging or " +"Final number of loops is not taken into account while arranging or " "validating objects distance. Increase loop number in such case." msgstr "" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 1f6dcf3b4b..85079d85fe 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -685,7 +685,7 @@ msgstr "" "ahora?" msgid "Repairing model object" -msgstr "Raparando modelo" +msgstr "Reparando modelo" msgid "Cut by line" msgstr "Corte por Línea" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index d52a68ee1b..73fcdb50ea 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -2057,7 +2057,7 @@ msgid "Replace the selected part with new STL" msgstr "Substituir a peça selecionada por novo STL" msgid "Replace all with STL" -msgstr "" +msgstr "Substituir tudo por STL" msgid "Replace all selected parts with STL from folder" msgstr "Substituir todas peças selecionadas com STL da pasta" @@ -3406,7 +3406,7 @@ msgid "Step" msgstr "Passo" msgid "Unmapped" -msgstr "" +msgstr "Não mapeado" msgid "" "Upper half area: Original\n" @@ -4267,7 +4267,7 @@ msgid "Auto Check: Material" msgstr "Verificação Automática: Material" msgid "Live View Camera Calibration" -msgstr "" +msgstr "Calibração da Câmera ao Vivo" msgid "Waiting for heatbed to reach target temperature" msgstr "Aguardando mesa aquecida atingir a temperatura desejada" @@ -6785,7 +6785,7 @@ msgid "Monitor if the waste is piled up in the purge chute." msgstr "Verifique se os resíduos estão se acumulando na calha de purga." msgid "Nozzle Clumping Detection" -msgstr "Detecção de acúmulo no bico" +msgstr "Detecção de Aglomeração no Bico" msgid "Check if the nozzle is clumping by filaments or other foreign objects." msgstr "" @@ -8037,10 +8037,12 @@ msgid "All" msgstr "Todos" msgid "Auto flush after changing..." -msgstr "" +msgstr "Auto purga depois da troca..." msgid "Auto calculate flushing volumes when selected values changed" msgstr "" +"Calcula automaticamente os volumes de purga quando os valores selecionados " +"são alterados" msgid "Auto arrange plate after cloning" msgstr "Organizar automaticamente a placa após a clonagem" @@ -8100,7 +8102,7 @@ msgid "If enabled, reverses the direction of zoom with mouse wheel." msgstr "Se ativo, inverte a direção de zoom com a roda do mouse." msgid "Clear my choice on..." -msgstr "" +msgstr "Limpar minha escolha em..." msgid "Unsaved projects" msgstr "Projetos não salvos" @@ -8158,7 +8160,7 @@ msgid "Update built-in Presets automatically." msgstr "Atualizar automaticamente Predefinições integradas." msgid "Network plugin" -msgstr "" +msgstr "Plugin de rede" msgid "Enable network plugin" msgstr "Ativar plugin de rede" @@ -8882,15 +8884,20 @@ msgid "" "You have selected both external and AMS filaments for an extruder. You will " "need to manually switch the external filament during printing." msgstr "" +"Você selecionou filamentos externos e AMS para uma extrusora. Será " +"necessário trocar manualmente o filamento externo durante a impressão." msgid "" "TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics " "calibration." -msgstr "" +msgstr "TPU 90A/TPU 85A é muito mole e não suporta calibração automática de " +"Dinâmica de Fluxo." msgid "" "Set dynamic flow calibration to 'OFF' to enable custom dynamic flow value." msgstr "" +"Desative a calibração de fluxo dinâmico para habilitar o valor de fluxo " +"dinâmico personalizado." msgid "This printer does not support printing all plates." msgstr "Esta impressora não suporta a imprimir todas as placas." @@ -8899,6 +8906,9 @@ msgid "" "Please cold pull before printing TPU to avoid clogging. You may use cold " "pull maintenance on the printer." msgstr "" +"Recomenda-se realizar um processo de 'cold pull' antes de imprimir em TPU " +"para evitar entupimentos. Você pode utilizar esse processo de manutenção na " +"impressora." msgid "High chamber temperature is required. Please close the door." msgstr "É necessária uma temperatura elevada na câmara. Feche a porta." @@ -8916,8 +8926,9 @@ msgid "click to retry" msgstr "clique para tentar novamente" msgid "Upload file timeout, please check if the firmware version supports it." -msgstr "Limite de tempo de envio exedido, verifique se a versão do firmware " -"tem suporte." +msgstr "" +"Limite de tempo de envio de arquivo excedido, verifique se a versão do " +"firmware tem suporte." msgid "" "No available external storage was obtained. Please confirm and try again." @@ -8936,6 +8947,8 @@ msgid "" "Please check the network and try again, You can restart or update the " "printer if the issue persists." msgstr "" +"Verifique a rede e tente novamente. Se o problema persistir, você pode " +"reiniciar ou atualizar a impressora." msgid "Sending..." msgstr "Enviando…" @@ -8952,7 +8965,7 @@ msgid "Sending failed, please try again!" msgstr "Falha no envio, tente novamente!" msgid "Connection failed. Click the icon to retry" -msgstr "" +msgstr "Falha na coexão. Clique no icon para tentar novamente" msgid "Cannot send the print task when the upgrade is in progress" msgstr "" @@ -9653,7 +9666,7 @@ msgid "Wipe tower parameters" msgstr "Parâmetros da torre de limpeza" msgid "Multi Filament" -msgstr "" +msgstr "Multi Filamento" msgid "Tool change parameters with single extruder MM printers" msgstr "" @@ -9723,7 +9736,7 @@ msgid "Timelapse G-code" msgstr "G-code de timelapse" msgid "Clumping Detection G-code" -msgstr "" +msgstr "G-code para detecção de aglomeração" msgid "Change filament G-code" msgstr "G-code de mudança de filamento" @@ -9862,11 +9875,11 @@ msgstr "Tem certeza de %1% a predefinição selecionada?" #, c-format, boost-format msgid "Left: %s" -msgstr "" +msgstr "Esquerda: %s" #, c-format, boost-format msgid "Right: %s" -msgstr "" +msgstr "Direita: %s" msgid "Click to reset current value and attach to the global value." msgstr "Clique para redefinir o valor atual e anexá-lo ao valor global." @@ -10102,25 +10115,25 @@ msgid "The configuration is up to date." msgstr "A configuração está atualizada." msgid "Open Wiki for more information >" -msgstr "" +msgstr "Abra o Wiki para mais informações >" msgid "OBJ file import color" msgstr "Importar cor de arquivo Obj" msgid "Some faces don't have color defined." -msgstr "" +msgstr "Algumas faces não têm a cor definida." msgid "MTL file exist error, could not find the material:" msgstr "" msgid "Please check OBJ or MTL file." -msgstr "" +msgstr "Verifique o arquivo OBJ ou MTL." msgid "Specify number of colors:" msgstr "Especifique a quantidade de cores:" msgid "Enter or click the adjustment button to modify number again" -msgstr "" +msgstr "Digite ou clique no botão de ajuste para modificar o número novamente" msgid "Recommended " msgstr "Recomendado " @@ -10129,10 +10142,10 @@ msgid "view" msgstr "" msgid "Current filament colors" -msgstr "" +msgstr "Cores de filamento atuais" msgid "Matching" -msgstr "" +msgstr "Correspondendo" msgid "Quick set" msgstr "" @@ -10147,7 +10160,7 @@ msgid "Append" msgstr "Adicionar" msgid "Append to existing filaments" -msgstr "" +msgstr "Adicionar aos filamentos existentes" msgid "Reset mapped extruders." msgstr "Redefinir extrusoras mapeadas." @@ -10389,6 +10402,9 @@ msgid "" "changed or filaments changed. You could disable the auto-calculate in Orca " "Slicer > Preferences" msgstr "" +"O Orca recalculará seus volumes de purga toda vez que a cor dos filamentos " +"ou os filamentos forem alterados. Você pode desativar o cálculo automático " +"em OrcaSlicer > Preferências" msgid "Flushing volume (mm³) for each filament pair." msgstr "Volume de purga (mm³) para cada par de filamentos." @@ -10405,10 +10421,10 @@ msgid "Re-calculate" msgstr "Recalcular" msgid "Left extruder" -msgstr "" +msgstr "Extrusora esquerda" msgid "Right extruder" -msgstr "" +msgstr "Extrusora direita" msgid "Multiplier" msgstr "Multiplicador" @@ -10417,7 +10433,7 @@ msgid "Flushing volumes for filament change" msgstr "Volumes de purga para troca de filamento" msgid "Please choose the filament colour" -msgstr "" +msgstr "Escolha a cor do filamento" msgid "" "Windows Media Player is required for this task! Do you want to enable " @@ -10732,19 +10748,27 @@ msgid "" "Try the following methods to update the connection parameters and reconnect " "to the printer." msgstr "" +"Tente os seguintes métodos para atualizar os parâmetros de conexão e " +"reconectar à impressora." msgid "1. Please confirm Orca Slicer and your printer are in the same LAN." msgstr "" +"1. Confirme se o Orca Slicer e sua impressora estão na mesma rede local." msgid "" "2. If the IP and Access Code below are different from the actual values on " "your printer, please correct them." msgstr "" +"2. Se o IP e o Código de Acesso abaixo forem diferentes dos valores reais da " +"sua impressora, corrija-os." msgid "" "3. Please obtain the device SN from the printer side; it is usually found in " "the device information on the printer screen." msgstr "" +"3. Obtenha o número de série (SN) do dispositivo na própria impressora; " +"geralmente ele pode ser encontrado nas informações do dispositivo na tela da " +"impressora." msgid "IP" msgstr "IP" @@ -10800,7 +10824,7 @@ msgstr "" "por favor passe para o passo 3 para resolver problemas de rede" msgid "Connection failed! Please refer to the wiki page." -msgstr "" +msgstr "Falha na conexão! Consulte a página da wiki." msgid "sending failed" msgstr "falha no envio" @@ -10809,9 +10833,11 @@ msgid "" "Failed to send. Click Retry to attempt sending again. If retrying does not " "work, please check the reason." msgstr "" +"Falha ao enviar. Clique em Tentar Novamente para tentar enviar de novo. Se " +"tentar novamente não funcionar, verifique o motivo." msgid "reconnect" -msgstr "" +msgstr "reconectar" msgid "Air Pump" msgstr "Bomba de Ar" @@ -10826,7 +10852,7 @@ msgid "Cutting Module" msgstr "Módulo de Corte" msgid "Auto Fire Extinguishing System" -msgstr "" +msgstr "Sistema Automático de Extinção de Incêndio" msgid "Model:" msgstr "Modelo:" @@ -10988,13 +11014,13 @@ msgid "Generating G-code: layer %1%" msgstr "Gerando G-code: camada %1%" msgid "Flush volumes matrix do not match to the correct size!" -msgstr "" +msgstr "A matriz de volumes de descarga não corresponde ao tamanho correto!" msgid "Grouping error: " -msgstr "" +msgstr "Erro de agrupamento: " msgid " can not be placed in the " -msgstr "" +msgstr " não pode ser colocado na " msgid "Inner wall" msgstr "Parede interna" @@ -11162,6 +11188,8 @@ msgid "" " is too close to clumping detection area, there may be collisions when " "printing." msgstr "" +" está muito perto da área de detecção de aglomeração, podendo haver colisões " +"durante a impressão." msgid "Prime Tower" msgstr "Torre de Preparo" @@ -11175,32 +11203,44 @@ msgstr " está muito perto da área de exclusão, e ocorrerão colisões.\n" msgid "" " is too close to clumping detection area, and collisions will be caused.\n" msgstr "" +" está muito perto da área de detecção de aglomeração, e ocorrerão colisões.\n" msgid "" "Printing high-temp and low-temp filaments together may cause nozzle clogging " "or printer damage." msgstr "" +"A impressão simultânea de filamentos de alta e baixa temperatura pode causar " +"entupimento do bico ou danos à impressora." msgid "" "Printing high-temp and low-temp filaments together may cause nozzle clogging " "or printer damage. If you still want to print, you can enable the option in " "Preferences." msgstr "" +"A impressão simultânea de filamentos de alta e baixa temperatura pode causar " +"entupimento do bico ou danos à impressora. Se ainda assim desejar imprimir, " +"você pode ativar a opção em Preferências." msgid "" "Printing different-temp filaments together may cause nozzle clogging or " "printer damage." msgstr "" +"Imprimir filamentos com temperaturas diferentes simultaneamente pode causar " +"entupimento dos bicos ou danos à impressora." msgid "" "Printing high-temp and mid-temp filaments together may cause nozzle clogging " "or printer damage." msgstr "" +"A impressão simultânea de filamentos de alta e média temperatura pode causar " +"entupimento do bico ou danos à impressora." msgid "" "Printing mid-temp and low-temp filaments together may cause nozzle clogging " "or printer damage." msgstr "" +"A impressão simultânea de filamentos de temperatura média e baixa pode causar " +"entupimento do bico ou danos à impressora." msgid "No extrusions under current settings." msgstr "Nenhuma extrusão com as configurações atuais." @@ -11215,6 +11255,8 @@ msgstr "" msgid "" "Clumping detection is not supported when \"by object\" sequence is enabled." msgstr "" +"A detecção de aglomeração não é suportada quando a sequência \"por objeto\" " +"está ativada." msgid "" "Prime tower is required for clumping detection; otherwise, there may be " @@ -11528,7 +11570,7 @@ msgid "Printable area" msgstr "Área de impressão" msgid "Extruder printable area" -msgstr "" +msgstr "Área de impressão da extrusora" msgid "Bed exclude area" msgstr "Área de exclusão da mesa" @@ -11590,12 +11632,14 @@ msgid "Maximum printable height which is limited by mechanism of printer." msgstr "Altura máxima de impressão limitada pelo mecanismo da impressora." msgid "Extruder printable height" -msgstr "" +msgstr "Altura de impressão da extrusora" msgid "" "Maximum printable height of this extruder which is limited by mechanism of " "printer." msgstr "" +"Altura máxima de impressão desta extrusora, limitada pelo mecanismo da " +"impressora." msgid "Preferred orientation" msgstr "Orientação preferida" @@ -14908,19 +14952,19 @@ msgstr "" "diâmetro do bico." msgid "Enable clumping detection" -msgstr "" +msgstr "Habilitar detecção de aglomeração" msgid "Clumping detection layers" -msgstr "" +msgstr "Camadas de detecção de aglomeração" msgid "Clumping detection layers." -msgstr "" +msgstr "Camadas de detecção de aglomeração." msgid "Probing exclude area of clumping" -msgstr "" +msgstr "Sondagem exclui área de aglomeração" msgid "Probing exclude area of clumping." -msgstr "" +msgstr "Sondagem exclui área de aglomeração." msgid "Filament to print internal sparse infill." msgstr "Filamento para imprimir preenchimento esparso interno." diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index a0af4ebd70..01c3669856 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -10,15 +10,15 @@ msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-05 17:33+0800\n" -"PO-Revision-Date: 2025-03-27 19:32+0800\n" -"Last-Translator: 5idereal \n" +"PO-Revision-Date: 2025-11-28 13:48-0600\n" +"Last-Translator: tntchn <15895303+tntchn@users.noreply.github.com>\n" "Language-Team: \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.5\n" +"X-Generator: Poedit 3.8\n" msgid "" "The filament may not be compatible with the current machine settings. " @@ -4732,10 +4732,10 @@ msgid "Add plate" msgstr "新增列印板" msgid "Auto orient all/selected objects" -msgstr "自动定位所有/选定的对象" +msgstr "自動旋轉所有/選取物件的方向" msgid "Auto orient all objects on current plate" -msgstr "自动调整当前板上的所有对象" +msgstr "自動旋轉目前板上所有物件的方向" msgid "Arrange all objects" msgstr "全域整理" @@ -7384,7 +7384,7 @@ msgid "Browse" msgstr "瀏覽" msgid "Choose folder for downloaded items" -msgstr "" +msgstr "選擇下載項目的目標資料夾" msgid "Choose Download Directory" msgstr "選擇下載資料夾" @@ -7411,7 +7411,7 @@ msgid "Metric" msgstr "公制" msgid "Imperial" -msgstr "英製" +msgstr "英制" msgid "Units" msgstr "單位" @@ -7454,10 +7454,10 @@ msgid "Show the splash screen during startup." msgstr "啟動時顯示啟動動畫。" msgid "Downloads folder" -msgstr "" +msgstr "下載資料夾" msgid "Target folder for downloaded items" -msgstr "" +msgstr "下載項目的存放資料夾" msgid "Load All" msgstr "載入全部" @@ -7478,13 +7478,13 @@ msgid "Should printer/filament/process settings be loaded when opening a 3MF fil msgstr "開啟 .3mf 檔案時，是否需要載入印表機、線材和參數設定？" msgid "Maximum recent files" -msgstr "" +msgstr "最近開啟的檔案上限" msgid "Maximum count of recent files" -msgstr "" +msgstr "最近開啟的檔案上限" msgid "Add STL/STEP files to recent files list" -msgstr "" +msgstr "在最近開啟的檔案中加入 STL/STEP 檔案" msgid "Don't warn when loading 3MF with modified G-code" msgstr "載入包含修改過 G-code 的 3MF 時不顯示警告" @@ -7526,7 +7526,7 @@ msgid "" msgstr "啟用時可以同時傳送到並管理多個機臺。" msgid "(Requires restart)" -msgstr "" +msgstr "（需要重啟程式）" msgid "Pop up to select filament grouping mode" msgstr "" @@ -7582,11 +7582,11 @@ msgid "If enabled, use free camera. If not enabled, use constrained camera." msgstr "如果啟用，則使用自由鏡頭。若未啟用，則使用受限鏡頭。" msgid "Swap pan and rotate mouse buttons" -msgstr "交换鼠标按钮的平移与旋转功能" +msgstr "對調滑鼠的平移與旋轉按鍵" msgid "" "If enabled, swaps the left and right mouse buttons pan and rotate functions." -msgstr "启用后，将左键和右键的平移与旋转功能对调" +msgstr "啟用後，對調滑鼠左鍵與右鍵的平移與旋轉功能。" msgid "Reverse mouse zoom" msgstr "反轉滑鼠滾輪縮放方向" @@ -9772,12 +9772,11 @@ msgid "" "it just orients the selected ones. Otherwise, it will orient all objects in " "the current project." msgstr "" -"自动调整选定零件/所有零件的方向,\n" -"有选定零件时调整选定零件的朝向,\n" -"没有选择零件时调整当项目所有零件的朝向" +"自動旋轉選取的物件或所有物件的方向。當有物件被選取時，僅自動旋轉選取的物件。無選取的物件時，" +"會自動旋轉專案中的所有物件。" msgid "Auto orients all objects on the active plate." -msgstr "自动调整活动板上的所有物体的方向。" +msgstr "自動旋轉目前板上所有物件的方向" msgid "Collapse/Expand the sidebar" msgstr "摺疊/展開 側邊欄" diff --git a/resources/handy_models/calicat.stl b/resources/handy_models/calicat.stl new file mode 100644 index 0000000000..3380af233b Binary files /dev/null and b/resources/handy_models/calicat.stl differ diff --git a/resources/images/advanced.svg b/resources/images/advanced.svg index 561a15b303..ef868e36b1 100644 --- a/resources/images/advanced.svg +++ b/resources/images/advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/ams_1_tray.svg b/resources/images/ams_1_tray.svg index 6d9c7b3f28..d46cb35b07 100644 --- a/resources/images/ams_1_tray.svg +++ b/resources/images/ams_1_tray.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/resources/images/ams_4_tray.svg b/resources/images/ams_4_tray.svg index 379dcdf991..779383ed27 100644 --- a/resources/images/ams_4_tray.svg +++ b/resources/images/ams_4_tray.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/resources/images/bed_cool.png b/resources/images/bed_cool.png index 41234a1ac5..625ebd6325 100644 Binary files a/resources/images/bed_cool.png and b/resources/images/bed_cool.png differ diff --git a/resources/images/bed_cool_supertack.png b/resources/images/bed_cool_supertack.png index cf05fb85ea..1c13570943 100644 Binary files a/resources/images/bed_cool_supertack.png and b/resources/images/bed_cool_supertack.png differ diff --git a/resources/images/bed_cool_supertack_mini.png b/resources/images/bed_cool_supertack_mini.png deleted file mode 100644 index b363b43093..0000000000 Binary files a/resources/images/bed_cool_supertack_mini.png and /dev/null differ diff --git a/resources/images/bed_cool_supertack_n.png b/resources/images/bed_cool_supertack_n.png deleted file mode 100644 index 7ba934c97a..0000000000 Binary files a/resources/images/bed_cool_supertack_n.png and /dev/null differ diff --git a/resources/images/bed_cool_supertack_o.png b/resources/images/bed_cool_supertack_o.png deleted file mode 100644 index b7a143a2df..0000000000 Binary files a/resources/images/bed_cool_supertack_o.png and /dev/null differ diff --git a/resources/images/bed_engineering.png b/resources/images/bed_engineering.png index 9fe23a2666..62a3ad9093 100644 Binary files a/resources/images/bed_engineering.png and b/resources/images/bed_engineering.png differ diff --git a/resources/images/bed_engineering_n.png b/resources/images/bed_engineering_n.png deleted file mode 100644 index 5ad3ab938f..0000000000 Binary files a/resources/images/bed_engineering_n.png and /dev/null differ diff --git a/resources/images/bed_engineering_o.png b/resources/images/bed_engineering_o.png deleted file mode 100644 index 4be2320dde..0000000000 Binary files a/resources/images/bed_engineering_o.png and /dev/null differ diff --git a/resources/images/bed_high_templ.png b/resources/images/bed_high_templ.png index 3fe8a603c8..d7f80aee92 100644 Binary files a/resources/images/bed_high_templ.png and b/resources/images/bed_high_templ.png differ diff --git a/resources/images/bed_high_templ_mini.png b/resources/images/bed_high_templ_mini.png deleted file mode 100644 index 6036556c0a..0000000000 Binary files a/resources/images/bed_high_templ_mini.png and /dev/null differ diff --git a/resources/images/bed_high_templ_n.png b/resources/images/bed_high_templ_n.png deleted file mode 100644 index 3fe8a603c8..0000000000 Binary files a/resources/images/bed_high_templ_n.png and /dev/null differ diff --git a/resources/images/bed_high_templ_o.png b/resources/images/bed_high_templ_o.png deleted file mode 100644 index f0fadb7667..0000000000 Binary files a/resources/images/bed_high_templ_o.png and /dev/null differ diff --git a/resources/images/bed_pei.png b/resources/images/bed_pei.png index 4a1913516d..c942905304 100644 Binary files a/resources/images/bed_pei.png and b/resources/images/bed_pei.png differ diff --git a/resources/images/bed_plate_cool_textured.png b/resources/images/bed_pei_cool.png similarity index 100% rename from resources/images/bed_plate_cool_textured.png rename to resources/images/bed_pei_cool.png diff --git a/resources/images/bed_pei_mini.png b/resources/images/bed_pei_mini.png deleted file mode 100644 index cea0373230..0000000000 Binary files a/resources/images/bed_pei_mini.png and /dev/null differ diff --git a/resources/images/bed_pei_n.png b/resources/images/bed_pei_n.png deleted file mode 100644 index 4a1913516d..0000000000 Binary files a/resources/images/bed_pei_n.png and /dev/null differ diff --git a/resources/images/bed_pei_o.png b/resources/images/bed_pei_o.png deleted file mode 100644 index d6fd7ce0a6..0000000000 Binary files a/resources/images/bed_pei_o.png and /dev/null differ diff --git a/resources/images/bed_plate_cool_smooth.png b/resources/images/bed_plate_cool_smooth.png deleted file mode 100644 index 625ebd6325..0000000000 Binary files a/resources/images/bed_plate_cool_smooth.png and /dev/null differ diff --git a/resources/images/bed_plate_cool_supertack.png b/resources/images/bed_plate_cool_supertack.png deleted file mode 100644 index 1c13570943..0000000000 Binary files a/resources/images/bed_plate_cool_supertack.png and /dev/null differ diff --git a/resources/images/bed_plate_engineering.png b/resources/images/bed_plate_engineering.png deleted file mode 100644 index 62a3ad9093..0000000000 Binary files a/resources/images/bed_plate_engineering.png and /dev/null differ diff --git a/resources/images/bed_plate_high_temp_smooth.png b/resources/images/bed_plate_high_temp_smooth.png deleted file mode 100644 index d7f80aee92..0000000000 Binary files a/resources/images/bed_plate_high_temp_smooth.png and /dev/null differ diff --git a/resources/images/bed_plate_pei.png b/resources/images/bed_plate_pei.png deleted file mode 100644 index c942905304..0000000000 Binary files a/resources/images/bed_plate_pei.png and /dev/null differ diff --git a/resources/images/big_bed_cool.png b/resources/images/big_bed_cool.png index 2d2917e2ed..66ea212bc3 100644 Binary files a/resources/images/big_bed_cool.png and b/resources/images/big_bed_cool.png differ diff --git a/resources/images/big_bed_cool_supertack.png b/resources/images/big_bed_cool_supertack.png index 87ab558248..bbd607e7a8 100644 Binary files a/resources/images/big_bed_cool_supertack.png and b/resources/images/big_bed_cool_supertack.png differ diff --git a/resources/images/big_bed_cool_supertack_mini.png b/resources/images/big_bed_cool_supertack_mini.png deleted file mode 100644 index 18605c6b67..0000000000 Binary files a/resources/images/big_bed_cool_supertack_mini.png and /dev/null differ diff --git a/resources/images/big_bed_cool_supertack_n.png b/resources/images/big_bed_cool_supertack_n.png deleted file mode 100644 index 1d87d3e831..0000000000 Binary files a/resources/images/big_bed_cool_supertack_n.png and /dev/null differ diff --git a/resources/images/big_bed_cool_supertack_o.png b/resources/images/big_bed_cool_supertack_o.png deleted file mode 100644 index d2bf848979..0000000000 Binary files a/resources/images/big_bed_cool_supertack_o.png and /dev/null differ diff --git a/resources/images/big_bed_engineering.png b/resources/images/big_bed_engineering.png index 7cdd39b641..2cd6e7fe08 100644 Binary files a/resources/images/big_bed_engineering.png and b/resources/images/big_bed_engineering.png differ diff --git a/resources/images/big_bed_engineering_n.png b/resources/images/big_bed_engineering_n.png deleted file mode 100644 index d8329e8b0c..0000000000 Binary files a/resources/images/big_bed_engineering_n.png and /dev/null differ diff --git a/resources/images/big_bed_engineering_o.png b/resources/images/big_bed_engineering_o.png deleted file mode 100644 index 87cf402281..0000000000 Binary files a/resources/images/big_bed_engineering_o.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ.png b/resources/images/big_bed_high_templ.png index ebc1b5f237..7b3bc41569 100644 Binary files a/resources/images/big_bed_high_templ.png and b/resources/images/big_bed_high_templ.png differ diff --git a/resources/images/big_bed_high_templ_mini.png b/resources/images/big_bed_high_templ_mini.png deleted file mode 100644 index 8f5800af04..0000000000 Binary files a/resources/images/big_bed_high_templ_mini.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ_n.png b/resources/images/big_bed_high_templ_n.png deleted file mode 100644 index ebc1b5f237..0000000000 Binary files a/resources/images/big_bed_high_templ_n.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ_o.png b/resources/images/big_bed_high_templ_o.png deleted file mode 100644 index e75df475ac..0000000000 Binary files a/resources/images/big_bed_high_templ_o.png and /dev/null differ diff --git a/resources/images/big_bed_pei.png b/resources/images/big_bed_pei.png index e87d15993d..d76c16f13c 100644 Binary files a/resources/images/big_bed_pei.png and b/resources/images/big_bed_pei.png differ diff --git a/resources/images/big_bed_plate_cool_textured.png b/resources/images/big_bed_pei_cool.png similarity index 100% rename from resources/images/big_bed_plate_cool_textured.png rename to resources/images/big_bed_pei_cool.png diff --git a/resources/images/big_bed_pei_mini.png b/resources/images/big_bed_pei_mini.png deleted file mode 100644 index 18878f8147..0000000000 Binary files a/resources/images/big_bed_pei_mini.png and /dev/null differ diff --git a/resources/images/big_bed_pei_n.png b/resources/images/big_bed_pei_n.png deleted file mode 100644 index e87d15993d..0000000000 Binary files a/resources/images/big_bed_pei_n.png and /dev/null differ diff --git a/resources/images/big_bed_pei_o.png b/resources/images/big_bed_pei_o.png deleted file mode 100644 index 51a5bef46a..0000000000 Binary files a/resources/images/big_bed_pei_o.png and /dev/null differ diff --git a/resources/images/big_bed_plate_cool_smooth.png b/resources/images/big_bed_plate_cool_smooth.png deleted file mode 100644 index 66ea212bc3..0000000000 Binary files a/resources/images/big_bed_plate_cool_smooth.png and /dev/null differ diff --git a/resources/images/big_bed_plate_cool_supertack.png b/resources/images/big_bed_plate_cool_supertack.png deleted file mode 100644 index bbd607e7a8..0000000000 Binary files a/resources/images/big_bed_plate_cool_supertack.png and /dev/null differ diff --git a/resources/images/big_bed_plate_engineering.png b/resources/images/big_bed_plate_engineering.png deleted file mode 100644 index 2cd6e7fe08..0000000000 Binary files a/resources/images/big_bed_plate_engineering.png and /dev/null differ diff --git a/resources/images/big_bed_plate_high_temp_smooth.png b/resources/images/big_bed_plate_high_temp_smooth.png deleted file mode 100644 index 7b3bc41569..0000000000 Binary files a/resources/images/big_bed_plate_high_temp_smooth.png and /dev/null differ diff --git a/resources/images/big_bed_plate_pei.png b/resources/images/big_bed_plate_pei.png deleted file mode 100644 index d76c16f13c..0000000000 Binary files a/resources/images/big_bed_plate_pei.png and /dev/null differ diff --git a/resources/images/custom-gcode_advanced.svg b/resources/images/custom-gcode_advanced.svg index 561a15b303..e363a28d13 100644 --- a/resources/images/custom-gcode_advanced.svg +++ b/resources/images/custom-gcode_advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/four_slot_ams_item.svg b/resources/images/four_slot_ams_item.svg index b42e94a6ca..8b1f7f787b 100644 --- a/resources/images/four_slot_ams_item.svg +++ b/resources/images/four_slot_ams_item.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/resources/images/four_slot_ams_item_dark.svg b/resources/images/four_slot_ams_item_dark.svg index 1d788268ff..8b1f7f787b 100644 --- a/resources/images/four_slot_ams_item_dark.svg +++ b/resources/images/four_slot_ams_item_dark.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/lock_hover.svg b/resources/images/lock_hover.svg index b25ba1cfdc..7abfb97480 100644 --- a/resources/images/lock_hover.svg +++ b/resources/images/lock_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/lock_normal.svg b/resources/images/lock_normal.svg index e585aba3f6..7abfb97480 100644 --- a/resources/images/lock_normal.svg +++ b/resources/images/lock_normal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/obj_variable_layer_height.svg b/resources/images/obj_variable_layer_height.svg new file mode 100644 index 0000000000..801d3e4ad2 --- /dev/null +++ b/resources/images/obj_variable_layer_height.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/page_down.svg b/resources/images/page_down.svg index 077526b5a7..7a9b362b61 100644 --- a/resources/images/page_down.svg +++ b/resources/images/page_down.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/images/page_up.svg b/resources/images/page_up.svg index 3a801242b2..d500df39a8 100644 --- a/resources/images/page_up.svg +++ b/resources/images/page_up.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/images/param_advanced.svg b/resources/images/param_advanced.svg index 86d13f71a7..d5bbb99a94 100644 --- a/resources/images/param_advanced.svg +++ b/resources/images/param_advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/param_extruder_clearence.svg b/resources/images/param_extruder_clearance.svg similarity index 100% rename from resources/images/param_extruder_clearence.svg rename to resources/images/param_extruder_clearance.svg diff --git a/resources/images/printer_placeholder.png b/resources/images/printer_placeholder.png index bc1b2af2ed..636ffc1075 100644 Binary files a/resources/images/printer_placeholder.png and b/resources/images/printer_placeholder.png differ diff --git a/resources/images/printer_preview_BL-P001.png b/resources/images/printer_preview_BL-P001.png index 5bf40ff509..7673774115 100644 Binary files a/resources/images/printer_preview_BL-P001.png and b/resources/images/printer_preview_BL-P001.png differ diff --git a/resources/images/printer_preview_BL-P002.png b/resources/images/printer_preview_BL-P002.png index 5bf40ff509..d8b089524c 100644 Binary files a/resources/images/printer_preview_BL-P002.png and b/resources/images/printer_preview_BL-P002.png differ diff --git a/resources/images/printer_preview_C11.png b/resources/images/printer_preview_C11.png index bbe6b42562..78c0d5d115 100644 Binary files a/resources/images/printer_preview_C11.png and b/resources/images/printer_preview_C11.png differ diff --git a/resources/images/printer_preview_C12.png b/resources/images/printer_preview_C12.png index d9b3294e7e..04d179dd05 100644 Binary files a/resources/images/printer_preview_C12.png and b/resources/images/printer_preview_C12.png differ diff --git a/resources/images/printer_preview_C13.png b/resources/images/printer_preview_C13.png index 7d666d02dd..5ae4c807d6 100644 Binary files a/resources/images/printer_preview_C13.png and b/resources/images/printer_preview_C13.png differ diff --git a/resources/images/printer_preview_N1.png b/resources/images/printer_preview_N1.png index 80fbe7dc2d..060e0a2d2c 100644 Binary files a/resources/images/printer_preview_N1.png and b/resources/images/printer_preview_N1.png differ diff --git a/resources/images/printer_preview_N2S.png b/resources/images/printer_preview_N2S.png index d7a640e41f..e6a3358061 100644 Binary files a/resources/images/printer_preview_N2S.png and b/resources/images/printer_preview_N2S.png differ diff --git a/resources/images/printer_preview_O1D.png b/resources/images/printer_preview_O1D.png index 69ad76d373..3f3a099bc7 100644 Binary files a/resources/images/printer_preview_O1D.png and b/resources/images/printer_preview_O1D.png differ diff --git a/resources/images/printer_preview_O1E.png b/resources/images/printer_preview_O1E.png index 255b4b37fe..d45e231794 100644 Binary files a/resources/images/printer_preview_O1E.png and b/resources/images/printer_preview_O1E.png differ diff --git a/resources/images/printer_preview_O1S.png b/resources/images/printer_preview_O1S.png index c5f8a5c5aa..70a048d50a 100644 Binary files a/resources/images/printer_preview_O1S.png and b/resources/images/printer_preview_O1S.png differ diff --git a/resources/images/printer_sync.svg b/resources/images/printer_sync.svg index 449ab9a97d..f052eec5b4 100644 --- a/resources/images/printer_sync.svg +++ b/resources/images/printer_sync.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/printer_sync_not.svg b/resources/images/printer_sync_not.svg index 225b67a5fc..5d5855c1f6 100644 --- a/resources/images/printer_sync_not.svg +++ b/resources/images/printer_sync_not.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/printer_sync_ok.svg b/resources/images/printer_sync_ok.svg index 4312185601..684a291cd1 100644 --- a/resources/images/printer_sync_ok.svg +++ b/resources/images/printer_sync_ok.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/reset_gray.svg b/resources/images/reset_gray.svg index 9e5578903e..dea3f8dcc5 100644 --- a/resources/images/reset_gray.svg +++ b/resources/images/reset_gray.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/images/revert_btn.svg b/resources/images/revert_btn.svg index 763a86ff76..ffcc5535f2 100644 --- a/resources/images/revert_btn.svg +++ b/resources/images/revert_btn.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/single_slot_ams_item.svg b/resources/images/single_slot_ams_item.svg index a1f94f84fc..edd4698500 100644 --- a/resources/images/single_slot_ams_item.svg +++ b/resources/images/single_slot_ams_item.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/single_slot_ams_item_dark.svg b/resources/images/single_slot_ams_item_dark.svg index b259df0329..edd4698500 100644 --- a/resources/images/single_slot_ams_item_dark.svg +++ b/resources/images/single_slot_ams_item_dark.svg @@ -1,15 +1 @@ - - - - - - - - 第 1 层 - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/tab_multi_active.svg b/resources/images/tab_multi_active.svg index dc776469e5..a005848cee 100644 --- a/resources/images/tab_multi_active.svg +++ b/resources/images/tab_multi_active.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_double_directional_arrow.svg b/resources/images/toolbar_double_directional_arrow.svg index 4cc9b2ecb3..b2b52621a0 100644 --- a/resources/images/toolbar_double_directional_arrow.svg +++ b/resources/images/toolbar_double_directional_arrow.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_reset.svg b/resources/images/toolbar_reset.svg index ad78b43e15..ffcc5535f2 100644 --- a/resources/images/toolbar_reset.svg +++ b/resources/images/toolbar_reset.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_hover.svg b/resources/images/toolbar_reset_hover.svg index ad78b43e15..ffcc5535f2 100644 --- a/resources/images/toolbar_reset_hover.svg +++ b/resources/images/toolbar_reset_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero.svg b/resources/images/toolbar_reset_zero.svg index 10be9c46fc..07ce4a5fd2 100644 --- a/resources/images/toolbar_reset_zero.svg +++ b/resources/images/toolbar_reset_zero.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero_hover.svg b/resources/images/toolbar_reset_zero_hover.svg index 10be9c46fc..07ce4a5fd2 100644 --- a/resources/images/toolbar_reset_zero_hover.svg +++ b/resources/images/toolbar_reset_zero_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/undo.svg b/resources/images/undo.svg index 763a86ff76..ffcc5535f2 100644 --- a/resources/images/undo.svg +++ b/resources/images/undo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 28ce9d1e90..9425300cb4 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -1,7 +1,7 @@ { "name": "Bambulab", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json", - "version": "02.00.00.55", + "version": "02.00.00.56", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/machine/fdm_machine_common.json b/resources/profiles/BBL/machine/fdm_machine_common.json index e33d6b9f9b..0073ac6a8a 100644 --- a/resources/profiles/BBL/machine/fdm_machine_common.json +++ b/resources/profiles/BBL/machine/fdm_machine_common.json @@ -136,6 +136,7 @@ "60" ], "scan_first_layer": "0", + "enable_power_loss_recovery": "1", "silent_mode": "0", "single_extruder_multi_material": "1", "support_air_filtration": "0", diff --git a/resources/profiles/RolohaunDesign.json b/resources/profiles/RolohaunDesign.json index e37fc75982..6312a3857f 100644 --- a/resources/profiles/RolohaunDesign.json +++ b/resources/profiles/RolohaunDesign.json @@ -1,6 +1,6 @@ { "name": "RolohaunDesign", - "version": "02.03.01.10", + "version": "02.03.02.10", "force_update": "0", "description": "RolohaunDesign Printer Profiles", "machine_model_list": [ diff --git a/resources/profiles/RolohaunDesign/process/0.08mm Super Fine @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.08mm Super Fine @Rolohaun Delta Flyer Refit.json index f8af4a582e..def8515213 100644 --- a/resources/profiles/RolohaunDesign/process/0.08mm Super Fine @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.08mm Super Fine @Rolohaun Delta Flyer Refit.json @@ -15,5 +15,8 @@ "top_shell_layers": "6", "top_solid_infill_flow_ratio": "0.95", "travel_speed": "300", - "wall_loops": "4" + "wall_loops": "4", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/process/0.10mm Fine @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.10mm Fine @Rolohaun Delta Flyer Refit.json index a65b454205..6bc3cdf7d5 100644 --- a/resources/profiles/RolohaunDesign/process/0.10mm Fine @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.10mm Fine @Rolohaun Delta Flyer Refit.json @@ -15,5 +15,8 @@ "top_shell_layers": "6", "top_solid_infill_flow_ratio": "0.95", "travel_speed": "300", - "wall_loops": "4" + "wall_loops": "4", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/process/0.16mm Optimal @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.16mm Optimal @Rolohaun Delta Flyer Refit.json index ed75234630..8d2816a526 100644 --- a/resources/profiles/RolohaunDesign/process/0.16mm Optimal @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.16mm Optimal @Rolohaun Delta Flyer Refit.json @@ -13,5 +13,8 @@ "sparse_infill_density": "10%", "top_shell_layers": "5", "top_solid_infill_flow_ratio": "0.95", - "travel_speed": "300" + "travel_speed": "300", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/process/0.20mm Standard @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.20mm Standard @Rolohaun Delta Flyer Refit.json index 57a39e636e..82cd6f4310 100644 --- a/resources/profiles/RolohaunDesign/process/0.20mm Standard @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.20mm Standard @Rolohaun Delta Flyer Refit.json @@ -10,5 +10,8 @@ "skirt_height": "1", "skirt_loops": "2", "top_solid_infill_flow_ratio": "0.95", - "travel_speed": "300" + "travel_speed": "300", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/process/0.24mm Draft @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.24mm Draft @Rolohaun Delta Flyer Refit.json index 6d2970466a..1e5c931697 100644 --- a/resources/profiles/RolohaunDesign/process/0.24mm Draft @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.24mm Draft @Rolohaun Delta Flyer Refit.json @@ -15,5 +15,8 @@ "top_shell_layers": "3", "top_solid_infill_flow_ratio": "0.95", "travel_speed": "300", - "wall_loops": "2" + "wall_loops": "2", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/process/0.28mm Rough Draft @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.28mm Rough Draft @Rolohaun Delta Flyer Refit.json index 14c8236e75..9dd977ae8b 100644 --- a/resources/profiles/RolohaunDesign/process/0.28mm Rough Draft @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.28mm Rough Draft @Rolohaun Delta Flyer Refit.json @@ -15,5 +15,8 @@ "top_shell_layers": "3", "top_solid_infill_flow_ratio": "0.95", "travel_speed": "300", - "wall_loops": "2" + "wall_loops": "2", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/process/0.2mm Vase Mode @Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/process/0.2mm Vase Mode @Rolohaun Delta Flyer Refit.json index 9114024f53..a8f4ce07aa 100644 --- a/resources/profiles/RolohaunDesign/process/0.2mm Vase Mode @Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/process/0.2mm Vase Mode @Rolohaun Delta Flyer Refit.json @@ -16,5 +16,8 @@ "top_shell_layers": "0", "top_solid_infill_flow_ratio": "0.95", "travel_speed": "300", - "wall_loops": "1" + "wall_loops": "1", + "compatible_printers": [ + "Rolohaun Delta Flyer Refit 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/web/data/text.js b/resources/web/data/text.js index 6dde5031fd..0784ee10d9 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -986,8 +986,6 @@ var LangText = { t90: "3D 模型", t91: "下載3D模型", t92: "Bambu聖誕小屋", - orca1: "Edit Project Info", - orca2: "no model information", wk1: "快速入門指南", wk2: "本文介紹了 Orca Slicer 的最基本用法。它指導用戶配置軟體，創建項目，並逐步完成第一個列印任務。", wk3: "基於項目的工作流", @@ -1004,6 +1002,8 @@ var LangText = { wk14: "與 STL 相比，STEP 帶來了更多有效的資訊。由於 STEP 的高精度，切片時可以生成更多的圓弧路徑。STEP 還包括模型每個零件的組裝關係，可分割模型後恢復裝配視圖。", wk15: "３Ｄ文本", wk16: "使用３Ｄ文字工具，使用者可以輕鬆地在項目中建立各種３Ｄ文字形狀，使模型更加個性化。Orca Slicer 提供了數十種字體，並支援粗體和斜體樣式，使文字具有更大的靈活性。", + orca1: "編輯專案資訊", + orca2: "沒有模型相關資訊", }, ru_RU: { t1: "Приветствуем в Orca Slicer!", diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html index 4f6b807b9d..efaea1c8ea 100644 --- a/resources/web/flush/WipingDialog.html +++ b/resources/web/flush/WipingDialog.html @@ -137,40 +137,6 @@ display: inline-block; } - .btn { - display: inline-block; - padding: 6px 9px; - border: 2px solid transparent; - border-radius: 12px; - font-size: 12px; - text-align: center; - cursor: pointer; - transition: all 0.3s; - } - - .btn-ok { - color: #fff; - background-color: #009688; - } - .btn-ok:hover { - background-color: #26A69A; - } - - .btn-cancel { - color: black; - background-color: white; - border: 1px solid black; - } - .btn-cancel:hover { - background-color: #eeeeee; - } - - body.dark-mode button.btn-cancel { - background-color: #2d2d31; - color: #e0e0e0; - border: 1px solid #e0e0e0; - } - select { padding: 6px 9px; border: 1px solid #dbdbdb; @@ -197,7 +163,7 @@ .button-container { display: flex; justify-content: center; - gap: 10px; + gap: 0px; margin: 10px; } @@ -266,15 +232,6 @@ position: sticky; z-index: 11; } - - body.dark-mode .btn-ok { - background-color: #009688; - } - - body.dark-mode .btn-dark { - background-color: #34495e; - } - body.dark-mode select { background-color: #2d2d31; color: white; @@ -295,6 +252,8 @@ + +
@@ -303,14 +262,14 @@ in Orca Slicer > Preferences.
-
- +