Compare commits

..
Author SHA1 Message Date
dependabot[bot] 5bf43d92b9 chore(deps): bump actions/setup-python from 6 to 7
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-08-01 16:24:21 +00:00
774 changed files with 5199 additions and 30257 deletions
+1 -9
View File
@@ -32,17 +32,9 @@ body:
attributes: attributes:
label: OrcaSlicer Version label: OrcaSlicer Version
description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`. description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`.
placeholder: e.g. 2.5.0 placeholder: e.g. 1.9.0
validations: validations:
required: true required: true
- type: input
id: working_version
attributes:
label: Regression compared to a previous version
description: Did it work in a previous version?
placeholder: e.g. 2.3.2
validations:
required: false
- type: dropdown - type: dropdown
id: os_type id: os_type
attributes: attributes:
-6
View File
@@ -1,12 +1,8 @@
name: Check profiles name: Check profiles
on: on:
pull_request: pull_request:
# release/* is included because pr-merge-bot.yml lets delegates merge into
# it, and it gates on this workflow's result. Without it a delegated merge
# into a release branch would run no profile validation at all.
branches: branches:
- main - main
- release/*
paths: paths:
- 'resources/profiles/**' - 'resources/profiles/**'
- ".github/workflows/check_profiles.yml" - ".github/workflows/check_profiles.yml"
@@ -24,8 +20,6 @@ permissions:
jobs: jobs:
check_profiles: check_profiles:
# This job name is the check-run name pr-merge-bot.yml requires before a
# delegated merge. Renaming it silently disables that gate.
name: Check profiles name: Check profiles
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
-510
View File
@@ -1,510 +0,0 @@
name: PR Merge Bot
# Merges a pull request on request from a delegated vendor profile maintainer.
# The merge is performed by this workflow's GITHUB_TOKEN, so a delegate needs no
# repository access.
#
# Commands, posted as a comment on the PR:
# /bot merge squash-merge the PR
# /bot merge --dry-run report the verdict without merging
#
# Merges only when the commenter holds a grant covering every changed path, the
# PR targets main or release/*, and CI is green on the head commit. Otherwise it
# comments naming the files that fell outside the grant.
#
# Grants come from the FOLDER_MERGERS variable in the `merge-delegation`
# environment: one per line, `account: path`, `#` comments and blank lines
# allowed. Paths may contain spaces. A vendor takes two grants, the folder and
# its sibling bundle JSON:
#
# # Acme profiles
# vendor-maintainer: resources/profiles/Acme/
# vendor-maintainer: resources/profiles/Acme.json
#
# Edit the grant list (environment scope, so admin only):
# gh variable set FOLDER_MERGERS --env merge-delegation --body "$(cat folder-mergers.txt)"
# gh variable get FOLDER_MERGERS --env merge-delegation
#
# Stop all merging without touching this file:
# gh variable set MERGE_BOT_DRY_RUN --body true
on:
issue_comment:
types:
- created
# One merge attempt per PR at a time, so two quick comments cannot race.
concurrency:
group: ${{ github.workflow }}-${{ github.event.issue.number }}
cancel-in-progress: false
jobs:
merge:
# Skips the job unless a PR comment mentions the command.
if: >-
github.repository == 'OrcaSlicer/OrcaSlicer'
&& github.event.issue.pull_request != null
&& contains(github.event.comment.body, '/bot merge')
permissions:
contents: write # pulls.merge
pull-requests: write # pulls.merge
issues: write # feedback comment + reactions
actions: write # re-dispatch build_all.yml after the merge
runs-on: ubuntu-latest
timeout-minutes: 10
# Supplies FOLDER_MERGERS. Must carry no protection rules, or every
# delegated merge would wait for a human reviewer.
environment: merge-delegation
steps:
- name: Merge PR on behalf of a folder delegate
uses: actions/github-script@v9
env:
# Read as env vars, never interpolated into the script body.
FOLDER_MERGERS: ${{ vars.FOLDER_MERGERS }}
MERGE_BOT_DRY_RUN: ${{ vars.MERGE_BOT_DRY_RUN }}
with:
script: |
function isPermissionDenied(error) {
return error && error.status === 403 && /Resource not accessible by integration/i.test(error.message || '');
}
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
const MARKER = '<!-- pr-merge-bot -->';
// No grant may reach outside this root.
const DELEGATABLE_ROOT = 'resources/profiles/';
const ALLOWED_BASE_BRANCH = /^(?:main|release\/.+)$/;
const MERGE_METHOD = 'squash';
const REQUIRED_CHECK = 'Check profiles'; // job name in check_profiles.yml
const MAX_CHANGED_FILES = 500; // policy cap, well under listFiles' 3000
const LISTFILES_CAP = 3000;
const MAX_REPORTED_FILES = 12;
const MERGEABLE_ATTEMPTS = 5;
const MERGEABLE_DELAY_MS = 2000;
const OK_CONCLUSIONS = new Set(['success', 'neutral', 'skipped']);
const REGULAR_FILE_MODES = new Set(['100644', '100755']);
// Paths refused whatever the grants say. Checked before grants, so
// delegating a new root means removing it from this list too.
const DENIED_PATTERNS = [
/^\.github\//,
/(^|\/)\.git(attributes|modules|ignore|config)$/,
/^(?:src|deps|deps_src|tests|tools|cmake|sandboxes|scripts|docs?|localization|bbl)\//,
/(^|\/)cmakelists\.txt$/,
/\.cmake$/,
/^build_[^/]*\.(?:sh|bat)$/,
/^version\.inc$/,
// Executables, including those inside the delegatable root.
/\.(?:sh|bash|bat|cmd|ps1|py|js|mjs|cjs|ts|rb|pl|php)$/
];
function parseGrants(raw) {
// GitHub login: 1-39 chars, alphanumerics with single interior hyphens.
const loginPattern = /^[A-Za-z0-9](?:[A-Za-z0-9]|-(?=[A-Za-z0-9])){0,38}$/;
const grantsByLogin = new Map();
const problems = [];
(raw || '').split(/\r?\n/).forEach((rawLine, index) => {
const line = rawLine.trim();
if (!line || line.startsWith('#')) {
return;
}
// Splits on the first colon only, so paths may contain ':' and spaces.
const separator = line.indexOf(':');
if (separator === -1) {
problems.push(`line ${index + 1}: expected \`account: path\``);
return;
}
const login = line.slice(0, separator).trim().replace(/^@/, '');
const path = line.slice(separator + 1).trim().replace(/\/+$/, '');
if (!loginPattern.test(login)) {
problems.push(`line ${index + 1}: \`${login}\` is not a valid GitHub account name`);
return;
}
if (/[\\*?\u0000-\u001f\u007f]/.test(path) || path.split('/').includes('..') || path.includes('//')) {
problems.push(`line ${index + 1}: invalid path (no globs, \`..\`, \`//\`, backslashes or control characters)`);
return;
}
// Rejects anything outside the root, and the bare root itself.
if (!path.startsWith(DELEGATABLE_ROOT) || path.length <= DELEGATABLE_ROOT.length) {
problems.push(`line ${index + 1}: \`${path}\` is not inside \`${DELEGATABLE_ROOT}\``);
return;
}
const key = login.toLowerCase();
grantsByLogin.set(key, (grantsByLogin.get(key) || []).concat(path));
});
return { grantsByLogin, problems };
}
function isDenied(path) {
if (/[\\\u0000-\u001f\u007f]/.test(path) || path.startsWith('/') || path.split('/').includes('..')) {
return true;
}
const normalized = path.normalize('NFKC').toLowerCase();
return DENIED_PATTERNS.some((pattern) => pattern.test(normalized));
}
// Byte-exact match on directory boundaries, so a grant of
// `.../Acme` covers neither `.../Acme Labs/x.json` nor `.../Acme.json`.
function isGranted(path, grants) {
return grants.some((grant) => path === grant || path.startsWith(`${grant}/`));
}
// Both endpoints of a rename; both must satisfy the grant.
function pathsFor(file) {
return [file.filename, file.previous_filename].filter(Boolean);
}
function formatList(items) {
const unique = [...new Set(items)];
const shown = unique.slice(0, MAX_REPORTED_FILES).map((item) => `- \`${item}\``);
if (unique.length > MAX_REPORTED_FILES) {
shown.push(`- …and ${unique.length - MAX_REPORTED_FILES} more`);
}
return shown.join('\n');
}
const { owner, repo } = context.repo;
const issue = context.payload.issue;
const comment = context.payload.comment;
if (!issue.pull_request) {
core.info('Ignoring comment that is not on a pull request.');
return;
}
// Ignores a comment whose sender is not its author.
if (context.payload.action !== 'created' || context.payload.sender.login !== comment.user.login) {
core.warning('Ignoring comment whose sender does not match its author.');
return;
}
if (comment.user.type !== 'User') {
core.info('Ignoring bot-authored command.');
return;
}
const commandLine = (comment.body || '')
.split('\n')
.map((line) => line.trim())
.find((line) => /^\/bot\s+merge\b/i.test(line));
if (!commandLine) {
core.info('No /bot merge command found.');
return;
}
const commenter = comment.user.login;
const { grantsByLogin, problems } = parseGrants(process.env.FOLDER_MERGERS);
const grants = grantsByLogin.get(commenter.toLowerCase()) || [];
for (const problem of problems) {
core.warning(`FOLDER_MERGERS ${problem}`);
}
// Says nothing to accounts with no grant, so it cannot be used to spam.
if (!grants.length) {
core.info(`Ignoring /bot merge from @${commenter}: not listed in FOLDER_MERGERS.`);
return;
}
// Warns instead of failing when the token cannot post feedback.
async function bestEffort(call, warning) {
try {
await call();
} catch (error) {
if (isPermissionDenied(error)) {
core.warning(warning);
return;
}
throw error;
}
}
const react = (content) => bestEffort(
() => github.rest.reactions.createForIssueComment({ owner, repo, comment_id: comment.id, content }),
`Cannot add the "${content}" reaction because the token cannot write.`);
const say = (body) => bestEffort(
() => github.rest.issues.createComment({ owner, repo, issue_number: issue.number, body: `${MARKER}\n${body}` }),
'Cannot post a comment because the token cannot write comments.');
// Declines the command: warns in the log, reacts, explains on the PR.
async function refuse(reason) {
const configNote = problems.length
? `\n\n\`FOLDER_MERGERS\` also has problems a maintainer needs to fix:\n${problems.map((problem) => `- ${problem}`).join('\n')}`
: '';
const grantsNote = `\n\n<details><summary>Your current grants</summary>\n\n${formatList(grants)}\n\n</details>`;
core.warning(`Refused /bot merge from @${commenter}: ${reason}`);
await react('-1');
await say(`@${commenter} I can't merge this PR: ${reason}${configNote}${grantsNote}`);
}
await react('eyes');
const args = (commandLine.match(/^\/bot\s+merge\s*(.*)$/i)[1] || '').trim().split(/\s+/).filter(Boolean);
const unknownArgs = args.filter((arg) => arg.toLowerCase() !== '--dry-run');
const dryRun = String(process.env.MERGE_BOT_DRY_RUN || '').toLowerCase() === 'true'
|| unknownArgs.length !== args.length;
if (unknownArgs.length) {
return refuse(
`I don't understand ${unknownArgs.map((arg) => `\`${arg}\``).join(', ')}. ` +
'Usage: `/bot merge` or `/bot merge --dry-run`.'
);
}
// Refuses everything while the grant list is malformed.
if (problems.length) {
return refuse(
'the `FOLDER_MERGERS` grant list has malformed lines, so I refuse every merge until it is fixed.'
);
}
let { data: pr } = await github.rest.pulls.get({
owner,
repo,
pull_number: issue.number
});
if (pr.merged) {
return refuse('it is already merged.');
}
if (pr.state !== 'open') {
return refuse(`its state is \`${pr.state}\`, not \`open\`.`);
}
if (pr.draft) {
return refuse('it is still a draft. Mark it ready for review first.');
}
if (!ALLOWED_BASE_BRANCH.test(pr.base.ref)) {
return refuse(`it targets \`${pr.base.ref}\`. Delegated merges are only allowed into \`main\` and \`release/*\`.`);
}
// ---- folder scope ----
const files = await github.paginate(github.rest.pulls.listFiles, {
owner,
repo,
pull_number: pr.number,
per_page: 100
});
if (!files.length) {
return refuse('it changes no files, so there is nothing to verify or merge.');
}
// Refuses when the file list is truncated or disagrees with the PR.
if (files.length >= LISTFILES_CAP || files.length !== pr.changed_files) {
return refuse(
`it reports ${pr.changed_files} changed files but the API listed ${files.length}, ` +
'so the file list is truncated and I cannot verify the folder scope. A maintainer must merge this one.'
);
}
if (pr.changed_files > MAX_CHANGED_FILES) {
return refuse(`it changes ${pr.changed_files} files; delegated merges are capped at ${MAX_CHANGED_FILES}.`);
}
const deniedFiles = [];
const outsideFiles = [];
for (const file of files) {
for (const path of pathsFor(file)) {
if (isDenied(path)) {
deniedFiles.push(path);
} else if (!isGranted(path, grants)) {
outsideFiles.push(path);
}
}
}
if (deniedFiles.length) {
core.error(`@${commenter} attempted a delegated merge touching protected paths: ${deniedFiles.join(', ')}`);
return refuse(
'it touches paths that are never delegatable, whatever the grants say ' +
`(CI, build, scripts or executable files):\n\n${formatList(deniedFiles)}\n\nA maintainer should look at this before it goes any further.`
);
}
if (outsideFiles.length) {
return refuse(
`${outsideFiles.length} changed path(s) fall outside your grants:\n\n${formatList(outsideFiles)}\n\n` +
'A vendor needs both grants: `resources/profiles/<Vendor>/` **and** `resources/profiles/<Vendor>.json`.'
);
}
// ---- file modes: rejects symlinks and submodules ----
// Fetches the delegatable subtree only; listFiles does not report modes.
const headSha = pr.head.sha;
const { data: tree } = await github.rest.git.getTree({
owner,
repo,
tree_sha: `${headSha}:${DELEGATABLE_ROOT.replace(/\/$/, '')}`,
recursive: 'true'
});
if (tree.truncated) {
return refuse('the git tree is too large to verify file modes. A maintainer must merge this one.');
}
// Entry paths are subtree-relative.
const modesByPath = new Map(tree.tree.map((entry) => [`${DELEGATABLE_ROOT}${entry.path}`, entry.mode]));
const irregularFiles = files
.filter((file) => file.status !== 'removed')
.map((file) => [file.filename, modesByPath.get(file.filename)])
.filter(([, mode]) => !REGULAR_FILE_MODES.has(mode))
.map(([path, mode]) => `${path} (mode ${mode || 'missing'})`);
if (irregularFiles.length) {
core.error(`@${commenter} attempted a delegated merge with non-regular files: ${irregularFiles.join(', ')}`);
return refuse(
`it adds symlinks, submodules or files I cannot verify:\n\n${formatList(irregularFiles)}\n\nA maintainer should look at this before it goes any further.`
);
}
// ---- mergeability: waits for GitHub to compute it ----
for (let attempt = 0; pr.mergeable === null && attempt < MERGEABLE_ATTEMPTS; attempt += 1) {
core.info(`Mergeability not computed yet; retrying in ${MERGEABLE_DELAY_MS}ms.`);
await sleep(MERGEABLE_DELAY_MS);
({ data: pr } = await github.rest.pulls.get({
owner,
repo,
pull_number: pr.number
}));
}
if (pr.mergeable === null) {
return refuse('GitHub is still working out whether it can be merged. Try `/bot merge` again in a minute.');
}
if (!pr.mergeable) {
return refuse(`it is not mergeable (\`${pr.mergeable_state}\`) - most likely a conflict with \`${pr.base.ref}\`.`);
}
// ---- CI on the head commit ----
const checkRuns = await github.paginate(github.rest.checks.listForRef, {
owner,
repo,
ref: headSha,
filter: 'latest',
per_page: 100
});
const pendingChecks = checkRuns.filter((run) => run.status !== 'completed');
const failedChecks = checkRuns.filter((run) => run.status === 'completed' && !OK_CONCLUSIONS.has(run.conclusion));
if (pendingChecks.length) {
return refuse(
`${pendingChecks.length} check(s) are still running on \`${headSha.slice(0, 7)}\`:\n\n` +
`${formatList(pendingChecks.map((run) => run.name))}\n\nRe-run \`/bot merge\` once they finish.`
);
}
if (failedChecks.length) {
return refuse(
`${failedChecks.length} check(s) are not green on \`${headSha.slice(0, 7)}\`:\n\n` +
formatList(failedChecks.map((run) => `${run.name} (${run.conclusion})`))
);
}
const { data: combined } = await github.rest.repos.getCombinedStatusForRef({
owner,
repo,
ref: headSha
});
// total_count 0 only means there are no legacy statuses.
if (combined.total_count > 0 && combined.state !== 'success') {
return refuse(
`the combined commit status on \`${headSha.slice(0, 7)}\` is \`${combined.state}\`:\n\n` +
formatList(combined.statuses.filter((status) => status.state !== 'success')
.map((status) => `${status.context} (${status.state})`))
);
}
// Requires the check to have actually run, not merely to have not failed.
const requiredCheck = checkRuns.find((run) =>
run.name === REQUIRED_CHECK &&
run.app && run.app.slug === 'github-actions' &&
run.status === 'completed' && OK_CONCLUSIONS.has(run.conclusion));
if (!requiredCheck) {
return refuse(
`the \`${REQUIRED_CHECK}\` check has not succeeded on \`${headSha.slice(0, 7)}\`. ` +
'If it never ran, a maintainer needs to approve the workflow run first.'
);
}
const scopeSummary = `${files.length} file(s), all within:\n${formatList(grants)}`;
if (dryRun) {
core.info('Dry run: every gate passed, not merging.');
await react('+1');
await say(
`@${commenter} **dry run** - this PR passes every gate and I *would* squash-merge it ` +
`at \`${headSha.slice(0, 7)}\`.\n\nVerified scope: ${scopeSummary}`
);
return;
}
// ---- re-validate, then merge ----
// An unchanged head SHA means the verified file list still holds.
const { data: fresh } = await github.rest.pulls.get({
owner,
repo,
pull_number: pr.number
});
if (fresh.head.sha !== headSha || fresh.base.ref !== pr.base.ref || fresh.state !== 'open' || fresh.merged || fresh.draft) {
return refuse('it changed while I was checking it. Nothing was merged - re-run `/bot merge`.');
}
let merged;
try {
// Pinned to the verified head: a moved head fails with 409.
({ data: merged } = await github.rest.pulls.merge({
owner,
repo,
pull_number: pr.number,
sha: headSha,
merge_method: MERGE_METHOD,
commit_title: `${pr.title} (#${pr.number})`,
commit_message:
`Merged by /bot merge on behalf of @${commenter} (id ${comment.user.id}).\n` +
`Grants: ${grants.join(', ')}\nHead: ${headSha}\n`
}));
} catch (error) {
const hint = {
403: 'the workflow token cannot write to the repository.',
405: 'GitHub refused the merge - branch protection, a required review or check, a newly added CODEOWNERS file, or squash merging being disabled.',
409: `the head commit moved after I verified it (was \`${headSha.slice(0, 7)}\`).`,
422: 'GitHub rejected the merge as invalid.'
}[error.status];
if (!hint) {
throw error;
}
await refuse(`${hint}\n\n> ${error.message}\n\nNothing was merged.`);
core.setFailed(`Delegated merge failed: ${error.status} ${error.message}`);
return;
}
core.info(`Merged #${pr.number} as ${merged.sha}.`);
await react('rocket');
await say(
`@${commenter} squash-merged into \`${pr.base.ref}\` as ${merged.sha}.\n\nVerified scope: ${scopeSummary}`
);
// ---- re-kick the build ----
// A GITHUB_TOKEN merge fires no push event, so build_all.yml would
// otherwise never see these files.
try {
await github.rest.actions.createWorkflowDispatch({
owner,
repo,
workflow_id: 'build_all.yml',
ref: pr.base.ref
});
core.info(`Dispatched build_all.yml on ${pr.base.ref}.`);
} catch (error) {
core.warning(`Merged successfully, but dispatching build_all.yml failed: ${error.message}`);
}
+1 -1
View File
@@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v6 uses: actions/setup-python@v7
with: with:
python-version: '3.12' python-version: '3.12'
-1
View File
@@ -56,7 +56,6 @@ ctest --test-dir ./tests/fff_print
- Add helper functions or utilities only when existing code cannot reasonably be reused. Avoid duplication. - Add helper functions or utilities only when existing code cannot reasonably be reused. Avoid duplication.
- Keep code concise and clear. Manually simplify AI generated bloated codes before review. - Keep code concise and clear. Manually simplify AI generated bloated codes before review.
- Include targeted tests or documented verification for behavior changes, especially in slicing logic, profiles, formats, and GUI defaults. - Include targeted tests or documented verification for behavior changes, especially in slicing logic, profiles, formats, and GUI defaults.
- For profile changes (`resources/profiles/<Vendor>/**`), check that `version` in the sibling `resources/profiles/<Vendor>.json` was bumped.
- For translation changes (`localization/i18n/**/*.po`), check that recurring terms match the [Localization glossary](https://github.com/OrcaSlicer/OrcaSlicer_WIKI/blob/main/guides/localization_glossary.md) for that language. - For translation changes (`localization/i18n/**/*.po`), check that recurring terms match the [Localization glossary](https://github.com/OrcaSlicer/OrcaSlicer_WIKI/blob/main/guides/localization_glossary.md) for that language.
## Localization & translations ## Localization & translations
-4
View File
@@ -80,12 +80,8 @@ endif()
if (DEFINED BBL_RELEASE_TO_PUBLIC) if (DEFINED BBL_RELEASE_TO_PUBLIC)
add_compile_definitions("BBL_RELEASE_TO_PUBLIC=${BBL_RELEASE_TO_PUBLIC}") add_compile_definitions("BBL_RELEASE_TO_PUBLIC=${BBL_RELEASE_TO_PUBLIC}")
if (BBL_RELEASE_TO_PUBLIC)
add_compile_definitions(WXINSPECTOR_DISABLE)
endif ()
else () else ()
add_compile_definitions("BBL_RELEASE_TO_PUBLIC=$<CONFIG:Release>") add_compile_definitions("BBL_RELEASE_TO_PUBLIC=$<CONFIG:Release>")
add_compile_definitions("$<$<CONFIG:Release>:WXINSPECTOR_DISABLE>")
endif () endif ()
find_package(Git) find_package(Git)
+1 -1
View File
@@ -152,7 +152,7 @@ echo on
set CMAKE_POLICY_VERSION_MINIMUM=3.5 set CMAKE_POLICY_VERSION_MINIMUM=3.5
if "%USE_NINJA%"=="1" ( if "%USE_NINJA%"=="1" (
cmake .. -G %CMAKE_GENERATOR% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type% cmake .. -G %CMAKE_GENERATOR% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type%
cmake --build . --config %build_type% --target all cmake --build . --config %build_type% --target ALL_BUILD
) else ( ) else (
cmake .. -G %CMAKE_GENERATOR% -A %arch% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type% cmake .. -G %CMAKE_GENERATOR% -A %arch% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type%
cmake --build . --config %build_type% --target ALL_BUILD -- -m cmake --build . --config %build_type% --target ALL_BUILD -- -m
-8
View File
@@ -52,14 +52,6 @@ ExternalProject_Add(dep_OpenSSL
CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch} CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
"--openssldir=${DESTDIR}" "--openssldir=${DESTDIR}"
"--prefix=${DESTDIR}" "--prefix=${DESTDIR}"
# OpenSSL's linux-x86_64 target sets multilib=64, so it installs to
# <prefix>/lib64 while every other dep uses <prefix>/lib. CPython's
# --with-openssl only ever emits -L<dir>/lib, so it misses the bundled
# static libs and silently links the system OpenSSL instead -- which,
# against 1.1.1w headers, leaves _ssl.so with an undefined
# SSL_get_peer_certificate (removed in OpenSSL 3.x). Pin libdir so the
# prefix stays single-layout.
"--libdir=lib"
${_cross_comp_prefix_line} ${_cross_comp_prefix_line}
no-shared no-shared
no-asm no-asm
-98
View File
@@ -1,98 +0,0 @@
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set(TBB_LINK_DEF_FILE_FLAG ${CMAKE_LINK_DEF_FILE_FLAG})
set(TBB_DEF_FILE_PREFIX win${TBB_ARCH})
# Workaround for CMake issue https://gitlab.kitware.com/cmake/cmake/issues/18317.
# TODO: consider use of CMP0092 CMake policy.
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(TBB_WARNING_LEVEL $<$<BOOL:${TBB_STRICT}>:/W4> $<$<BOOL:${TBB_STRICT}>:/WX>)
# Warning suppression C4324: structure was padded due to alignment specifier
set(TBB_WARNING_SUPPRESS /wd4324)
set(TBB_TEST_COMPILE_FLAGS /bigobj)
if (MSVC_VERSION LESS_EQUAL 1900)
# Warning suppression C4503 for VS2015 and earlier:
# decorated name length exceeded, name was truncated.
# More info can be found at
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4503
set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} /wd4503)
endif()
set(TBB_LIB_COMPILE_FLAGS -D_CRT_SECURE_NO_WARNINGS /GS)
set(TBB_COMMON_COMPILE_FLAGS /volatile:iso /FS /EHsc)
# Ignore /WX set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
tbb_remove_compile_flag(/WX)
endif()
if (WINDOWS_STORE OR TBB_WINDOWS_DRIVER)
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /D_WIN32_WINNT=0x0A00)
set(TBB_COMMON_LINK_FLAGS -NODEFAULTLIB:kernel32.lib -INCREMENTAL:NO)
set(TBB_COMMON_LINK_LIBS OneCore.lib)
endif()
if (WINDOWS_STORE)
if (NOT CMAKE_SYSTEM_VERSION EQUAL 10.0)
message(FATAL_ERROR "CMAKE_SYSTEM_VERSION must be equal to 10.0")
endif()
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /ZW /ZW:nostdlib)
# CMake define this extra lib, remove it for this build type
string(REGEX REPLACE "WindowsApp.lib" "" CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}")
if (TBB_NO_APPCONTAINER)
set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -APPCONTAINER:NO)
endif()
endif()
if (TBB_WINDOWS_DRIVER)
# Since this is universal driver disable this variable
set(CMAKE_SYSTEM_PROCESSOR "")
# CMake define list additional libs, remove it for this build type
set(CMAKE_CXX_STANDARD_LIBRARIES "")
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /D _UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__)
endif()
if (NOT DEFINED TBB_ENABLE_IPO)
if (DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
set(TBB_ENABLE_IPO ${CMAKE_INTERPROCEDURAL_OPTIMIZATION})
else()
set(TBB_ENABLE_IPO ON)
endif()
endif()
if (TBB_ENABLE_IPO)
if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
endif()
set(TBB_OPENMP_NO_LINK_FLAG TRUE)
set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
else()
set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:/GL>)
set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-LTCG> $<$<NOT:$<CONFIG:Debug>>:-INCREMENTAL:NO>)
endif()
else()
if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)" AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
endif()
set(TBB_IPO_COMPILE_FLAGS "")
set(TBB_IPO_LINK_FLAGS "")
endif()
set(TBB_OPENMP_FLAG /openmp)
+1 -5
View File
@@ -1,6 +1,4 @@
if (MSVC) if (FLATPAK AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/MSVC.cmake ./cmake/compilers/MSVC.cmake)
elseif (FLATPAK AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/GNU.cmake ./cmake/compilers/GNU.cmake) set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/GNU.cmake ./cmake/compilers/GNU.cmake)
else() else()
set(_patch_command "") set(_patch_command "")
@@ -15,8 +13,6 @@ orcaslicer_add_cmake_project(
-DTBB_BUILD_SHARED=OFF -DTBB_BUILD_SHARED=OFF
-DTBB_BUILD_TESTS=OFF -DTBB_BUILD_TESTS=OFF
-DTBB_TEST=OFF -DTBB_TEST=OFF
-DTBB_ENABLE_IPO=OFF
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_DEBUG_POSTFIX=_debug -DCMAKE_DEBUG_POSTFIX=_debug
) )
-28
View File
@@ -1,28 +0,0 @@
---
build/cmake/wxWidgetsConfig.cmake.in | 10 +++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in
index 1a83f36..70ad8a4 100644
--- a/build/cmake/wxWidgetsConfig.cmake.in
+++ b/build/cmake/wxWidgetsConfig.cmake.in
@@ -58,7 +58,16 @@ if(WIN32_MSVC_NAMING)
endif()
endif()
-include("${CMAKE_CURRENT_LIST_DIR}${wxPLATFORM_LIB_DIR}/@PROJECT_NAME@Targets.cmake")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+ if (CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(ARM64|arm64|aarch64)$")
+ set(_wx_clang_msvc_lib_dir "vc_arm64_lib")
+ else()
+ set(_wx_clang_msvc_lib_dir "vc_x64_lib")
+ endif()
+ include("${CMAKE_CURRENT_LIST_DIR}${wxPLATFORM_LIB_DIR}/${_wx_clang_msvc_lib_dir}/@PROJECT_NAME@Targets.cmake")
+else()
+ include("${CMAKE_CURRENT_LIST_DIR}${wxPLATFORM_LIB_DIR}/@PROJECT_NAME@Targets.cmake")
+endif()
macro(wx_inherit_property source dest name)
# property name without _<CONFIG>
--
2.43.0
-1
View File
@@ -28,7 +28,6 @@ orcaslicer_add_cmake_project(
GIT_SHALLOW ON GIT_SHALLOW ON
GIT_SUBMODULES 3rdparty/catch 3rdparty/pcre 3rdparty/libwebp GIT_SUBMODULES 3rdparty/catch 3rdparty/pcre 3rdparty/libwebp
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG} DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
PATCH_COMMAND git apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-Clang-CL-fix.patch
CMAKE_ARGS CMAKE_ARGS
-DwxBUILD_PRECOMP=ON -DwxBUILD_PRECOMP=ON
${_wx_toolkit} ${_wx_toolkit}
+1 -5
View File
@@ -37,11 +37,7 @@ target_include_directories(Clipper2
) )
if (WIN32) if (WIN32)
if (MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang") target_compile_options(Clipper2 PRIVATE /W4 /WX)
target_compile_options(Clipper2 PRIVATE /W4 /WX)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
target_compile_options(Clipper2 PRIVATE /W4)
endif()
else() else()
target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror) target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
target_link_libraries(Clipper2 PUBLIC -lm) target_link_libraries(Clipper2 PUBLIC -lm)
-1
View File
@@ -2856,7 +2856,6 @@ const ImWchar* ImFontAtlas::GetGlyphRangesDefault()
{ {
0x0020, 0x00FF, // Basic Latin + Latin Supplement 0x0020, 0x00FF, // Basic Latin + Latin Supplement
0x2000, 0x206F, // General Punctuation 0x2000, 0x206F, // General Punctuation
0x2103, 0x2103, // ℃ Celsius symbol
0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
0x31F0, 0x31FF, // Katakana Phonetic Extensions 0x31F0, 0x31FF, // Katakana Phonetic Extensions
0xFF00, 0xFFEF, // Half-width characters 0xFF00, 0xFFEF, // Half-width characters
-95
View File
@@ -465,57 +465,6 @@ static void stb_textedit_click(STB_TEXTEDIT_STRING *str, STB_TexteditState *stat
STB_TEXTEDIT_LAYOUTROW(&r, str, 0); STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
y = r.ymin; y = r.ymin;
} }
else
{
// In multi-line mode, clamp y to stay within the text vertical bounds.
// This lets the click still land at a valid location if the mouse is slightly
// above or below the text.
StbTexteditRow r;
int n = STB_TEXTEDIT_STRINGLEN(str);
int i = 0;
float base_y = 0, y_min, y_max;
// Get the first row to establish y_min and start the iteration
STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
if (r.num_chars <= 0)
{
state->cursor = 0;
state->select_start = state->cursor;
state->select_end = state->cursor;
state->has_preferred_x = 0;
return;
}
y_min = r.ymin;
y_max = base_y + r.ymax;
i = r.num_chars;
base_y += r.baseline_y_delta;
// Walk the remaining rows to find the bottom of the last row
while (i < n)
{
STB_TEXTEDIT_LAYOUTROW(&r, str, i);
if (r.num_chars <= 0)
break;
y_max = base_y + r.ymax;
i += r.num_chars;
base_y += r.baseline_y_delta;
}
// If the text ends with a newline, account for the empty trailing line
// so the cursor can be placed on it
if (n > 0 && STB_TEXTEDIT_GETCHAR(str, n - 1) == STB_TEXTEDIT_NEWLINE)
{
STB_TEXTEDIT_LAYOUTROW(&r, str, n);
y_max = base_y + r.ymax;
}
// Subtract half the last line height to avoid rounding issues when the mouse
// is just barely below the last line (keep cursor on the last line, not after the text)
y_max -= (r.ymax - r.ymin) * 0.5f;
if (y < y_min) y = y_min;
if (y > y_max) y = y_max;
}
state->cursor = stb_text_locate_coord(str, x, y); state->cursor = stb_text_locate_coord(str, x, y);
state->select_start = state->cursor; state->select_start = state->cursor;
@@ -536,50 +485,6 @@ static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state
STB_TEXTEDIT_LAYOUTROW(&r, str, 0); STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
y = r.ymin; y = r.ymin;
} }
else
{
// In multi-line mode, clamp y to stay within the text vertical bounds.
// This lets the drag keep working if the mouse goes off the top or bottom of the text.
StbTexteditRow r;
int n = STB_TEXTEDIT_STRINGLEN(str);
int i = 0;
float base_y = 0, y_min, y_max;
// Get the first row to establish y_min and start the iteration
STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
if (r.num_chars <= 0)
return;
y_min = r.ymin;
y_max = base_y + r.ymax;
i = r.num_chars;
base_y += r.baseline_y_delta;
// Walk the remaining rows to find the bottom of the last row
while (i < n)
{
STB_TEXTEDIT_LAYOUTROW(&r, str, i);
if (r.num_chars <= 0)
break;
y_max = base_y + r.ymax;
i += r.num_chars;
base_y += r.baseline_y_delta;
}
// If the text ends with a newline, account for the empty trailing line
// so the cursor can be placed on it
if (n > 0 && STB_TEXTEDIT_GETCHAR(str, n - 1) == STB_TEXTEDIT_NEWLINE)
{
STB_TEXTEDIT_LAYOUTROW(&r, str, n);
y_max = base_y + r.ymax;
}
// Subtract half the last line height to avoid rounding issues when the mouse
// is just barely below the last line (keep cursor on the last line, not after the text)
y_max -= (r.ymax - r.ymin) * 0.5f;
if (y < y_min) y = y_min;
if (y > y_max) y = y_max;
}
if (state->select_start == state->select_end) if (state->select_start == state->select_end)
state->select_start = state->cursor; state->select_start = state->cursor;
-2
View File
@@ -11,8 +11,6 @@ add_library(miniz_static STATIC
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE) target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE)
elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
target_compile_options(miniz_static PRIVATE /clang:-Wno-error=incompatible-pointer-types)
endif() endif()
target_link_libraries(miniz INTERFACE miniz_static) target_link_libraries(miniz INTERFACE miniz_static)
+4 -4
View File
@@ -7781,19 +7781,19 @@ msgid "Replaced with 3D files from directory:\n"
msgstr "" msgstr ""
#, possible-boost-format #, possible-boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "" msgstr ""
#, possible-boost-format #, possible-boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "" msgstr ""
#, possible-boost-format #, possible-boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "" msgstr ""
#, possible-boost-format #, possible-boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "" msgstr ""
msgid "Replaced volumes" msgid "Replaced volumes"
+12 -12
View File
@@ -8361,21 +8361,21 @@ msgstr "No s'ha seleccionat el directori per a la substitució"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Substituït amb fitxers 3D del directori:\n" msgstr "Substituït amb fitxers 3D del directori:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Omès %s: mateix fitxer.\n" msgstr "✖ Omès %1%: mateix fitxer.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Omès %s: el fitxer no existeix.\n" msgstr "✖ Omès %1%: el fitxer no existeix.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Omès %s: la substitució ha fallat.\n" msgstr "✖ Omès %1%: la substitució ha fallat.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Substituït %s.\n" msgstr "✔ Substituït %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Volums substituïts" msgstr "Volums substituïts"
+12 -12
View File
@@ -8320,21 +8320,21 @@ msgstr "Nebyla vybrána složka pro nahrazení"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Nahrazeno 3D soubory ze složky:\n" msgstr "Nahrazeno 3D soubory ze složky:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Přeskočeno %s: stejný soubor.\n" msgstr "✖ Přeskočeno %1%: stejný soubor.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Přeskočeno %s: soubor neexistuje.\n" msgstr "✖ Přeskočeno %1%: soubor neexistuje.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Přeskočeno %s: nahrazení se nezdařilo.\n" msgstr "✖ Přeskočeno %1%: nahrazení se nezdařilo.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Nahrazeno %s.\n" msgstr "✔ Nahrazeno %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Nahrazené objemy" msgstr "Nahrazené objemy"
+12 -12
View File
@@ -8191,21 +8191,21 @@ msgstr "Verzeichnis um daraus zu ersetzen wurde nicht ausgewählt"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Ersetzt durch 3D-Dateien aus Verzeichnis:\n" msgstr "Ersetzt durch 3D-Dateien aus Verzeichnis:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Übersprungen %s: gleiche Datei.\n" msgstr "✖ Übersprungen %1%: gleiche Datei.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Übersprungen %s: Datei existiert nicht.\n" msgstr "✖ Übersprungen %1%: Datei existiert nicht.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Übersprungen %s: Ersetzen fehlgeschlagen.\n" msgstr "✖ Übersprungen %1%: Ersetzen fehlgeschlagen.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Ersetzt %s.\n" msgstr "✔ Ersetzt %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Ersetzte Volumen" msgstr "Ersetzte Volumen"
+8 -8
View File
@@ -7776,20 +7776,20 @@ msgstr ""
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "" msgstr ""
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "" msgstr ""
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "" msgstr ""
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "" msgstr ""
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "" msgstr ""
msgid "Replaced volumes" msgid "Replaced volumes"
+12 -12
View File
@@ -7997,21 +7997,21 @@ msgstr "No se seleccionó el directorio para el reemplazo"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Reemplazado con archivos 3D desde el directorio:\n" msgstr "Reemplazado con archivos 3D desde el directorio:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Omitido %s: mismo archivo.\n" msgstr "✖ Omitido %1%: mismo archivo.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Omitido %s: el archivo no existe.\n" msgstr "✖ Omitido %1%: el archivo no existe.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Omitido %s: fallo al reemplazar.\n" msgstr "✖ Omitido %1%: fallo al reemplazar.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Reemplazado %s.\n" msgstr "✔ Reemplazado %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Volúmenes reemplazados" msgstr "Volúmenes reemplazados"
+26 -26
View File
@@ -8064,21 +8064,21 @@ msgstr "Ez da ordezkatzeko direktoriorik hautatu"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Direktorio honetako 3D fitxategiekin ordeztuta:\n" msgstr "Direktorio honetako 3D fitxategiekin ordeztuta:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ %s saltatu da: fitxategi bera.\n" msgstr "✖ %1% saltatu da: fitxategi bera.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ %s saltatu da: fitxategia ez da existitzen.\n" msgstr "✖ %1% saltatu da: fitxategia ez da existitzen.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ %s saltatu da: ezin izan da ordeztu.\n" msgstr "✖ %1% saltatu da: ezin izan da ordeztu.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ %s ordezkatu da.\n" msgstr "✔ %1% ordezkatu da.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Ordeztutako bolumenak" msgstr "Ordeztutako bolumenak"
@@ -12013,11 +12013,11 @@ msgstr "Purgatze-dorreak euskarriak objektuaren geruza-altuera bera izatea eskat
# AI Translated # AI Translated
msgid "For Organic supports, two walls are supported only with the Hollow/Default base pattern." msgid "For Organic supports, two walls are supported only with the Hollow/Default base pattern."
msgstr "Euskarri organikoetan, bi horma Hutsa/Lehenetsia oinarri-patroiarekin soilik onartzen dira." msgstr "Euskarri organikoetan, bi horma Hollow/Default oinarri-patroiarekin soilik onartzen dira."
# AI Translated # AI Translated
msgid "The Lightning base pattern is not supported by this support type; Rectilinear will be used instead." msgid "The Lightning base pattern is not supported by this support type; Rectilinear will be used instead."
msgstr "Tximista oinarri-patroia ez du euskarri mota honek onartzen; Lerrozuzena erabiliko da horren ordez." msgstr "Lightning oinarri-patroia ez du euskarri mota honek onartzen; Rectilinear erabiliko da horren ordez."
msgid "Organic support tree tip diameter must not be smaller than support material extrusion width." msgid "Organic support tree tip diameter must not be smaller than support material extrusion width."
msgstr "Euskarri organikoaren zuhaitz-muturraren diametroak ezin du izan euskarri-materialaren estrusio-zabalera baino txikiagoa." msgstr "Euskarri organikoaren zuhaitz-muturraren diametroak ezin du izan euskarri-materialaren estrusio-zabalera baino txikiagoa."
@@ -12030,7 +12030,7 @@ msgstr "Euskarri organikoaren adar-diametroak ezin du izan euskarri-zuhaitzaren
# AI Translated # AI Translated
msgid "The Hollow base pattern is not supported by this support type; Rectilinear will be used instead." msgid "The Hollow base pattern is not supported by this support type; Rectilinear will be used instead."
msgstr "Hutsa oinarri-patroia ez du euskarri mota honek onartzen; Lerrozuzena erabiliko da horren ordez." msgstr "Hollow oinarri-patroia ez du euskarri mota honek onartzen; Rectilinear erabiliko da horren ordez."
msgid "Support enforcers are used but support is not enabled. Please enable support." msgid "Support enforcers are used but support is not enabled. Please enable support."
msgstr "Euskarri-behartzaileak erabiltzen dira, baina euskarria ez dago gaituta. Gaitu euskarriak." msgstr "Euskarri-behartzaileak erabiltzen dira, baina euskarria ez dago gaituta. Gaitu euskarriak."
@@ -13252,7 +13252,7 @@ msgstr "Moderatua"
# AI Translated # AI Translated
msgid "Top surface pattern" msgid "Top surface pattern"
msgstr "Goiko gainazaleko patroia" msgstr "Goiko gainazalaren patroia"
# AI Translated # AI Translated
msgid "This is the line pattern for top surface infill." msgid "This is the line pattern for top surface infill."
@@ -13265,13 +13265,13 @@ msgid "Monotonic line"
msgstr "Lerro monotonikoa" msgstr "Lerro monotonikoa"
msgid "Rectilinear" msgid "Rectilinear"
msgstr "Lerrozuzena" msgstr "Rectilinear"
msgid "Aligned Rectilinear" msgid "Aligned Rectilinear"
msgstr "Lerrozuzen lerrokatua" msgstr "Lerrozuzen lerrokatua"
msgid "Concentric" msgid "Concentric"
msgstr "Kontzentrikoa" msgstr "Concentric"
msgid "Hilbert Curve" msgid "Hilbert Curve"
msgstr "Hilbert kurba" msgstr "Hilbert kurba"
@@ -13337,7 +13337,7 @@ msgstr "Kanporantz"
# AI Translated # AI Translated
msgid "Bottom surface pattern" msgid "Bottom surface pattern"
msgstr "Beheko gainazaleko patroia" msgstr "Beheko gainazalaren patroia"
# AI Translated # AI Translated
msgid "This is the line pattern of bottom surface infill, not including bridge infill." msgid "This is the line pattern of bottom surface infill, not including bridge infill."
@@ -13362,7 +13362,7 @@ msgid ""
"Outward starts at the center of the surface, so any excess material is pushed towards the edge where it is least visible. Inward starts at the edge and ends with the tight curves at the center.\n" "Outward starts at the center of the surface, so any excess material is pushed towards the edge where it is least visible. Inward starts at the edge and ends with the tight curves at the center.\n"
"Default uses shortest-path ordering, which may run in either direction." "Default uses shortest-path ordering, which may run in either direction."
msgstr "" msgstr ""
"Goiko gainazalak betetzen diren noranzkoa zentroan oinarritutako patroia erabiltzen denean (Kontzentrikoa, Arkimedesen kordak, Oktagrama-kiribila).\n" "Gaineko gainazalak betetzen diren noranzkoa zentroan oinarritutako patroia erabiltzen denean (Konzentrikoa, Arkimedeen Akordeak, Oktograma Espirala).\n"
"Kanporanzkoa erdialdean hasten da, beraz, gehiegizko materiala gutxien ikusten den ertzera bultzatzen da. Barruranzkoa ertzean hasten da eta erdian kurba estuekin amaitzen da.\n" "Kanporanzkoa erdialdean hasten da, beraz, gehiegizko materiala gutxien ikusten den ertzera bultzatzen da. Barruranzkoa ertzean hasten da eta erdian kurba estuekin amaitzen da.\n"
"Lehenetsiak bide laburreneko ordena erabiltzen du, zeina norabide batean zein bestean ibil daitekeen." "Lehenetsiak bide laburreneko ordena erabiltzen du, zeina norabide batean zein bestean ibil daitekeen."
@@ -13375,7 +13375,7 @@ msgid ""
"Inward starts each surface with the wider outer curves, which improves first layer adhesion on build plates where the tight curves at the center may not stick. Outward starts at the center, pushing any excess material towards the edge.\n" "Inward starts each surface with the wider outer curves, which improves first layer adhesion on build plates where the tight curves at the center may not stick. Outward starts at the center, pushing any excess material towards the edge.\n"
"Default uses shortest-path ordering, which may run in either direction." "Default uses shortest-path ordering, which may run in either direction."
msgstr "" msgstr ""
"Beheko gainazalak betetzen diren noranzkoa zentroan oinarritutako patroia erabiltzen denean (Kontzentrikoa, Arkimedesen kordak, Oktagrama-kiribila).\n" "Beheko gainazalak betetzen diren noranzkoa zentroan oinarritutako patroia erabiltzen denean (Konzentrikoa, Arkimedeen Akordeak, Oktograma Espirala).\n"
"Barruranzkoa hasten da gainazal bakoitza kanpoko kurba zabalagoekin, eta horrek lehen geruzaren atxikimendua hobetzen du erdiko kurba estuak itsatsi ez daitezkeen inprimatze-plaketan. Kanporanzkoa erdialdean hasten da, gehiegizko materiala ertzera bultzatuz.\n" "Barruranzkoa hasten da gainazal bakoitza kanpoko kurba zabalagoekin, eta horrek lehen geruzaren atxikimendua hobetzen du erdiko kurba estuak itsatsi ez daitezkeen inprimatze-plaketan. Kanporanzkoa erdialdean hasten da, gehiegizko materiala ertzera bultzatuz.\n"
"Lehenetsiak bide laburreneko ordena erabiltzen du, zeina norabide batean zein bestean ibil daitekeen." "Lehenetsiak bide laburreneko ordena erabiltzen du, zeina norabide batean zein bestean ibil daitekeen."
@@ -16431,9 +16431,9 @@ msgid ""
msgstr "" msgstr ""
"Euskarriaren lerro-patroia.\n" "Euskarriaren lerro-patroia.\n"
"\n" "\n"
"Zuhaitz-euskarrien aukera lehenetsia Hutsa da, hau da, ez dago oinarri-patroirik. Beste euskarri motetarako, aukera lehenetsia patroi lerrozuzena da.\n" "Zuhaitz-euskarrien aukera lehenetsia Hutsa da, hau da, ez dago oinarri-patroirik. Beste euskarri motetarako, aukera lehenetsia patroi zuzenekoa da.\n"
"\n" "\n"
"OHARRA: Euskarri organikoetan, bi hormak Hutsa/Lehenetsia oinarri-patroiarekin bakarrik onartzen dira. Tximista oinarri-patroia Zuhaitz mehea/Indartsua/Hibridoa euskarriek bakarrik onartzen dute. Beste euskarri motetarako, Lerrozuzena erabiliko da Tximistaren ordez." "OHARRA: Euskarri organikoetan, bi hormak Hutsa/Lehenetsia oinarri-patroiarekin bakarrik onartzen dira. Tximistetan oinarritutako patroia Zuhaitz mehea/Indartsua/Hibridoa euskarriek bakarrik onartzen dute. Beste euskarri motetarako, Zuzenekoa erabiliko da Tximistenaren ordez."
msgid "Rectilinear grid" msgid "Rectilinear grid"
msgstr "Sare lerrozuzena" msgstr "Sare lerrozuzena"
@@ -16713,7 +16713,7 @@ msgid ""
" - Each Model: centers the pattern on each connected body. Parts that touch or overlap share one center; parts detached from the rest each get their own.\n" " - Each Model: centers the pattern on each connected body. Parts that touch or overlap share one center; parts detached from the rest each get their own.\n"
" - Each Assembly: uses a single shared center for the whole object or assembly." " - Each Assembly: uses a single shared center for the whole object or assembly."
msgstr "" msgstr ""
"Goiko eta beheko gainazaleko patroi zentratuen (Arkimedesen kordak, Oktagrama-kiribila) zentroa non kokatzen den aukeratzen du.\n" "Goiko eta beheko gainazaleko patroi zentratuen (Arkimedesen kordak, Oktagrama-espirala) zentroa non kokatzen den aukeratzen du.\n"
" - Gainazal bakoitza: patroia gainazal-eskualde bakoitzean zentratzen du, uharte bakoitza bere kabuz simetrikoa izan dadin.\n" " - Gainazal bakoitza: patroia gainazal-eskualde bakoitzean zentratzen du, uharte bakoitza bere kabuz simetrikoa izan dadin.\n"
" - Modelo bakoitza: patroia konektatutako gorputz bakoitzean zentratzen du. Elkar ukitzen edo gainjartzen diren piezek zentro bera partekatzen dute; gainerakoetatik bereizitako piezek beren zentroa dute.\n" " - Modelo bakoitza: patroia konektatutako gorputz bakoitzean zentratzen du. Elkar ukitzen edo gainjartzen diren piezek zentro bera partekatzen dute; gainerakoetatik bereizitako piezek beren zentroa dute.\n"
" - Muntaketa bakoitza: zentro partekatu bakarra erabiltzen du objektu edo muntaketa osorako." " - Muntaketa bakoitza: zentro partekatu bakarra erabiltzen du objektu edo muntaketa osorako."
@@ -17144,7 +17144,7 @@ msgid "Detect narrow internal solid infills"
msgstr "Detektatu barruko betegarri solido estua" msgstr "Detektatu barruko betegarri solido estua"
msgid "This option will auto-detect narrow internal solid infill areas. If enabled, the concentric pattern will be used for the area to speed up printing. Otherwise, the rectilinear pattern will be used by default." msgid "This option will auto-detect narrow internal solid infill areas. If enabled, the concentric pattern will be used for the area to speed up printing. Otherwise, the rectilinear pattern will be used by default."
msgstr "Aukera honek barruko betegarri solido estuko eremuak automatikoki detektatuko ditu. Gaituta badago, eremu horretan patroi kontzentrikoa erabiliko da inprimaketa azkartzeko. Bestela, patroi lerrozuzena erabiliko da lehenespenez." msgstr "Aukera honek barruko betegarri solido estuko eremuak automatikoki detektatuko ditu. Gaituta badago, eremu horretan patroi zentrokidea erabiliko da inprimaketa azkartzeko. Bestela, patroi lerrozuzena erabiliko da lehenespenez."
msgid "invalid value " msgid "invalid value "
msgstr "balio baliogabea " msgstr "balio baliogabea "
@@ -18703,7 +18703,7 @@ msgstr "YOLO (perfekzionista)"
# AI Translated # AI Translated
msgid "Top Surface Pattern" msgid "Top Surface Pattern"
msgstr "Goiko gainazaleko patroia" msgstr "Goiko gainazalaren patroia"
msgid "Choose a slot for the selected color" msgid "Choose a slot for the selected color"
msgstr "Aukeratu zirrikitu bat hautatutako kolorearentzat" msgstr "Aukeratu zirrikitu bat hautatutako kolorearentzat"
+17 -17
View File
@@ -8120,21 +8120,21 @@ msgstr "Le répertoire pour le remplacement n'a pas été sélectionné"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Remplacé par des fichiers 3D depuis le répertoire :\n" msgstr "Remplacé par des fichiers 3D depuis le répertoire :\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Ignoré %s : même fichier.\n" msgstr "✖ Ignoré %1% : même fichier.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Ignoré %s : le fichier n'existe pas.\n" msgstr "✖ Ignoré %1% : le fichier n'existe pas.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Ignoré %s : échec du remplacement.\n" msgstr "✖ Ignoré %1% : échec du remplacement.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Remplacé %s.\n" msgstr "✔ Remplacé %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Volumes remplacés" msgstr "Volumes remplacés"
@@ -9283,22 +9283,22 @@ msgid "DEV host: api-dev.bambu-lab.com/v1"
msgstr "Hôte DEV : api-dev.bambu-lab.com/v1" msgstr "Hôte DEV : api-dev.bambu-lab.com/v1"
msgid "QA host: api-qa.bambu-lab.com/v1" msgid "QA host: api-qa.bambu-lab.com/v1"
msgstr "Hôte QA : api-qa.bambu-lab.com/v1" msgstr "Hôte AQ : api-qa.bambu-lab.com/v1"
msgid "PRE host: api-pre.bambu-lab.com/v1" msgid "PRE host: api-pre.bambu-lab.com/v1"
msgstr "Hôte PRE : api-pre.bambu-lab.com/v1" msgstr "Hébergeur PRE : api-pre.bambu-lab.com/v1"
msgid "Product host" msgid "Product host"
msgstr "Hôte du produit" msgstr "Hôte du produit"
msgid "Debug save button" msgid "Debug save button"
msgstr "Bouton d'enregistrement de debugage" msgstr "bouton d'enregistrement de débogage"
msgid "Save debug settings" msgid "Save debug settings"
msgstr "Enregistrer les paramètres de debugage" msgstr "enregistrer les paramètres de débogage"
msgid "Debug settings have been saved successfully!" msgid "Debug settings have been saved successfully!"
msgstr "Les paramètres de debug ont été enregistrés avec succès !" msgstr "Les paramètres DEBUG ont été enregistrés avec succès !"
msgid "Cloud environment switched; please login again!" msgid "Cloud environment switched; please login again!"
msgstr "L'environnement Cloud a changé, veuillez vous reconnecter !" msgstr "L'environnement Cloud a changé, veuillez vous reconnecter !"
+12 -12
View File
@@ -8244,21 +8244,21 @@ msgstr "A cseréhez nem lett mappa kiválasztva"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Cserélve a mappából származó 3D fájlokra:\n" msgstr "Cserélve a mappából származó 3D fájlokra:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ %s kihagyva: azonos fájl.\n" msgstr "✖ Kihagyva %1%: azonos fájl.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ %s kihagyva: a fájl nem létezik.\n" msgstr "✖ Kihagyva %1%: a fájl nem létezik.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ %s kihagyva: a csere sikertelen.\n" msgstr "✖ Kihagyva %1%: a csere sikertelen.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔%s lecserélve.\n" msgstr "✔ Lecserélve: %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Lecserélt térfogatok" msgstr "Lecserélt térfogatok"
+12 -12
View File
@@ -8244,21 +8244,21 @@ msgstr "La directory per la sostituzione non è stata selezionata"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Sostituito con file 3D dalla directory:\n" msgstr "Sostituito con file 3D dalla directory:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Saltato %s: stesso file.\n" msgstr "✖ Saltato %1%: stesso file.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Saltato %s: il file non esiste.\n" msgstr "✖ Saltato %1%: il file non esiste.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Saltato %s: sostituzione fallita.\n" msgstr "✖ Saltato %1%: sostituzione fallita.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Sostituito %s.\n" msgstr "✔ Sostituito %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Volumi sostituiti" msgstr "Volumi sostituiti"
+12 -12
View File
@@ -8262,21 +8262,21 @@ msgstr "置換用のディレクトリが選択されていません"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "ディレクトリの3Dファイルで置換しました:\n" msgstr "ディレクトリの3Dファイルで置換しました:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ スキップ %s: 同一ファイル。\n" msgstr "✖ スキップ %1%: 同一ファイル。\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ スキップ %s: ファイルが存在しません。\n" msgstr "✖ スキップ %1%: ファイルが存在しません。\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ スキップ %s: 置換に失敗しました。\n" msgstr "✖ スキップ %1%: 置換に失敗しました。\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ 置換しました %s。\n" msgstr "✔ 置換しました %1%。\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "置換されたボリューム" msgstr "置換されたボリューム"
+12 -12
View File
@@ -8288,24 +8288,24 @@ msgid "Replaced with 3D files from directory:\n"
msgstr "다음 디렉터리의 3D 파일로 교체했습니다:\n" msgstr "다음 디렉터리의 3D 파일로 교체했습니다:\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ 건너뜀 %s: 동일한 파일입니다.\n" msgstr "✖ 건너뜀 %1%: 동일한 파일입니다.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ 건너뜀 %s: 파일이 존재하지 않습니다.\n" msgstr "✖ 건너뜀 %1%: 파일이 존재하지 않습니다.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ 건너뜀 %s: 교체하지 못했습니다.\n" msgstr "✖ 건너뜀 %1%: 교체하지 못했습니다.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ %s을(를) 교체했습니다.\n" msgstr "✔ %1%을(를) 교체했습니다.\n"
# AI Translated # AI Translated
msgid "Replaced volumes" msgid "Replaced volumes"
+12 -12
View File
@@ -8239,21 +8239,21 @@ msgstr ""
"Pakeista 3D failais iš katalogo:\n" "Pakeista 3D failais iš katalogo:\n"
"\n" "\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Praleistas %s: tas pats failas.\n" msgstr "✖ Praleistas %1%: tas pats failas.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Praleistas %s: failas neegzistuoja.\n" msgstr "✖ Praleistas %1%: failas neegzistuoja.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Praleistas %s: nepavyko pakeisti.\n" msgstr "✖ Praleistas %1%: nepavyko pakeisti.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Pakeistas %s.\n" msgstr "✔ Pakeistas %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Pakeisti tūriai" msgstr "Pakeisti tūriai"
+12 -12
View File
@@ -8999,24 +8999,24 @@ msgid "Replaced with 3D files from directory:\n"
msgstr "Vervangen door 3D-bestanden uit de map:\n" msgstr "Vervangen door 3D-bestanden uit de map:\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Overgeslagen %s: hetzelfde bestand.\n" msgstr "✖ Overgeslagen %1%: hetzelfde bestand.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Overgeslagen %s: bestand bestaat niet.\n" msgstr "✖ Overgeslagen %1%: bestand bestaat niet.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Overgeslagen %s: vervangen is mislukt.\n" msgstr "✖ Overgeslagen %1%: vervangen is mislukt.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Vervangen %s.\n" msgstr "✔ Vervangen %1%.\n"
# AI Translated # AI Translated
msgid "Replaced volumes" msgid "Replaced volumes"
+12 -12
View File
@@ -8444,24 +8444,24 @@ msgid "Replaced with 3D files from directory:\n"
msgstr "Zastąpiono plikami 3D z katalogu:\n" msgstr "Zastąpiono plikami 3D z katalogu:\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Pominięto %s: ten sam plik.\n" msgstr "✖ Pominięto %1%: ten sam plik.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Pominięto %s: plik nie istnieje.\n" msgstr "✖ Pominięto %1%: plik nie istnieje.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Pominięto %s: nie udało się zastąpić.\n" msgstr "✖ Pominięto %1%: nie udało się zastąpić.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Zastąpiono %s.\n" msgstr "✔ Zastąpiono %1%.\n"
# AI Translated # AI Translated
msgid "Replaced volumes" msgid "Replaced volumes"
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+12 -12
View File
@@ -9088,24 +9088,24 @@ msgid "Replaced with 3D files from directory:\n"
msgstr "Ersatt med 3D-filer från mappen:\n" msgstr "Ersatt med 3D-filer från mappen:\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Hoppade över %s: samma fil.\n" msgstr "✖ Hoppade över %1%: samma fil.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Hoppade över %s: filen finns inte.\n" msgstr "✖ Hoppade över %1%: filen finns inte.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Hoppade över %s: det gick inte att ersätta.\n" msgstr "✖ Hoppade över %1%: det gick inte att ersätta.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Ersatte %s.\n" msgstr "✔ Ersatte %1%.\n"
# AI Translated # AI Translated
msgid "Replaced volumes" msgid "Replaced volumes"
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+12 -12
View File
@@ -8306,21 +8306,21 @@ msgstr "Каталог для заміни не вибрано"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "Замінено 3D-файлами з каталогу:\n" msgstr "Замінено 3D-файлами з каталогу:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Пропущено %s: той самий файл.\n" msgstr "✖ Пропущено %1%: той самий файл.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Пропущено %s: файл не існує.\n" msgstr "✖ Пропущено %1%: файл не існує.\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Пропущено %s: не вдалося замінити.\n" msgstr "✖ Пропущено %1%: не вдалося замінити.\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Замінено %s.\n" msgstr "✔ Замінено %1%.\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "Замінені обʼєми" msgstr "Замінені обʼєми"
+12 -12
View File
@@ -8721,24 +8721,24 @@ msgid "Replaced with 3D files from directory:\n"
msgstr "Đã thay thế bằng file 3D từ thư mục:\n" msgstr "Đã thay thế bằng file 3D từ thư mục:\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ Đã bỏ qua %s: cùng một file.\n" msgstr "✖ Đã bỏ qua %1%: cùng một file.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ Đã bỏ qua %s: file không tồn tại.\n" msgstr "✖ Đã bỏ qua %1%: file không tồn tại.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ Đã bỏ qua %s: thay thế thất bại.\n" msgstr "✖ Đã bỏ qua %1%: thay thế thất bại.\n"
# AI Translated # AI Translated
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ Đã thay thế %s.\n" msgstr "✔ Đã thay thế %1%.\n"
# AI Translated # AI Translated
msgid "Replaced volumes" msgid "Replaced volumes"
+12 -12
View File
@@ -8028,21 +8028,21 @@ msgstr "未选择替换目录"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "替换为目录中的 3D 文件:\n" msgstr "替换为目录中的 3D 文件:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ 跳过 %s:同一文件。\n" msgstr "✖ 跳过 %1%:同一文件。\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ 跳过%s:文件不存在。\n" msgstr "✖ 跳过%1%:文件不存在。\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ 跳过%s:替换失败。\n" msgstr "✖ 跳过%1%:替换失败。\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ 替换了 %s。\n" msgstr "✔ 替换了 %1%。\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "替换的卷" msgstr "替换的卷"
+12 -12
View File
@@ -8193,21 +8193,21 @@ msgstr "未選擇替換的目錄"
msgid "Replaced with 3D files from directory:\n" msgid "Replaced with 3D files from directory:\n"
msgstr "已從目錄替換為 3D 檔案:\n" msgstr "已從目錄替換為 3D 檔案:\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: same file.\n" msgid "✖ Skipped %1%: same file.\n"
msgstr "✖ 已跳過 %s:相同檔案。\n" msgstr "✖ 已跳過 %1%:相同檔案。\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: file does not exist.\n" msgid "✖ Skipped %1%: file does not exist.\n"
msgstr "✖ 已跳過 %s:檔案不存在。\n" msgstr "✖ 已跳過 %1%:檔案不存在。\n"
#, c-format #, boost-format
msgid "✖ Skipped %s: failed to replace.\n" msgid "✖ Skipped %1%: failed to replace.\n"
msgstr "✖ 已跳過 %s:無法替換。\n" msgstr "✖ 已跳過 %1%:無法替換。\n"
#, c-format #, boost-format
msgid "✔ Replaced %s.\n" msgid "✔ Replaced %1%.\n"
msgstr "✔ 已替換 %s。\n" msgstr "✔ 已替換 %1%。\n"
msgid "Replaced volumes" msgid "Replaced volumes"
msgstr "已替換體積" msgstr "已替換體積"
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "Creality", "name": "Creality",
"version": "02.03.02.76", "version": "02.03.02.75",
"force_update": "0", "force_update": "0",
"description": "Creality configurations", "description": "Creality configurations",
"machine_model_list": [ "machine_model_list": [
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -38,7 +38,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -38,7 +38,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -128,7 +128,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -124,7 +124,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -38,7 +38,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -128,7 +128,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -128,7 +128,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -38,7 +38,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -38,7 +38,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -39,7 +39,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "1", "enable_prime_tower": "1",
"enable_support": "0", "enable_support": "0",
@@ -126,7 +126,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -38,7 +38,7 @@
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.15", "elefant_foot_compensation": "0.15",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enable_prime_tower": "0", "enable_prime_tower": "0",
"enable_support": "0", "enable_support": "0",
@@ -126,7 +126,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -126,7 +126,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -126,7 +126,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -126,7 +126,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
@@ -126,7 +126,7 @@
"detect_narrow_internal_solid_infill": "1", "detect_narrow_internal_solid_infill": "1",
"dont_filter_internal_bridges": "disabled", "dont_filter_internal_bridges": "disabled",
"elefant_foot_compensation_layers": "1", "elefant_foot_compensation_layers": "1",
"enable_arc_fitting": "0", "enable_arc_fitting": "1",
"enable_overhang_speed": "1", "enable_overhang_speed": "1",
"enforce_support_layers": "0", "enforce_support_layers": "0",
"ensure_vertical_shell_thickness": "ensure_all", "ensure_vertical_shell_thickness": "ensure_all",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "Custom Printer", "name": "Custom Printer",
"version": "02.04.00.03", "version": "02.04.00.01",
"force_update": "0", "force_update": "0",
"description": "My configurations", "description": "My configurations",
"machine_model_list": [ "machine_model_list": [
@@ -24,6 +24,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -24,6 +24,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -24,6 +24,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -24,6 +24,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -25,6 +25,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -25,6 +25,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -25,6 +25,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -25,6 +25,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -25,6 +25,12 @@
"filament_loading_speed_start": [ "filament_loading_speed_start": [
"50" "50"
], ],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_flow": [
"40"
],
"filament_stamping_distance": [ "filament_stamping_distance": [
"45" "45"
], ],
@@ -116,7 +116,7 @@
"deretraction_speed": [ "deretraction_speed": [
"30" "30"
], ],
"z_hop_types": "Slope Lift", "z_hop_types": "Normal Lift",
"silent_mode": "0", "silent_mode": "0",
"single_extruder_multi_material": "1", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
@@ -118,7 +118,7 @@
"deretraction_speed": [ "deretraction_speed": [
"30" "30"
], ],
"z_hop_types": "Slope Lift", "z_hop_types": "Normal Lift",
"silent_mode": "0", "silent_mode": "0",
"single_extruder_multi_material": "1", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
@@ -116,7 +116,7 @@
"deretraction_speed": [ "deretraction_speed": [
"30" "30"
], ],
"z_hop_types": "Slope Lift", "z_hop_types": "Normal Lift",
"silent_mode": "0", "silent_mode": "0",
"single_extruder_multi_material": "1", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
@@ -6,7 +6,6 @@
"instantiation": "false", "instantiation": "false",
"gcode_flavor": "klipper", "gcode_flavor": "klipper",
"single_extruder_multi_material": "0", "single_extruder_multi_material": "0",
"wait_for_temp_on_wipe_tower": "1",
"default_filament_profile": [ "default_filament_profile": [
"Generic PLA @MyToolChanger" "Generic PLA @MyToolChanger"
], ],
@@ -173,11 +172,11 @@
"0.4" "0.4"
], ],
"z_hop_types": [ "z_hop_types": [
"Slope Lift", "Normal Lift",
"Slope Lift", "Normal Lift",
"Slope Lift", "Normal Lift",
"Slope Lift", "Normal Lift",
"Slope Lift" "Normal Lift"
], ],
"purge_in_prime_tower": "0", "purge_in_prime_tower": "0",
"machine_pause_gcode": "M601", "machine_pause_gcode": "M601",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "OrcaFilamentLibrary", "name": "OrcaFilamentLibrary",
"version": "02.04.00.04", "version": "02.04.00.03",
"force_update": "0", "force_update": "0",
"description": "Orca Filament Library", "description": "Orca Filament Library",
"filament_list": [ "filament_list": [
@@ -36,9 +36,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"8" "8"
], ],
"filament_multitool_ramming_flow": [
"8"
],
"filament_type": [ "filament_type": [
"PET-CF" "PET-CF"
], ],
@@ -39,9 +39,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"8" "8"
], ],
"filament_multitool_ramming_flow": [
"8"
],
"filament_vendor": [ "filament_vendor": [
"Bambu Lab" "Bambu Lab"
], ],
@@ -39,9 +39,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"6" "6"
], ],
"filament_multitool_ramming_flow": [
"6"
],
"filament_vendor": [ "filament_vendor": [
"Bambu Lab" "Bambu Lab"
], ],
@@ -21,9 +21,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"6" "6"
], ],
"filament_multitool_ramming_flow": [
"6"
],
"filament_type": [ "filament_type": [
"PLA-AERO" "PLA-AERO"
], ],
@@ -27,9 +27,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"6" "6"
], ],
"filament_multitool_ramming_flow": [
"6"
],
"filament_scarf_seam_type": [ "filament_scarf_seam_type": [
"none" "none"
], ],
@@ -21,9 +21,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"6" "6"
], ],
"filament_multitool_ramming_flow": [
"6"
],
"filament_vendor": [ "filament_vendor": [
"Bambu Lab" "Bambu Lab"
], ],
@@ -36,9 +36,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"1" "1"
], ],
"filament_multitool_ramming_flow": [
"1"
],
"filament_retraction_minimum_travel": [ "filament_retraction_minimum_travel": [
"3" "3"
], ],

Some files were not shown because too many files have changed in this diff Show More