From a1996bcb10eb6230064424484c3bde1c327e4af1 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 12 Oct 2023 11:24:48 -0400 Subject: [PATCH 001/276] Create voron quality templates for TPU, ASA, & PVA --- .../voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.40_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.40_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.40_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.60_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.60_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.60_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 14 ++++++++++++++ 120 files changed, 1680 insertions(+) create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg new file mode 100644 index 00000000000..ebc976366b0 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg new file mode 100644 index 00000000000..9804ecf7114 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg new file mode 100644 index 00000000000..2beda6c48ce --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg new file mode 100644 index 00000000000..31cecf17f5d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg new file mode 100644 index 00000000000..104bfea97c4 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg new file mode 100644 index 00000000000..133d2414758 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg new file mode 100644 index 00000000000..01fd2203290 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg new file mode 100644 index 00000000000..0fe59289dd3 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg new file mode 100644 index 00000000000..1aa2318ebf7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg new file mode 100644 index 00000000000..cdcc1f12e63 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg new file mode 100644 index 00000000000..ba19a931fad --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg new file mode 100644 index 00000000000..500b3919746 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg new file mode 100644 index 00000000000..f7746ae45b4 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg new file mode 100644 index 00000000000..7d1e6db8c4b --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg new file mode 100644 index 00000000000..b170db68d75 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg new file mode 100644 index 00000000000..cb80eac3202 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg new file mode 100644 index 00000000000..44e3e41ec64 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg new file mode 100644 index 00000000000..577d95bcae3 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg new file mode 100644 index 00000000000..aa428981946 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg new file mode 100644 index 00000000000..9aabb6bdf50 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg new file mode 100644 index 00000000000..ef73cde4d01 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg new file mode 100644 index 00000000000..89afd5ad5a7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg new file mode 100644 index 00000000000..260cbcb0a09 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg new file mode 100644 index 00000000000..e80548bd264 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg new file mode 100644 index 00000000000..e0ddf3bd840 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg new file mode 100644 index 00000000000..1cbd9bc682c --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg new file mode 100644 index 00000000000..80b638f5d0d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg new file mode 100644 index 00000000000..b46f16fa109 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg new file mode 100644 index 00000000000..0b805a3a9c8 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg new file mode 100644 index 00000000000..87d6cf97677 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg new file mode 100644 index 00000000000..3eb0d48c2aa --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg new file mode 100644 index 00000000000..d4aa532a513 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg new file mode 100644 index 00000000000..f3c5ca5709f --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..d68c76b16a4 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg new file mode 100644 index 00000000000..0b83b76b8a7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg new file mode 100644 index 00000000000..5f48c4fff52 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg new file mode 100644 index 00000000000..f9dcc943d7a --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..16c5652c630 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg new file mode 100644 index 00000000000..e1c234aa840 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg new file mode 100644 index 00000000000..23140f2504b --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg new file mode 100644 index 00000000000..68476222a53 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..d5e79b4fd24 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg new file mode 100644 index 00000000000..17ec969aab5 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg new file mode 100644 index 00000000000..321aae21df6 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg new file mode 100644 index 00000000000..9f01426ed53 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..2004264a7d1 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg new file mode 100644 index 00000000000..eaa57826bbe --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg new file mode 100644 index 00000000000..b53900a9cab --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..479e901e11d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..0c8355ec630 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg new file mode 100644 index 00000000000..c4bb92bbfc1 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg new file mode 100644 index 00000000000..8d543ca12d0 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..be0ab318ff9 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..63e12aacbaa --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg new file mode 100644 index 00000000000..4a892490dab --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg new file mode 100644 index 00000000000..b83a897baff --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..3a23a4d8510 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..100582ef576 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg new file mode 100644 index 00000000000..805c10660d1 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..a99b46e74a7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..70c26fe0a43 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg new file mode 100644 index 00000000000..3c530199a1f --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..a4ce01d2257 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..66b6c9f1e8c --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg new file mode 100644 index 00000000000..969dafa0359 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..1add8697ecc --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..4cb0c22e5d8 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..36f7f3191ed --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg new file mode 100644 index 00000000000..ce92a788dc7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..2cad6b7cc96 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..7e20740ad19 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg new file mode 100644 index 00000000000..72040ce7b90 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..2c9b28648e8 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..e17eb9ac175 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg new file mode 100644 index 00000000000..10eb64e8a7f --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 24 diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..692fdababb9 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg new file mode 100644 index 00000000000..3bf3e44a7b2 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg new file mode 100644 index 00000000000..2187c6b83e7 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..28082467f88 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg new file mode 100644 index 00000000000..2b6e31b2d1c --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg new file mode 100644 index 00000000000..337788f5ebe --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..5af8bffbd1b --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg new file mode 100644 index 00000000000..3fb36fe8cc9 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg new file mode 100644 index 00000000000..a44a11224bf --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..10038d67334 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 165 diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg new file mode 100644 index 00000000000..21a1fcc6dd1 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..96a5251d22d --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..f8250e0170b --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 165 diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg new file mode 100644 index 00000000000..e551012466b --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..48258a6333d --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..2875de3bc85 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 165 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg new file mode 100644 index 00000000000..52c5f4595df --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..301599b3fc9 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg new file mode 100644 index 00000000000..ca35c2ff057 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..2431f3d22b8 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg new file mode 100644 index 00000000000..9c751318323 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 70 diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg new file mode 100644 index 00000000000..f89060d180f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..b02d096b433 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg new file mode 100644 index 00000000000..f553eb5b44f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 70 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg new file mode 100644 index 00000000000..59d0e084264 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..77493a918a1 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg new file mode 100644 index 00000000000..def0ddd15ea --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 70 diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..bfd9c26752c --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg new file mode 100644 index 00000000000..5c36feef58c --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg new file mode 100644 index 00000000000..8e58f73be3d --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..6b92ba820fa --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg new file mode 100644 index 00000000000..33f7e6ea82c --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg new file mode 100644 index 00000000000..45b7ad07082 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..011e388c7ec --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg new file mode 100644 index 00000000000..603629754f8 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg new file mode 100644 index 00000000000..a9a393ab4c8 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg new file mode 100644 index 00000000000..0bb1bd6dee2 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg new file mode 100644 index 00000000000..726fcd22b33 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg new file mode 100644 index 00000000000..690fc8aac6e --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg new file mode 100644 index 00000000000..b0dcf50b9f9 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg new file mode 100644 index 00000000000..4f0cbe518f5 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg new file mode 100644 index 00000000000..df2430e76fc --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg new file mode 100644 index 00000000000..162c4e75be0 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg new file mode 100644 index 00000000000..51fca8354cc --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg new file mode 100644 index 00000000000..afe89c11b22 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 40 From 2f7cc785d47940f40315fc13ff5b7c1f7ed01ad7 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Sat, 30 Dec 2023 11:00:32 -0500 Subject: [PATCH 002/276] Update TPU profiles to half default print speed --- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 1aa2318ebf7..41d00c386c2 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index cdcc1f12e63..139176c8b0a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index ba19a931fad..fe5508166f6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 500b3919746..bebf33324c2 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index ef73cde4d01..b10f1b02460 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 89afd5ad5a7..d9b9dd2239b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 260cbcb0a09..5e4b35b65de 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index e80548bd264..4d4d2fad6a8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 +speed_print = 100 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 3eb0d48c2aa..9a47ce845c0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 +speed_print = 67.5 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index d4aa532a513..8de361f76a3 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index f3c5ca5709f..039984b24c7 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index d5e79b4fd24..185df5fe8bd 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 17ec969aab5..360fa87bdfe 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 321aae21df6..6bb6848807d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 9f01426ed53..86c66009a39 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 63e12aacbaa..1100df1e0de 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 4a892490dab..1633f9841f5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index b83a897baff..1a49abd3489 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 3a23a4d8510..5b4553e54c4 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 66b6c9f1e8c..b53023163a3 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 969dafa0359..d031c9c1719 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 1add8697ecc..2fa799ed41e 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 2c9b28648e8..ec418884428 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index e17eb9ac175..4c6bb7faf60 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 10eb64e8a7f..44d2d139aa7 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 +speed_print = 12 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 5af8bffbd1b..a3fa3c85528 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 3fb36fe8cc9..13ed5db3c6b 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index a44a11224bf..2e290dc6ad1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 2875de3bc85..2761c51a66e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = 82.5 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 52c5f4595df..35fd6530340 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 301599b3fc9..de30290f493 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 59d0e084264..e98ebb29291 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 77493a918a1..e2d26ed930c 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index def0ddd15ea..764cb3e5a8b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = 35 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 011e388c7ec..93d5f610575 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = 37.5 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 603629754f8..4e40b980117 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index a9a393ab4c8..32b3ac7baed 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 162c4e75be0..d3c1735d010 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 51fca8354cc..d010a7424d4 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index afe89c11b22..8a227f7e2a1 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = 20 From 5fac8e49536a6386e26cd354bb1199385f4bd61a Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Sat, 30 Dec 2023 12:00:44 -0500 Subject: [PATCH 003/276] Automated refactoring --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 1 + 120 files changed, 120 insertions(+) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index ebc976366b0..493a5c3df78 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index 9804ecf7114..2ddc0226a71 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index 2beda6c48ce..30eb2b0db34 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 31cecf17f5d..0a7bd540a97 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 104bfea97c4..ae513c2d975 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index 133d2414758..383c5c70120 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 01fd2203290..afb57510b07 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index 0fe59289dd3..5ec6a73ae61 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 41d00c386c2..8a3b92d8062 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 139176c8b0a..41d45a8bf0b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index fe5508166f6..f6f444b1059 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index bebf33324c2..06e30b77476 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index f7746ae45b4..12293993965 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index 7d1e6db8c4b..d2912da65f6 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index b170db68d75..98b99324371 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index cb80eac3202..ba92ae0cd20 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 44e3e41ec64..973e129fdf9 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 577d95bcae3..216df622134 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index aa428981946..931e8413cd9 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 9aabb6bdf50..f54b0052d7e 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index b10f1b02460..cd9fc72e26b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index d9b9dd2239b..aace6cda1d8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 5e4b35b65de..5ae10c6ee2a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 4d4d2fad6a8..fd4bfb609cc 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 100 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index e0ddf3bd840..ca321a4b763 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 1cbd9bc682c..6e4a78dc037 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 80b638f5d0d..096152bfd77 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index b46f16fa109..48f9844b6bf 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 0b805a3a9c8..77e3b72ab5d 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 87d6cf97677..10f5d429d69 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 9a47ce845c0..967697958a6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 67.5 + diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 8de361f76a3..89875231903 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 039984b24c7..e94d00a67b4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index d68c76b16a4..826bf0bdd08 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 0b83b76b8a7..7e0e9890c20 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index 5f48c4fff52..e86cd870021 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index f9dcc943d7a..a0a22942f21 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index 16c5652c630..cd973ed51fc 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index e1c234aa840..a95e17a4795 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 23140f2504b..18300cf771b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 68476222a53..84c1d0699d0 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 185df5fe8bd..d1fd9e5e6d4 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 360fa87bdfe..162777e8feb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 6bb6848807d..860bf7055d1 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 86c66009a39..35b30655850 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index 2004264a7d1..113311a8099 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index eaa57826bbe..5ba13532f98 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index b53900a9cab..1c9ef83c972 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 479e901e11d..efb2a540d2d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index 0c8355ec630..064d48ca69d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index c4bb92bbfc1..405fde86956 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 8d543ca12d0..e3263ad178a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index be0ab318ff9..f4a771194a0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 1100df1e0de..2701b082fd5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 1633f9841f5..7277888f1c7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 1a49abd3489..47e35c12400 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 5b4553e54c4..bff35671990 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 22.5 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index 100582ef576..c96c60fbf9b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index 805c10660d1..c02b5d6dc33 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index a99b46e74a7..3e8e05d1416 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 70c26fe0a43..255ced0194c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 3c530199a1f..c3b1d62ac67 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index a4ce01d2257..d77abeffd6a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index b53023163a3..d3a0e72fa99 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 25 + diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index d031c9c1719..8b98c3a135f 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 2fa799ed41e..c0adbbf212b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 20 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 4cb0c22e5d8..6b0fbbdbb03 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 36f7f3191ed..c306db902aa 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index ce92a788dc7..29578491b68 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index 2cad6b7cc96..cd4c274fe2d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 7e20740ad19..f607c9b8faf 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 72040ce7b90..77513d7591c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index ec418884428..9254ae49c39 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 20 + diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 4c6bb7faf60..0fcdc37a3a1 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 15 + diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 44d2d139aa7..87f5f87d5f5 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 12 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 692fdababb9..cfd6add8834 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 3bf3e44a7b2..6c27dd130cf 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 2187c6b83e7..0f290b7cb1f 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 28082467f88..96a2f30f139 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 2b6e31b2d1c..77a45110433 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 337788f5ebe..9b49d2e193d 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index a3fa3c85528..2e13c2dff22 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 13ed5db3c6b..de9b69c8cc1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 2e290dc6ad1..501ac919ad7 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 10038d67334..49707c696c7 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 21a1fcc6dd1..b3a19c030ea 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 96a5251d22d..ef0aea91579 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index f8250e0170b..5e9909e678b 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index e551012466b..cd1182e8a62 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index 48258a6333d..27b0b6b1ed4 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 2761c51a66e..17e5ad6adc8 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 82.5 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 35fd6530340..4196040066c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index de30290f493..974e147fd7b 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 62.5 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index ca35c2ff057..22bc6e1f8ec 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 2431f3d22b8..4241e9b3954 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 9c751318323..f74b55a6291 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index f89060d180f..f0ecdb8ca3b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index b02d096b433..96b47167f91 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index f553eb5b44f..4e2e171a4f2 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index e98ebb29291..11d00339fa3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 62.5 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index e2d26ed930c..0a5edb2d143 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 764cb3e5a8b..8e3014b4314 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 35 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index bfd9c26752c..23671640c03 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 5c36feef58c..0d6ad1e5c35 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 8e58f73be3d..a9d0e9f7b50 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index 6b92ba820fa..c848cb5158f 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index 33f7e6ea82c..bfae62d4305 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 45b7ad07082..7f639f3c4d4 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 93d5f610575..c9553f59fa9 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 37.5 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 4e40b980117..8344e000a37 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 32b3ac7baed..ea098d3f601 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 25 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 0bb1bd6dee2..2996d1decd0 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 726fcd22b33..3317131bdda 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index 690fc8aac6e..8e349deebac 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index b0dcf50b9f9..13885a6d9ba 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 4f0cbe518f5..09159c31e1f 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index df2430e76fc..63b15c31420 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d3c1735d010..e7096cd5d45 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index d010a7424d4..b4c891e91cf 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 25 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 8a227f7e2a1..59e16a7dc21 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 20 + From 123e2e7ed4ada3ec9033db9d743d0e6b1610c9ca Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Mon, 3 Jun 2024 14:21:59 -0400 Subject: [PATCH 004/276] Update TPU print speed to 1/4 default speed --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 4 ++-- 40 files changed, 80 insertions(+), 80 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 8a3b92d8062..5da54393108 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 41d45a8bf0b..c7357e7ad77 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index f6f444b1059..5409cfcd9e3 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 06e30b77476..2cff4392a9e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index cd9fc72e26b..06b2da2b9db 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index aace6cda1d8..d635c830056 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 5ae10c6ee2a..db281b027f5 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index fd4bfb609cc..fb4bb2ff34c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 100 +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 967697958a6..581e36ea952 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.35mm [values] -speed_print = 67.5 +speed_print = 33.75 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 89875231903..363c05bdcc4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.35mm [values] -speed_print = 135 +speed_print = 67.5 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index e94d00a67b4..f7fe05ebfc5 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.35mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index d1fd9e5e6d4..5759fa713ab 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 162777e8feb..393d608e4a8 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 860bf7055d1..cce573ca548 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 35b30655850..ddadeda6612 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 2701b082fd5..a6c5cfe2f7f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 7277888f1c7..9e608f42ce0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 45 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 47e35c12400..1762784c5a4 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index bff35671990..eb8a2814026 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 22.5 +speed_print = 11.25 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index d3a0e72fa99..bd6b41e227d 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.60mm [values] -speed_print = 25 +speed_print = 12.5 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 8b98c3a135f..6e39b47a1a9 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.60mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index c0adbbf212b..dfdd12eee81 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.60mm [values] -speed_print = 20 +speed_print = 10 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 9254ae49c39..6c9e84f82ce 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.80mm [values] -speed_print = 20 +speed_print = 10 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 0fcdc37a3a1..5311ea88926 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.80mm [values] -speed_print = 15 +speed_print = 7.5 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 87f5f87d5f5..bb32162e758 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.80mm [values] -speed_print = 12 +speed_print = 6 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 2e13c2dff22..9354b2d56df 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.40mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index de9b69c8cc1..c77b167ed93 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 501ac919ad7..ab872b2453c 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 17e5ad6adc8..80955fe2d18 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.60mm [values] -speed_print = 82.5 +speed_print = 41.25 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 4196040066c..29bcd8bd4f5 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 974e147fd7b..6c9421ae859 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.60mm [values] -speed_print = 62.5 +speed_print = 31.25 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 11d00339fa3..8405cc9c506 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.80mm [values] -speed_print = 62.5 +speed_print = 31.25 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 0a5edb2d143..1fd21898c0e 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.80mm [values] -speed_print = 45 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 8e3014b4314..8d125246a0b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.80mm [values] -speed_print = 35 +speed_print = 17.5 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index c9553f59fa9..11274094715 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.00mm [values] -speed_print = 37.5 +speed_print = 18.75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 8344e000a37..e1e8d5fe322 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.00mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index ea098d3f601..018120006e8 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.00mm [values] -speed_print = 25 +speed_print = 12.5 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index e7096cd5d45..76d329b6d89 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.20mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b4c891e91cf..60b7aa7b959 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.20mm [values] -speed_print = 25 +speed_print = 12.5 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 59e16a7dc21..147fb614d41 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.20mm [values] -speed_print = 20 +speed_print = 10 From b1237930f282c5928d9a30ce4be22546f915b2c5 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 20 Jun 2024 13:47:26 -0400 Subject: [PATCH 005/276] Revert "Update TPU print speed to 1/4 default speed" This reverts commit 123e2e7ed4ada3ec9033db9d743d0e6b1610c9ca. --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 4 ++-- 40 files changed, 80 insertions(+), 80 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 5da54393108..8a3b92d8062 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index c7357e7ad77..41d45a8bf0b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 45 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 5409cfcd9e3..f6f444b1059 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 2cff4392a9e..06e30b77476 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 60 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 06b2da2b9db..cd9fc72e26b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index d635c830056..aace6cda1d8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 40 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index db281b027f5..5ae10c6ee2a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index fb4bb2ff34c..fd4bfb609cc 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 50 +speed_print = 100 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 581e36ea952..967697958a6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.35mm [values] -speed_print = 33.75 +speed_print = 67.5 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 363c05bdcc4..89875231903 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.35mm [values] -speed_print = 67.5 +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index f7fe05ebfc5..e94d00a67b4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.35mm [values] -speed_print = 45 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 5759fa713ab..d1fd9e5e6d4 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 20 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 393d608e4a8..162777e8feb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 30 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index cce573ca548..860bf7055d1 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 60 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index ddadeda6612..35b30655850 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 40 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index a6c5cfe2f7f..2701b082fd5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 15 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 9e608f42ce0..7277888f1c7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 22.5 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 1762784c5a4..47e35c12400 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 30 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index eb8a2814026..bff35671990 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 11.25 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index bd6b41e227d..d3a0e72fa99 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.60mm [values] -speed_print = 12.5 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 6e39b47a1a9..8b98c3a135f 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.60mm [values] -speed_print = 20 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index dfdd12eee81..c0adbbf212b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.60mm [values] -speed_print = 10 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 6c9e84f82ce..9254ae49c39 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.80mm [values] -speed_print = 10 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 5311ea88926..0fcdc37a3a1 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.80mm [values] -speed_print = 7.5 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index bb32162e758..87f5f87d5f5 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.80mm [values] -speed_print = 6 +speed_print = 12 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 9354b2d56df..2e13c2dff22 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.40mm [values] -speed_print = 62.5 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index c77b167ed93..de9b69c8cc1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.40mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index ab872b2453c..501ac919ad7 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.40mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 80955fe2d18..17e5ad6adc8 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.60mm [values] -speed_print = 41.25 +speed_print = 82.5 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 29bcd8bd4f5..4196040066c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.60mm [values] -speed_print = 62.5 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 6c9421ae859..974e147fd7b 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.60mm [values] -speed_print = 31.25 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 8405cc9c506..11d00339fa3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.80mm [values] -speed_print = 31.25 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 1fd21898c0e..0a5edb2d143 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.80mm [values] -speed_print = 22.5 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 8d125246a0b..8e3014b4314 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.80mm [values] -speed_print = 17.5 +speed_print = 35 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 11274094715..c9553f59fa9 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.00mm [values] -speed_print = 18.75 +speed_print = 37.5 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index e1e8d5fe322..8344e000a37 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.00mm [values] -speed_print = 15 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 018120006e8..ea098d3f601 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.00mm [values] -speed_print = 12.5 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 76d329b6d89..e7096cd5d45 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.20mm [values] -speed_print = 15 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 60b7aa7b959..b4c891e91cf 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.20mm [values] -speed_print = 12.5 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 147fb614d41..59e16a7dc21 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.20mm [values] -speed_print = 10 +speed_print = 20 From e57de120e7a8f929b26a82e462536b1b6619f3bb Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 20 Jun 2024 13:52:37 -0400 Subject: [PATCH 006/276] Fix setting_version numbers after previous revert commit --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 120 files changed, 120 insertions(+), 200 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index 493a5c3df78..25cf918de3a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index 2ddc0226a71..b95644f29ca 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index 30eb2b0db34..f374cfa7ad9 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 0a7bd540a97..886853ea070 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index ae513c2d975..0f5f68f8068 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index 383c5c70120..c777e5df434 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index afb57510b07..95b03145f10 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index 5ec6a73ae61..c8b6f447b09 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 8a3b92d8062..43b58d4e2b6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 41d45a8bf0b..04cf23e9f6e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index f6f444b1059..84487791c60 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 06e30b77476..24f473751f0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index 12293993965..d09e45a6dcd 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index d2912da65f6..08fe21ac9b8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 98b99324371..86ea8ebf3d0 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index ba92ae0cd20..94d13b14b41 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 200 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 973e129fdf9..84a8c392aa6 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 216df622134..39a0e2abec6 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 931e8413cd9..0c495c3f397 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index f54b0052d7e..3d11356390e 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 200 - diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index cd9fc72e26b..51b08ec6967 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index aace6cda1d8..ce7f879c4b0 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 5ae10c6ee2a..a8ec456ae03 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index fd4bfb609cc..36ffb39a41d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index ca321a4b763..07637db3d94 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 135 - diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 6e4a78dc037..4147cc5a514 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 270 - diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 096152bfd77..446edac258b 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index 48f9844b6bf..b7ad0b7fb4b 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 135 - diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 77e3b72ab5d..cf3723bf567 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 270 - diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 10f5d429d69..f5d2271fb95 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 967697958a6..c5213aff7fb 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 89875231903..d5696ca6d01 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index e94d00a67b4..e567a011932 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index 826bf0bdd08..a33f0154952 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 7e0e9890c20..d0919334c80 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index e86cd870021..d408e80a696 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index a0a22942f21..d72f3fa69ae 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index cd973ed51fc..f50542de3dc 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index a95e17a4795..794f7c9f427 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 18300cf771b..dd760800f56 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 84c1d0699d0..c7c3fadd6a3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index d1fd9e5e6d4..ffb83008738 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 162777e8feb..922be924a64 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 860bf7055d1..3b5378ba2a5 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 35b30655850..b11a565db35 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index 113311a8099..e38c806be09 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index 5ba13532f98..bd382890ef1 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index 1c9ef83c972..196d1237d5f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index efb2a540d2d..1c7105d9f76 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 45 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index 064d48ca69d..fbaed4cf07a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index 405fde86956..d5f0ca764e3 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index e3263ad178a..0fdf3509e85 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index f4a771194a0..b7a76abacc3 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 45 - diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 2701b082fd5..6b8d0d573f1 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 7277888f1c7..0bfec404622 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 47e35c12400..2761c4b4fa0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index bff35671990..6e0d8bced0e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index c96c60fbf9b..d20f20c61cb 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index c02b5d6dc33..466ff4e31b8 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 3e8e05d1416..97538706b3e 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 255ced0194c..065d3607cab 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index c3b1d62ac67..184f35515e1 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index d77abeffd6a..72039f2899a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index d3a0e72fa99..a13522261a4 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 8b98c3a135f..131d1799182 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index c0adbbf212b..9f26cd5543f 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 6b0fbbdbb03..8cd040d0905 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index c306db902aa..7a773baa07a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 30 - diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index 29578491b68..b8b2fdc90ca 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 24 - diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index cd4c274fe2d..7ed437fd2c9 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index f607c9b8faf..6eaa234c87a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 30 - diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 77513d7591c..7a04a841183 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 24 - diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 9254ae49c39..9ff7d91b583 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 0fcdc37a3a1..6aa5f3138df 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 87f5f87d5f5..571cb11b78f 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index cfd6add8834..5d36181fb07 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 6c27dd130cf..6e6a2a21292 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 0f290b7cb1f..d60b9616381 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 96a2f30f139..62b510b747f 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 77a45110433..ca6c64c9a56 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 9b49d2e193d..1186ab72bcd 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 2e13c2dff22..8246fdc0f17 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index de9b69c8cc1..c2352fb90b6 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 501ac919ad7..a4e6a4de5c0 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 49707c696c7..3506d904ff4 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 165 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index b3a19c030ea..6c9a5b3cc3e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index ef0aea91579..3ec8220523a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 5e9909e678b..5fe09c4ca82 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 165 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index cd1182e8a62..bf19eb7dc07 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index 27b0b6b1ed4..5c51e326d95 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 17e5ad6adc8..26da41cc39c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 4196040066c..b32518c57a6 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 974e147fd7b..0c040900871 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index 22bc6e1f8ec..d63a6859e31 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 4241e9b3954..71574805288 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index f74b55a6291..69d7c611ec4 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 70 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index f0ecdb8ca3b..0ca125ac27e 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 96b47167f91..284e3a3df08 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index 4e2e171a4f2..ba4f8768895 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 70 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 11d00339fa3..4ff9f42302c 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 0a5edb2d143..cee979a790c 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 8e3014b4314..e443d8dd059 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 23671640c03..17f36968a1c 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 75 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 0d6ad1e5c35..ef67a15698d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index a9d0e9f7b50..2f5309fc0ee 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index c848cb5158f..1cf2f5bdb3d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 75 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index bfae62d4305..24c8331ab9d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 7f639f3c4d4..0e3f24c2ffe 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index c9553f59fa9..d4e583531bd 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 8344e000a37..83cdbf0e285 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index ea098d3f601..ab7d9aedd0c 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 2996d1decd0..ea744a797dd 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 3317131bdda..3803acc1142 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index 8e349deebac..e38510ca0de 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index 13885a6d9ba..3ff28da7652 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 09159c31e1f..6b1350f480b 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index 63b15c31420..e65f3bc294d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index e7096cd5d45..0dcb3f48595 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b4c891e91cf..b336b676296 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 59e16a7dc21..85c00089c9e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm From dc5d1a6aed648114da0ca887a927874826ad6f1b Mon Sep 17 00:00:00 2001 From: NerdyGriffin Date: Thu, 20 Jun 2024 17:54:01 +0000 Subject: [PATCH 007/276] Applied printer-linter format --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 1 + 80 files changed, 80 insertions(+) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index 25cf918de3a..d89894647cb 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index b95644f29ca..e3d0252d492 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index f374cfa7ad9..ab3e3e17ea2 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 886853ea070..b9e9565c3c0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 0f5f68f8068..991ac5d1010 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index c777e5df434..e148d1c4b65 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 95b03145f10..9b9a0ffee9f 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index c8b6f447b09..d134c72fdb7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index d09e45a6dcd..895ff9daf49 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index 08fe21ac9b8..f10be46a983 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 86ea8ebf3d0..2b7356f1a55 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index 94d13b14b41..542b8d29869 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 84a8c392aa6..2ce1651a4c8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 39a0e2abec6..cac8e008e96 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 0c495c3f397..616a9537c80 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 3d11356390e..75ed433d4cd 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index 07637db3d94..49bdf430a35 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 4147cc5a514..531dcb8b391 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 446edac258b..656d982e010 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index b7ad0b7fb4b..3b0eb953ba1 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index cf3723bf567..51128170f46 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index f5d2271fb95..00ba1c82677 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index a33f0154952..de76119db32 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index d0919334c80..48191495900 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index d408e80a696..777d39748c5 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index d72f3fa69ae..294d9c66b8a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index f50542de3dc..53497d79238 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index 794f7c9f427..43a0ffa1add 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index dd760800f56..8c737fbf042 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index c7c3fadd6a3..2d4595f38e7 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index e38c806be09..e948b334dad 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index bd382890ef1..5b11b8a69a8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index 196d1237d5f..ebb14aab785 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 1c7105d9f76..0fc5fbe8d59 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index fbaed4cf07a..efcf6f0246d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index d5f0ca764e3..670e236a79a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 0fdf3509e85..878507ce990 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index b7a76abacc3..f4f6b4dfff2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index d20f20c61cb..4bb9372a9bc 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index 466ff4e31b8..fbb74fb9ca4 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 97538706b3e..3e8e8195bce 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 065d3607cab..66b0fd971ce 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 184f35515e1..26bdebd1b25 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index 72039f2899a..4e5662790be 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 8cd040d0905..51da4e343b7 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 7a773baa07a..77aebb66d9a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index b8b2fdc90ca..9b99c0eef3c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index 7ed437fd2c9..a6b11d0f459 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 6eaa234c87a..6b74da6994c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 7a04a841183..431ecc57e97 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 5d36181fb07..2d1e463704f 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 6e6a2a21292..4a61f16bb9c 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index d60b9616381..3906f5a5a31 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 62b510b747f..6316562eec0 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index ca6c64c9a56..51f85f9d603 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 1186ab72bcd..def6946bf15 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 3506d904ff4..d41c1552341 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 6c9a5b3cc3e..9c69b07258e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 3ec8220523a..5b35eec0b71 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 5fe09c4ca82..470729ca7c1 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index bf19eb7dc07..e2b949208e9 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index 5c51e326d95..e6309376564 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index d63a6859e31..bc372dae4bb 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 71574805288..41af7ad5525 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 69d7c611ec4..990bb0d5187 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index 0ca125ac27e..8a739087b3d 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 284e3a3df08..7fae42c017e 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index ba4f8768895..81f7a4affdb 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 17f36968a1c..3be4231e8b7 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index ef67a15698d..7ac9945261d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 2f5309fc0ee..79e3d1d86a1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index 1cf2f5bdb3d..b48aadb0e4e 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index 24c8331ab9d..cabb3d90206 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 0e3f24c2ffe..30d016cf2c6 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index ea744a797dd..374535d12f9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 3803acc1142..9790b61217f 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index e38510ca0de..a395749b1d5 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index 3ff28da7652..d5ca080c10d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 6b1350f480b..212b8b9ba5f 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index e65f3bc294d..441cbb9d4f1 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + From 121d4e5eb8e315898646602d8b2cf170a2157fe9 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Mon, 8 Jul 2024 14:57:49 -0400 Subject: [PATCH 008/276] Adjust detailed TPU speeds to prevent large changes in flow rate --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 8 +++++++- 40 files changed, 280 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 43b58d4e2b6..2cf0a195c1c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 04cf23e9f6e..0952c07a80c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 90 +speed_print = 135.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 84487791c60..bbc9e4ffe28 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 24f473751f0..0b47c78a5f8 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 120 +speed_print = 180.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 51b08ec6967..7c2a05e66c0 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index ce7f879c4b0..3f8a9895428 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 80 +speed_print = 120.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index a8ec456ae03..e8a762d1863 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 36ffb39a41d..e5ef4c483ca 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 100 +speed_print = 150.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index c5213aff7fb..5f5abd74ebd 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.35mm [values] -speed_print = 67.5 +speed_print = 101.25 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index d5696ca6d01..a6adfda7c49 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 +speed_print = 202.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index e567a011932..96045c435c1 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.35mm [values] -speed_print = 90 +speed_print = 135.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index ffb83008738..1c0555239e0 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 40 +speed_print = 60.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 922be924a64..c1e0322e1eb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 60 +speed_print = 90.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 3b5378ba2a5..0de952ef55c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 +speed_print = 180.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index b11a565db35..59fb7d540f6 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 +speed_print = 120.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 6b8d0d573f1..919c263ca2d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 30 +speed_print = 45.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 0bfec404622..64175bd8077 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 +speed_print = 67.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 2761c4b4fa0..97c35ca6fc9 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 +speed_print = 90.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 6e0d8bced0e..2be42474a6b 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 22.5 +speed_print = 33.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index a13522261a4..95929bdc452 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.60mm [values] -speed_print = 25 +speed_print = 37.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 131d1799182..8d7d0f3aaa7 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 +speed_print = 60.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 9f26cd5543f..04e2569fbd4 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.60mm [values] -speed_print = 20 +speed_print = 30.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 9ff7d91b583..adb8472a190 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.80mm [values] -speed_print = 20 +speed_print = 30.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 6aa5f3138df..8068c116d69 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.80mm [values] -speed_print = 15 +speed_print = 22.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 571cb11b78f..8066424cb1a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.80mm [values] -speed_print = 12 +speed_print = 18.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 8246fdc0f17..4c411fc00b5 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 125 +speed_print = 187.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index c2352fb90b6..0965ed21404 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index a4e6a4de5c0..d73bca44337 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 26da41cc39c..842f79871aa 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 82.5 +speed_print = 123.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index b32518c57a6..8961c62d1f8 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = 187.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0c040900871..20e15860f3a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 62.5 +speed_print = 93.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 4ff9f42302c..5eb7d8f7d8d 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 62.5 +speed_print = 93.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index cee979a790c..4f49a4405ad 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 45 +speed_print = 67.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index e443d8dd059..bf49161adc5 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 35 +speed_print = 52.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index d4e583531bd..c6633f1febc 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 37.5 +speed_print = 56.25 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 83cdbf0e285..a1fe3727a7a 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 30 +speed_print = 45.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index ab7d9aedd0c..8d17ff05e68 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 25 +speed_print = 37.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 0dcb3f48595..d2278274aa5 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 30 +speed_print = 45.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b336b676296..2d597a2939e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 25 +speed_print = 37.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 85c00089c9e..4644c85f0e4 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 20 +speed_print = 30.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) From d878f1dea1715f5aaa9ec884ef5564cfbc6c190d Mon Sep 17 00:00:00 2001 From: NerdyGriffin Date: Mon, 8 Jul 2024 18:59:53 +0000 Subject: [PATCH 009/276] Applied printer-linter format --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 6 +++--- 40 files changed, 120 insertions(+), 120 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 2cf0a195c1c..ded650a8538 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 0952c07a80c..1a830d3e0c4 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 135.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index bbc9e4ffe28..2f9334ea178 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 0b47c78a5f8..9cc821f5808 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 180.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 7c2a05e66c0..0afdab1ae7a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 3f8a9895428..851efaaab37 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 120.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index e8a762d1863..8762ee57528 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index e5ef4c483ca..262b000de1e 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 150.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 5f5abd74ebd..26ff3d8ed2a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.35mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 101.25 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index a6adfda7c49..99c077c29a8 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.35mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 202.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 96045c435c1..f1a7a25d254 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.35mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 135.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 1c0555239e0..54b8f76ee04 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 60.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index c1e0322e1eb..6468beff3f2 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 90.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 0de952ef55c..dc27882a6bb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 180.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 59fb7d540f6..089f0fd42d6 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 120.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 919c263ca2d..2f93f0947f5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 45.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 64175bd8077..523f6b5ca8a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 67.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 97c35ca6fc9..025dca4d2cc 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 90.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 2be42474a6b..11af45c75bb 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 33.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 95929bdc452..92d903a6047 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 37.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 8d7d0f3aaa7..25ea6624f8c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 60.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 04e2569fbd4..c79df07dcaf 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 30.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index adb8472a190..a7699412d30 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 30.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 8068c116d69..4f371790e1b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 22.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 8066424cb1a..e0af23cb346 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 18.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 4c411fc00b5..bfc92a423da 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 187.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 0965ed21404..3b3c2e64513 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index d73bca44337..1ef18523342 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 842f79871aa..13367c7d13c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 123.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 8961c62d1f8..ba274be0deb 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 187.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 20e15860f3a..c664f992bad 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 93.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 5eb7d8f7d8d..5a103312bc5 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 93.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 4f49a4405ad..d64059fcc72 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 67.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index bf49161adc5..4bb10a451bd 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 52.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index c6633f1febc..226f06eb18c 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.00mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 56.25 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index a1fe3727a7a..fa9d1606478 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.00mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 45.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 8d17ff05e68..e7ce2784ac3 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.00mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 37.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d2278274aa5..60a91f1b8ef 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.20mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 45.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 2d597a2939e..806ec3a92d6 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.20mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 37.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 4644c85f0e4..71384ca0d78 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.20mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 30.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) From 103d1e68a3398428e156826ebc822c621f6584aa Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Fri, 2 Aug 2024 12:19:59 -0400 Subject: [PATCH 010/276] Set TPU speed to 2/3 standard and adjust detailed speeds to not exceed voron defaults --- .../voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_v6_0.80_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.40_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.40_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.60_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.60_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.80_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.80_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.80_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.00_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.00_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.20_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.20_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 15 ++++++++------- 40 files changed, 320 insertions(+), 280 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index ded650a8538..5011553485e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 1a830d3e0c4..945416b8cd5 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 135.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 120 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 2f9334ea178..daa79a78d26 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 9cc821f5808..2d883460b5a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 180.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 160 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 0afdab1ae7a..63eaa61a547 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 851efaaab37..ce2316afa06 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 120.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 106.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 8762ee57528..b9b41700285 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 262b000de1e..0f0971167d5 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 150.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 133.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 26ff3d8ed2a..33fe0ab20df 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.35mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 101.25 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 90 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 99c077c29a8..890be107ef7 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.35mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 202.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 180 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index f1a7a25d254..4d967adaed6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.35mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 135.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 120 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 54b8f76ee04..3eb030ab422 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 60.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 53.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 6468beff3f2..d646f74cda3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 90.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 80 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index dc27882a6bb..7540e643048 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 180.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 160 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 089f0fd42d6..73b66a93b22 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 120.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 106.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 2f93f0947f5..9bb39835015 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 45.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 40 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 523f6b5ca8a..c062c70d724 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 67.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 60 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 025dca4d2cc..242be6013ed 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 90.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 80 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 11af45c75bb..0a3ecc59eea 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 33.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 30 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 92d903a6047..9a4c3559f4b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 37.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 33.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 25ea6624f8c..2f301d16afa 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 60.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 53.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index c79df07dcaf..55cf1efe17b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 30.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 26.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index a7699412d30..08038fda885 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 30.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 26.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 4f371790e1b..dd8748ad8eb 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 22.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 20 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index e0af23cb346..5ab269f1187 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 18.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 16 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index bfc92a423da..2ca8e32d091 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 187.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 166.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 3b3c2e64513..319ef3c704a 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 1ef18523342..df258b855a9 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 13367c7d13c..16f131a43eb 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 123.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 110 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index ba274be0deb..1799665c2b6 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 187.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 166.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index c664f992bad..0955990fc37 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 93.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 83.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 5a103312bc5..1659953e4c3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 93.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 83.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index d64059fcc72..390e3d96b8c 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 67.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 60 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 4bb10a451bd..ae00da306b1 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 52.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 46.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 226f06eb18c..d93c6209441 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.00mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 56.25 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 50 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index fa9d1606478..0c611ffc6d9 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.00mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 45.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 40 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index e7ce2784ac3..70af9ed539d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.00mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 37.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 33.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 60a91f1b8ef..8c6ad1d30f3 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.20mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 45.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 40 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 806ec3a92d6..32f4fb40e86 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.20mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 37.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 33.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 71384ca0d78..5cc4e796a8a 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.20mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 30.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 26.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print From 3136dfc0ec1d6dcef35825573f5a888e1119bfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20J=C3=A4ger?= Date: Fri, 9 Aug 2024 18:13:01 +0200 Subject: [PATCH 011/276] Process M82 and M83 command for Marlin flavoured GCode too --- plugins/GCodeReader/FlavorParser.py | 10 ++++++++-- plugins/GCodeReader/RepRapFlavorParser.py | 8 -------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index 372ee831356..74dbeadec09 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -298,8 +298,14 @@ def processTCode(self, global_stack, T: int, line: str, position: Position, path position.e.extend([0] * (self._extruder_number - len(position.e) + 1)) return position - def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> Position: - pass + def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> None: + # Set extrusion mode + if M == 82: + # Set absolute extrusion mode + self._is_absolute_extrusion = True + elif M == 83: + # Set relative extrusion mode + self._is_absolute_extrusion = False _type_keyword = ";TYPE:" _layer_keyword = ";LAYER:" diff --git a/plugins/GCodeReader/RepRapFlavorParser.py b/plugins/GCodeReader/RepRapFlavorParser.py index 10b7b785876..1a80412238e 100644 --- a/plugins/GCodeReader/RepRapFlavorParser.py +++ b/plugins/GCodeReader/RepRapFlavorParser.py @@ -11,14 +11,6 @@ class RepRapFlavorParser(FlavorParser.FlavorParser): def __init__(self): super().__init__() - def processMCode(self, M, line, position, path): - if M == 82: - # Set absolute extrusion mode - self._is_absolute_extrusion = True - elif M == 83: - # Set relative extrusion mode - self._is_absolute_extrusion = False - def _gCode90(self, position, params, path): """Set the absolute positioning From 77e5ddf55d44dcb44e2591f194db1e389985f87b Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 15 Aug 2024 10:10:34 -0400 Subject: [PATCH 012/276] Revert TPU print speed to 1/4 default speed --- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 5011553485e..95f126b12ba 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 945416b8cd5..8591e1017af 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 120 +speed_print = 45 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index daa79a78d26..3b19e1b5da7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 2d883460b5a..4401e26ff52 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 160 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 63eaa61a547..fc078619d42 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index ce2316afa06..16adbecf9b4 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 106.67 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index b9b41700285..f87579b796a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 0f0971167d5..8b41e53b09a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 133.33 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 33fe0ab20df..c460287dc60 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 90 +speed_print = 33.75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 890be107ef7..a37852e7eb4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 180 +speed_print = 67.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 4d967adaed6..8a0961a1708 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 120 +speed_print = 45 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 3eb030ab422..c1182d00c71 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 53.33 +speed_print = 20 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index d646f74cda3..49e4f45f900 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 80 +speed_print = 30 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 7540e643048..6899f677edb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 160 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 73b66a93b22..81c9da6f179 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 106.67 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 9bb39835015..3b21154e825 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 15 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index c062c70d724..e81d9f4c341 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 22.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 242be6013ed..2797670b13c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 80 +speed_print = 30 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 0a3ecc59eea..a9a804111c7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 +speed_print = 11.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 9a4c3559f4b..7a6508c7a78 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.33 +speed_print = 12.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 2f301d16afa..ae9cd42d9df 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 53.33 +speed_print = 20 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 55cf1efe17b..d0816f8db78 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 26.67 +speed_print = 10 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 08038fda885..63e1744c1ce 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 26.67 +speed_print = 10 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index dd8748ad8eb..ae5571e6d54 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 20 +speed_print = 7.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 5ab269f1187..bceb062d4da 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 16 +speed_print = 6 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 2ca8e32d091..9bca6ec732d 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 166.67 +speed_print = 62.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 319ef3c704a..da94b9d8090 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index df258b855a9..7cd4fe079ef 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 16f131a43eb..57b96a4bd79 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 110 +speed_print = 41.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 1799665c2b6..42448cd7a6a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 166.67 +speed_print = 62.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0955990fc37..0c4d4ae2fbe 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 83.33 +speed_print = 31.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 1659953e4c3..592ddfa0ee2 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 83.33 +speed_print = 31.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 390e3d96b8c..b98808413fd 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 22.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index ae00da306b1..f009518856b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 46.67 +speed_print = 17.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index d93c6209441..305172aff43 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 +speed_print = 18.75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 0c611ffc6d9..ba92b8ee8bf 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 15 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 70af9ed539d..96ce9681403 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.33 +speed_print = 12.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 8c6ad1d30f3..e81913aec35 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 15 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 32f4fb40e86..b3faafde03b 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.33 +speed_print = 12.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 5cc4e796a8a..bce5c0a55c9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 26.67 +speed_print = 10 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) From a7e5477e1fe85cab9ba278382c427493e365699f Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Mon, 26 Aug 2024 08:00:04 -0400 Subject: [PATCH 013/276] Restore TPU print speed to the default voron speeds. --- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 95f126b12ba..e7b6b714fb6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 8591e1017af..a93e0bd832d 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 45 +speed_print = 180 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 3b19e1b5da7..ee2404bc086 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 4401e26ff52..6931141a6fa 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 240 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index fc078619d42..217caf56592 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 16adbecf9b4..bd067c1827e 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 160 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index f87579b796a..05000e8e19e 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 8b41e53b09a..a9347074515 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 +speed_print = 200 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index c460287dc60..57751118f94 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.75 +speed_print = 135 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index a37852e7eb4..4016f5584e6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 67.5 +speed_print = 270 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 8a0961a1708..b7474b0cbd1 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 45 +speed_print = 180 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index c1182d00c71..7b8ecd49579 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 20 +speed_print = 80 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 49e4f45f900..cc323328b34 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 +speed_print = 120 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 6899f677edb..fcdc58c5d03 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 240 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 81c9da6f179..63d675bb68a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 160 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 3b21154e825..7fa652d8551 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 15 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index e81d9f4c341..898a271b49c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 22.5 +speed_print = 90 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 2797670b13c..b7aaa1f7a28 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 +speed_print = 120 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index a9a804111c7..f05f6527836 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 11.25 +speed_print = 45 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 7a6508c7a78..5e053d8bc49 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 12.5 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index ae9cd42d9df..d2b06a4d31e 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 20 +speed_print = 80 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index d0816f8db78..b6a752f140c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 10 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 63e1744c1ce..94fa58ec41e 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 10 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index ae5571e6d54..ed6e3bbd967 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 7.5 +speed_print = 30 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index bceb062d4da..49e348299b9 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 6 +speed_print = 24 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 9bca6ec732d..13df7a17fef 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 62.5 +speed_print = 250 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index da94b9d8090..f7f4de0b259 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 7cd4fe079ef..0f7fdf0238e 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 57b96a4bd79..a026d13755a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 41.25 +speed_print = 165 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 42448cd7a6a..2551c5085d9 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 62.5 +speed_print = 250 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0c4d4ae2fbe..03d7a5de608 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 31.25 +speed_print = 125 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 592ddfa0ee2..f8382a17f7d 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 31.25 +speed_print = 125 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index b98808413fd..a9c02df5d2c 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 22.5 +speed_print = 90 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index f009518856b..f3920f61e85 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 17.5 +speed_print = 70 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 305172aff43..57ddcf68f4b 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 18.75 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index ba92b8ee8bf..5de4dff5123 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 15 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 96ce9681403..0fdf7be51cf 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 12.5 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index e81913aec35..d431a471c7e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 15 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b3faafde03b..e611c83dd9d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 12.5 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index bce5c0a55c9..041a037ed06 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 10 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) From ff6c8ee49a4860ee157b824f061350414c76f6bf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Sep 2024 17:00:06 +0200 Subject: [PATCH 014/276] Add script to easily gather packages hashes --- scripts/get_pypi_hashes.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 scripts/get_pypi_hashes.py diff --git a/scripts/get_pypi_hashes.py b/scripts/get_pypi_hashes.py new file mode 100755 index 00000000000..cd62de5961b --- /dev/null +++ b/scripts/get_pypi_hashes.py @@ -0,0 +1,22 @@ +import requests +import argparse +from pathlib import Path + +def get_package_wheel_hashes(package, version): + url = f"https://pypi.org/pypi/{package}/{version}/json" + data = requests.get(url).json() + + print(f" {package}:") + print(f" version: '{version}'") + print(f" hashes:") + + for url in data["urls"]: + print(f" - sha256:{url['digests']['sha256']}") + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Display the hashes of the wheel files to be inserted in pip_requirements") + parser.add_argument("package", type=Path, help="Name of the target package") + parser.add_argument("version", type=Path, help="Version of the target package") + args = parser.parse_args() + get_package_wheel_hashes(args.package, args.version) From 88c846cbd4733b5ce4bbcd8d453db498a1c4f845 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 23 Sep 2024 12:42:48 +0200 Subject: [PATCH 015/276] Add script to gater hashes of Pypi packages --- scripts/get_pypi_hashes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get_pypi_hashes.py b/scripts/get_pypi_hashes.py index cd62de5961b..de2314099e8 100755 --- a/scripts/get_pypi_hashes.py +++ b/scripts/get_pypi_hashes.py @@ -7,7 +7,7 @@ def get_package_wheel_hashes(package, version): data = requests.get(url).json() print(f" {package}:") - print(f" version: '{version}'") + print(f" version: \"{version}\"") print(f" hashes:") for url in data["urls"]: From fb5e4f855340fd89c19a09f450ace9a9ab7fde88 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 10:10:33 +0200 Subject: [PATCH 016/276] Update cura_resources recipe and workflow --- .github/workflows/conan-package-resources.yml | 20 ++++++------------- resources/conanfile.py | 7 ++----- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 92a7e005fa7..3ea07d70840 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -20,21 +20,13 @@ on: - '[0-9].[0-9]*' - '[0-9].[0-9][0-9]*' -env: - CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} - jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main +# FIXME: Use main once merged + conan-package: + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: project_name: cura_resources - - conan-package-export: - needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} conan_recipe_root: "./resources/" - secrets: inherit \ No newline at end of file + platform_windows: false + platform_mac: false + secrets: inherit diff --git a/resources/conanfile.py b/resources/conanfile.py index fde648eeace..666b5719e8a 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -5,7 +5,7 @@ from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration -required_conan_version = ">=1.58.0 <2.0.0" +required_conan_version = ">=2.7.0" class CuraResource(ConanFile): @@ -17,7 +17,7 @@ class CuraResource(ConanFile): topics = ("conan", "cura") settings = "os", "compiler", "build_type", "arch" no_copy_source = True - + package_type = "header-library" @property def _shared_resources(self): @@ -54,9 +54,6 @@ def package_info(self): self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res")) self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) - self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res")) - self.env_info.CURA_ENGINE_SEARCH_PATH.append(os.path.join(self.package_folder, "res", "definitions")) - self.env_info.CURA_ENGINE_SEARCH_PATH.append(os.path.join(self.package_folder, "res", "definitions")) def package_id(self): self.info.clear() From d441dc642b2030bfec2f457ebe47adf168b134db Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 10:12:17 +0200 Subject: [PATCH 017/276] Skip system dependencies to build cura resources --- .github/workflows/conan-package-resources.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 3ea07d70840..94705c7348a 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -29,4 +29,5 @@ jobs: conan_recipe_root: "./resources/" platform_windows: false platform_mac: false + install_system_dependencies: false secrets: inherit From e3cb6d4f8c6c7e9a39decef1bf2a0afdab0f6c4f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 16:08:30 +0200 Subject: [PATCH 018/276] Basically working recipe --- conandata.yml | 420 ++++++++++++++++++++++++++++++++++++- conanfile.py | 125 ++++------- requirements-dev.txt | 6 - requirements-ultimaker.txt | 1 - requirements.txt | 408 ----------------------------------- 5 files changed, 449 insertions(+), 511 deletions(-) delete mode 100644 requirements-dev.txt delete mode 100644 requirements-ultimaker.txt delete mode 100644 requirements.txt diff --git a/conandata.yml b/conandata.yml index eda0a7c1648..f40ad698a22 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,20 @@ version: "5.9.0-alpha.0" + requirements: - - "cura_resources/(latest)@ultimaker/testing" - - "uranium/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" - - "dulcificum/0.2.1" - - "pysavitar/5.3.0" - - "pynest2d/5.3.0" - - "native_cad_plugin/2.0.0" + - "cura_resources/5.9.0-alpha.0@ultimaker/cura_11622" + - "uranium/5.9.0-alpha.0@ultimaker/cura_11622" + - "curaengine/5.9.0-alpha.0@ultimaker/cura_11622" + - "cura_binary_data/5.9.0-alpha.0@ultimaker/cura_11622" + - "fdm_materials/5.9.0-alpha.0@ultimaker/cura_11622" + - "dulcificum/0.2.0-alpha.0@ultimaker/cura_11622" + - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" + - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" requirements_internal: - "fdm_materials/5.8.1" - - "cura_private_data/(latest)@internal/testing" + - "cura_private_data/5.9.0-alpha.0@internal/cura_11622" +requirements_enterprise: + - "native_cad_plugin/2.0.0" + urls: default: cloud_api_root: "https://api.ultimaker.com" @@ -25,6 +28,7 @@ urls: marketplace_root: "https://marketplace-staging.ultimaker.com" digital_factory_url: "https://digitalfactory-staging.ultimaker.com" cura_latest_url: "https://software.ultimaker.com/latest.json" + pyinstaller: runinfo: entrypoint: "cura_app.py" @@ -124,6 +128,7 @@ pyinstaller: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" + pycharm_targets: - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja module_name: Cura @@ -242,3 +247,398 @@ pycharm_targets: module_name: Cura name: pytest in TestSettingVisibilityPresets.py script_name: tests/Settings/TestSettingVisibilityPresets.py + +pip_requirements: + any: + libCharon: + url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" + PyQt6-NetworkAuth: + version: "6.6.0" + hashes: + - sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 + - sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 + - sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 + - sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb + PyQt6-NetworkAuth-Qt6: + version: "6.6.0" + hashes: + - sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 + - sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 + - sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 + - sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 + certifi: + version: "2023.5.7" + hashes: + - sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 + - sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 + zeroconf: + version: "0.31.0" + hashes: + - sha256:5a468da018bc3f04bbce77ae247924d802df7aeb4c291bbbb5a9616d128800b0 + - sha256:53a180248471c6f81bd1fffcbce03ed93d7d8eaf10905c9121ac1ea996d19844 + importlib-metadata: + version: "4.10.0" + hashes: + - sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 + - sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 + keyring: + version: "23.0.1" + hashes: + - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 + - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 + trimesh: + version: "3.9.36" + hashes: + - sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 + - sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e + sentry-sdk: + version: "0.13.5" + hashes: + - sha256:05285942901d38c7ce2498aba50d8e87b361fc603281a5902dda98f3f8c5e145 + - sha256:c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82 + pyserial: + version: "3.4" + hashes: + - sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8 + - sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 + chardet: + version: "3.0.4" + hashes: + - sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 + - sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae + idna: + version: "2.8" + hashes: + - sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c + - sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 + attrs: + version: "21.3.0" + hashes: + - sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c + - sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 + requests: + version: "2.22.0" + hashes: + - sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 + - sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 + twisted: + version: "21.2.0" + hashes: + - sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e + - sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 + constantly: + version: "15.1.0" + hashes: + - sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d + - sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 + hyperlink: + version: "21.0.0" + hashes: + - sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4 + - sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b + incremental: + version: "22.10.0" + hashes: + - sha256:b864a1f30885ee72c5ac2835a761b8fe8aa9c28b9395cacf27286602688d3e51 + - sha256:912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 + zope.interface: + version: "5.4.0" + hashes: + - sha256:7df1e1c05304f26faa49fa752a8c690126cf98b40b91d54e6e9cc3b7d6ffe8b7 + - sha256:2c98384b254b37ce50eddd55db8d381a5c53b4c10ee66e1e7fe749824f894021 + - sha256:08f9636e99a9d5410181ba0729e0408d3d8748026ea938f3b970a0249daa8192 + - sha256:0ea1d73b7c9dcbc5080bb8aaffb776f1c68e807767069b9ccdd06f27a161914a + - sha256:273f158fabc5ea33cbc936da0ab3d4ba80ede5351babc4f577d768e057651531 + - sha256:f7ee479e96f7ee350db1cf24afa5685a5899e2b34992fb99e1f7c1b0b758d263 + - sha256:b0297b1e05fd128d26cc2460c810d42e205d16d76799526dfa8c8ccd50e74959 + - sha256:af310ec8335016b5e52cae60cda4a4f2a60a788cbb949a4fbea13d441aa5a09e + - sha256:9a9845c4c6bb56e508651f005c4aeb0404e518c6f000d5a1123ab077ab769f5c + - sha256:a1e6e96217a0f72e2b8629e271e1b280c6fa3fe6e59fa8f6701bec14e3354325 + - sha256:877473e675fdcc113c138813a5dd440da0769a2d81f4d86614e5d62b69497155 + - sha256:0b465ae0962d49c68aa9733ba92a001b2a0933c317780435f00be7ecb959c702 + - sha256:5dd9ca406499444f4c8299f803d4a14edf7890ecc595c8b1c7115c2342cadc5f + - sha256:469e2407e0fe9880ac690a3666f03eb4c3c444411a5a5fddfdabc5d184a79f05 + - sha256:52de7fc6c21b419078008f697fd4103dbc763288b1406b4562554bd47514c004 + - sha256:3dd4952748521205697bc2802e4afac5ed4b02909bb799ba1fe239f77fd4e117 + - sha256:dd93ea5c0c7f3e25335ab7d22a507b1dc43976e1345508f845efc573d3d779d8 + - sha256:3748fac0d0f6a304e674955ab1365d515993b3a0a865e16a11ec9d86fb307f63 + - sha256:66c0061c91b3b9cf542131148ef7ecbecb2690d48d1612ec386de9d36766058f + - sha256:d0c1bc2fa9a7285719e5678584f6b92572a5b639d0e471bb8d4b650a1a910920 + - sha256:2876246527c91e101184f63ccd1d716ec9c46519cc5f3d5375a3351c46467c46 + - sha256:334701327f37c47fa628fc8b8d28c7d7730ce7daaf4bda1efb741679c2b087fc + - sha256:71aace0c42d53abe6fc7f726c5d3b60d90f3c5c055a447950ad6ea9cec2e37d9 + - sha256:5bb3489b4558e49ad2c5118137cfeaf59434f9737fa9c5deefc72d22c23822e2 + - sha256:1c0e316c9add0db48a5b703833881351444398b04111188069a26a61cfb4df78 + - sha256:6f0c02cbb9691b7c91d5009108f975f8ffeab5dff8f26d62e21c493060eff2a1 + - sha256:7d97a4306898b05404a0dcdc32d9709b7d8832c0c542b861d9a826301719794e + - sha256:867a5ad16892bf20e6c4ea2aab1971f45645ff3102ad29bd84c86027fa99997b + - sha256:5f931a1c21dfa7a9c573ec1f50a31135ccce84e32507c54e1ea404894c5eb96f + - sha256:194d0bcb1374ac3e1e023961610dc8f2c78a0f5f634d0c737691e215569e640d + - sha256:8270252effc60b9642b423189a2fe90eb6b59e87cbee54549db3f5562ff8d1b8 + - sha256:15e7d1f7a6ee16572e21e3576d2012b2778cbacf75eb4b7400be37455f5ca8bf + - sha256:8892f89999ffd992208754851e5a052f6b5db70a1e3f7d54b17c5211e37a98c7 + - sha256:2e5a26f16503be6c826abca904e45f1a44ff275fdb7e9d1b75c10671c26f8b94 + - sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3 + - sha256:4de4bc9b6d35c5af65b454d3e9bc98c50eb3960d5a3762c9438df57427134b8e + - sha256:bf68f4b2b6683e52bec69273562df15af352e5ed25d1b6641e7efddc5951d1a7 + - sha256:63b82bb63de7c821428d513607e84c6d97d58afd1fe2eb645030bdc185440120 + - sha256:db1fa631737dab9fa0b37f3979d8d2631e348c3b4e8325d6873c2541d0ae5a48 + - sha256:f44e517131a98f7a76696a7b21b164bcb85291cee106a23beccce454e1f433a4 + - sha256:a9506a7e80bcf6eacfff7f804c0ad5350c8c95b9010e4356a4b36f5322f09abb + - sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54 + - sha256:0cee5187b60ed26d56eb2960136288ce91bcf61e2a9405660d271d1f122a69a4 + - sha256:a8156e6a7f5e2a0ff0c5b21d6bcb45145efece1909efcbbbf48c56f8da68221d + - sha256:205e40ccde0f37496904572035deea747390a8b7dc65146d30b96e2dd1359a83 + - sha256:3f24df7124c323fceb53ff6168da70dbfbae1442b4f3da439cd441681f54fe25 + - sha256:5208ebd5152e040640518a77827bdfcc73773a15a33d6644015b763b9c9febc1 + - sha256:17776ecd3a1fdd2b2cd5373e5ef8b307162f581c693575ec62e7c5399d80794c + - sha256:d4d9d6c1a455d4babd320203b918ccc7fcbefe308615c521062bc2ba1aa4d26e + - sha256:0cba8477e300d64a11a9789ed40ee8932b59f9ee05f85276dbb4b59acee5dd09 + - sha256:5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e + automat: + version: "20.2.0" + hashes: + - sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111 + - sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 + shapely: + version: "2.0.6" + hashes: + - sha256:29a34e068da2d321e926b5073539fd2a1d4429a2c656bd63f0bd4c8f5b236d0b + - sha256:e1c84c3f53144febf6af909d6b581bc05e8785d57e27f35ebaa5c1ab9baba13b + - sha256:2ad2fae12dca8d2b727fa12b007e46fbc522148a584f5d6546c539f3464dccde + - sha256:b3304883bd82d44be1b27a9d17f1167fda8c7f5a02a897958d86c59ec69b705e + - sha256:3ec3a0eab496b5e04633a39fa3d5eb5454628228201fb24903d38174ee34565e + - sha256:28f87cdf5308a514763a5c38de295544cb27429cfa655d50ed8431a4796090c4 + - sha256:5aeb0f51a9db176da9a30cb2f4329b6fbd1e26d359012bb0ac3d3c7781667a9e + - sha256:9a7a78b0d51257a367ee115f4d41ca4d46edbd0dd280f697a8092dd3989867b2 + - sha256:f32c23d2f43d54029f986479f7c1f6e09c6b3a19353a3833c2ffb226fb63a855 + - sha256:b3dc9fb0eb56498912025f5eb352b5126f04801ed0e8bdbd867d21bdbfd7cbd0 + - sha256:d93b7e0e71c9f095e09454bf18dad5ea716fb6ced5df3cb044564a00723f339d + - sha256:c02eb6bf4cfb9fe6568502e85bb2647921ee49171bcd2d4116c7b3109724ef9b + - sha256:cec9193519940e9d1b86a3b4f5af9eb6910197d24af02f247afbfb47bcb3fab0 + - sha256:83b94a44ab04a90e88be69e7ddcc6f332da7c0a0ebb1156e1c4f568bbec983c3 + - sha256:537c4b2716d22c92036d00b34aac9d3775e3691f80c7aa517c2c290351f42cd8 + - sha256:98fea108334be345c283ce74bf064fa00cfdd718048a8af7343c59eb40f59726 + - sha256:42fd4cd4834747e4990227e4cbafb02242c0cffe9ce7ef9971f53ac52d80d55f + - sha256:665990c84aece05efb68a21b3523a6b2057e84a1afbef426ad287f0796ef8a48 + - sha256:42805ef90783ce689a4dde2b6b2f261e2c52609226a0438d882e3ced40bb3013 + - sha256:6d2cb146191a47bd0cee8ff5f90b47547b82b6345c0d02dd8b25b88b68af62d7 + - sha256:e3fdef0a1794a8fe70dc1f514440aa34426cc0ae98d9a1027fb299d45741c381 + - sha256:2c665a0301c645615a107ff7f52adafa2153beab51daf34587170d85e8ba6805 + - sha256:0334bd51828f68cd54b87d80b3e7cee93f249d82ae55a0faf3ea21c9be7b323a + - sha256:d37d070da9e0e0f0a530a621e17c0b8c3c9d04105655132a87cfff8bd77cc4c2 + - sha256:fa7468e4f5b92049c0f36d63c3e309f85f2775752e076378e36c6387245c5462 + - sha256:ed5867e598a9e8ac3291da6cc9baa62ca25706eea186117034e8ec0ea4355653 + - sha256:81d9dfe155f371f78c8d895a7b7f323bb241fb148d848a2bf2244f79213123fe + - sha256:fbb7bf02a7542dba55129062570211cfb0defa05386409b3e306c39612e7fbcc + - sha256:837d395fac58aa01aa544495b97940995211e3e25f9aaf87bc3ba5b3a8cd1ac7 + - sha256:c6d88ade96bf02f6bfd667ddd3626913098e243e419a0325ebef2bbd481d1eb6 + - sha256:8b3b818c4407eaa0b4cb376fd2305e20ff6df757bf1356651589eadc14aab41b + - sha256:1bbc783529a21f2bd50c79cef90761f72d41c45622b3e57acf78d984c50a5d13 + - sha256:2423f6c0903ebe5df6d32e0066b3d94029aab18425ad4b07bf98c3972a6e25a1 + - sha256:2de00c3bfa80d6750832bde1d9487e302a6dd21d90cb2f210515cefdb616e5f5 + - sha256:3a82d58a1134d5e975f19268710e53bddd9c473743356c90d97ce04b73e101ee + - sha256:392f66f458a0a2c706254f473290418236e52aa4c9b476a072539d63a2460595 + - sha256:eba5bae271d523c938274c61658ebc34de6c4b33fdf43ef7e938b5776388c1be + - sha256:7060566bc4888b0c8ed14b5d57df8a0ead5c28f9b69fb6bed4476df31c51b0af + - sha256:b02154b3e9d076a29a8513dffcb80f047a5ea63c897c0cd3d3679f29363cf7e5 + - sha256:44246d30124a4f1a638a7d5419149959532b99dfa25b54393512e6acc9c211ac + - sha256:2b542d7f1dbb89192d3512c52b679c822ba916f93479fa5d4fc2fe4fa0b3c9e8 + - sha256:997f6159b1484059ec239cacaa53467fd8b5564dabe186cd84ac2944663b0bf6 + cython: + version: "0.29.26" + hashes: + - sha256:c4b003b6b7aa9e74552ef8d4e6009b3e3c3e8fa585710b3a6d062e088e460c1b + - sha256:ce804a021c92fea66c8c100781a111706f21bade7a546895c5a9c57fe2df8b24 + - sha256:93840f2071c1f15e613509eadee1fbcd335e8666772437fe5038e24059edd48c + - sha256:10402f0f1564ffc6ecb9c45e07f995771d05bb0b0e1d151e40574638292ee3a5 + - sha256:8e07121b34221458a2151d37e137b8f5b011a9c51dd38db2499a6198590aa319 + - sha256:233a87db76941626f1db08f4b25a4a5b425b13b64ed0e673c3641f7b650a48d8 + - sha256:6773cce9d4b3b6168d8feb2b6f06b658ef1e11cbfec075041745666d8e2a5e45 + - sha256:c813799d533194b7d85203d881d8b4f567a8c644a67f50d47f1ffbf316df412f + - sha256:362fbb9cb4627c7786231429768b54aaba5459a2a0e46c25e59f202ca6155437 + - sha256:2b834ff6e4d10ba6d7a0d676dd71c1b427a181ddbbbbf79e91d1861557aab59f + - sha256:0c3093bc99facfc97e5019f6c5bc39987663792265c1334d9fc9e37c3a3dcd6f + - sha256:bbf0149680c1fca07200a3ed372b22e6bad7851d191b717a61f9a68af370e180 + - sha256:a1cc55db32cd39474081d478263b96e036552cdbbab8831c90ea43fb385a9b66 + - sha256:ebe32e002a9e6553de399033e259ece72aa17c77f740b265e66f122572a8a278 + - sha256:6b385f68789c3e8a75b4827e8a4970ff04605ad3cb1c0b41005cc69368dad65d + - sha256:1519eb639de308f5763eb0666b4cc7bd3958268f3f6228cc610b7b4d6c94b68b + - sha256:e118525defec3f67471d8ee5ce04340d43195410a87e5d7ec8a1a9e953c0066a + - sha256:706ea55f58c2722206e51cd9a8754ed0995c4c4231d24b095875d2641d745222 + - sha256:77913fe27c5e22c995bac090d01e200ff91e5f58aa944e2d2e94cbf67ea2ae34 + - sha256:51923120f57a42c59f5ee6bba9e89a31a394ae8cd419c753f64d8a3aea1ee8b7 + - sha256:82881565d04027728d7762edd8c085927a840873af7ee049d703e0ca226bc08d + - sha256:531303085503959338e6cdac630626280ef111aecbb22d48321673a8c3897c0a + - sha256:0205b685802eb4c039b14f67b7ac3f00c55ff04b9e3871df2249576d3e59ba42 + - sha256:7df94e56872df8f396ca669466fee60256f69f678654239f706b1e643c2ac4a5 + - sha256:4b7d04b393d9a4b5fec0cbc4b0f29fe083a9d862d95231a6e7608978bd661d7e + - sha256:af91dd63ac5f1f7fc70dc91ea063f727db42b5eb934d1f3832611be18e25171e + - sha256:d83dad8dc6c63706cb3178dc79010b3865b1345090727189d2cd61758a825ee8 + - sha256:ca10e9fde0eaba1407ab353ff07a26daaa3e4dbe356108a149e482d441f070dd + - sha256:fec66cd0a48697fab903854566235aecf1084f62e3163d6589ae7335a1b4d448 + - sha256:b3041e45aefaa4449fd671902132c0ac1f72eedaedac745c0e1a70a13bf990bb + - sha256:ed76fb98979f02b5e89079906071983a36f3634d3028b86f935cf0196f24fcaa + - sha256:4d868e1a41f5123f51a20c1b8e82f7cb6fa3370c104e98e707f7c910e8cadad1 + - sha256:868f309095e557f06dc58723ae865e8c65cfedb2646a562bd8080c92d69e4e4b + - sha256:be550b566345bf53b95616334793ce42a128cf1d9dcde1e28cbf7ce52ea61d6d + - sha256:be13be1e2b9b7395588f2a23bfa692f2f3e6f7936ccf7825c83431b8c8c3452b + - sha256:41ee918480371ae5e5851ba9b1ead5a183e24aedb27bf807c7405d124e943f40 + - sha256:c91b1ba0d43f7f7ccde8121c672207c7891735ddcc83496af1e0ab617ddc4aba + - sha256:5ecf5cf5b57086cc6c1cfc76d6353bbd7023e95da32e0883f1302ca50e481c33 + - sha256:0ffce25bf50fa926ec6bf8d6f29650e7cb33fae445938c9880e1ce9b776353ef + - sha256:5041adfef502d67ecd5e291a7cf645a37fed7a9dac557f40d491053f35204d00 + - sha256:5fd5db458c9d3d2c2abd047f3190624d9cce8a80a8e0ca0baa69cfd133a523bc + - sha256:75eaa22911d2ec37a3841f77b710b178c805cd378b5e1c4fb82dbc35620d2062 + - sha256:3aed8c642e8fb27024bca46830b7f62335a44a92354acf708d6b8d050f945a3a + - sha256:b5ca05c2bfba0c2480b5fd390ecffe46b8da574d887d600388d6e3caf3f99a88 + - sha256:f5e15ff892c8afad64931ee3dd723c4755c2c516606f9aae7613bebfac62b0f6 + - sha256:af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 + pybind11: + version: "2.6.2" + hashes: + - sha256:2d8aebe1709bc367e34e3b23d8eccbf3f387ee9d5640548c6260d33b59f02405 + - sha256:d0e0aed9279656f21501243b707eb6e3b951e89e10c3271dedf3ae41c365e5ed + wheel: + version: "0.37.1" + hashes: + - sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a + - sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 + ifaddr: + version: "0.1.7" + hashes: + - sha256:d1f603952f0a71c9ab4e705754511e4e03b02565bc4cec7188ad6415ff534cd3 + - sha256:1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 + pycparser: + version: "2.20" + hashes: + - sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 + - sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 + zipp: + version: "3.5.0" + hashes: + - sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 + - sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 + cffi: + version: "1.15.0" + hashes: + - sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962 + - sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0 + - sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14 + - sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27 + - sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023 + - sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474 + - sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6 + - sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 + - sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e + - sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7 + - sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 + - sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c + - sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962 + - sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382 + - sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55 + - sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 + - sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e + - sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39 + - sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc + - sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032 + - sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8 + - sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605 + - sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e + - sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc + - sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636 + - sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4 + - sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997 + - sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b + - sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2 + - sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7 + - sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66 + - sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029 + - sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880 + - sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20 + - sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024 + - sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e + - sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728 + - sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6 + - sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c + - sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443 + - sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a + - sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37 + - sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a + - sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e + - sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796 + - sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df + - sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8 + - sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a + - sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 + - sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 + urllib3: + version: "1.25.9" + hashes: + - sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 + - sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 + jeepney: + version: "0.7.1" + hashes: + - sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac + - sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f + SecretStorage: + version: "3.3.3" + hashes: + - sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + - sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 + keyring: + version: "23.0.1" + hashes: + - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 + - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 + charset-normalizer: + version: "2.1.0" + hashes: + - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 + - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 + Windows: + twisted-iocpsupport: + version: "1.0.2" + hashes: + - sha256:985c06a33f5c0dae92c71a036d1ea63872ee86a21dd9b01e1f287486f15524b4 + - sha256:81b3abe3527b367da0220482820cb12a16c661672b7bcfcde328902890d63323 + - sha256:9dbb8823b49f06d4de52721b47de4d3b3026064ef4788ce62b1a21c57c3fff6f + - sha256:b9fed67cf0f951573f06d560ac2f10f2a4bbdc6697770113a2fc396ea2cb2565 + - sha256:b76b4eed9b27fd63ddb0877efdd2d15835fdcb6baa745cb85b66e5d016ac2878 + - sha256:851b3735ca7e8102e661872390e3bce88f8901bece95c25a0c8bb9ecb8a23d32 + - sha256:bf4133139d77fc706d8f572e6b7d82871d82ec7ef25d685c2351bdacfb701415 + - sha256:306becd6e22ab6e8e4f36b6bdafd9c92e867c98a5ce517b27fdd27760ee7ae41 + - sha256:3c61742cb0bc6c1ac117a7e5f422c129832f0c295af49e01d8a6066df8cfc04d + - sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 + - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf + - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 + pywin32: + version: "303" + hashes: + - sha256:6fed4af057039f309263fd3285d7b8042d41507343cd5fa781d98fcc5b90e8bb + - sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 + - sha256:d9b5d87ca944eb3aa4cd45516203ead4b37ab06b8b777c54aedc35975dec0dee + - sha256:fcf44032f5b14fcda86028cdf49b6ebdaea091230eb0a757282aa656e4732439 + - sha256:aad484d52ec58008ca36bd4ad14a71d7dd0a99db1a4ca71072213f63bf49c7d9 + - sha256:2a09632916b6bb231ba49983fe989f2f625cea237219530e81a69239cd0c4559 + - sha256:b1675d82bcf6dbc96363fca747bac8bff6f6e4a447a4287ac652aa4b9adc796e + - sha256:c268040769b48a13367221fced6d4232ed52f044ffafeda247bd9d2c6bdc29ca + - sha256:5f9ec054f5a46a0f4dfd72af2ce1372f3d5a6e4052af20b858aa7df2df7d355b + - sha256:793bf74fce164bcffd9d57bb13c2c15d56e43c9542a7b9687b4fccf8f8a41aba + - sha256:7d3271c98434617a11921c5ccf74615794d97b079e22ed7773790822735cc352 + - sha256:79cbb862c11b9af19bcb682891c1b91942ec2ff7de8151e2aea2e175899cda34 + pywin32-ctypes: + version: "0.2.0" + hashes: + - sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 + - sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 + +pip_requirements_dev: + - pytest + - pyinstaller==6.3.0 + - pyinstaller-hooks-contrib + - pyyaml + - sip==6.5.1 + - jinja2 + diff --git a/conanfile.py b/conanfile.py index 999cca3362c..8b34e959d33 100644 --- a/conanfile.py +++ b/conanfile.py @@ -11,7 +11,7 @@ from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException -required_conan_version = ">=1.58.0 <2.0.0" +required_conan_version = ">=2.7.0" class CuraConan(ConanFile): @@ -26,26 +26,26 @@ class CuraConan(ConanFile): settings = "os", "compiler", "build_type", "arch" # FIXME: Remove specific branch once merged to main - python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable" + python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" options = { - "enterprise": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string - "staging": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string + "enterprise": [True, False], + "staging": [True, False], "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools - "cloud_api_version": "ANY", - "display_name": "ANY", # TODO: should this be an option?? + "cloud_api_version": ["ANY"], + "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles - "internal": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string + "internal": [True, False], "enable_i18n": [True, False], } default_options = { - "enterprise": "False", - "staging": "False", + "enterprise": False, + "staging": False, "devtools": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented - "internal": "False", + "internal": False, "enable_i18n": False, } @@ -72,8 +72,7 @@ def _cura_run_env(self): self._cura_env = Environment() self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) - if not self.in_local_cache: - self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) + self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) if self.settings.os == "Linux": self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") @@ -81,42 +80,21 @@ def _cura_run_env(self): self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") return self._cura_env - @property - def _enterprise(self): - return self.options.enterprise in ["True", 'true'] - - @property - def _internal(self): - return self.options.internal in ["True", 'true'] - @property def _app_name(self): - if self._enterprise: + if self.options.enterprise: return str(self.options.display_name) + " Enterprise" return str(self.options.display_name) @property def _urls(self): - if self.options.staging in ["True", 'true']: + if self.options.staging: return "staging" return "default" - @property - def requirements_txts(self): - if self.options.devtools: - return ["requirements.txt", "requirements-ultimaker.txt", "requirements-dev.txt"] - return ["requirements.txt", "requirements-ultimaker.txt"] - @property def _base_dir(self): - if self.install_folder is None: - if self.build_folder is not None: - return Path(self.build_folder) - return Path(os.getcwd(), "venv") - if self.in_local_cache: - return Path(self.install_folder) - else: - return Path(self.source_folder, "venv") + return Path(self.source_folder, "venv") @property def _share_dir(self): @@ -132,7 +110,7 @@ def _script_dir(self): def _site_packages(self): if self.settings.os == "Windows": return self._base_dir.joinpath("Lib", "site-packages") - py_version = Version(self.deps_cpp_info["cpython"].version) + py_version = Version(self.dependencies["cpython"].ref.version) return self._base_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages") @property @@ -176,12 +154,11 @@ def _python_installs(self): inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() with venv_vars.apply(): - self.run(f"""python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}""", + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", env = "conanrun", - output = buffer) + stdout = buffer) - packages = str(buffer.getvalue()).split("-----------------\n") - packages = packages[1].strip('\r\n').split(";") + packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") python_installs[name] = {"version": version} @@ -197,7 +174,7 @@ def _generate_cura_version(self, location): cura_version = Version(self.conf.get("user.cura:version", default = self.version, check_type = str)) pre_tag = f"-{cura_version.pre}" if cura_version.pre else "" build_tag = f"+{cura_version.build}" if cura_version.build else "" - internal_tag = f"+internal" if self._internal else "" + internal_tag = f"+internal" if self.options.internal else "" cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}{internal_tag}" with open(os.path.join(location, "CuraVersion.py"), "w") as f: @@ -205,7 +182,7 @@ def _generate_cura_version(self, location): cura_app_name = self.name, cura_app_display_name = self._app_name, cura_version = cura_version, - cura_build_type = "Enterprise" if self._enterprise else "", + cura_build_type = "Enterprise" if self.options.enterprise else "", cura_debug_mode = self.options.cura_debug_mode, cura_cloud_api_root = self.conan_data["urls"][self._urls]["cloud_api_root"], cura_cloud_api_version = self.options.cloud_api_version, @@ -221,7 +198,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] for data in pyinstaller_metadata["datas"].values(): - if not self._internal and data.get("internal", False): + if not self.options.internal and data.get("internal", False): continue if "package" in data: # get the paths from conan package @@ -321,20 +298,6 @@ def config_options(self): if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): del self.options.enable_i18n - def configure(self): - self.options["pyarcus"].shared = True - self.options["pysavitar"].shared = True - self.options["pynest2d"].shared = True - self.options["dulcificum"].shared = self.settings.os != "Windows" - self.options["cpython"].shared = True - self.options["boost"].header_only = True - if self.settings.os == "Linux": - self.options["openssl"].shared = True - if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "": - self.options["curaengine"].enable_sentry = True - self.options["arcus"].enable_sentry = True - self.options["clipper"].enable_sentry = True - def validate(self): version = self.conf.get("user.cura:version", default = self.version, check_type = str) if version and Version(version) <= Version("4"): @@ -342,22 +305,16 @@ def validate(self): def requirements(self): for req in self.conan_data["requirements"]: - if self._internal and "fdm_materials" in req: - continue - if not self._enterprise and "native_cad_plugin" in req: + if self.options.internal and "fdm_materials" in req: continue self.requires(req) - if self._internal: + if self.options.internal: for req in self.conan_data["requirements_internal"]: self.requires(req) - self.requires("cpython/3.10.4@ultimaker/stable") - self.requires("clipper/6.4.2@ultimaker/stable") - self.requires("openssl/3.2.0") - self.requires("protobuf/3.21.12") - self.requires("boost/1.82.0") - self.requires("spdlog/1.12.0") - self.requires("fmt/10.1.1") - self.requires("zlib/1.2.13") + if self.options.enterprise: + for req in self.conan_data["requirements_enterprise"]: + self.requires(req) + self.requires("cpython/3.12.2") def build_requirements(self): if self.options.get_safe("enable_i18n", False): @@ -383,18 +340,17 @@ def generate(self): self._generate_cura_version(os.path.join(self.source_folder, "cura")) - if not self.in_local_cache: - # Copy CuraEngine.exe to bindirs of Virtual Python Environment - curaengine = self.dependencies["curaengine"].cpp_info - copy(self, "CuraEngine.exe", curaengine.bindirs[0], self.source_folder, keep_path = False) - copy(self, "CuraEngine", curaengine.bindirs[0], self.source_folder, keep_path = False) + # Copy CuraEngine.exe to bindirs of Virtual Python Environment + curaengine = self.dependencies["curaengine"].cpp_info + copy(self, "CuraEngine.exe", curaengine.bindirs[0], self.source_folder, keep_path = False) + copy(self, "CuraEngine", curaengine.bindirs[0], self.source_folder, keep_path = False) - # Copy the external plugins that we want to bundle with Cura - if self._enterprise: - rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) - native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info - copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) - copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) + # Copy the external plugins that we want to bundle with Cura + if self.options.enterprise: + rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) + native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info + copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) + copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) # Copy resources of cura_binary_data cura_binary_data = self.dependencies["cura_binary_data"].cpp_info @@ -417,7 +373,7 @@ def generate(self): copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources - if self._internal: + if self.options.internal: cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) @@ -537,8 +493,6 @@ def package_info(self): self.env_info.PYTHONPATH.append(os.path.join(self.source_folder, "plugins")) def package_id(self): - self.info.clear() - # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` del self.info.options.enterprise @@ -547,8 +501,7 @@ def package_id(self): del self.info.options.cloud_api_version del self.info.options.display_name del self.info.options.cura_debug_mode - if self.options.get_safe("enable_i18n", False): - del self.info.options.enable_i18n + self.info.options.rm_safe("enable_i18n") # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different # Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 162b33bf158..00000000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,6 +0,0 @@ -pytest -pyinstaller==6.3.0 -pyinstaller-hooks-contrib -pyyaml -sip==6.5.1 -jinja2 diff --git a/requirements-ultimaker.txt b/requirements-ultimaker.txt deleted file mode 100644 index 8a412d85969..00000000000 --- a/requirements-ultimaker.txt +++ /dev/null @@ -1 +0,0 @@ -git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 344a0156d8d..00000000000 --- a/requirements.txt +++ /dev/null @@ -1,408 +0,0 @@ -### Direct requirements for Uranium and libCharon ### -PyQt6-sip==13.6.0 \ - --hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \ - --hash=sha256:13885361ca2cb2f5085d50359ba61b3fabd41b139fb58f37332acbe631ef2357 \ - --hash=sha256:24441032a29791e82beb7dfd76878339058def0e97fdb7c1cea517f3a0e6e96b \ - --hash=sha256:2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778 \ - --hash=sha256:3075d8b325382750829e6cde6971c943352309d35768a4d4da0587459606d562 \ - --hash=sha256:33ea771fe777eb0d1a2c3ef35bcc3f7a286eb3ff09cd5b2fdd3d87d1f392d7e8 \ - --hash=sha256:39854dba35f8e5a4288da26ecb5f40b4c5ec1932efffb3f49d5ea435a7f37fb3 \ - --hash=sha256:3bf03e130fbfd75c9c06e687b86ba375410c7a9e835e4e03285889e61dd4b0c4 \ - --hash=sha256:43fb8551796030aae3d66d6e35e277494071ec6172cd182c9569ab7db268a2f5 \ - --hash=sha256:58f68a48400e0b3d1ccb18090090299bad26e3aed7ccb7057c65887b79b8aeea \ - --hash=sha256:5b9c6b6f9cfccb48cbb78a59603145a698fb4ffd176764d7083e5bf47631d8df \ - --hash=sha256:747f6ca44af81777a2c696bd501bc4815a53ec6fc94d4e25830e10bc1391f8ab \ - --hash=sha256:86a7b67c64436e32bffa9c28c9f21bf14a9faa54991520b12c3f6f435f24df7f \ - --hash=sha256:8c282062125eea5baf830c6998587d98c50be7c3a817a057fb95fef647184012 \ - --hash=sha256:8f9df9f7ccd8a9f0f1d36948c686f03ce1a1281543a3e636b7b7d5e086e1a436 \ - --hash=sha256:98bf954103b087162fa63b3a78f30b0b63da22fd6450b610ec1b851dbb798228 \ - --hash=sha256:9adf672f9114687533a74d5c2d4c03a9a929ad5ad9c3e88098a7da1a440ab916 \ - --hash=sha256:a6ce80bc24618d8a41be8ca51ad9f10e8bc4296dd90ab2809573df30a23ae0e5 \ - --hash=sha256:d6b5f699aaed0ac1fcd23e8fbca70d8a77965831b7c1ce474b81b1678817a49d \ - --hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \ - --hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9 -PyQt6==6.6.0 \ - --hash=sha256:33655db05ac2de699320f035250c21434c77144a6a2943aca3f4c579dabc3f7b \ - --hash=sha256:3ef68830a9b32050c30f7962c56a5927802c9193b68eaf405faecb8ce9ae10a8 \ - --hash=sha256:d41512d66044c2df9c5f515a56a922170d68a37b3406ffddc8b4adc57181b576 \ - --hash=sha256:fc7185d65755f26d7a6842492ec5398c92544dc4eafbbcbef1b1922aca585c96 -PyQt6-Qt6==6.6.0 \ - --hash=sha256:1b079a33088d32ff47872cdb37fd15aa42101f0be46c3340244483849b781438 \ - --hash=sha256:8cb30d64a4d32465ea1686bc827cbe452225fb387c4873356b0fa7b9ae63534f \ - --hash=sha256:a151f34712cd645111e89cb30b02e5fb69c9dcc3603ab3c03a561e874bd7cbcf \ - --hash=sha256:e5483ae04bf107411c7469f1be9f9e2eb9840303e788b3ac524fe30af90d45f4 -PyQt6-NetworkAuth==6.6.0 \ - --hash=sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 \ - --hash=sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 \ - --hash=sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb \ - --hash=sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 -PyQt6-NetworkAuth-Qt6==6.6.0 \ - --hash=sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 \ - --hash=sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 \ - --hash=sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 \ - --hash=sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 - -certifi==2023.5.7; \ - --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 -cryptography==41.0.1 \ - --hash=sha256:059e348f9a3c1950937e1b5d7ba1f8e968508ab181e75fc32b879452f08356db \ - --hash=sha256:1a5472d40c8f8e91ff7a3d8ac6dfa363d8e3138b961529c996f3e2df0c7a411a \ - --hash=sha256:1a8e6c2de6fbbcc5e14fd27fb24414507cb3333198ea9ab1258d916f00bc3039 \ - --hash=sha256:1fee5aacc7367487b4e22484d3c7e547992ed726d14864ee33c0176ae43b0d7c \ - --hash=sha256:5d092fdfedaec4cbbffbf98cddc915ba145313a6fdaab83c6e67f4e6c218e6f3 \ - --hash=sha256:5f0ff6e18d13a3de56f609dd1fd11470918f770c6bd5d00d632076c727d35485 \ - --hash=sha256:7bfc55a5eae8b86a287747053140ba221afc65eb06207bedf6e019b8934b477c \ - --hash=sha256:7fa01527046ca5facdf973eef2535a27fec4cb651e4daec4d043ef63f6ecd4ca \ - --hash=sha256:8dde71c4169ec5ccc1087bb7521d54251c016f126f922ab2dfe6649170a3b8c5 \ - --hash=sha256:8f4ab7021127a9b4323537300a2acfb450124b2def3756f64dc3a3d2160ee4b5 \ - --hash=sha256:948224d76c4b6457349d47c0c98657557f429b4e93057cf5a2f71d603e2fc3a3 \ - --hash=sha256:9a6c7a3c87d595608a39980ebaa04d5a37f94024c9f24eb7d10262b92f739ddb \ - --hash=sha256:b46e37db3cc267b4dea1f56da7346c9727e1209aa98487179ee8ebed09d21e43 \ - --hash=sha256:b4ceb5324b998ce2003bc17d519080b4ec8d5b7b70794cbd2836101406a9be31 \ - --hash=sha256:cb33ccf15e89f7ed89b235cff9d49e2e62c6c981a6061c9c8bb47ed7951190bc \ - --hash=sha256:d198820aba55660b4d74f7b5fd1f17db3aa5eb3e6893b0a41b75e84e4f9e0e4b \ - --hash=sha256:d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006 \ - --hash=sha256:eb8163f5e549a22888c18b0d53d6bb62a20510060a22fd5a995ec8a05268df8a \ - --hash=sha256:f73bff05db2a3e5974a6fd248af2566134d8981fd7ab012e5dd4ddb1d9a70699 -zeroconf==0.31.0 \ - --hash=sha256:53a180248471c6f81bd1fffcbce03ed93d7d8eaf10905c9121ac1ea996d19844 \ - --hash=sha256:5a468da018bc3f04bbce77ae247924d802df7aeb4c291bbbb5a9616d128800b0 -importlib-metadata==4.10.0 \ - --hash=sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 \ - --hash=sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 -keyring==23.0.1 \ - --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ - --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - -# Use Numpy wheel that is compiled with Intel optimizations (MKL). Obtained from https://www.lfd.uci.edu/~gohlke/pythonlibs/#numpy -# We cache this at software.ultimaker.com since this website tends to remove older versions rather quickly. -https://software.ultimaker.com/cura-binary-dependencies/numpy-1.21.5+mkl-cp310-cp310-win_amd64.whl; \ - sys_platform=="win32" \ - --hash=sha256:fbd5d5126b730a151134d21994a951fe28df06464e0c9a2cba2a4132e542a5fc -numpy==1.21.5; \ - sys_platform!="win32" \ - --hash=sha256:00c9fa73a6989895b8815d98300a20ac993c49ac36c8277e8ffeaa3631c0dbbb \ - --hash=sha256:025b497014bc33fc23897859350f284323f32a2fff7654697f5a5fc2a19e9939 \ - --hash=sha256:08de8472d9f7571f9d51b27b75e827f5296295fa78817032e84464be8bb905bc \ - --hash=sha256:1964db2d4a00348b7a60ee9d013c8cb0c566644a589eaa80995126eac3b99ced \ - --hash=sha256:2a9add27d7fc0fdb572abc3b2486eb3b1395da71e0254c5552b2aad2a18b5441 \ - --hash=sha256:2d8adfca843bc46ac199a4645233f13abf2011a0b2f4affc5c37cd552626f27b \ - --hash=sha256:301e408a052fdcda5cdcf03021ebafc3c6ea093021bf9d1aa47c54d48bdad166 \ - --hash=sha256:311283acf880cfcc20369201bd75da907909afc4666966c7895cbed6f9d2c640 \ - --hash=sha256:341dddcfe3b7b6427a28a27baa59af5ad51baa59bfec3264f1ab287aa3b30b13 \ - --hash=sha256:3a5098df115340fb17fc93867317a947e1dcd978c3888c5ddb118366095851f8 \ - --hash=sha256:3c978544be9e04ed12016dd295a74283773149b48f507d69b36f91aa90a643e5 \ - --hash=sha256:3d893b0871322eaa2f8c7072cdb552d8e2b27645b7875a70833c31e9274d4611 \ - --hash=sha256:4fe6a006557b87b352c04596a6e3f12a57d6e5f401d804947bd3188e6b0e0e76 \ - --hash=sha256:507c05c7a37b3683eb08a3ff993bd1ee1e6c752f77c2f275260533b265ecdb6c \ - --hash=sha256:58ca1d7c8aef6e996112d0ce873ac9dfa1eaf4a1196b4ff7ff73880a09923ba7 \ - --hash=sha256:61bada43d494515d5b122f4532af226fdb5ee08fe5b5918b111279843dc6836a \ - --hash=sha256:69a5a8d71c308d7ef33ef72371c2388a90e3495dbb7993430e674006f94797d5 \ - --hash=sha256:6a5928bc6241264dce5ed509e66f33676fc97f464e7a919edc672fb5532221ee \ - --hash=sha256:7b9d6b14fc9a4864b08d1ba57d732b248f0e482c7b2ff55c313137e3ed4d8449 \ - --hash=sha256:a7c4b701ca418cd39e28ec3b496e6388fe06de83f5f0cb74794fa31cfa384c02 \ - --hash=sha256:a7e8f6216f180f3fd4efb73de5d1eaefb5f5a1ee5b645c67333033e39440e63a \ - --hash=sha256:b545ebadaa2b878c8630e5bcdb97fc4096e779f335fc0f943547c1c91540c815 \ - --hash=sha256:c293d3c0321996cd8ffe84215ffe5d269fd9d1d12c6f4ffe2b597a7c30d3e593 \ - --hash=sha256:c5562bcc1a9b61960fc8950ade44d00e3de28f891af0acc96307c73613d18f6e \ - --hash=sha256:ca9c23848292c6fe0a19d212790e62f398fd9609aaa838859be8459bfbe558aa \ - --hash=sha256:cc1b30205d138d1005adb52087ff45708febbef0e420386f58664f984ef56954 \ - --hash=sha256:dbce7adeb66b895c6aaa1fad796aaefc299ced597f6fbd9ceddb0dd735245354 \ - --hash=sha256:dc4b2fb01f1b4ddbe2453468ea0719f4dbb1f5caa712c8b21bb3dd1480cd30d9 \ - --hash=sha256:eed2afaa97ec33b4411995be12f8bdb95c87984eaa28d76cf628970c8a2d689a \ - --hash=sha256:fc7a7d7b0ed72589fd8b8486b9b42a564f10b8762be8bd4d9df94b807af4a089 -pyclipper==1.3.0.post3; \ - --hash=sha256:1408461fba4985d58589fa74c59e273e8aa91d8b55c2e9a6abf966eed7562d90 \ - --hash=sha256:1df7e4bce6ac68abfe926d319f52b749b7c9d5e0a6bd7112a0c7f2f908abecbc \ - --hash=sha256:24b6b70114941805c14a33e9378e52d24b18791f1bfc365853d5adb33425f173 \ - --hash=sha256:2b0950dada5b56a002dddccf131815a8f9b55c4df86ff6a43b7ef48a91b572aa \ - --hash=sha256:2d51757df15f1721946f39016191c7d685306fc69d8a5f2933a1d22119150a1d \ - --hash=sha256:341556b83ce2a5d4ee36e263e04751a9949e4161f60f0011f9500b845b25ce3c \ - --hash=sha256:46b3996c8dcda562c408e653ccef8efd95a7d69400f9119df2c2cb8083d36bf8 \ - --hash=sha256:5434e1e69425dc7958579b1f7bedfa8a7cce79400e1b708a42be769a165a3a2c \ - --hash=sha256:5b4e0e360ebfc25d01c7e0873b27f912d1c02d99b84393d526bc01836a5fb9f4 \ - --hash=sha256:60f20e96e9e055e9bb2e729fe6078969ce252c6b7b1b18d8d963e5343d99f99e \ - --hash=sha256:615bece709d8c304d97089a83f8ff91ca0d2646e8fe42f2637d7cdfcf99a6e4e \ - --hash=sha256:639fbc55569b94487f89261b1656e3e655d06888a582218c5432c426705d1f6f \ - --hash=sha256:6748239b89a5edd00b3ce36cb5c7a177978ff3361de861fe2cc559bb2760625d \ - --hash=sha256:679bfd1fd4595a3f58a706256dc6cc7179ee40fbeff4d134aa3163a9c87ca545 \ - --hash=sha256:6ace0de72f252e48eda28981e24142a2b02ac17eacc3d8a2baf628671dd8cc8f \ - --hash=sha256:771ba332790e88eb4aa9de2172131af25525ac23fdda789691e543962849f149 \ - --hash=sha256:8fabba875314ebc751b66e571b8b0d5319c76e22051304880a552d70db2252af \ - --hash=sha256:a050ec9df95e9611461adb7f86da4f066848c045d966c46e7b124593e6410e2a \ - --hash=sha256:ab7e2f9b655333a37002b90bea47d77ff8d1f01293798911afa7f39217f1b71d \ - --hash=sha256:b0097aef9ac8a5e10434059641fea338fb682c61993bfe65670e459ec14b4151 \ - --hash=sha256:b509cfd696962683553cd6b9fc7f0baf05bff47c09fd68b085a8aea493436267 \ - --hash=sha256:bad590e701eaef644899ce164631f83e39669796e552f17aef5a37238646b392 \ - --hash=sha256:c586ca07c1418d4f010c6bc65215c4b193211e1b95dd8a1bd312d8207c5ccf6a \ - --hash=sha256:cb5ad68b82c2aa408672444e567cea138db29790997d603525878632d61fd6ec \ - --hash=sha256:cd9f0496daa9b505902848d401bfc3ffe80ee3a6863451fc6c05ceb2a45b9d8f \ - --hash=sha256:da4d8f253dd8e152b3364902bed5e221165d3af4e71e2ae81eb9a9a9802089a2 \ - --hash=sha256:e8d77755a00566e0f0cf48da2e42e76ff93423b55880621944f950058be3fc0e \ - --hash=sha256:ebc13dbfaec1b489fc6ed92a642b8a2c7072fa2d4bc12514cc2bbeacd47c5baf \ - --hash=sha256:ed5ea68bc6f3428fbf9d98f1e72e2020d763d88053cc9a9d31b2eeb49500b26f \ - --hash=sha256:ee52b9d29512eb7b8b9faee6db3f8694eb6c8455785a5d2d561c40eca67b226f \ - --hash=sha256:f428ecdd224ec30c1a4dbdbaac44e746cbe9a05c25627b05cc7bc2dcda235a26 \ - --hash=sha256:f5f3ad171f21511813085ac549bb717bbdcc0f4da27abf6b0629438e1f23ca0b -scipy==1.9.1 \ - --hash=sha256:c61b4a91a702e8e04aeb0bfc40460e1f17a640977c04dda8757efb0199c75332 \ - --hash=sha256:d79da472015d0120ba9b357b28a99146cd6c17b9609403164b1a8ed149b4dfc8 \ - --hash=sha256:825951b88f56765aeb6e5e38ac9d7d47407cfaaeb008d40aa1b45a2d7ea2731e \ - --hash=sha256:f950a04b33e17b38ff561d5a0951caf3f5b47caa841edd772ffb7959f20a6af0 \ - --hash=sha256:8cc81ac25659fec73599ccc52c989670e5ccd8974cf34bacd7b54a8d809aff1a \ - --hash=sha256:8d3faa40ac16c6357aaf7ea50394ea6f1e8e99d75e927a51102b1943b311b4d9 \ - --hash=sha256:7a412c476a91b080e456229e413792bbb5d6202865dae963d1e6e28c2bb58691 \ - --hash=sha256:eb954f5aca4d26f468bbebcdc5448348eb287f7bea536c6306f62ea062f63d9a \ - --hash=sha256:3c6f5d1d4b9a5e4fe5e14f26ffc9444fc59473bbf8d45dc4a9a15283b7063a72 \ - --hash=sha256:bc4e2c77d4cd015d739e75e74ebbafed59ba8497a7ed0fd400231ed7683497c4 \ - --hash=sha256:0419485dbcd0ed78c0d5bf234c5dd63e86065b39b4d669e45810d42199d49521 \ - --hash=sha256:34441dfbee5b002f9e15285014fd56e5e3372493c3e64ae297bae2c4b9659f5a \ - --hash=sha256:b97b479f39c7e4aaf807efd0424dec74bbb379108f7d22cf09323086afcd312c \ - --hash=sha256:e8fe305d9d67a81255e06203454729405706907dccbdfcc330b7b3482a6c371d \ - --hash=sha256:39ab9240cd215a9349c85ab908dda6d732f7d3b4b192fa05780812495536acc4 \ - --hash=sha256:71487c503e036740635f18324f62a11f283a632ace9d35933b2b0a04fd898c98 \ - --hash=sha256:3bc1ab68b9a096f368ba06c3a5e1d1d50957a86665fc929c4332d21355e7e8f4 \ - --hash=sha256:f7c39f7dbb57cce00c108d06d731f3b0e2a4d3a95c66d96bce697684876ce4d4 \ - --hash=sha256:47d1a95bd9d37302afcfe1b84c8011377c4f81e33649c5a5785db9ab827a6ade \ - --hash=sha256:96d7cf7b25c9f23c59a766385f6370dab0659741699ecc7a451f9b94604938ce \ - --hash=sha256:09412eb7fb60b8f00b328037fd814d25d261066ebc43a1e339cdce4f7502877e \ - --hash=sha256:90c805f30c46cf60f1e76e947574f02954d25e3bb1e97aa8a07bc53aa31cf7d1 \ - --hash=sha256:26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 -trimesh==3.9.36 \ - --hash=sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e \ - --hash=sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 -sentry-sdk==0.13.5 \ - --hash=sha256:05285942901d38c7ce2498aba50d8e87b361fc603281a5902dda98f3f8c5e145 \ - --hash=sha256:c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82 -mypy==0.931 \ - --hash=sha256:0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce \ - --hash=sha256:1171f2e0859cfff2d366da2c7092b06130f232c636a3f7301e3feb8b41f6377d \ - --hash=sha256:1b06268df7eb53a8feea99cbfff77a6e2b205e70bf31743e786678ef87ee8069 \ - --hash=sha256:1b65714dc296a7991000b6ee59a35b3f550e0073411ac9d3202f6516621ba66c \ - --hash=sha256:1bf752559797c897cdd2c65f7b60c2b6969ffe458417b8d947b8340cc9cec08d \ - --hash=sha256:300717a07ad09525401a508ef5d105e6b56646f7942eb92715a1c8d610149714 \ - --hash=sha256:3c5b42d0815e15518b1f0990cff7a705805961613e701db60387e6fb663fe78a \ - --hash=sha256:4365c60266b95a3f216a3047f1d8e3f895da6c7402e9e1ddfab96393122cc58d \ - --hash=sha256:50c7346a46dc76a4ed88f3277d4959de8a2bd0a0fa47fa87a4cde36fe247ac05 \ - --hash=sha256:5b56154f8c09427bae082b32275a21f500b24d93c88d69a5e82f3978018a0266 \ - --hash=sha256:74f7eccbfd436abe9c352ad9fb65872cc0f1f0a868e9d9c44db0893440f0c697 \ - --hash=sha256:7b3f6f557ba4afc7f2ce6d3215d5db279bcf120b3cfd0add20a5d4f4abdae5bc \ - --hash=sha256:8c11003aaeaf7cc2d0f1bc101c1cc9454ec4cc9cb825aef3cafff8a5fdf4c799 \ - --hash=sha256:8ca7f8c4b1584d63c9a0f827c37ba7a47226c19a23a753d52e5b5eddb201afcd \ - --hash=sha256:c89702cac5b302f0c5d33b172d2b55b5df2bede3344a2fbed99ff96bddb2cf00 \ - --hash=sha256:d8f1ff62f7a879c9fe5917b3f9eb93a79b78aad47b533911b853a757223f72e7 \ - --hash=sha256:d9d2b84b2007cea426e327d2483238f040c49405a6bf4074f605f0156c91a47a \ - --hash=sha256:e839191b8da5b4e5d805f940537efcaa13ea5dd98418f06dc585d2891d228cf0 \ - --hash=sha256:f9fe20d0872b26c4bba1c1be02c5340de1019530302cf2dcc85c7f9fc3252ae0 \ - --hash=sha256:ff3bf387c14c805ab1388185dd22d6b210824e164d4bb324b195ff34e322d166 -pyserial==3.4 \ - --hash=sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 \ - --hash=sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8 - -### Indirect requirements ### -chardet==3.0.4 \ - --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ - --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 -idna==2.8 \ - --hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \ - --hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c -attrs==21.3.0 \ - --hash=sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c \ - --hash=sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 -requests==2.22.0 \ - --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \ - --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 -# twisted -Twisted==21.2.0 \ - --hash=sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 \ - --hash=sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e -constantly==15.1.0 \ - --hash=sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 \ - --hash=sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d -hyperlink==21.0.0 \ - --hash=sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b \ - --hash=sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4 -incremental==22.10.0 \ - --hash=sha256:b864a1f30885ee72c5ac2835a761b8fe8aa9c28b9395cacf27286602688d3e51 \ - --hash=sha256:912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 -zope.interface==5.4.0 \ - --hash=sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3 \ - --hash=sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54 \ - --hash=sha256:5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e \ - --hash=sha256:bf68f4b2b6683e52bec69273562df15af352e5ed25d1b6641e7efddc5951d1a7 \ - --hash=sha256:db1fa631737dab9fa0b37f3979d8d2631e348c3b4e8325d6873c2541d0ae5a48 \ - --hash=sha256:f44e517131a98f7a76696a7b21b164bcb85291cee106a23beccce454e1f433a4 -Automat==20.2.0 \ - --hash=sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 \ - --hash=sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111 -twisted-iocpsupport==1.0.2; \ - sys_platform=="win32" \ - --hash=sha256:306becd6e22ab6e8e4f36b6bdafd9c92e867c98a5ce517b27fdd27760ee7ae41 \ - --hash=sha256:3c61742cb0bc6c1ac117a7e5f422c129832f0c295af49e01d8a6066df8cfc04d \ - --hash=sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 \ - --hash=sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf \ - --hash=sha256:81b3abe3527b367da0220482820cb12a16c661672b7bcfcde328902890d63323 \ - --hash=sha256:851b3735ca7e8102e661872390e3bce88f8901bece95c25a0c8bb9ecb8a23d32 \ - --hash=sha256:985c06a33f5c0dae92c71a036d1ea63872ee86a21dd9b01e1f287486f15524b4 \ - --hash=sha256:9dbb8823b49f06d4de52721b47de4d3b3026064ef4788ce62b1a21c57c3fff6f \ - --hash=sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 \ - --hash=sha256:b76b4eed9b27fd63ddb0877efdd2d15835fdcb6baa745cb85b66e5d016ac2878 \ - --hash=sha256:b9fed67cf0f951573f06d560ac2f10f2a4bbdc6697770113a2fc396ea2cb2565 \ - --hash=sha256:bf4133139d77fc706d8f572e6b7d82871d82ec7ef25d685c2351bdacfb701415 -numpy-stl==2.10.1 \ - --hash=sha256:f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c -python-utils==2.3.0 \ - --hash=sha256:34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3 \ - --hash=sha256:e25f840564554eaded56eaa395bca507b0b9e9f0ae5ecb13a8cb785305c56d25 -six==1.12.0 \ - --hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c \ - --hash=sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 -shapely==2.0.1 \ - --hash=sha256:01224899ff692a62929ef1a3f5fe389043e262698a708ab7569f43a99a48ae82 \ - --hash=sha256:05c51a29336e604c084fb43ae5dbbfa2c0ef9bd6fedeae0a0d02c7b57a56ba46 \ - --hash=sha256:09d6c7763b1bee0d0a2b84bb32a4c25c6359ad1ac582a62d8b211e89de986154 \ - --hash=sha256:193a398d81c97a62fc3634a1a33798a58fd1dcf4aead254d080b273efbb7e3ff \ - --hash=sha256:1a34a23d6266ca162499e4a22b79159dc0052f4973d16f16f990baa4d29e58b6 \ - --hash=sha256:2569a4b91caeef54dd5ae9091ae6f63526d8ca0b376b5bb9fd1a3195d047d7d4 \ - --hash=sha256:33403b8896e1d98aaa3a52110d828b18985d740cc9f34f198922018b1e0f8afe \ - --hash=sha256:3ad81f292fffbd568ae71828e6c387da7eb5384a79db9b4fde14dd9fdeffca9a \ - --hash=sha256:3cb256ae0c01b17f7bc68ee2ffdd45aebf42af8992484ea55c29a6151abe4386 \ - --hash=sha256:45b4833235b90bc87ee26c6537438fa77559d994d2d3be5190dd2e54d31b2820 \ - --hash=sha256:4641325e065fd3e07d55677849c9ddfd0cf3ee98f96475126942e746d55b17c8 \ - --hash=sha256:502e0a607f1dcc6dee0125aeee886379be5242c854500ea5fd2e7ac076b9ce6d \ - --hash=sha256:66a6b1a3e72ece97fc85536a281476f9b7794de2e646ca8a4517e2e3c1446893 \ - --hash=sha256:70a18fc7d6418e5aea76ac55dce33f98e75bd413c6eb39cfed6a1ba36469d7d4 \ - --hash=sha256:7d3bbeefd8a6a1a1017265d2d36f8ff2d79d0162d8c141aa0d37a87063525656 \ - --hash=sha256:83a8ec0ee0192b6e3feee9f6a499d1377e9c295af74d7f81ecba5a42a6b195b7 \ - --hash=sha256:865bc3d7cc0ea63189d11a0b1120d1307ed7a64720a8bfa5be2fde5fc6d0d33f \ - --hash=sha256:90cfa4144ff189a3c3de62e2f3669283c98fb760cfa2e82ff70df40f11cadb39 \ - --hash=sha256:91575d97fd67391b85686573d758896ed2fc7476321c9d2e2b0c398b628b961c \ - --hash=sha256:9a6ac34c16f4d5d3c174c76c9d7614ec8fe735f8f82b6cc97a46b54f386a86bf \ - --hash=sha256:a529218e72a3dbdc83676198e610485fdfa31178f4be5b519a8ae12ea688db14 \ - --hash=sha256:a70a614791ff65f5e283feed747e1cc3d9e6c6ba91556e640636bbb0a1e32a71 \ - --hash=sha256:ac1dfc397475d1de485e76de0c3c91cc9d79bd39012a84bb0f5e8a199fc17bef \ - --hash=sha256:b06d031bc64149e340448fea25eee01360a58936c89985cf584134171e05863f \ - --hash=sha256:b4f0711cc83734c6fad94fc8d4ec30f3d52c1787b17d9dca261dc841d4731c64 \ - --hash=sha256:b50c401b64883e61556a90b89948297f1714dbac29243d17ed9284a47e6dd731 \ - --hash=sha256:b519cf3726ddb6c67f6a951d1bb1d29691111eaa67ea19ddca4d454fbe35949c \ - --hash=sha256:bca57b683e3d94d0919e2f31e4d70fdfbb7059650ef1b431d9f4e045690edcd5 \ - --hash=sha256:c43755d2c46b75a7b74ac6226d2cc9fa2a76c3263c5ae70c195c6fb4e7b08e79 \ - --hash=sha256:c7eed1fb3008a8a4a56425334b7eb82651a51f9e9a9c2f72844a2fb394f38a6c \ - --hash=sha256:c8b0d834b11be97d5ab2b4dceada20ae8e07bcccbc0f55d71df6729965f406ad \ - --hash=sha256:ce88ec79df55430e37178a191ad8df45cae90b0f6972d46d867bf6ebbb58cc4d \ - --hash=sha256:d173d24e85e51510e658fb108513d5bc11e3fd2820db6b1bd0522266ddd11f51 \ - --hash=sha256:d8f55f355be7821dade839df785a49dc9f16d1af363134d07eb11e9207e0b189 \ - --hash=sha256:da71de5bf552d83dcc21b78cc0020e86f8d0feea43e202110973987ffa781c21 \ - --hash=sha256:e55698e0ed95a70fe9ff9a23c763acfe0bf335b02df12142f74e4543095e9a9b \ - --hash=sha256:f32a748703e7bf6e92dfa3d2936b2fbfe76f8ce5f756e24f49ef72d17d26ad02 \ - --hash=sha256:f470a130d6ddb05b810fc1776d918659407f8d025b7f56d2742a596b6dffa6c7 -cython==0.29.26 \ - --hash=sha256:af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 \ - --hash=sha256:f5e15ff892c8afad64931ee3dd723c4755c2c516606f9aae7613bebfac62b0f6 \ - --hash=sha256:2b834ff6e4d10ba6d7a0d676dd71c1b427a181ddbbbbf79e91d1861557aab59f \ - --hash=sha256:c813799d533194b7d85203d881d8b4f567a8c644a67f50d47f1ffbf316df412f \ - --hash=sha256:6773cce9d4b3b6168d8feb2b6f06b658ef1e11cbfec075041745666d8e2a5e45 \ - --hash=sha256:362fbb9cb4627c7786231429768b54aaba5459a2a0e46c25e59f202ca6155437 -pybind11==2.6.2 \ - --hash=sha256:2d8aebe1709bc367e34e3b23d8eccbf3f387ee9d5640548c6260d33b59f02405 \ - --hash=sha256:d0e0aed9279656f21501243b707eb6e3b951e89e10c3271dedf3ae41c365e5ed -wheel==0.37.1 \ - --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 \ - --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a -setuptools==62.0.0 \ - --hash=sha256:7999cbd87f1b6e1f33bf47efa368b224bed5e27b5ef2c4d46580186cbcb1a86a \ - --hash=sha256:a65e3802053e99fc64c6b3b29c11132943d5b8c8facbcc461157511546510967 -ifaddr==0.1.7 \ - --hash=sha256:1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 \ - --hash=sha256:d1f603952f0a71c9ab4e705754511e4e03b02565bc4cec7188ad6415ff534cd3 -pycparser==2.20 \ - --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \ - --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 -zipp==3.5.0 \ - --hash=sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 \ - --hash=sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 -cffi==1.15.0 \ - --hash=sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 \ - --hash=sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 \ - --hash=sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636 \ - --hash=sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20 \ - --hash=sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728 \ - --hash=sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27 \ - --hash=sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66 \ - --hash=sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443 \ - --hash=sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0 \ - --hash=sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7 \ - --hash=sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39 \ - --hash=sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605 \ - --hash=sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a \ - --hash=sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37 \ - --hash=sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029 \ - --hash=sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 \ - --hash=sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc \ - --hash=sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df \ - --hash=sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14 \ - --hash=sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880 \ - --hash=sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2 \ - --hash=sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a \ - --hash=sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e \ - --hash=sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474 \ - --hash=sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024 \ - --hash=sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8 \ - --hash=sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 \ - --hash=sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e \ - --hash=sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a \ - --hash=sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e \ - --hash=sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032 \ - --hash=sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6 \ - --hash=sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e \ - --hash=sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b \ - --hash=sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e \ - --hash=sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 \ - --hash=sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962 \ - --hash=sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c \ - --hash=sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4 \ - --hash=sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55 \ - --hash=sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962 \ - --hash=sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023 \ - --hash=sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c \ - --hash=sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6 \ - --hash=sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8 \ - --hash=sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382 \ - --hash=sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7 \ - --hash=sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc \ - --hash=sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997 \ - --hash=sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796 -urllib3==1.25.9 \ - --hash=sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 \ - --hash=sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 -mypy-extensions==0.4.3 \ - --hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \ - --hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8 -tomli==2.0.1 \ - --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ - --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f -typing-extensions==3.10.0.2 \ - --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e \ - --hash=sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34 -jeepney==0.7.1; \ - --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ - --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f -SecretStorage==3.3.3 \ - --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ - --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 -keyring==23.0.1 \ - --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ - --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 -networkx==2.6.2 \ - --hash=sha256:2306f1950ce772c5a59a57f5486d59bb9cab98497c45fc49cbc45ac0dec119bb \ - --hash=sha256:5fcb7004be69e8fbdf07dcb502efa5c77cadcaad6982164134eeb9721f826c2e -pywin32==303; \ - sys_platform=="win32" \ - --hash=sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 -pywin32-ctypes==0.2.0; \ - sys_platform=="win32" \ - --hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \ - --hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 - -charset-normalizer==2.1.0; \ - --hash=sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 From d26c5b74a6af7b69f0e4efb7043c4c9859d06cd8 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 16:37:15 +0200 Subject: [PATCH 019/276] Fix incompatible Python dependencies and files generation --- conandata.yml | 12 ++++++------ conanfile.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index f40ad698a22..535c345e6e9 100644 --- a/conandata.yml +++ b/conandata.yml @@ -317,10 +317,10 @@ pip_requirements: - sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c - sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 requests: - version: "2.22.0" + version: "2.32.3" hashes: - - sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 - - sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 + - sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 + - sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 twisted: version: "21.2.0" hashes: @@ -573,10 +573,10 @@ pip_requirements: - sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 - sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 urllib3: - version: "1.25.9" + version: "2.2.3" hashes: - - sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 - - sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 + - sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac + - sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9 jeepney: version: "0.7.1" hashes: diff --git a/conanfile.py b/conanfile.py index 8b34e959d33..3710db42aef 100644 --- a/conanfile.py +++ b/conanfile.py @@ -135,7 +135,7 @@ def _conan_installs(self): # list of conan installs for dependency in self.dependencies.host.values(): conan_installs[dependency.ref.name] = { - "version": dependency.ref.version, + "version": str(dependency.ref.version), "revision": dependency.ref.revision } return conan_installs From b526920e7c8313d9cf7a38cc9d8766e5f5a86f7d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 08:48:54 +0200 Subject: [PATCH 020/276] Use common package creation workflow --- .github/workflows/conan-package.yml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 42d03b50385..a85756777c5 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -32,28 +32,13 @@ on: - '[0-9].[0-9]*' - '[0-9].[0-9][0-9]*' -env: - CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} - jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main +# FIXME: Use main once merged + conan-package: + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: project_name: cura - - conan-package-export: - needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} - secrets: inherit - - conan-package-create: - needs: [ conan-recipe-version, conan-package-export ] - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} + platform_windows: false + platform_mac: false conan_extra_args: "-o cura:enable_i18n=True" - secrets: inherit \ No newline at end of file + secrets: inherit From 219782b5adc4692646e02350f6df466f1e579259 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 08:58:42 +0200 Subject: [PATCH 021/276] Fix conan argument syntax --- .github/workflows/conan-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index a85756777c5..bfc24c9f36a 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -40,5 +40,5 @@ jobs: project_name: cura platform_windows: false platform_mac: false - conan_extra_args: "-o cura:enable_i18n=True" + conan_extra_args: "-o \"cura/*:enable_i18n=True\"" secrets: inherit From 5506d57d38f12945e00538d1c4a0b43435ff2841 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 09:17:11 +0200 Subject: [PATCH 022/276] Fix dep and remove references to pip requirements txt files --- conanfile.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/conanfile.py b/conanfile.py index 3710db42aef..154f0e6bdb2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -318,7 +318,7 @@ def requirements(self): def build_requirements(self): if self.options.get_safe("enable_i18n", False): - self.tool_requires("gettext/0.21", force_host_context = True) + self.test_requires("gettext/0.21") def layout(self): self.folders.source = "." @@ -327,7 +327,7 @@ def layout(self): self.cpp.package.libdirs = [os.path.join("site-packages", "cura")] self.cpp.package.bindirs = ["bin"] - self.cpp.package.resdirs = ["resources", "plugins", "packaging", "pip_requirements"] # pip_requirements should be the last item in the list + self.cpp.package.resdirs = ["resources", "plugins", "packaging"] def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) @@ -477,10 +477,6 @@ def package(self): rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], Path(res_dir).name)) def package_info(self): - self.user_info.pip_requirements = "requirements.txt" - self.user_info.pip_requirements_git = "requirements-ultimaker.txt" - self.user_info.pip_requirements_build = "requirements-dev.txt" - if self.in_local_cache: self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "site-packages")) self.env_info.PYTHONPATH.append(os.path.join(self.package_folder, "site-packages")) @@ -502,7 +498,3 @@ def package_id(self): del self.info.options.display_name del self.info.options.cura_debug_mode self.info.options.rm_safe("enable_i18n") - - # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different - # Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't - # ideal but an acceptable solution for now. From 7e9ca6f35fe1bd7753cb3b0013c60961090b1c5e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 10:40:31 +0200 Subject: [PATCH 023/276] Set translations sources folders --- conandata.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conandata.yml b/conandata.yml index 535c345e6e9..8d37d40bca0 100644 --- a/conandata.yml +++ b/conandata.yml @@ -642,3 +642,9 @@ pip_requirements_dev: - sip==6.5.1 - jinja2 +python_translation_source_folders: + - cura + - plugins +qml_translation_source_folders: + - resources/qml + - plugins From d91ff40e34142c9fe687ea94b3a333ad6fd90b96 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 10:42:49 +0200 Subject: [PATCH 024/276] Do not update translations automatically --- .github/workflows/conan-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index bfc24c9f36a..abdb17f48e9 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -40,5 +40,4 @@ jobs: project_name: cura platform_windows: false platform_mac: false - conan_extra_args: "-o \"cura/*:enable_i18n=True\"" secrets: inherit From 7ddd65987f2a87bc538c7ecae41b082eefc31bc9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 11:32:51 +0200 Subject: [PATCH 025/276] Update recipe for package creation --- conanfile.py | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/conanfile.py b/conanfile.py index 154f0e6bdb2..d554850a491 100644 --- a/conanfile.py +++ b/conanfile.py @@ -204,9 +204,9 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in data: # get the paths from conan package if data["package"] == self.name: if self.in_local_cache: - src_path = os.path.join(self.package_folder, data["src"]) + src_path = str(Path(self.package_folder, data["src"])) else: - src_path = os.path.join(self.source_folder, data["src"]) + src_path = str(Path(self.source_folder, data["src"])) else: if data["package"] not in self.deps_cpp_info.deps: continue @@ -223,7 +223,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in binary: # get the paths from conan package src_path = os.path.join(self.deps_cpp_info[binary["package"]].rootpath, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder - src_path = str(self.source_path.joinpath(binary["root"], binary["src"])) + src_path = str(Path(self.source_folder, binary["root"], binary["src"])) if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: @@ -338,7 +338,7 @@ def generate(self): vr = VirtualRunEnv(self) vr.generate() - self._generate_cura_version(os.path.join(self.source_folder, "cura")) + self._generate_cura_version(str(Path(self.source_folder, "cura"))) # Copy CuraEngine.exe to bindirs of Virtual Python Environment curaengine = self.dependencies["curaengine"].cpp_info @@ -347,10 +347,10 @@ def generate(self): # Copy the external plugins that we want to bundle with Cura if self.options.enterprise: - rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) + rmdir(self, str(Path(self.source_folder, "plugins", "NativeCADplugin"))) native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info - copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) - copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) + copy(self, "*", native_cad_plugin.resdirs[0], str(Path(self.source_folder, "plugins", "NativeCADplugin")), keep_path = True) + copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(Path(self.source_folder, "resources", "bundled_packages")), keep_path = False) # Copy resources of cura_binary_data cura_binary_data = self.dependencies["cura_binary_data"].cpp_info @@ -368,7 +368,7 @@ def generate(self): copy(self, "*.dylib", libdir, str(self._base_dir.joinpath("lib")), keep_path = False) # Copy materials (flat) - rmdir(self, os.path.join(self.source_folder, "resources", "materials")) + rmdir(self, str(Path(self.source_folder, "resources", "materials"))) fdm_materials = self.dependencies["fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) @@ -378,7 +378,7 @@ def generate(self): copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) if self.options.devtools: - entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) + entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) self._generate_pyinstaller_spec( location=self.generators_folder, entrypoint_location="'{}'".format( @@ -401,8 +401,8 @@ def generate(self): def build(self): if self.options.get_safe("enable_i18n", False) and self._i18n_options["build"]: - for po_file in self.source_path.joinpath("resources", "i18n").glob("**/*.po"): - mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_path)) + for po_file in Path(self.source_folder, "resources", "i18n").glob("**/*.po"): + mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mkdir(self, str(unix_path(self, Path(mo_file).parent))) cpp_info = self.dependencies["gettext"].cpp_info @@ -477,16 +477,8 @@ def package(self): rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], Path(res_dir).name)) def package_info(self): - if self.in_local_cache: - self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "site-packages")) - self.env_info.PYTHONPATH.append(os.path.join(self.package_folder, "site-packages")) - self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "plugins")) - self.env_info.PYTHONPATH.append(os.path.join(self.package_folder, "plugins")) - else: - self.runenv_info.append_path("PYTHONPATH", self.source_folder) - self.env_info.PYTHONPATH.append(self.source_folder) - self.runenv_info.append_path("PYTHONPATH", os.path.join(self.source_folder, "plugins")) - self.env_info.PYTHONPATH.append(os.path.join(self.source_folder, "plugins")) + self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "site-packages")) + self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "plugins")) def package_id(self): # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py From edbfb9a9ca10fc7675d8749022efa5c6ef795278 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 11:36:26 +0200 Subject: [PATCH 026/276] Use common workflow --- .github/workflows/unit-test.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 21655408897..fb997464d17 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -37,26 +37,10 @@ on: - main - '[0-9]+.[0-9]+' -permissions: - contents: read - -env: - CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD: ${{ secrets.CONAN_PASS }} - jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main - with: - project_name: cura - testing: - uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main - needs: [ conan-recipe-version ] + name: Run unit tests +# FIXME: use main once merged + uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-11622_conan_v2 with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - conan_extra_args: '-g VirtualPythonEnv -o cura:devtools=True -c tools.build:skip_test=False --options "*:enable_sentry=False"' - unit_test_cmd: 'pytest --junitxml=junit_cura.xml' - unit_test_dir: 'tests' - conan_generator_dir: './venv/bin' - secrets: inherit \ No newline at end of file + test_use_pytest: true From b95512392186d0b0fb433cf6fe9295084518e18a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 15:31:37 +0200 Subject: [PATCH 027/276] Update variable name --- .github/workflows/conan-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index abdb17f48e9..65e467f4c37 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -37,7 +37,7 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - project_name: cura + package_name: cura platform_windows: false platform_mac: false secrets: inherit From 9c5e763aaa565d3ab66f6f5f775821f5da29a5e9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 15:33:48 +0200 Subject: [PATCH 028/276] Update variable name --- .github/workflows/conan-package-resources.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 94705c7348a..4bad3d2bcb1 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -25,7 +25,7 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - project_name: cura_resources + package_name: cura_resources conan_recipe_root: "./resources/" platform_windows: false platform_mac: false From 3199437403da2996e162530f6bd40996468904a1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 16:52:51 +0200 Subject: [PATCH 029/276] Remove now useless attribute --- conanfile.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d554850a491..ee367a2c52c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -57,10 +57,6 @@ def set_version(self): def _i18n_options(self): return self.conf.get("user.i18n:options", default = {"extract": True, "build": True}, check_type = dict) - @property - def _pycharm_targets(self): - return self.conan_data["pycharm_targets"] - # FIXME: These env vars should be defined in the runenv. _cura_env = None From 57cd7a99a0f5c0e8a2418dd2f64acddc0911eced Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 09:12:40 +0200 Subject: [PATCH 030/276] Fix unit tests --- tests/API/TestAccount.py | 4 +-- tests/Settings/TestCuraStackBuilder.py | 5 ++-- tests/TestOAuth2.py | 41 ++++++++++++++++---------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/tests/API/TestAccount.py b/tests/API/TestAccount.py index 9d62646eff5..26da8d04cd1 100644 --- a/tests/API/TestAccount.py +++ b/tests/API/TestAccount.py @@ -80,12 +80,12 @@ def test_errorLoginState(application): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. account._onLoginStateChanged(True, "BLARG!") # Even though we said that the login worked, it had an error message, so the login failed. - account.loginStateChanged.emit.called_with(False) + account.loginStateChanged.emit.assert_called_with(False) with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): account._onLoginStateChanged(True) account._onLoginStateChanged(False, "OMGZOMG!") - account.loginStateChanged.emit.called_with(False) + account.loginStateChanged.emit.assert_called_with(False) def test_sync_success(): account = Account(MagicMock()) diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 6bd19a0d30d..b049433923e 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -50,9 +50,10 @@ def quality_changes_container(): def test_createMachineWithUnknownDefinition(application, container_registry): application.getContainerRegistry = MagicMock(return_value=container_registry) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.ConfigurationErrorMessage.ConfigurationErrorMessage.getInstance") as mocked_config_error: + mocked_config_error = MagicMock() + with patch("UM.ConfigurationErrorMessage.ConfigurationErrorMessage.getInstance", MagicMock(return_value=mocked_config_error)): assert CuraStackBuilder.createMachine("Whatever", "NOPE") is None - assert mocked_config_error.addFaultyContainers.called_with("NOPE") + mocked_config_error.addFaultyContainers.assert_called_once_with("NOPE") def test_createMachine(application, container_registry, definition_container, global_variant, material_instance_container, diff --git a/tests/TestOAuth2.py b/tests/TestOAuth2.py index 41edaebbf72..d49d42f065c 100644 --- a/tests/TestOAuth2.py +++ b/tests/TestOAuth2.py @@ -3,6 +3,7 @@ from datetime import datetime from unittest.mock import MagicMock, Mock, patch +from pytest import fixture from PyQt6.QtGui import QDesktopServices from PyQt6.QtNetwork import QNetworkReply @@ -59,6 +60,17 @@ MALFORMED_AUTH_RESPONSE = AuthenticationResponse(success=False) +@fixture +def http_request_manager(): + mock_reply = Mock() # The user profile that the service should respond with. + mock_reply.error = Mock(return_value=QNetworkReply.NetworkError.NoError) + + http_mock = Mock() + http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) + http_mock.readJSON = Mock(return_value={"data": {"user_id": "id_ego_or_superego", "username": "Ghostkeeper"}}) + http_mock.setDelayRequests = Mock() + return http_mock + def test_cleanAuthService() -> None: """ Ensure that when setting up an AuthorizationService, no data is set. @@ -72,18 +84,20 @@ def test_cleanAuthService() -> None: assert authorization_service.getAccessToken() is None -def test_refreshAccessTokenSuccess(): +def test_refreshAccessTokenSuccess(http_request_manager): authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) authorization_service.initialize() with patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()): authorization_service._storeAuthData(SUCCESSFUL_AUTH_RESPONSE) authorization_service.onAuthStateChanged.emit = MagicMock() - with patch.object(AuthorizationHelpers, "getAccessTokenUsingRefreshToken", return_value=SUCCESSFUL_AUTH_RESPONSE): - authorization_service.refreshAccessToken() - assert authorization_service.onAuthStateChanged.emit.called_with(True) + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value=http_request_manager)): + with patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()): + with patch.object(AuthorizationHelpers, "getAccessTokenUsingRefreshToken", side_effect=lambda refresh_token, callback: callback(SUCCESSFUL_AUTH_RESPONSE)): + authorization_service.refreshAccessToken() + authorization_service.onAuthStateChanged.emit.assert_called_once_with(logged_in = True) -def test__parseJWTNoRefreshToken(): +def test__parseJWTNoRefreshToken(http_request_manager): """ Tests parsing the user profile if there is no refresh token stored, but there is a normal authentication token. @@ -94,13 +108,8 @@ def test__parseJWTNoRefreshToken(): authorization_service._storeAuthData(NO_REFRESH_AUTH_RESPONSE) mock_callback = Mock() # To log the final profile response. - mock_reply = Mock() # The user profile that the service should respond with. - mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.NoError) - http_mock = Mock() - http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) - http_mock.readJSON = Mock(return_value = {"data": {"user_id": "id_ego_or_superego", "username": "Ghostkeeper"}}) - with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_request_manager)): authorization_service._parseJWT(mock_callback) mock_callback.assert_called_once() profile_reply = mock_callback.call_args_list[0][0][0] @@ -175,9 +184,10 @@ def test_refreshAccessTokenFailed(): """ authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) authorization_service.initialize() + with patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()): + authorization_service._storeAuthData(SUCCESSFUL_AUTH_RESPONSE) + authorization_service.onAuthStateChanged.emit = MagicMock() - def mock_refresh(self, refresh_token, callback): # Refreshing gives a valid token. - callback(FAILED_AUTH_RESPONSE) mock_reply = Mock() # The response that the request should give, containing an error about it failing to authenticate. mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.AuthenticationRequiredError) # The reply is 403: Authentication required, meaning the server responded with a "Can't do that, Dave". http_mock = Mock() @@ -187,10 +197,9 @@ def mock_refresh(self, refresh_token, callback): # Refreshing gives a valid tok with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.readJSON", Mock(return_value = {"error_description": "Mock a failed request!"})): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): authorization_service._storeAuthData(SUCCESSFUL_AUTH_RESPONSE) - authorization_service.onAuthStateChanged.emit = MagicMock() - with patch("cura.OAuth2.AuthorizationHelpers.AuthorizationHelpers.getAccessTokenUsingRefreshToken", mock_refresh): + with patch("cura.OAuth2.AuthorizationHelpers.AuthorizationHelpers.getAccessTokenUsingRefreshToken", side_effect=lambda refresh_token, callback: callback(FAILED_AUTH_RESPONSE)): authorization_service.refreshAccessToken() - assert authorization_service.onAuthStateChanged.emit.called_with(False) + authorization_service.onAuthStateChanged.emit.assert_called_with(logged_in = False) def test_refreshAccesTokenWithoutData(): authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) From 906e4e6c424b3d8940b1aa6e83733235de26f051 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 09:50:16 +0200 Subject: [PATCH 031/276] Use common workflow for translation update --- .../workflows/requirements-conan-package.txt | 2 - .../workflows/requirements-printer-linter.txt | 1 - .github/workflows/requirements-runner.txt | 0 .github/workflows/update-translation.yml | 93 +++---------------- 4 files changed, 11 insertions(+), 85 deletions(-) delete mode 100644 .github/workflows/requirements-conan-package.txt delete mode 100644 .github/workflows/requirements-printer-linter.txt delete mode 100644 .github/workflows/requirements-runner.txt diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt deleted file mode 100644 index 215557e3679..00000000000 --- a/.github/workflows/requirements-conan-package.txt +++ /dev/null @@ -1,2 +0,0 @@ -conan>=1.60.2,<2.0.0 -sip<=6.7.12 diff --git a/.github/workflows/requirements-printer-linter.txt b/.github/workflows/requirements-printer-linter.txt deleted file mode 100644 index 4818cc54196..00000000000 --- a/.github/workflows/requirements-printer-linter.txt +++ /dev/null @@ -1 +0,0 @@ -pyyaml \ No newline at end of file diff --git a/.github/workflows/requirements-runner.txt b/.github/workflows/requirements-runner.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml index 55ce1446660..aa897e5e2c1 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translation.yml @@ -1,87 +1,16 @@ -name: update-translations +name: Update translations on: - push: - paths: - - 'plugins/**' - - 'resources/**' - - 'cura/**' - - 'icons/**' - - 'tests/**' - - 'packaging/**' - - '.github/workflows/conan-*.yml' - - '.github/workflows/notify.yml' - - '.github/workflows/requirements-conan-package.txt' - - 'requirements*.txt' - - 'conanfile.py' - - 'conandata.yml' - - 'GitVersion.yml' - - '*.jinja' - branches: - - '[1-9].[0-9]' - - '[1-9].[0-9][0-9]' - tags: - - '[1-9].[0-9].[0-9]*' - - '[1-9].[0-9].[0-9]' - - '[1-9].[0-9][0-9].[0-9]*' + workflow_dispatch: + inputs: + branch: + description: 'Specific branch to update translations on' + required: false + type: string jobs: update-translations: - name: Update translations - - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Cache Conan data - id: cache-conan - uses: actions/cache@v3 - with: - path: ~/.conan - key: ${{ runner.os }}-conan - - - name: Setup Python and pip - uses: actions/setup-python@v4 - with: - python-version: 3.11.x - cache: pip - cache-dependency-path: .github/workflows/requirements-conan-package.txt - - - name: Install Python requirements for runner - run: pip install -r .github/workflows/requirements-conan-package.txt - - # NOTE: Due to what are probably github issues, we have to remove the cache and reconfigure before the rest. - # This is maybe because grub caches the disk it uses last time, which is recreated each time. - - name: Install Linux system requirements - if: ${{ runner.os == 'Linux' }} - run: | - sudo rm /var/cache/debconf/config.dat - sudo dpkg --configure -a - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt update - sudo apt upgrade - sudo apt install efibootmgr build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config flex bison g++-12 gcc-12 -y - - - name: Install GCC-13 - run: | - sudo apt install g++-13 gcc-13 -y - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13 - - - name: Create the default Conan profile - run: conan profile new default --detect --force - - - name: Get Conan configuration - run: | - conan config install https://github.com/Ultimaker/conan-config.git - conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - - - name: generate the files using Conan install - run: conan install . --build=missing --update -o cura:devtools=True - - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - file_pattern: resources/i18n/*.po resources/i18n/*.pot - status_options: --untracked-files=no - commit_message: update translations +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@CURA-11622_conan_v2 + with: + branch: ${{ inputs.branch }} From 961862bb2b8161cb1fb22cf8e5e2a3f06c067514 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 11:16:35 +0200 Subject: [PATCH 032/276] Use uptodate linux installer workflow --- .github/workflows/installers.yml | 6 +++--- .github/workflows/linux.yml | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 805f1917aa8..134b2f5e89c 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -10,7 +10,7 @@ on: required: true type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args, e.g. --requires' default: '' required: false type: string @@ -84,15 +84,15 @@ jobs: operating_system: self-hosted-Windows-X64 secrets: inherit +# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} conan_args: ${{ github.event.inputs.conan_args }} enterprise: ${{ github.event.inputs.enterprise == 'true' }} staging: ${{ github.event.inputs.staging == 'true' }} - architecture: X64 operating_system: self-hosted-Ubuntu22-X64 secrets: inherit diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f9d800c77d7..6d428a8cc92 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -10,7 +10,7 @@ on: required: true type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args, e.g. --requires' default: '' required: false type: string @@ -24,13 +24,6 @@ on: default: false required: true type: boolean - architecture: - description: 'Architecture' - required: true - default: 'X64' - type: choice - options: - - X64 operating_system: description: 'OS' required: true @@ -41,13 +34,13 @@ on: - self-hosted-Ubuntu22-X64 jobs: +# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} - architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} secrets: inherit From cee46ae1ea7a30b3f06b431d54161efb506b88db Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 12:58:35 +0200 Subject: [PATCH 033/276] Rename devtools option to pyinstaller --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index ee367a2c52c..21d55d4d2c1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -31,7 +31,7 @@ class CuraConan(ConanFile): options = { "enterprise": [True, False], "staging": [True, False], - "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools + "pyinstaller": [True, False], "cloud_api_version": ["ANY"], "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles @@ -41,7 +41,7 @@ class CuraConan(ConanFile): default_options = { "enterprise": False, "staging": False, - "devtools": False, + "pyinstaller": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented @@ -373,7 +373,7 @@ def generate(self): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.devtools: + if self.options.pyinstaller: entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) self._generate_pyinstaller_spec( location=self.generators_folder, @@ -481,7 +481,7 @@ def package_id(self): # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` del self.info.options.enterprise del self.info.options.staging - del self.info.options.devtools + del self.info.options.pyinstaller del self.info.options.cloud_api_version del self.info.options.display_name del self.info.options.cura_debug_mode From ab96236a8f16014706da86c3a5715b85fa784929 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 16:38:23 +0200 Subject: [PATCH 034/276] Fix pyinstaller data generation --- conandata.yml | 8 -------- conanfile.py | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/conandata.yml b/conandata.yml index 8d37d40bca0..d1fd19af9f9 100644 --- a/conandata.yml +++ b/conandata.yml @@ -86,14 +86,6 @@ pyinstaller: package: "fdm_materials" src: "res/resources/materials" dst: "share/cura/resources/materials" - tcl: - package: "tcl" - src: "lib/tcl8.6" - dst: "tcl" - tk: - package: "tk" - src: "lib/tk8.6" - dst: "tk" binaries: curaengine: package: "curaengine" diff --git a/conanfile.py b/conanfile.py index 21d55d4d2c1..21a8c808434 100644 --- a/conanfile.py +++ b/conanfile.py @@ -199,14 +199,11 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in data: # get the paths from conan package if data["package"] == self.name: - if self.in_local_cache: - src_path = str(Path(self.package_folder, data["src"])) - else: - src_path = str(Path(self.source_folder, data["src"])) + src_path = str(Path(self.source_folder, data["src"])) else: - if data["package"] not in self.deps_cpp_info.deps: + if data["package"] not in self.dependencies: continue - src_path = os.path.join(self.deps_cpp_info[data["package"]].rootpath, data["src"]) + src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) else: @@ -217,7 +214,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e binaries = [] for binary in pyinstaller_metadata["binaries"].values(): if "package" in binary: # get the paths from conan package - src_path = os.path.join(self.deps_cpp_info[binary["package"]].rootpath, binary["src"]) + src_path = os.path.join(self.dependencies[binary["package"]].package_folder, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder src_path = str(Path(self.source_folder, binary["root"], binary["src"])) if self.settings.os == "Windows": From 3ec6a7886e41c08cb4dc311069951d2bdc1b107b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 14 Oct 2024 10:20:05 +0200 Subject: [PATCH 035/276] Revert the strategy for skin support above sparse infill Due to the issue with printing extra lines on top of already printed infill lines, the change has been reverted. --- resources/definitions/ultimaker.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 14c7f6d0e04..05664fe3a4a 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -42,6 +42,7 @@ "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" }, "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" }, "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" }, + "extra_infill_lines_to_support_skins": { "value": "'none'"}, "gradual_support_infill_step_height": { "value": "4 * layer_height" }, "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, @@ -109,6 +110,7 @@ "roofing_layer_count": { "value": "1" }, "roofing_material_flow": { "value": "material_flow" }, "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, + "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" }, "skin_material_flow": { "value": "0.95 * material_flow" }, "skin_material_flow_layer_0": { "value": "95" }, "skin_monotonic": { "value": "roofing_layer_count == 0" }, From 16706f6666479b9ef23fea8ee801f4c135c44e86 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 14 Oct 2024 08:23:42 +0000 Subject: [PATCH 036/276] Applied printer-linter format --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 05664fe3a4a..65ceaf6f0fb 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -42,7 +42,7 @@ "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" }, "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" }, "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" }, - "extra_infill_lines_to_support_skins": { "value": "'none'"}, + "extra_infill_lines_to_support_skins": { "value": "'none'" }, "gradual_support_infill_step_height": { "value": "4 * layer_height" }, "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, From 863569b7dece3c7f77eaebe0532722ec40056da5 Mon Sep 17 00:00:00 2001 From: Dmitry Gribenchuk Date: Thu, 17 Oct 2024 11:24:48 +0300 Subject: [PATCH 037/276] small code-style fixes --- tests/TestBuildVolume.py | 1 - tests/TestConvexHullDecorator.py | 2 +- tests/TestCuraSceneController.py | 3 +-- tests/TestCuraSceneNode.py | 2 -- tests/TestLayer.py | 2 +- tests/TestObjectsModel.py | 1 - tests/TestPrintInformation.py | 2 +- tests/TestProfileRequirements.py | 6 +++--- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index 5012784bdf0..ece4b22d6f9 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -424,4 +424,3 @@ def test_oneAtATime(self, build_volume: BuildVolume): with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"): with patch.dict(self.setting_property_dict, {"print_sequence": {"value": "one_at_a_time"}}): assert build_volume.getEdgeDisallowedSize() == 0.1 - diff --git a/tests/TestConvexHullDecorator.py b/tests/TestConvexHullDecorator.py index eed5a3a6c36..94bcd58f37d 100644 --- a/tests/TestConvexHullDecorator.py +++ b/tests/TestConvexHullDecorator.py @@ -188,4 +188,4 @@ def test_compute2DConvexHullMeshDataGrouped(convex_hull_decorator): copied_decorator._global_stack = mocked_stack copied_decorator._getSettingProperty = MagicMock(return_value=0) node.addDecorator(copied_decorator) - assert convex_hull_decorator._compute2DConvexHull() == Polygon([[-5.0, 5.0], [5.0, 5.0], [5.0, -5.0], [-5.0, -5.0]]) \ No newline at end of file + assert convex_hull_decorator._compute2DConvexHull() == Polygon([[-5.0, 5.0], [5.0, 5.0], [5.0, -5.0], [-5.0, -5.0]]) diff --git a/tests/TestCuraSceneController.py b/tests/TestCuraSceneController.py index 634ce89d867..fe6f964593e 100644 --- a/tests/TestCuraSceneController.py +++ b/tests/TestCuraSceneController.py @@ -75,5 +75,4 @@ def test_updateMaxBuildPlate(objects_model, multi_build_plate_model): # And check what happens if we move down again! controller._calcMaxBuildPlate = MagicMock(return_value=2) controller.updateMaxBuildPlate(SceneNode()) - assert controller._active_build_plate == 0 # We don't have any items anywhere, so default to 0 - + assert controller._active_build_plate == 0 # We don't have any items anywhere, so default to 0 diff --git a/tests/TestCuraSceneNode.py b/tests/TestCuraSceneNode.py index 9e2fcb11880..77f4051a998 100644 --- a/tests/TestCuraSceneNode.py +++ b/tests/TestCuraSceneNode.py @@ -53,5 +53,3 @@ def test_invalidConvexHull(self, cura_scene_node): def test_outsideBuildArea(cura_scene_node): cura_scene_node.setOutsideBuildArea(True) assert cura_scene_node.isOutsideBuildArea - - diff --git a/tests/TestLayer.py b/tests/TestLayer.py index f8183437d6f..602a0a50613 100644 --- a/tests/TestLayer.py +++ b/tests/TestLayer.py @@ -36,4 +36,4 @@ def test_elementCount(): layer_polygon.elementCount = 12 layer.polygons.append(layer_polygon) assert layer.build(0, 0, [], [], [], [], [] ,[] , []) == (9001, 9002) - assert layer.elementCount == 12 \ No newline at end of file + assert layer.elementCount == 12 diff --git a/tests/TestObjectsModel.py b/tests/TestObjectsModel.py index b34c32a95ee..1bc0bf6aced 100644 --- a/tests/TestObjectsModel.py +++ b/tests/TestObjectsModel.py @@ -226,4 +226,3 @@ def test_updateOutsideBuildplate(self, objects_model, application_with_mocked_sc "per_object_settings_count": 0, "mesh_type": "" }] - diff --git a/tests/TestPrintInformation.py b/tests/TestPrintInformation.py index bfebe4a5288..4135782f0cf 100644 --- a/tests/TestPrintInformation.py +++ b/tests/TestPrintInformation.py @@ -148,4 +148,4 @@ def test_defineAbbreviatedMachineName(): # Test not ultimaker printer, name suffix should have first letter from the printer name project_name = ["HelloWorld", ".3mf"] print_information.setProjectName(project_name[0] + project_name[1]) - assert printer_name[0] + "_" + project_name[0] == print_information._job_name \ No newline at end of file + assert printer_name[0] + "_" + project_name[0] == print_information._job_name diff --git a/tests/TestProfileRequirements.py b/tests/TestProfileRequirements.py index a88513ce24f..c2114cba790 100644 --- a/tests/TestProfileRequirements.py +++ b/tests/TestProfileRequirements.py @@ -1,8 +1,8 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import configparser #To read the profiles. -import os #To join paths. +import configparser # To read the profiles. +import os # To join paths. import pytest ## Makes sure that the variants for the Ultimaker 3 Extended are exactly the @@ -13,7 +13,7 @@ # needed, but until then we should keep them the same. It's happened all too # often that we updated the variants for the UM3 but forgot about the UM3E. @pytest.mark.parametrize("um3_file, um3e_file", [ - #List the corresponding files below. + # List the corresponding files below. ("ultimaker3_aa0.25.inst.cfg", "ultimaker3_extended_aa0.25.inst.cfg"), ("ultimaker3_aa0.8.inst.cfg", "ultimaker3_extended_aa0.8.inst.cfg"), ("ultimaker3_aa04.inst.cfg", "ultimaker3_extended_aa04.inst.cfg"), From 8f2f4e82af21c557c8fe89ae767a26d2e134ced6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 21 Oct 2024 15:38:09 +0200 Subject: [PATCH 038/276] Add empty username if DF doesn't return one CURA-12183 --- .../DigitalLibrary/src/DigitalFactoryApiClient.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py index c0ce594ecf4..30b807753aa 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py @@ -196,7 +196,7 @@ def getListOfFilesInProject(self, library_project_id: str, on_finished: Callable url = "{}/projects/{}/files".format(self.CURA_API_ROOT, library_project_id) self._http.get(url, scope = self._scope, - callback = self._parseCallback(on_finished, DigitalFactoryFileResponse, failed), + callback = self._parseCallback(on_finished, DigitalFactoryFileResponse, failed, default_values = {'username': ''}), error_callback = failed, timeout = self.DEFAULT_REQUEST_TIMEOUT) @@ -205,7 +205,8 @@ def _parseCallback(self, Callable[[List[CloudApiClientModel]], Any]], model: Type[CloudApiClientModel], on_error: Optional[Callable] = None, - pagination_manager: Optional[PaginationManager] = None) -> Callable[[QNetworkReply], None]: + pagination_manager: Optional[PaginationManager] = None, + default_values: Dict[str, str] = None) -> Callable[[QNetworkReply], None]: """ Creates a callback function so that it includes the parsing of the response into the correct model. @@ -234,7 +235,7 @@ def parse(reply: QNetworkReply) -> None: if status_code >= 300 and on_error is not None: on_error() else: - self._parseModels(response, on_finished, model, pagination_manager = pagination_manager) + self._parseModels(response, on_finished, model, pagination_manager = pagination_manager, default_values = default_values) self._anti_gc_callbacks.append(parse) return parse @@ -262,7 +263,8 @@ def _parseModels(self, on_finished: Union[Callable[[CloudApiClientModel], Any], Callable[[List[CloudApiClientModel]], Any]], model_class: Type[CloudApiClientModel], - pagination_manager: Optional[PaginationManager] = None) -> None: + pagination_manager: Optional[PaginationManager] = None, + default_values: Dict[str, str] = None) -> None: """Parses the given models and calls the correct callback depending on the result. :param response: The response from the server, after being converted to a dict. @@ -279,7 +281,10 @@ def _parseModels(self, if "links" in response and pagination_manager: pagination_manager.setLinks(response["links"]) if isinstance(data, list): - results = [model_class(**c) for c in data] # type: List[CloudApiClientModel] + results = [] # type: List[CloudApiClientModel] + for model_data in data: + complete_model_data = (default_values | model_data) if default_values is not None else model_data + results.append(model_class(**complete_model_data)) on_finished_list = cast(Callable[[List[CloudApiClientModel]], Any], on_finished) on_finished_list(results) else: From faa3a14843991e2d11391fc01c1329c61f52730c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 22 Oct 2024 09:27:43 +0200 Subject: [PATCH 039/276] Restore temperature wait for UM Original printers CURA-12174 This is apparently required for those printers. The default behavior was changed in previous release, and not having the wait temperature prevented them for setting the initial temperature. I assume they don't recognize the M104 command --- resources/definitions/ultimaker_original.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index e7870129ed9..826a612c6c6 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -68,6 +68,7 @@ "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 205 }, + "material_print_temp_wait": { "value": true }, "speed_slowdown_layers": { "value": 2 } } } \ No newline at end of file From 5dd6700031ac5cb102aa3fee2bfee540f395a0d9 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 23 Oct 2024 17:08:15 +0200 Subject: [PATCH 040/276] Refactor binaries filtering and update dependencies Introduce a mechanism to filter blacklisted binaries from the build configuration and update the conandata.yml with a new blacklist section. Additionally, remove unnecessary dependencies from requirements.txt, particularly entries for PyQt6-NetworkAuth and related packages. Contribute to CURA-12229 --- conandata.yml | 7 +++++++ conanfile.py | 6 +++++- requirements.txt | 10 ---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/conandata.yml b/conandata.yml index fa0305261c7..b3a71a4b50e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -124,6 +124,13 @@ pyinstaller: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" + blacklist: + - "libassimp.so" + - "PyQt6/Qt6/qml/QtQuick3D" # directory + - "libqtquick3deffectplugin.so" + - "libqtquick3dphysicshelpersplugin.so" + - "libqtquick3dparticleeffectsplugin.so" + - "etc......." pycharm_targets: - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja module_name: Cura diff --git a/conanfile.py b/conanfile.py index 999cca3362c..be515c876d3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -281,13 +281,17 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e version = self.conf.get("user.cura:version", default = self.version, check_type = str) cura_version = Version(version) + # filter all binary files in binaries on the blacklist + blacklist = pyinstaller_metadata["blacklist"] + filtered_binaries = [b for b in binaries if b not in blacklist] + with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( name = str(self.options.display_name).replace(" ", "-"), display_name = self._app_name, entrypoint = entrypoint_location, datas = datas, - binaries = binaries, + binaries = filtered_binaries, venv_script_path = str(self._script_dir), hiddenimports = pyinstaller_metadata["hiddenimports"], collect_all = pyinstaller_metadata["collect_all"], diff --git a/requirements.txt b/requirements.txt index 344a0156d8d..83da635cd29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,16 +31,6 @@ PyQt6-Qt6==6.6.0 \ --hash=sha256:8cb30d64a4d32465ea1686bc827cbe452225fb387c4873356b0fa7b9ae63534f \ --hash=sha256:a151f34712cd645111e89cb30b02e5fb69c9dcc3603ab3c03a561e874bd7cbcf \ --hash=sha256:e5483ae04bf107411c7469f1be9f9e2eb9840303e788b3ac524fe30af90d45f4 -PyQt6-NetworkAuth==6.6.0 \ - --hash=sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 \ - --hash=sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 \ - --hash=sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb \ - --hash=sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 -PyQt6-NetworkAuth-Qt6==6.6.0 \ - --hash=sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 \ - --hash=sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 \ - --hash=sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 \ - --hash=sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 certifi==2023.5.7; \ --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 From 32369e39e3f37e321b1625c73fbef6dda1fd642a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 24 Oct 2024 09:48:36 +0200 Subject: [PATCH 041/276] Fix z-fighting between build-plate-grid and printer-model. Since both of them where a different render type (solid versus transparent) the sorting didn't work. Make them both transparent. (Though no changes where made there, see also UM/Scene/Platform -- which is not to be confused with UM/Platform.) should fix CURA-12188 --- cura/BuildVolume.py | 4 ++-- resources/shaders/grid.shader | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 742d1872cb5..02cc943823c 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -262,9 +262,9 @@ def render(self, renderer): renderer.queueNode(self, mode = RenderBatch.RenderMode.Lines) renderer.queueNode(self, mesh = self._origin_mesh, backface_cull = True) - renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True) + renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True, transparent = True, sort = -10) if self._disallowed_area_mesh: - renderer.queueNode(self, mesh = self._disallowed_area_mesh, shader = self._shader, transparent = True, backface_cull = True, sort = -9) + renderer.queueNode(self, mesh = self._disallowed_area_mesh, shader = self._shader, transparent = True, backface_cull = True, sort = -5) if self._error_mesh: renderer.queueNode(self, mesh=self._error_mesh, shader=self._shader, transparent=True, diff --git a/resources/shaders/grid.shader b/resources/shaders/grid.shader index 0ec6cc0f989..968c17d99a6 100644 --- a/resources/shaders/grid.shader +++ b/resources/shaders/grid.shader @@ -45,6 +45,7 @@ fragment = float majorLine = min(majorGrid.x, majorGrid.y); gl_FragColor = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); + gl_FragColor.a = 0.8; } vertex41core = @@ -88,6 +89,7 @@ fragment41core = float majorLine = min(majorGrid.x, majorGrid.y); frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); + frag_color.a = 0.8; } [defaults] From a6a223bcc10a2ab89de3dc06d744a804d0bf94e9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 24 Oct 2024 09:50:03 +0200 Subject: [PATCH 042/276] Prevent 'too small' starts from not rendering. Not actually part of CURA-12188 but I was in the neighbourhood anyway. --- plugins/SimulationView/layers3d.shader | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/SimulationView/layers3d.shader b/plugins/SimulationView/layers3d.shader index 2bf77e89fae..494a07083da 100644 --- a/plugins/SimulationView/layers3d.shader +++ b/plugins/SimulationView/layers3d.shader @@ -360,8 +360,8 @@ geometry41core = ((v_prev_line_type[0] != 1) && (v_line_type[0] == 1)) || ((v_prev_line_type[0] != 4) && (v_line_type[0] == 4)) )) { - float w = size_x; - float h = size_y; + float w = max(0.05, size_x); + float h = max(0.05, size_y); myEmitVertex(v_vertex[0] + vec3( w, h, w), u_starts_color, normalize(vec3( 1.0, 1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, h, w, 0.0))); // Front-top-left myEmitVertex(v_vertex[0] + vec3(-w, h, w), u_starts_color, normalize(vec3(-1.0, 1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, h, w, 0.0))); // Front-top-right From 0473d789ba0a78418b926a69a7857825af4da4cc Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 24 Oct 2024 11:27:07 +0200 Subject: [PATCH 043/276] Make the build-plate-grid render mostly opaque. Some printers looked a bit weird with the previous value. Just completely remove the two altered lines if it's still not OK though. part of CURA-12188 --- resources/shaders/grid.shader | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/shaders/grid.shader b/resources/shaders/grid.shader index 968c17d99a6..5334461015f 100644 --- a/resources/shaders/grid.shader +++ b/resources/shaders/grid.shader @@ -45,7 +45,7 @@ fragment = float majorLine = min(majorGrid.x, majorGrid.y); gl_FragColor = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); - gl_FragColor.a = 0.8; + gl_FragColor.a = 0.98; } vertex41core = @@ -89,7 +89,7 @@ fragment41core = float majorLine = min(majorGrid.x, majorGrid.y); frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); - frag_color.a = 0.8; + frag_color.a = 0.98; } [defaults] From 0311ca0ddc1d7f449ece9d2af9cce5ef473baa2c Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 25 Oct 2024 13:30:27 +0200 Subject: [PATCH 044/276] Update MakerbotWriter.py switch back and front bounds order to line up with the NP and makerbot documentation --- plugins/MakerbotWriter/MakerbotWriter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 8b30362d78a..5c655dc8cc3 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -250,7 +250,7 @@ def _getMeta(self, root_nodes: List[SceneNode]) -> Tuple[Dict[str, any], str]: meta["preferences"] = dict() bounds = application.getBuildVolume().getBoundingBox() meta["preferences"]["instance0"] = { - "machineBounds": [bounds.right, bounds.back, bounds.left, bounds.front] if bounds is not None else None, + "machineBounds": [bounds.right, bounds.front, bounds.left, bounds.back] if bounds is not None else None, "printMode": CuraApplication.getInstance().getIntentManager().currentIntentCategory, } From 1a0f4016178813d426cd2f252e6b9f6b65e0c96d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 25 Oct 2024 15:08:51 +0200 Subject: [PATCH 045/276] remove legacy material linkage There are no PC, HIPS, TPU, PC, BVOH materials for makerbot series and the references used point to Generic 175 material GUIDs which is blocked for the makerbot/sketch series. --- cura/PrinterOutput/FormatMaps.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 80eb8049a33..b22aad74414 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -35,16 +35,11 @@ class FormatMaps: "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, "nylon-cf": {"name": "Nylon CF", "guid": "17abb865-ca73-4ccd-aeda-38e294c9c60b"}, "nylon": {"name": "Nylon", "guid": "9475b03d-fd19-48a2-b7b5-be1fb46abb02"}, - "pc": {"name": "PC", "guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, "petg": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "bvoh": {"name": "BVOH", "guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, - "cpe": {"name": "CPE", "guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, - "hips": {"name": "HIPS", "guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu": {"name": "TPU 95A", "guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, "im-pla": {"name": "Tough", "guid": "96fca5d9-0371-4516-9e96-8e8182677f3c"} # /!\ When changing this list, make sure the changes are reported accordingly on Digital Factory } From e7d8acf2608a805b0f8888c323a307430020ada3 Mon Sep 17 00:00:00 2001 From: h1data Date: Sun, 27 Oct 2024 22:57:12 +0900 Subject: [PATCH 046/276] improve Japanese translation for 5.9 --- resources/i18n/ja_JP/cura.po | 873 ++++++++++--------- resources/i18n/ja_JP/fdmextruder.def.json.po | 74 +- resources/i18n/ja_JP/fdmprinter.def.json.po | 848 +++++++++--------- 3 files changed, 913 insertions(+), 882 deletions(-) diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 63755bf0a87..0976b8ee80d 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-13 09:02+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2024-10-27 12:31+0000\n" +"Last-Translator: h1data \n" +"Language-Team: Japanese \n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "%(width).1f x %(depth).1f x %(height).1f mm" msgctxt "@action:label" msgid "%1 & material" -msgstr "%1とフィラメント" +msgstr "%1と材料" msgctxt "@action:label" msgid "%1 out of %2" @@ -44,105 +44,106 @@ msgstr "%1m" msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." -msgstr "＆プリンターを追加する..." +msgstr "プリンターを追加(&A)..." msgctxt "@action:inmenu menubar:view" msgid "&Camera position" -msgstr "カメラ位置 (&C)" +msgstr "カメラ位置(&C)" msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." -msgstr "&今の設定/無効からプロファイルを作成する..." +msgstr "現在の設定からプロファイルを作成/上書き(&C)..." msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" -msgstr "&変更を破棄する" +msgstr "変更を破棄(&D)" msgctxt "@title:menu menubar:toplevel" msgid "&Edit" -msgstr "&編集" +msgstr "編集(&E)" msgctxt "@title:menu menubar:file" msgid "&Export..." -msgstr "エクスポート... (&E)" +msgstr "エクスポート(&E)..." msgctxt "@title:menu menubar:toplevel" msgid "&File" -msgstr "&ファイル" +msgstr "ファイル(&F)" msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" -msgstr "&モデルグループ" +msgstr "モデルをグループ化(&G)" msgctxt "@title:menu menubar:toplevel" msgid "&Help" -msgstr "ヘルプ" +msgstr "ヘルプ(&H)" msgctxt "@title:menu" msgid "&Material" -msgstr "&フィラメント" +msgstr "材料(&M)" msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" -msgstr "モ&デルの合体" +msgstr "モデルを合体(&M)" msgctxt "@action:inmenu" msgid "&Multiply Model..." -msgstr "&モデルを増倍する..." +msgstr "モデルを複製(&M)..." msgctxt "@action:inmenu menubar:file" msgid "&New Project..." -msgstr "&新しいプロジェクト..." +msgstr "新規プロジェクト(&N)..." msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." -msgstr "&ファイルを開く(s)..." +msgstr "ファイルを開く(&O)..." msgctxt "@title:menu menubar:settings" msgid "&Printer" -msgstr "&プリンター" +msgstr "プリンター(&P)" msgctxt "@action:inmenu menubar:file" msgid "&Quit" -msgstr "&やめる" +msgstr "終了(&Q)" msgctxt "@action:inmenu menubar:edit" msgid "&Redo" -msgstr "&やりなおす" +msgstr "やり直し(&R)" msgctxt "@title:menu menubar:file" msgid "&Save Project..." -msgstr "プロジェクトを保存... (&S)" +msgstr "プロジェクトを保存(&S)..." msgctxt "@title:menu menubar:file Don't translate 'Universal Cura Project'" msgid "&Save Universal Cura Project..." -msgstr "Universal Cura Projectを保存..." +msgstr "Universal Cura Projectを保存(&S)..." msgctxt "@title:menu menubar:toplevel" msgid "&Settings" -msgstr "&設定" +msgstr "設定(&S)" msgctxt "@action:inmenu menubar:edit" msgid "&Undo" -msgstr "&取り消す" +msgstr "元に戻す(&U)" msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" -msgstr "&現在の設定/無効にプロファイルをアップデートする" +msgstr "現在の設定でプロファイルを更新/上書きする(&U)" msgctxt "@title:menu menubar:toplevel" msgid "&View" -msgstr "&ビュー" +msgstr "表示(&V)" msgctxt "@label" msgid "*You will need to restart the application for these changes to have effect." -msgstr "*これらの変更を有効にするには、アプリケーションを再始動する必要があります。" +msgstr "*これらの変更を有効にするには、アプリケーションを再起動する必要があります。" msgctxt "@text" msgid "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the UltiMaker community" -msgstr "- マーケットプレースから材料プロファイルとプラグインを追加" -"- 材料プロファイルとプラグインのバックアップと同期" -"- UltiMakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" +msgstr "" +"- マーケットプレイスから材料プロファイルとプラグインを追加\n" +"- 材料プロファイルとプラグインのバックアップと同期\n" +"- UltiMakerコミュニティで48,000人以上のユーザーとアイデアを共有したりアドバイスをもらったりしましょう" msgctxt "@heading" msgid "-- incomplete --" @@ -150,7 +151,7 @@ msgstr "-- 未完了 --" msgctxt "@action:label" msgid "1mm Transmittance (%)" -msgstr "1mm透過率（%）" +msgstr "1mm透過率 (%)" msgctxt "@info:title" msgid "3D Model Assistant" @@ -166,7 +167,7 @@ msgstr "3Dビュー" msgctxt "@item:inlistbox" msgid "3MF File" -msgstr "3MF ファイル" +msgstr "3MFファイル" msgctxt "name" msgid "3MF Reader" @@ -210,23 +211,26 @@ msgstr "
  • OpenGLバージョン: {version}
    • " msgctxt "@label crash message" msgid "

    A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

    \n

    Please use the \"Send report\" button to post a bug report automatically to our servers

    \n " -msgstr "

    致命的なエラーが発生しました。問題解決のためこのクラッシュレポートを送信してください

    " -"

    「レポート送信」ボタンを使用してバグレポートが自動的に当社サーバーに送られるようにしてください

    " +msgstr "" +"

    致命的なエラーが発生しました。問題解決のためこのクラッシュレポートを送信してください

    \n" +"

    「レポート送信」ボタンを使用すると、バグレポートが自動的に当社サーバーに送信されます/p>\n" " " msgctxt "@label crash message" msgid "

    Oops, UltiMaker Cura has encountered something that doesn't seem right.

    \n

    We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

    \n

    Backups can be found in the configuration folder.

    \n

    Please send us this Crash Report to fix the problem.

    \n " -msgstr "

    申し訳ありません。UltiMaker Cura で何らかの不具合が生じています。

    " -"

    開始時に回復不能のエラーが発生しました。不適切なファイル設定が原因の可能性があります。バックアップを実行してからリセットしてください。

    " -"

    バックアップは、設定フォルダに保存されます。

    " -"

    問題解決のために、このクラッシュ報告をお送りください。

    " +msgstr "" +"

    申し訳ありません。UltiMaker Cura で何らかの不具合が生じています。

    \n" +"

    開始時に回復不能のエラーが発生しました。不適切な設定ファイルが原因の可能性があります。バックアップを実行してからリセットしてください。

    \n" +"

    バックアップは、設定フォルダに保存されます。

    \n" +"

    問題解決のために、このクラッシュ報告をお送りください。

    \n" " " msgctxt "@info:status" msgid "

    One or more 3D models may not print optimally due to the model size and material configuration:

    \n

    {model_names}

    \n

    Find out how to ensure the best possible print quality and reliability.

    \n

    View print quality guide

    " -msgstr "

    モデルのサイズまたは材料の設定によっては、適切に印刷しない3Dモデルがあります。:

    " -"

    {model_names}

    " -"

    可能な限り最高の品質および信頼性を得る方法をご覧ください。

    " +msgstr "" +"

    モデルのサイズおよび材料の構成により、いくつかの3Dモデルの印刷は最適化されません。:

    \n" +"

    {model_names}

    \n" +"

    可能な限り最高の品質と確実な印刷を実現する方法をご覧ください。

    \n" "

    印字品質ガイドを見る

    " msgctxt "@label" @@ -240,7 +244,7 @@ msgstr[0] "一部のプリンターではクラウド接続は利用できませ msgctxt "@text" msgid "A highly dense and strong part but at a slower print time. Great for functional parts." -msgstr "密度の高い強力な部品ですが,印刷時間は遅くなります。機能部品に最適です。" +msgstr "密度の高い強力な部品ですが、印刷時間が遅くなります。機能部品に最適です。" msgctxt "@message" msgid "A print is still in progress. Cura cannot start another print via USB until the previous print has completed." @@ -248,7 +252,7 @@ msgstr "現在印刷中です。Curaは、前の印刷が完了するまでUSB msgctxt "@item:inlistbox" msgid "AMF File" -msgstr "AMF ファイル" +msgstr "AMFファイル" msgctxt "name" msgid "AMF Reader" @@ -284,7 +288,7 @@ msgstr "%1について" msgctxt "@action:inmenu menubar:help" msgid "About..." -msgstr "アバウト..." +msgstr "Curaについて..." msgctxt "@button" msgid "Accept" @@ -292,7 +296,7 @@ msgstr "承認する" msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." -msgstr "G-codeを承認し、プリンターに送信する。またプラグインはファームウェアをアップデートできます。" +msgstr "G-codeを承認し、プリンターに送信します。またプラグインはファームウェアをアップデートできます。" msgctxt "@label" msgid "Account synced" @@ -324,11 +328,11 @@ msgstr "新規追加" msgctxt "@title:window" msgid "Add Printer" -msgstr "プリンターを追加する" +msgstr "プリンターの追加" msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "Digital FactoryでUltiMakerプリンターを追加する" +msgstr "Digital FactoryでUltiMakerプリンターを追加" msgctxt "@label" msgid "Add a Cloud printer" @@ -336,15 +340,15 @@ msgstr "クラウドプリンターを追加" msgctxt "@label" msgid "Add a networked printer" -msgstr "ネットワークプリンターの追加" +msgstr "ネットワークプリンターを追加" msgctxt "@label" msgid "Add a non-networked printer" -msgstr "非ネットワークプリンターの追加" +msgstr "非ネットワークプリンターを追加" msgctxt "@action" msgid "Add a script" -msgstr "スクリプトを加える" +msgstr "スクリプトを追加" msgctxt "@option:check" msgid "Add icon to system tray *" @@ -352,11 +356,11 @@ msgstr "システムトレイにアイコンを追加 *" msgctxt "@button" msgid "Add local printer" -msgstr "ローカルプリンターの追加" +msgstr "ローカルプリンターを追加" msgctxt "@option:check" msgid "Add machine prefix to job name" -msgstr "プリンターの敬称をジョブネームに加える" +msgstr "プリンターの接頭辞をジョブ名に付与" msgctxt "@text" msgid "Add material settings and plugins from the Marketplace" @@ -364,27 +368,27 @@ msgstr "マーケットプレイスから材料設定とプラグインを追加 msgctxt "@action:inmenu Marketplace is a brand name of UltiMaker's, so don't translate." msgid "Add more materials from Marketplace" -msgstr "Add more materials from Marketplace" +msgstr "マーケットプレイスから更に材料を追加" msgctxt "@button" msgid "Add printer" -msgstr "プリンターの追加" +msgstr "プリンターを追加" msgctxt "@label" msgid "Add printer" -msgstr "プリンターの追加" +msgstr "プリンターを追加" msgctxt "@label" msgid "Add printer by IP" -msgstr "IP でプリンターを追加" +msgstr "IPでプリンターを追加" msgctxt "@label" msgid "Add printer by IP address" -msgstr "IP アドレスでプリンターを追加" +msgstr "IPアドレスでプリンターを追加" msgctxt "@button" msgid "Add printer manually" -msgstr "プリンタを手動で追加する" +msgstr "手動でプリンタを追加" msgctxt "info:status Filled in with printer name and printer model." msgid "Adding printer {name} ({model}) from your account" @@ -408,7 +412,7 @@ msgstr "プリントのインフィルの密度を調整します。" msgctxt "support_type description" msgid "Adjusts the placement of the support structures. The placement can be set to touching build plate or everywhere. When set to everywhere the support structures will also be printed on the model." -msgstr "サポート材の配置を調整します。配置はTouching BuildplateまたはEveryWhereに設定することができます。EveryWhereに設定した場合、サポート材がモデルの上にもプリントされます。" +msgstr "サポート材の配置を調整します。配置はTouching BuildplateまたはEveryWhereに設定できます。EveryWhereに設定した場合、サポート材がモデルの上にもプリントされます。" msgctxt "@label Header for list of settings." msgid "Affected By" @@ -424,11 +428,11 @@ msgstr "同意する" msgctxt "@item:inlistbox" msgid "All Files (*)" -msgstr "全てのファイル" +msgstr "全てのファイル (*)" msgctxt "@item:inlistbox" msgid "All Supported Types ({0})" -msgstr "すべてのサポートのタイプ ({0})" +msgstr "サポートされたすべてのタイプ ({0})" msgctxt "@text:window" msgid "Allow sending anonymous data" @@ -464,7 +468,7 @@ msgstr "常に変更した設定を新しいプロファイルに送信する" msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" -msgstr "ユニット値がミリメートルではなくメートルの場合、モデルが極端に小さく現れる場合があります。モデルはスケールアップされるべきですか？" +msgstr "単位がミリメートルではなくメートルの場合、モデルが極端に小さくなる場合があります。この場合にモデルを拡大するかどうかを選択します。" msgctxt "@label" msgid "Annealing" @@ -488,7 +492,7 @@ msgstr "適用:" msgctxt "@label" msgid "Apply Extruder offsets to GCode" -msgstr "エクストルーダーのオフセットをGCodeに適用します" +msgstr "エクストルーダーのオフセットをGCodeに適用" msgctxt "@info:title" msgid "Are you ready for cloud printing?" @@ -500,7 +504,7 @@ msgstr "%1 を中止してよろしいですか？" msgctxt "@label" msgid "Are you sure you want to abort the print?" -msgstr "本当にプリントを中止してもいいですか？" +msgstr "本当にプリントを中止してもよろしいですか？" msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to delete %1?" @@ -508,7 +512,7 @@ msgstr "%1 を削除しますか？" msgctxt "@dialog:info" msgid "Are you sure you want to delete this backup? This cannot be undone." -msgstr "このバックアップを削除しますか？これは取り消しできません。" +msgstr "このバックアップを削除しますか？この操作は取り消しできません。" msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" @@ -524,11 +528,11 @@ msgstr "{printer_name}を一時的に削除してもよろしいですか？" msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." -msgstr "新しいプロジェクトを開始しますか？この作業では保存していない設定やビルドプレートをクリアします。" +msgstr "新しいプロジェクトを開始しますか？この操作により保存していない設定やビルドプレートがクリアされます。" msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" -msgstr "%1を取り外しますか？この作業はやり直しが効きません！" +msgstr "%1を取り外しますか？この操作は取り消しできません。" msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" @@ -536,11 +540,11 @@ msgstr "{0}を取り除いてもよろしいですか？この操作は元に戻 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" -msgstr "すべてのモデルをアレンジする" +msgstr "全モデルを再配置" msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models in a grid" -msgstr "すべてのモデルをグリッドに配置" +msgstr "全モデルを格子状に配置" msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" @@ -556,15 +560,15 @@ msgstr "自動バックアップ" msgctxt "@checkbox:description" msgid "Automatically create a backup each day that Cura is started." -msgstr "Cura を起動した日は常にバックアップを自動生成します。" +msgstr "Curaを起動した際、日毎にバックアップを自動生成します。" msgctxt "@option:check" msgid "Automatically drop models to the build plate" -msgstr "自動的にモデルをビルドプレートに落とす" +msgstr "自動でモデルをビルドプレート上に配置" msgctxt "@action:button" msgid "Automatically upgrade Firmware" -msgstr "自動でファームウェアをアップグレード" +msgstr "自動でファームウェアを更新" msgctxt "@label" msgid "Available networked printers" @@ -592,7 +596,7 @@ msgstr "今すぐバックアップする" msgctxt "@action:button" msgid "Backup and Reset Configuration" -msgstr "バックアップとリセットの設定" +msgstr "設定構成のバックアップとリセット" msgctxt "description" msgid "Backup and restore your configuration." @@ -616,11 +620,11 @@ msgstr "バランス" msgctxt "@action:label" msgid "Base (mm)" -msgstr "ベース（mm）" +msgstr "ベース (mm)" msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "底面図" +msgstr "ボトムビュー" msgctxt "@label" msgid "Brand" @@ -640,7 +644,7 @@ msgstr "ビルドプレート" msgctxt "@label" msgid "Build plate shape" -msgstr "ビルドプレート形" +msgstr "ビルドプレートの形状" msgctxt "@label" msgid "Bundled Materials" @@ -660,7 +664,7 @@ msgstr "作成者" msgctxt "@label Description for application dependency" msgid "C/C++ Binding library" -msgstr "C/C++ バインディングライブラリー" +msgstr "C/C++バインディングライブラリー" msgctxt "@item:inlistbox" msgid "COLLADA Digital Asset Exchange" @@ -680,7 +684,7 @@ msgstr "カメラレンダリング:" msgctxt "@action:inmenu menubar:view" msgid "Camera view" -msgstr "カメラビュー" +msgstr "カメラ表示" msgctxt "@info:title" msgid "Can't Find Location" @@ -696,7 +700,7 @@ msgstr "UltiMakerプリンターに接続できませんか？" msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." -msgstr "プリンタを追加する前に、{0}からプロファイルの取り込はできません。" +msgstr "プリンタを追加する前に、{0}からプロファイルのインポートはできません。" msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" @@ -724,7 +728,7 @@ msgstr "G-codeリーダーに注意メッセージ" msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" -msgstr "プラットホームの中心にモデルを配置" +msgstr "プラットフォームの中心にモデルを配置(&N)" msgctxt "@action:inmenu menubar:edit" msgid "Center Selected" @@ -732,11 +736,11 @@ msgstr "選択内容を中央に移動" msgctxt "@action:button" msgid "Center camera when item is selected" -msgstr "アイテムを選択するとカメラが中心にきます" +msgstr "アイテム選択時カメラを中心に移動" msgctxt "@info:tooltip" msgid "Change active post-processing scripts." -msgstr "処理したアクティブなスクリプトを変更します。" +msgstr "有効なポストプロセッシングスクリプトを変更します。" msgctxt "@label" msgid "Change material %1 from %2 to %3." @@ -756,7 +760,7 @@ msgstr "アカウントにおける変更" msgctxt "@label:textbox" msgid "Check all" -msgstr "全てを調べる" +msgstr "全て選択" msgctxt "@button" msgid "Check for account updates" @@ -764,7 +768,7 @@ msgstr "アカウントの更新を確認" msgctxt "@option:check" msgid "Check for updates on start" -msgstr "スタート時にアップデートあるかどうかのチェック" +msgstr "起動時にアップデートをチェック" msgctxt "@label" msgid "Checking..." @@ -780,11 +784,16 @@ msgstr "プリント問題の可能性のあるモデルをプリント構成を msgctxt "@label" msgid "Chooses between the techniques available to generate support. \n\n\"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \n\n\"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible." -msgstr "サポートを生成するために利用できる技術を選択します。「標準」のサポート構造はオーバーハング部品のすぐ下に作成し、そのエリアを真下に生成します。「ツリー」サポートはオーバーハングエリアに向かって枝を作成し、モデルを枝の先端で支えます。枝をモデルのまわりにはわせて、できる限りビルドプレートから支えます。" +msgstr "" +"サポート生成に利用する方式を選択します。\n" +"\n" +"「標準」サポートはサポート構造をオーバーハング部品のすぐ下に作成し、そのエリアを真下に生成します。\n" +"\n" +"「ツリー」サポートはオーバーハングエリアに向かって枝を作成し、モデルを枝の先端で支えます。枝をモデルのまわりにはわせて、できる限りビルドプレートから支えます。" msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" -msgstr "ビルドプレート上のクリア" +msgstr "ビルドプレートをクリア" msgctxt "@option:check" msgid "Clear buildplate before loading model into the single instance" @@ -796,7 +805,7 @@ msgstr "材料アーカイブのエクスポートボタンをクリックしま msgctxt "@action:button" msgid "Close" -msgstr "閉める" +msgstr "閉じる" msgctxt "@title:window %1 is the application name" msgid "Closing %1" @@ -820,11 +829,11 @@ msgstr "カラースキーム" msgctxt "@info" msgid "Compare and save." -msgstr "比較して保存してください。" +msgstr "変更を比較して保存します。" msgctxt "@label" msgid "Compatibility Mode" -msgstr "コンパティビリティモード" +msgstr "互換モード" msgctxt "@label Description for application dependency" msgid "Compatibility between Python 2 and 3" @@ -836,7 +845,7 @@ msgstr "互換性のあるプリンター" msgctxt "@label" msgid "Compatible material diameter" -msgstr "適合する材料直径" +msgstr "適合する材料の直径" msgctxt "@header" msgid "Compatible printers" @@ -884,11 +893,11 @@ msgstr "構成" msgctxt "@action:inmenu" msgid "Configure Cura..." -msgstr "Curaを構成する..." +msgstr "Curaの構成..." msgctxt "@info:tooltip" msgid "Configure Per Model Settings" -msgstr "各モデル構成設定" +msgstr "モデル別設定を構成" msgctxt "@action" msgid "Configure group" @@ -896,7 +905,7 @@ msgstr "グループの設定" msgctxt "@action:menu" msgid "Configure setting visibility..." -msgstr "視野のセッティングを構成する..." +msgstr "表示項目設定..." msgctxt "@title:window" msgid "Confirm Diameter Change" @@ -904,7 +913,7 @@ msgstr "直径変更の確認" msgctxt "@title:window" msgid "Confirm Remove" -msgstr "モデルを取り除きました" +msgstr "モデルを削除しました" msgctxt "@action:button" msgid "Connect" @@ -932,7 +941,7 @@ msgstr "キャンセルしたプリンター" msgctxt "@info:status" msgid "Connected via USB" -msgstr "USBにて接続する" +msgstr "USB接続" msgctxt "@info:status" msgid "Connected via cloud" @@ -964,11 +973,11 @@ msgstr "クリップボードにコピー" msgctxt "@action:menu" msgid "Copy value to all extruders" -msgstr "すべてのエクストルーダーの値をコピーする" +msgstr "すべてのエクストルーダーに値をコピー" msgctxt "@label" msgid "Cost per Meter" -msgstr "毎メーターコスト" +msgstr "メートルあたりのコスト" msgctxt "@info" msgid "Could not access update information." @@ -988,7 +997,7 @@ msgstr "デバイス{device}に書き出すためのファイル名が見つか msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" -msgstr "%1フィラメントを取り込むことができない: %2" +msgstr "材料%1のインポートに失敗しました： %2" msgctxt "@info:error" msgid "Could not interpret the server's response." @@ -1000,7 +1009,7 @@ msgstr "GCodeWriterプラグインを読み込めませんでした。プラグ msgctxt "@info:error" msgid "Could not reach Marketplace." -msgstr "マーケットプレースにアクセスできませんでした。" +msgstr "マーケットプレイスにアクセスできませんでした。" msgctxt "@message" msgid "Could not read response." @@ -1024,17 +1033,20 @@ msgstr "データをプリンタにアップロードできませんでした。 msgctxt "@info:plugin_failed" msgid "Couldn't start EnginePlugin: {self._plugin_id}\nNo permission to execute process." -msgstr "EnginePluginを開始できませんでした：{self._plugin_id}" +msgstr "" +"EnginePluginを開始できませんでした：{self._plugin_id}\n" "処理を実行する権限がありません。" msgctxt "@info:plugin_failed" msgid "Couldn't start EnginePlugin: {self._plugin_id}\nOperating system is blocking it (antivirus?)" -msgstr "EnginePluginを開始できませんでした：{self._plugin_id}" +msgstr "" +"EnginePluginを開始できませんでした：{self._plugin_id}\n" "OSによりブロックされています（ウイルス対策？）" msgctxt "@info:plugin_failed" msgid "Couldn't start EnginePlugin: {self._plugin_id}\nResource is temporarily unavailable" -msgstr "EnginePluginを開始できませんでした：{self._plugin_id}" +msgstr "" +"EnginePluginを開始できませんでした：{self._plugin_id}\n" "リソースは一時的に利用できません" msgctxt "@title:window" @@ -1043,7 +1055,7 @@ msgstr "クラッシュ報告" msgctxt "@title:window" msgid "Create Profile" -msgstr "プロファイルを作る" +msgstr "プロファイルを作成" msgctxt "@text" msgid "Create a free UltiMaker Account" @@ -1059,19 +1071,19 @@ msgstr "サポートが印刷されないボリュームを作成します。" msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" -msgstr "新しいものを作成する" +msgstr "新規作成" msgctxt "@action:button" msgid "Create new" -msgstr "新しいものを作成する" +msgstr "新規作成" msgctxt "@button" msgid "Create new" -msgstr "新しいものを作成する" +msgstr "新規作成" msgctxt "@action:tooltip" msgid "Create new profile from current settings/overrides" -msgstr "現在の設定/上書きから新しいプロファイルを作成します" +msgstr "現在の設定と上書きされた値から新しいプロファイルを作成します" msgctxt "@tooltip:button" msgid "Create print projects in Digital Library." @@ -1091,11 +1103,11 @@ msgstr "Cura 15.04 プロファイル" msgctxt "@title:window" msgid "Cura Backups" -msgstr "Cura バックアップ" +msgstr "Curaバックアップ" msgctxt "name" msgid "Cura Backups" -msgstr "Cura バックアップ" +msgstr "Curaバックアップ" msgctxt "@item:inlistbox" msgid "Cura Profile" @@ -1111,7 +1123,7 @@ msgstr "Curaプロファイルライター" msgctxt "@item:inlistbox" msgid "Cura Project 3MF file" -msgstr "Curaが3MF fileを算出します" +msgstr "Curaプロジェクト3MFファイル" msgctxt "@backuplist:label" msgid "Cura Version" @@ -1127,8 +1139,9 @@ msgstr "Curaはグループ{0}のホストプリンターにまだインスト msgctxt "@info:credit" msgid "Cura is developed by UltiMaker in cooperation with the community.\nCura proudly uses the following open source projects:" -msgstr "CuraはUltiMakerのコミュニティの協力によって開発され、" -"Curaはオープンソースで使えることを誇りに思います:" +msgstr "" +"CuraはUltiMakerおよびコミュニティの協力によって開発されています。\n" +"Curaは以下の素晴らしいオープンソースプロジェクトを使用しています:" msgctxt "@label" msgid "Cura language" @@ -1176,7 +1189,7 @@ msgstr "カスタム" msgctxt "@label" msgid "Custom Material" -msgstr "カスタムフィラメント" +msgstr "カスタム材料" msgctxt "@label" msgid "Custom profile" @@ -1200,7 +1213,7 @@ msgstr "カット" msgctxt "@item:inlistbox" msgid "Cutting mesh" -msgstr "メッシュ切断" +msgstr "切断メッシュ" msgctxt "@item:inlistbox" msgid "Darker is higher" @@ -1212,7 +1225,7 @@ msgstr "データを送信しました" msgctxt "@label Description for application dependency" msgid "Data interchange format" -msgstr "データインターフェイスフォーマット" +msgstr "データ交換フォーマット" msgctxt "@button" msgid "Decline" @@ -1240,7 +1253,7 @@ msgstr "プロジェクトファイルを開く際のデフォルト機能" msgctxt "@window:text" msgid "Default behavior when opening a project file: " -msgstr "プロジェクトファイル開く際のデフォルト機能: " +msgstr "プロジェクトファイル読み込み時のデフォルト動作: " msgctxt "@action:button" msgid "Defaults" @@ -1280,7 +1293,7 @@ msgstr "パッケージ管理システム" msgctxt "@action:label" msgid "Depth (mm)" -msgstr "深さ（mm)" +msgstr "深さ (mm)" msgctxt "@action:label" msgid "Derivative from" @@ -1312,7 +1325,7 @@ msgstr "エクストルーダーを無効にする" msgctxt "@option:discardOrKeep" msgid "Discard and never ask again" -msgstr "取り消し、再度確認しない" +msgstr "取り消して二度と確認しない" msgctxt "@action:button" msgid "Discard changes" @@ -1336,11 +1349,11 @@ msgstr "ディスプレイ名" msgctxt "@option:check" msgid "Display model errors" -msgstr "モデルエラーを表示" +msgstr "モデルのエラーを表示" msgctxt "@option:check" msgid "Display overhang" -msgstr "ディスプレイオーバーハング" +msgstr "オーバーハングを表示" msgctxt "@info:option_text" msgid "Do not show this message again" @@ -1352,7 +1365,7 @@ msgstr "材料パッケージとソフトウェアパッケージをアカウン msgctxt "@action:label" msgid "Don't show project summary on save again" -msgstr "保存中のプロジェクトサマリーを非表示にする" +msgstr "保存時にプロジェクトの概要を表示しない" msgctxt "@action:menu" msgid "Don't show this setting" @@ -1380,7 +1393,7 @@ msgstr "ドラフト" msgctxt "@action:inmenu menubar:edit" msgid "Drop All Models to buildplate" -msgstr "すべてのモデルをビルドプレートにドロップ" +msgstr "全モデルをビルドプレートに下ろす" msgctxt "@action:button" msgid "Duplicate" @@ -1396,7 +1409,7 @@ msgstr "プレビューではバックアップは5つまでに制限されて msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" -msgstr "拡張子" +msgstr "拡張(&E)" msgctxt "@action:button" msgid "Edit" @@ -1440,7 +1453,7 @@ msgstr "2Dの画像ファイルからプリント可能なジオメトリーを msgctxt "@title:label" msgid "End G-code" -msgstr "G-codeの終了" +msgstr "終了G-code" msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." @@ -1456,7 +1469,7 @@ msgstr "エンジニアリング" msgctxt "@option:check" msgid "Ensure models are kept apart" -msgstr "モデルの距離が離れているように確認する" +msgstr "モデル同士を離す" msgctxt "@label" msgid "Enter the IP address of your printer on the network." @@ -1484,7 +1497,7 @@ msgstr "全画面表示を終了する" msgctxt "@label" msgid "Experimental" -msgstr "実験" +msgstr "実験的" msgctxt "@action:button" msgid "Export" @@ -1496,7 +1509,7 @@ msgstr "すべての材料を書き出す" msgctxt "@title:window" msgid "Export Material" -msgstr "フィラメントを書き出す" +msgstr "材料をエクスポート" msgctxt "@title:window" msgid "Export Profile" @@ -1504,7 +1517,7 @@ msgstr "プロファイルを書き出す" msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." -msgstr "選択エクスポート..." +msgstr "選択内容をエクスポート..." msgctxt "@title:window Don't translate 'Universal Cura Project'" msgid "Export Universal Cura Project" @@ -1528,7 +1541,7 @@ msgstr "UltiMaker Curaをプラグインと材料プロファイルで拡張し msgctxt "description" msgid "Extension that allows for user created scripts for post processing" -msgstr "後処理のためにユーザーが作成したスクリプト用拡張子" +msgstr "ユーザー作成スクリプトによるポストプロセッシングを可能にする拡張" msgctxt "@label" msgid "Extruder" @@ -1540,7 +1553,7 @@ msgstr "エクストルーダー%1" msgctxt "@title:label" msgid "Extruder End G-code" -msgstr "エクストルーダーがG-Codeを終了する" +msgstr "エクストルーダー終了G-Code" msgctxt "@label" msgid "Extruder End G-code duration" @@ -1548,7 +1561,7 @@ msgstr "エクストルーダー終了Gコードの時間" msgctxt "@title:label" msgid "Extruder Start G-code" -msgstr "エクストルーダーがG-Codeを開始する" +msgstr "エクストルーダー開始G-Code" msgctxt "@label" msgid "Extruder Start G-code duration" @@ -1568,15 +1581,15 @@ msgstr "失敗" msgctxt "@text:error" msgid "Failed to connect to Digital Factory to sync materials with some of the printers." -msgstr "Digital Factoryに接続して一部のプリンターと材料を同期するのに失敗しました。" +msgstr "一部のプリンターと材料を同期する際、Digital Factoryとの接続に失敗しました。" msgctxt "@text:error" msgid "Failed to connect to Digital Factory." -msgstr "Digital Factoryに接続するのに失敗しました。" +msgstr "Digital Factoryへの接続に失敗しました。" msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." -msgstr "材料のアーカイブを作成してプリンターと同期するのに失敗しました。" +msgstr "プリンターと同期する際、材料アーカイブの作成に失敗しました。" msgctxt "@info:status" msgid "Failed to eject {0}. Another program may be using the drive." @@ -1584,7 +1597,7 @@ msgstr "{0}取り出し失敗。他のプログラムがデバイスを使用し msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" -msgstr "フィラメントの書き出しに失敗しました %1: %2" +msgstr "材料のエクスポートに失敗しました %1: %2" msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" @@ -1596,15 +1609,15 @@ msgstr "{0}にプロファイルを書き出すことに失 msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" -msgstr "{0}からプロファイルの取り込みに失敗しました:" +msgstr "{0}からプロファイルのインポートに失敗しました:" msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" -msgstr "{0}からプロファイルの取り込に失敗しました:" +msgstr "{0}からプロファイルのインポートに失敗しました:" msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" -msgstr "{0}からプロファイルの取り込に失敗しました:{1}" +msgstr "{0}からプロファイルのインポートに失敗しました:{1}" msgctxt "@button" msgid "Failed to load packages:" @@ -1612,7 +1625,7 @@ msgstr "パッケージの読み込みに失敗しました。" msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." -msgstr "材料のアーカイブを読み込んでプリンターと同期するのに失敗しました。" +msgstr "プリンターと同期する際、材料アーカイブの読み込みに失敗しました。" msgctxt "@message:title" msgid "Failed to save material archive" @@ -1644,7 +1657,7 @@ msgstr "すでに存在するファイルです" msgctxt "@info:title" msgid "File Saved" -msgstr "ファイル保存" +msgstr "ファイル保存完了" msgctxt "@info:status" msgid "File {0} does not contain any valid profile." @@ -1704,15 +1717,15 @@ msgstr "ファームウェアアップデート完了。" msgctxt "@label" msgid "Firmware update failed due to an communication error." -msgstr "コミュニケーションエラーによりファームウェアアップデート失敗しました。" +msgstr "通信エラーによりファームウェアアップデートが失敗しました。" msgctxt "@label" msgid "Firmware update failed due to an input/output error." -msgstr "インプット/アウトプットエラーによりファームウェアアップデート失敗しました。" +msgstr "入出力エラーによりファームウェアアップデートが失敗しました。" msgctxt "@label" msgid "Firmware update failed due to an unknown error." -msgstr "不特定なエラーの発生によりファームウェアアップデート失敗しました。" +msgstr "不明なエラーの発生によりファームウェアアップデートが失敗しました。" msgctxt "@label" msgid "Firmware update failed due to missing firmware." @@ -1736,7 +1749,7 @@ msgstr "以下の手順に従って、新しい材料プロファイルをプリ msgctxt "@info" msgid "Follow the procedure to add a new printer" -msgstr "新規にプリンターを追加する場合は、以下の手順で行います" +msgstr "新規にプリンターを追加するには、以下の手順で行います" msgctxt "@text" msgid "Following a few simple steps, you will be able to synchronize all your material profiles with your printers." @@ -1760,7 +1773,7 @@ msgstr "リトフェインの場合、暗いピクセルは、より多くの光 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" -msgstr "レイヤービューコンパティビリティモードを強制する。（再起動が必要）" +msgstr "レイヤービュー互換モードを強制（再起動が必要）" msgid "FreeCAD trackpad" msgstr "FreeCADトラックパッド" @@ -1803,15 +1816,15 @@ msgstr "G-codeフレーバー" msgctxt "@label Description for application component" msgid "G-code generator" -msgstr "G-codeの生成" +msgstr "G-codeジェネレーター" msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." -msgstr "GCodeGzWriter はテキストモードをサポートしていません。" +msgstr "GCodeGzWriterはテキストモードをサポートしていません。" msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." -msgstr "GCodeWriter は非テキストモードはサポートしていません。" +msgstr "GCodeWriterは非テキストモードはサポートしていません。" msgctxt "@item:inlistbox" msgid "GIF Image" @@ -1867,7 +1880,7 @@ msgstr "グラフィックユーザーインターフェイス" msgctxt "@label" msgid "Grid Placement" -msgstr "グリッドの配置" +msgstr "格子状に配置" msgctxt "@label" msgid "Group #{group_nr}" @@ -1895,11 +1908,11 @@ msgstr "加熱式ビルドボリューム" msgctxt "@action:label" msgid "Height (mm)" -msgstr "高さ（mm）" +msgstr "高さ (mm)" msgctxt "@label" msgid "Helpers" -msgstr "ヘルプ" +msgstr "補助" msgctxt "@label" msgid "Hide all connected printers" @@ -1919,7 +1932,7 @@ msgstr "モデルの欠けている部分または不要な表面部分を、警 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." -msgstr "赤でサポートができないエリアをハイライトしてください。サポートがない場合、正確にプリントができない場合があります。" +msgstr "サポートされないエリアが赤でハイライトされます。この状態でサポートがない場合、正常にプリントされません。" msgctxt "@button" msgid "How to load new material profiles to my printer" @@ -1951,15 +1964,15 @@ msgstr "画像リーダー" msgctxt "@action:button" msgid "Import" -msgstr "取り込む" +msgstr "インポート" msgctxt "@title:window" msgid "Import Material" -msgstr "フィラメントを取り込む" +msgstr "材料のインポート" msgctxt "@title:window" msgid "Import Profile" -msgstr "プロファイルを取り込む" +msgstr "プロファイルをインポート" msgctxt "@action:button" msgid "Import all as models" @@ -1975,7 +1988,7 @@ msgstr "メンテナンス。プリンターをチェックしてください" msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "Cura から印刷を監視するには、プリンタを接続してください。" +msgstr "Curaから印刷を監視するには、プリンタを接続してください。" msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." @@ -1983,7 +1996,7 @@ msgstr "Curaの使用を開始するには、プリンターを設定する必 msgctxt "@button" msgid "In order to use the package you will need to restart Cura" -msgstr "このパッケージを使用するには、Curaを再始動する必要があります" +msgstr "このパッケージを使用するには、Curaを再起動する必要があります" msgctxt "@option:radio" msgid "Include UltiMaker account name" @@ -2123,7 +2136,7 @@ msgstr "無効なファイルのURL:" msgctxt "@action:button" msgid "Invert the direction of camera zoom." -msgstr "カメラのズーム方向を反転する。" +msgstr "カメラのズーム方向を反転" msgctxt "@label" msgid "Is printed as support." @@ -2131,7 +2144,7 @@ msgstr "サポートとしてプリントされます。" msgctxt "@text" msgid "It seems like you don't have any compatible printers connected to Digital Factory. Make sure your printer is connected and it's running the latest firmware." -msgstr "互換性のあるプリンターがDigital Factoryに接続されていないようです。プリンターが接続されていて、最新のファームウェアが実行されていることを確認してください。" +msgstr "互換性のあるプリンターがDigital Factoryに接続されていないようです。プリンターが接続されていること、最新のファームウェアが実行されていることを確認してください。" msgctxt "@item:inlistbox" msgid "JPEG Image" @@ -2143,7 +2156,7 @@ msgstr "JPG画像" msgctxt "@label Description for application dependency" msgid "JSON parser" -msgstr "JSON解析プログラム" +msgstr "JSON解析" msgctxt "@label" msgid "Job Name" @@ -2219,7 +2232,7 @@ msgstr "Curaのプリントプロファイルについて詳しくはこちら" msgctxt "@button" msgid "Learn more about adding printers to Cura" -msgstr "Curaへのプリンターの追加方法はこちら" +msgstr "Curaへのプリンター追加方法はこちら" msgctxt "@label" msgid "Learn more about project packages." @@ -2247,7 +2260,7 @@ msgstr "ビルドプレートを調整する" msgctxt "@item:inlistbox" msgid "Lighter is higher" -msgstr "薄いほうを高く" +msgstr "明るいほうを高く" msgctxt "@label:listbox" msgid "Line Type" @@ -2263,7 +2276,7 @@ msgstr "線形" msgctxt "@label Description for development tool" msgid "Linux cross-distribution application deployment" -msgstr "Linux 分散アプリケーションの開発" +msgstr "Linuxディストリビューション間へのアプリケーション配布" msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." @@ -2279,7 +2292,7 @@ msgstr "読み込み中" msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." -msgstr "プロジェクトを読み込むとビルドプレート上のすべてのモデルがクリアされます。" +msgstr "プロジェクトを読み込むとビルドプレートにあるすべてのモデルがクリアされます。" msgctxt "@label" msgid "Loading available configurations from the printer..." @@ -2363,19 +2376,19 @@ msgstr "MakerbotWriterはテキストモードをサポートしていません msgctxt "@action:inmenu" msgid "Manage Materials..." -msgstr "フィラメントを管理する..." +msgstr "材料の管理..." msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." -msgstr "プリンターを管理する..." +msgstr "プリンターの管理(&I)..." msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." -msgstr "プロファイルを管理する..." +msgstr "プロファイルの管理..." msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." -msgstr "視野のセッティングを管理する..." +msgstr "表示項目設定..." msgctxt "@item:inmenu" msgid "Manage backups" @@ -2423,15 +2436,15 @@ msgstr "製造元" msgctxt "@action:button" msgid "Marketplace" -msgstr "マーケットプレース" +msgstr "マーケットプレイス" msgctxt "@label" msgid "Marketplace" -msgstr "マーケットプレース" +msgstr "マーケットプレイス" msgctxt "name" msgid "Marketplace" -msgstr "マーケットプレース" +msgstr "マーケットプレイス" msgctxt "@action:label" msgid "Material" @@ -2439,7 +2452,7 @@ msgstr "材料" msgctxt "@label" msgid "Material" -msgstr "フィラメント" +msgstr "材料" msgctxt "@label:category menu label" msgid "Material" @@ -2447,15 +2460,15 @@ msgstr "材料" msgctxt "@label:listbox" msgid "Material Color" -msgstr "フィラメントの色" +msgstr "材料の色" msgctxt "name" msgid "Material Profiles" -msgstr "フィラメントプロファイル" +msgstr "材料プロファイル" msgctxt "@label" msgid "Material Type" -msgstr "フィラメントタイプ" +msgstr "材料の種類" msgctxt "@title" msgid "Material color picker" @@ -2467,11 +2480,11 @@ msgstr "材料予測" msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" -msgstr "素材プロファイルが以下のプリンターと正常に同期されました：" +msgstr "材料プロファイルが以下のプリンターと正常に同期されました：" msgctxt "@action:label" msgid "Material settings" -msgstr "フィラメント設定" +msgstr "材料設定" msgctxt "@backuplist:label" msgid "Materials" @@ -2483,11 +2496,11 @@ msgstr "材料" msgctxt "@title:tab" msgid "Materials" -msgstr "マテリアル" +msgstr "材料" msgctxt "@label" msgid "Materials compatible with active printer:" -msgstr "アクティブなプリンターと互換性のある材料：" +msgstr "有効なプリンターと互換性のある材料：" msgctxt "@label" msgid "Mesh Type" @@ -2511,7 +2524,7 @@ msgstr "G-codeを修正" msgctxt "@label" msgid "Modify settings for overlaps" -msgstr "オーバーラップの設定を変更" +msgstr "オーバーラップ設定を変更" msgctxt "@item:inmenu" msgid "Monitor" @@ -2559,16 +2572,16 @@ msgstr "モデルの選択時にモデルがカメラの中心に見えるよう msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected" -msgstr "選択内容を増倍" +msgstr "選択内容を複製" msgctxt "@title:window" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" -msgstr[0] "選択した複数のモデル" +msgstr[0] "選択したモデルの複製" msgctxt "@info" msgid "Multiply selected item and place them in a grid of build plate." -msgstr "選択したアイテムを乗算し、ビルドプレートのグリッドに配置します。" +msgstr "選択したアイテムを複製し、ビルドプレートに対し格子状に配置します。" msgctxt "@info:status" msgid "Multiplying and placing objects" @@ -2576,7 +2589,7 @@ msgstr "造形データを増やす、配置する" msgctxt "@title" msgid "My Backups" -msgstr "マイ バックアップ" +msgstr "マイバックアップ" msgctxt "@label:button" msgid "My printers" @@ -2757,7 +2770,7 @@ msgstr "ノズルサイズ" msgctxt "@label" msgid "Number of Copies" -msgstr "コピーの数" +msgstr "コピー数" msgctxt "@label" msgid "Number of Extruders" @@ -2789,11 +2802,11 @@ msgstr "トップのレイヤーを表示する" msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" -msgstr "一度に一つのG-codeしか読み取れません。{0}の取り込みをスキップしました。" +msgstr "G-codeは一度に1つしか読み込めません。{0}の取り込みをスキップしました。" msgctxt "@message" msgid "Oops! We encountered an unexpected error during your slicing process. Rest assured, we've automatically received the crash logs for analysis, if you have not disabled data sharing in your preferences. To assist us further, consider sharing your project details on our issue tracker." -msgstr "おっと！スライス処理中に予期しないエラーが発生しました。設定でデータ共有を無効にしていない場合は,分析用にクラッシュログを自動的に受信しますのでご安心ください。さらに支援を行うために,問題トラッカーでプロジェクトの詳細を共有することを検討してください。" +msgstr "申し訳ありません。スライス処理中に予期せぬエラーが発生しました。設定でデータ共有を無効にしていない場合は、クラッシュログを自動的に受信し分析を行います。また、Issue trackerでプロジェクトの詳細を共有いただけると助かります。" msgctxt "@action:button" msgid "Open" @@ -2801,7 +2814,7 @@ msgstr "開く" msgctxt "@title:menu menubar:file" msgid "Open &Recent" -msgstr "最近開いたファイルを開く" +msgstr "最近開いたファイルを開く(&R)" msgctxt "@item:inlistbox 'Open' is part of the name of this file format." msgid "Open Compressed Triangle Mesh" @@ -2825,11 +2838,11 @@ msgstr "プロジェクトファイルを開く" msgctxt "@title:window Don't translate 'Universal Cura Project'" msgid "Open Universal Cura Project (UCP)" -msgstr "Universal Cura Project（UCP）を開く" +msgstr "Universal Cura Project (UCP) を開く" msgctxt "@title:window Don't translate 'Universal Cura Project'" msgid "Open Universal Cura Project (UCP) file" -msgstr "Universal Cura Project（UCP）ファイルを開く" +msgstr "Universal Cura Project (UCP) ファイルを開く" msgctxt "@action:label" msgid "Open With" @@ -2861,7 +2874,7 @@ msgstr "OpenGL" msgctxt "@label" msgid "Opening and saving files" -msgstr "ファイルを開くまた保存" +msgstr "ファイルの読み込みと保存" msgctxt "@header" msgid "Optimized for Air Manager" @@ -2913,7 +2926,7 @@ msgstr[0] "%1個の設定を上書きします。" msgctxt "@title:menu menubar:toplevel" msgid "P&references" -msgstr "プレファレンス" +msgstr "プレファレンス(&R)" msgctxt "@item:inlistbox" msgid "PNG Image" @@ -2957,18 +2970,18 @@ msgstr "一時停止しています..." msgctxt "@label" msgid "Per Model Settings" -msgstr "各モデル設定" +msgstr "モデル別設定" msgctxt "name" msgid "Per Model Settings Tool" -msgstr "各モデル設定ツール" +msgstr "モデル別設定ツール" msgid "Perspective" -msgstr "パースペクティブ表示" +msgstr "透視投影表示" msgctxt "@action:inmenu menubar:view" msgid "Perspective" -msgstr "パースペクティブ表示" +msgstr "透視投影表示" msgctxt "@action:label" msgid "Placement" @@ -3000,9 +3013,11 @@ msgstr "このアプリケーションの許可において必要な権限を与 msgctxt "@info" msgid "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.\n- Check if you are signed in to discover cloud-connected printers." -msgstr "プリンタが接続されているか確認し、以下を行います。" -"- プリンタの電源が入っているか確認します。" -"- プリンタがネットワークに接続されているかどうかを確認します。- クラウドに接続されたプリンタを検出するためにサインインしているかどうかを確認します。" +msgstr "" +"プリンタが接続されているか、以下を確認してください:\n" +"- プリンタの電源が入っていること。\n" +"- プリンタがネットワークに接続されていること。\n" +"- クラウドに接続されたプリンタを検出するためにサインインしていること。" msgctxt "@text" msgid "Please name your printer" @@ -3030,10 +3045,11 @@ msgstr "造形物を取り出してください" msgctxt "@info:status" msgid "Please review settings and check if your models:\n- Fit within the build volume\n- Are assigned to an enabled extruder\n- Are not all set as modifier meshes" -msgstr "設定を見直し、モデルが次の状態かどうかを確認してください。" -"- 造形サイズに合っている" -"- 有効なエクストルーダーに割り当てられている" -"- すべてが修飾子メッシュとして設定されているわけではない" +msgstr "" +"設定を見直し、モデルが次の状態かどうかを確認してください。\n" +"- 造形サイズに合っている\n" +"- 有効なエクストルーダーに割り当てられている\n" +"- すべてのセットが修飾子メッシュとして設定されていない" msgctxt "@label" msgid "Please select any upgrades made to this UltiMaker Original" @@ -3041,11 +3057,11 @@ msgstr "このUltiMaker Originalに施されたアップグレートを選択す msgctxt "@description" msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" -msgstr "検証済みのUltiMaker Cura Enterprise用プラグインおよび材料を入手するにはサインインしてください。" +msgstr "UltiMaker Cura Enterprise用の検証済みプラグインおよび材料を入手するにはサインインしてください。" msgctxt "@info:tooltip" msgid "Please sign in to your UltiMaker account to allow sending non-anonymous data." -msgstr "匿名でないデータの送信を許可するには,UltiMakerアカウントにサインインしてください。" +msgstr "非匿名データの送信を許可するには、UltiMakerアカウントにサインインしてください。" msgctxt "@action:button" msgid "Please sync the material profiles with your printers before starting to print." @@ -3085,19 +3101,19 @@ msgstr "Prusa Research開発のポリゴンパッキングライブラリー" msgctxt "@item:inmenu" msgid "Post Processing" -msgstr "後処理" +msgstr "ポストプロセッシング" msgctxt "name" msgid "Post Processing" -msgstr "後処理" +msgstr "ポストプロセッシング" msgctxt "@title:window" msgid "Post Processing Plugin" -msgstr "プラグイン処理後" +msgstr "ポストプロセッシングプラグイン" msgctxt "@label" msgid "Post Processing Scripts" -msgstr "スクリプトの処理後" +msgstr "ポストプロセッシングスクリプト" msgctxt "@button" msgid "Pre-heat" @@ -3105,7 +3121,7 @@ msgstr "プレヒート" msgctxt "@item:inmenu" msgid "Prepare" -msgstr "準備する" +msgstr "準備" msgctxt "name" msgid "Prepare Stage" @@ -3207,7 +3223,7 @@ msgstr "プリント設定" msgctxt "@label shown when we load a Gcode file" msgid "Print setup disabled. G-code file can not be modified." -msgstr "印刷設定は無効にされました。G-code ファイルは変更できません。" +msgstr "印刷設定は無効にされました。G-codeファイルは変更できません。" msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" @@ -3335,7 +3351,7 @@ msgstr "プロファイル設定" msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." -msgstr "プロファイル{0}は不特定なファイルまたは破損があります。" +msgstr "プロファイル{0}に不明な種別または破損したファイルがあります。" msgctxt "@backuplist:label" msgid "Profiles" @@ -3351,11 +3367,11 @@ msgstr "プロファイル" msgctxt "@label" msgid "Profiles compatible with active printer:" -msgstr "アクティブなプリンターと互換性のあるプロファイル：" +msgstr "有効なプリンターと互換性のあるプロファイル：" msgctxt "@label Description for application dependency" msgid "Programming language" -msgstr "プログラミング用語" +msgstr "プログラミング言語" msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." @@ -3383,95 +3399,95 @@ msgstr "ファームウェアアップデートのためのマシン操作を提 msgctxt "description" msgid "Provides a monitor stage in Cura." -msgstr "Curaでモニターステージを提供します。" +msgstr "Cura内にモニターステージを提供します。" msgctxt "description" msgid "Provides a normal solid mesh view." -msgstr "ノーマルなソリットメッシュビューを供給する。" +msgstr "ノーマルなソリットメッシュビューを提供します。" msgctxt "description" msgid "Provides a prepare stage in Cura." -msgstr "Curaで準備ステージを提供します。" +msgstr "Cura内に準備ステージを提供します。" msgctxt "description" msgid "Provides a preview stage in Cura." -msgstr "Curaでプレビューステージを提供します。" +msgstr "Cura内にプレビューステージを提供します。" msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." -msgstr "プリンターの設定を変更（印刷ボリューム、ノズルサイズ、その他）" +msgstr "プリンター設定を変更する方法を提供します。（印刷ボリューム、ノズルサイズなど）" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." -msgstr "XMLベースフィラメントのプロファイルを読み書きするための機能を供給する。" +msgstr "XMLの材料プロファイルを読み書きするための機能を提供します。" msgctxt "description" msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." -msgstr "UltiMakerのプリンターのアクションを供給する（ベッドレベリングウィザード、アップグレードの選択、他）" +msgstr "UltiMakerのプリンターのアクションを提供します。（ベッドレベリングウィザード、アップグレードの選択など）" msgctxt "description" msgid "Provides removable drive hotplugging and writing support." -msgstr "取り外し可能なドライブホットプラギング及びサポートの書き出しの供給。" +msgstr "取り外し可能なドライブホットプラギングおよび書き出しのサポートを提供します。" msgctxt "description" msgid "Provides support for exporting Cura profiles." -msgstr "Curaプロファイルを書き出すためのサポートを供給する。" +msgstr "Curaプロファイルのエクスポート機能を提供します。" msgctxt "description" msgid "Provides support for importing Cura profiles." -msgstr "Curaプロファイルを取り込むためのサポートを供給する。" +msgstr "Curaプロファイルのインポート機能を提供します。" msgctxt "description" msgid "Provides support for importing profiles from g-code files." -msgstr "g-codeファイルからプロファイルを読み込むサポートを供給する。" +msgstr "G-codeファイルからのプロファイルインポート機能を提供します。" msgctxt "description" msgid "Provides support for importing profiles from legacy Cura versions." -msgstr "レガシーCura Versionsからプロファイルを取り込むためのサポートを供給する。" +msgstr "レガシーCura Versionsからプロファイルのインポート機能を提供します。" msgctxt "description" msgid "Provides support for reading 3MF files." -msgstr "３MFファイルを読むこむためのサポートを供給する。" +msgstr "3MFファイルの読み込み機能を提供します。" msgctxt "description" msgid "Provides support for reading AMF files." -msgstr "AMFファイルの読込みをサポートしています。" +msgstr "AMFファイルの読み込み機能を提供します。" msgctxt "description" msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Ultimakerフォーマットパッケージの読み込みをサポートします。" +msgstr "Ultimakerフォーマットパッケージの読み込み機能を提供します。" msgctxt "description" msgid "Provides support for reading X3D files." -msgstr "X3Dファイルを読むこむためのサポートを供給する。" +msgstr "X3Dファイルの読み込み機能を提供します。" msgctxt "description" msgid "Provides support for reading model files." -msgstr "モデルファイルを読み込むためのサポートを供給します。" +msgstr "モデルファイルの読み込み機能を提供します。" msgctxt "description" msgid "Provides support for writing 3MF and UCP files." -msgstr "3MFおよびUCPファイルの書き込みのサポートを提供します。" +msgstr "3MFおよびUCPファイルの書き込み機能を提供します。" msgctxt "description" msgid "Provides support for writing MakerBot Format Packages." -msgstr "MakerBotフォーマットパッケージを書き込むためのサポートを提供します。" +msgstr "MakerBotフォーマットパッケージの書き込み機能を提供します。" msgctxt "description" msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Ultimakerフォーマットパッケージへの書き込みをサポートします。" +msgstr "Ultimakerフォーマットパッケージへの書き込み機能を提供します。" msgctxt "description" msgid "Provides the Per Model Settings." -msgstr "各モデル設定を与える。" +msgstr "モデル別設定を提供します。" msgctxt "description" msgid "Provides the X-Ray view." -msgstr "透視ビューイング。" +msgstr "透視ビューを提供します。" msgctxt "description" msgid "Provides the link to the CuraEngine slicing backend." -msgstr "CuraEngineスライシングバックエンドにリンクを供給する。" +msgstr "CuraEngineスライシングバックエンドとのリンクを提供します。" msgctxt "description" msgid "Provides the preview of sliced layerdata." @@ -3507,7 +3523,7 @@ msgstr "キューがいっぱい" msgctxt "@label" msgid "Queued" -msgstr "順番を待つ" +msgstr "キュー挿入済み" msgctxt "@info:button, %1 is the application name" msgid "Quit %1" @@ -3559,7 +3575,7 @@ msgstr "リリースノート" msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" -msgstr "すべてのモデルを読み込む" +msgstr "全モデルを再読み込み" msgctxt "@text:window" msgid "Remember my choice" @@ -3575,11 +3591,11 @@ msgstr "取り外し可能なドライブアウトプットデバイスプラグ msgctxt "@action:button" msgid "Remove" -msgstr "取り除く" +msgstr "削除" msgctxt "@action:button" msgid "Remove printers" -msgstr "プリンターを取り除く" +msgstr "プリンターを削除" msgctxt "@title:window" msgid "Remove printers?" @@ -3587,19 +3603,19 @@ msgstr "プリンターを削除しますか？" msgctxt "@action:button" msgid "Rename" -msgstr "名を変える" +msgstr "名称変更" msgctxt "@title:window" msgid "Rename" -msgstr "名前変更" +msgstr "名称変更" msgctxt "@title:window" msgid "Rename Profile" -msgstr "プロファイル名を変える" +msgstr "プロファイル名を変更" msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" -msgstr "報告＆バグ" +msgstr "バグを報告(&B)" msgctxt "@label:button" msgid "Report a bug" @@ -3619,11 +3635,11 @@ msgstr "構成の変更が必要です" msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" -msgstr "すべてのモデルのポジションをリセットする" +msgstr "全モデルの座標をリセット" msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" -msgstr "すべてのモデル＆変更点をリセットする" +msgstr "全モデルの変更をリセット" msgctxt "@info" msgid "Reset to defaults." @@ -3699,7 +3715,7 @@ msgstr "Cura Projectと.makerbot印刷ファイルを保存する" msgctxt "@option" msgid "Save Cura project and .ufp print file" -msgstr " Cura Projectと.ufp印刷ファイルを保存する" +msgstr "Cura Projectと.ufp印刷ファイルを保存する" msgctxt "@title:window" msgid "Save Custom Profile" @@ -3755,11 +3771,11 @@ msgstr "リムーバブルドライブ{0}に保存中" msgctxt "@option:check" msgid "Scale extremely small models" -msgstr "極端に小さなモデルをスケールアップする" +msgstr "極端に小さいモデルを拡大" msgctxt "@option:check" msgid "Scale large models" -msgstr "大きなモデルをスケールする" +msgstr "大きなモデルを縮小" msgctxt "@placeholder" msgid "Search" @@ -3767,7 +3783,7 @@ msgstr "検索" msgctxt "@info" msgid "Search in the browser" -msgstr "ブラウザでの検索" +msgstr "ブラウザで検索" msgctxt "@label:textbox" msgid "Search settings" @@ -3775,7 +3791,7 @@ msgstr "検索設定" msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" -msgstr "すべてのモデル選択" +msgstr "全モデルを選択" msgctxt "@title:window" msgid "Select Printer" @@ -3815,7 +3831,7 @@ msgstr "以下のリストからプリンタを選択します:" msgctxt "@option:check" msgid "Send (anonymous) print information" -msgstr "(不特定な) プリントインフォメーションを送信" +msgstr "匿名のプリント情報を送信" msgctxt "@label" msgid "Send G-code" @@ -3831,11 +3847,11 @@ msgstr "クラッシュ報告をUltiMakerに送信する" msgctxt "@info:tooltip" msgid "Send crash reports with your registered UltiMaker account name and the project name to UltiMaker Sentry. No actual model data is being send." -msgstr "登録したUltiMakerアカウント名とプロジェクト名を含むクラッシュレポートを,UltiMaker Sentryに送信します。実際のモデルデータは送信されません。" +msgstr "登録したUltiMakerアカウント名とプロジェクト名を含むクラッシュレポートをUltiMaker Sentryに送信します。実際のモデルデータは送信されません。" msgctxt "@info:tooltip" msgid "Send crash reports without any personally identifiable information or models data to UltiMaker." -msgstr "個人を特定できる情報やモデルデータを含まないクラッシュレポートを,UltiMakerに送信します。" +msgstr "個人を特定できる情報やモデルデータを含まないクラッシュレポートをUltiMakerに送信します。" msgctxt "@option:check" msgid "Send engine crash reports" @@ -3859,11 +3875,11 @@ msgstr "監視ロガー" msgctxt "@label Description for application dependency" msgid "Serial communication library" -msgstr "シリアルコミュニケーションライブラリー" +msgstr "シリアル通信ライブラリー" msgctxt "@action:inmenu" msgid "Set as Active Extruder" -msgstr "アクティブエクストルーダーとしてセットする" +msgstr "アクティブエクストルーダーにセット" msgctxt "@title:column" msgid "Setting" @@ -3871,7 +3887,7 @@ msgstr "設定" msgctxt "@title:tab" msgid "Setting Visibility" -msgstr "視野設定" +msgstr "表示項目設定" msgctxt "@info:progress" msgid "Setting up preferences..." @@ -3883,7 +3899,7 @@ msgstr "シーンをセットアップ中..." msgctxt "@action:label" msgid "Setting visibility" -msgstr "視野設定" +msgstr "表示項目設定" msgctxt "@label" msgid "Settings" @@ -3919,67 +3935,67 @@ msgstr "シェルの厚さ" msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" -msgstr "Curaのプログラム開始時にアップデートがあるかチェックしますか？" +msgstr "Curaのプログラム開始時にアップデートをチェックするかどうか" msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" -msgstr "Curaを終了した場所で開くようにしますか？" +msgstr "Curaを終了した場所で開くかどうか" msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" -msgstr "プリンター名の敬称はプリントジョブの名前に自動的に加えられるべきか？" +msgstr "自動的にプリンター名を元にした接頭辞をプリントジョブ名に加えるかどうか" msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" -msgstr "プロジェクトファイルを保存時にサマリーを表示するべきか？" +msgstr "プロジェクトファイル保存時に概要を表示するかどうか" msgctxt "@info:tooltip" msgid "Should an automatic check for new plugins be done every time Cura is started? It is highly recommended that you do not disable this!" -msgstr "Curaを起動するたびに、新しいプラグインの自動チェックを実行する必要がありますか？これは無効にしないことを強くお勧めします！" +msgstr "Curaを起動するたびに、新しいプラグインの自動チェックを実行するかどうか。この設定は無効にしないことを強くお勧めします！" msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "プリンターの不明なデータをUltiMakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。" +msgstr "プリントの匿名データをUltiMakerに送信するかどうか。メモ、モデル、IPアドレス、および個人的情報は送信・保存されません。" msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" -msgstr "レイヤーはコンパティビリティモードに強制されるべきか？" +msgstr "レイヤーを強制的に互換モードにするかどうか" msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" -msgstr "モデルがビルドボリュームに対して大きすぎる場合はスケールされるべきか？" +msgstr "モデルがビルドボリュームに対して大きすぎる場合にサイズを調整するかどうか" msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" -msgstr "モデルはロード後に選択しますか？" +msgstr "モデルをロード後に選択するかどうか" msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" -msgstr "プラットホーム上のモデルはブルドプレートに触れるように下げるべきか？" +msgstr "プラットフォーム上のモデルをブルドプレートに触れるまで下げるかどうか" msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" -msgstr "交差を避けるためにプラットホーム上のモデルを移動するべきですか？" +msgstr "プラットフォーム上のモデル同士が重ならないよう移動するかどうか" msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" -msgstr "デスクトップまたは外部アプリケーションから開いたファイルをCuraの同じインスタンスで開く必要がありますか？" +msgstr "デスクトップまたは外部アプリケーションから開いたファイルをCuraの同じインスタンスで開くかどうか" msgctxt "@info:tooltip" msgid "Should slicing crashes be automatically reported to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored, unless you give explicit permission." -msgstr "スライスのクラッシュは自動的にUltimakerに報告されますか？明示的な許可がない限り,モデル,IPアドレス,その他の個人を特定できる情報が送信または保存されることはありません。" +msgstr "スライスのクラッシュを自動的にUltimakerに報告するかどうか。明示的な許可がない限り、モデル、IPアドレス、およびその他の個人を特定できる情報が送信または保存されることはありません。" msgctxt "@info:tooltip" msgid "Should the build plate be cleared before loading a new model in the single instance of Cura?" -msgstr "Curaの単一インスタンスに新しいモデルをロードする前に、ビルドプレートをクリアする必要はありますか？" +msgstr "単一のCuraインスタンスに新しいモデルをロードする前に、ビルドプレートをクリアするかどうか" msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" -msgstr "Curaのデフォルトのズーム機能は変更できるべきか？" +msgstr "Curaのデフォルトズームの動作を反転するかどうか" msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" -msgstr "ズームはマウスの方向に動くべきか？" +msgstr "マウスの方向にズームするかどうか" msgctxt "@label" msgid "Show 5 Detailed Layers On Top" @@ -3987,15 +4003,15 @@ msgstr "トップの5レイヤーの詳細を表示する" msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" -msgstr "コンフィグレーションのフォルダーを表示する" +msgstr "コンフィグレーションのフォルダーを表示" msgctxt "@button" msgid "Show Custom" -msgstr "カスタムを表示" +msgstr "カスタム表示" msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" -msgstr "オンラインドキュメントを表示する" +msgstr "オンラインドキュメントを表示(&D)" msgctxt "@action:inmenu" msgid "Show Online Troubleshooting" @@ -4019,7 +4035,7 @@ msgstr "G-codeリーダーに注意メッセージを表示します。" msgctxt "@action:button" msgid "Show configuration folder" -msgstr "コンフィグレーションのフォルダーを表示する" +msgstr "コンフィグレーションのフォルダーを表示" msgctxt "@action:button" msgid "Show detailed crash report" @@ -4031,7 +4047,7 @@ msgstr "設定を表示" msgctxt "@option:check" msgid "Show summary dialog when saving project" -msgstr "プロジェクトを保存時にダイアログサマリーを表示する" +msgstr "プロジェクト保存時に概要ダイアログを表示" msgctxt "@tooltip:button" msgid "Show your support for Cura with a donation." @@ -4091,11 +4107,11 @@ msgstr "スライス" msgctxt "@option:check" msgid "Slice automatically" -msgstr "自動的にスライスする" +msgstr "自動的にスライス" msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." -msgstr "セッティングを変更すると自動にスライスします。" +msgstr "セッティングを変更すると自動でスライスします。" msgctxt "name" msgid "Slice info" @@ -4127,8 +4143,10 @@ msgstr "ソリッドビュー" msgctxt "@label" msgid "Some hidden settings use values different from their normal calculated value.\n\nClick to make these settings visible." -msgstr "いくらかの非表示設定は通常の計算された値と異なる値を使用します。" -"表示されるようにクリックしてください。" +msgstr "" +"いくつかの非表示設定が通常の計算結果と異なる値となっています。\n" +"\n" +"クリックすると表示されます。" msgctxt "@info:status" msgid "Some of the packages used in the project file are currently not installed in Cura, this might produce undesirable print results. We highly recommend installing the all required packages from the Marketplace." @@ -4144,8 +4162,10 @@ msgstr "%1で定義された一部の設定値が上書きされました msgctxt "@tooltip" msgid "Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager." -msgstr "いくらかの設定プロファイルにある値とことなる場合無効にします。" -"プロファイルマネージャーをクリックして開いてください。" +msgstr "" +"いくつかの設定/上書きされた値はプロファイルに保存された値と異なります。\n" +"\n" +"クリックするとプロファイルマネージャーを開きます。" msgctxt "@action:label" msgid "Some settings from current profile were overwritten." @@ -4169,11 +4189,11 @@ msgstr "スピード" msgctxt "@action:inmenu" msgid "Sponsor Cura" -msgstr "スポンサーCura" +msgstr "スポンサーになる" msgctxt "@label:button" msgid "Sponsor Cura" -msgstr "スポンサーCura" +msgstr "スポンサーになる" msgctxt "@option:radio" msgid "Stable and Beta releases" @@ -4197,7 +4217,7 @@ msgstr "ビルドプレートのレベリングを開始する" msgctxt "@title:label" msgid "Start G-code" -msgstr "G-Codeの開始" +msgstr "開始G-Code" msgctxt "@label" msgid "Start the slicing process" @@ -4217,15 +4237,15 @@ msgstr "強度" msgctxt "description" msgid "Submits anonymous slice info. Can be disabled through preferences." -msgstr "不特定なスライス情報を提出。プレファレンスの中で無効になる可能性もある。" +msgstr "匿名のスライス情報を登録します。設定により無効になる可能性があります。" msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" -msgstr "フィラメントの%1への書き出しが完了ました" +msgstr "材料を%1にエクスポートしました。" msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" -msgstr "フィラメント%1の取り込みに成功しました" +msgstr "材料を%1からインポートしました" msgctxt "@info:status" msgid "Successfully imported profile {0}." @@ -4237,15 +4257,15 @@ msgstr "推奨される材料の設定" msgctxt "@action:label" msgid "Suggested Profile settings" -msgstr "推奨されるプロフィールの設定" +msgstr "推奨プロファイル設定" msgctxt "@action:title" msgid "Summary - Cura Project" -msgstr "サマリーCuraプロジェクト" +msgstr "概要 - Curaプロジェクト" msgctxt "@action:title Don't translate 'Universal Cura Project'" msgid "Summary - Open Universal Cura Project (UCP)" -msgstr "概要 - Universal Cura Project（UCP）を開く" +msgstr "概要 - Universal Cura Project (UCP) を開く" msgctxt "@action:title Don't translate 'Universal Cura Project'" msgid "Summary - Universal Cura Project" @@ -4281,31 +4301,31 @@ msgstr "サポートタイプ" msgctxt "@label Description for application dependency" msgid "Support library for faster math" -msgstr "ファターマスを操作するためのライブラリーサポート" +msgstr "高速演算用サポートライブラリー" msgctxt "@label Description for application component" msgid "Support library for file metadata and streaming" -msgstr "ファイルメタデータとストリーミングのためのライブラリーサポート" +msgstr "ファイルメタデータとストリーミングのサポートライブラリー" msgctxt "@label Description for application component" msgid "Support library for handling 3MF files" -msgstr "3MFファイルを操作するためのライブラリーサポート" +msgstr "3MFファイル操作用サポートライブラリー" msgctxt "@label Description for application dependency" msgid "Support library for handling STL files" -msgstr "STLファイルを操作するためのライブラリーサポート" +msgstr "STLファイル操作用サポートライブラリー" msgctxt "@label Description for application dependency" msgid "Support library for handling triangular meshes" -msgstr "参画メッシュを操作するためのライブラリーサポート" +msgstr "三角メッシュ処理用サポートライブラリー" msgctxt "@label Description for application dependency" msgid "Support library for scientific computing" -msgstr "サイエンスコンピューティングを操作するためのライブラリーサポート" +msgstr "科学技術計算サポートライブラリー" msgctxt "@label Description for application dependency" msgid "Support library for system keyring access" -msgstr "システムキーリングアクセスを操作するためのライブラリーサポート" +msgstr "システムキーリングアクセス用サポートライブラリー" msgctxt "@action:button" msgid "Sync" @@ -4378,7 +4398,7 @@ msgstr "バランスのとれたプロファイルは、生産性、表面品質 msgctxt "@info:tooltip" msgid "The base height from the build plate in millimeters." -msgstr "ミリメートルでビルドプレートからベースの高さ。" +msgstr "ビルドプレートからベースまでの高さをミリメートルで指定します。" msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -4398,7 +4418,7 @@ msgstr "クラウドプリンターがオフラインです。プリンターの msgctxt "@tooltip" msgid "The colour of the material in this extruder." -msgstr "エクストルーダーのマテリアルの色。" +msgstr "このエクストルーダーの材料の色。" msgctxt "@tooltip" msgid "The configuration of this extruder is not allowed, and prohibits slicing." @@ -4418,7 +4438,7 @@ msgstr "このホットエンドの現在の温度です。" msgctxt "@info:tooltip" msgid "The depth in millimeters on the build plate" -msgstr "ビルドプレート上の奥行きミリメートル" +msgstr "ビルドプレート上の奥行き（ミリメートル）" msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." @@ -4458,7 +4478,7 @@ msgstr "アカウントにある以下のプリンターがCuraに追加され msgctxt "@title:header" msgid "The following printers will receive the new material profiles:" -msgstr "以下のプリンターに新しい素材プロファイルが配布されます：" +msgstr "以下のプリンターに新しい材料プロファイルが配布されます：" msgctxt "@info:tooltip" msgid "The following script is active:" @@ -4475,11 +4495,11 @@ msgstr "ハイライトされたエリアは、欠けている表面または無 msgctxt "@tooltip" msgid "The material in this extruder." -msgstr "エクストルーダー入ったフィラメント。" +msgstr "このエクストルーダーにある材料。" msgctxt "@label:label Ultimaker Marketplace is a brand name, don't translate" msgid "The material package associated with the Cura project could not be found on the Ultimaker Marketplace. Use the partial material profile definition stored in the Cura project file at your own risk." -msgstr "Curaプロジェクトに関連付けられている材料パッケージがUltimaker Marketplaceで見つかりませんでした。Curaプロジェクトファイルに保存されている材料パッケージ定義を部分的に使用する場合は自己責任で行ってください。" +msgstr "Curaプロジェクトに関連付けられている材料パッケージがUltimakerマーケットプレイスで見つかりませんでした。Curaプロジェクトファイルに保存されている材料プロファイルの定義を部分的に使用する場合は自己責任で行ってください。" msgctxt "@info:tooltip" msgid "The maximum distance of each pixel from \"Base.\"" @@ -4487,7 +4507,7 @@ msgstr "“ベース”から各ピクセルへの最大距離。" msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" -msgstr "新しいフィラメントの直径は %1 mm に設定されています。これは現在のエクストルーダーに適応していません。続行しますか？" +msgstr "新しいフィラメントの直径は%1mmに設定されています。これは現在のエクストルーダーに適応していません。続行しますか？" msgctxt "@tooltip" msgid "The nozzle inserted in this extruder." @@ -4495,9 +4515,13 @@ msgstr "ノズルが入ったエクストルーダー。" msgctxt "@label" msgid "The pattern of the infill material of the print:\n\nFor quick prints of non functional model choose line, zig zag or lightning infill.\n\nFor functional part not subjected to a lot of stress we recommend grid or triangle or tri hexagon.\n\nFor functional 3D prints which require high strength in multiple directions use cubic, cubic subdivision, quarter cubic, octet, and gyroid." -msgstr "プリントのインフィル材料のパターン：" -"非機能モデルをクイックプリントする場合は、ライン、ジグザグ、ライトニングインフィルから選択します。 " -"応力があまりかからない機能部品の場合は、グリッド、トライアングル、トライヘキサゴンをお勧めします。" +msgstr "" +"プリントのインフィル材料のパターン：\n" +"\n" +"非機能モデルを手早くプリントする場合は、ライン、ジグザグ、ライトニングインフィルから選択します。\n" +"\n" +"応力があまりかからない機能部品の場合は、グリッド、トライアングル、トライヘキサゴンをお勧めします。\n" +"\n" "複数の方向に高い強度を必要とする機能的な3Dプリントの場合は、キュービック、キュービックサブディビジョン、クォーターキュービック、オクテット、ジャイロイドを使用します。" msgctxt "@info:tooltip" @@ -4506,7 +4530,7 @@ msgstr "厚さ1ミリメートルのプリントを貫通する光の割合。 msgctxt "@label:label Ultimaker Marketplace is a brand name, don't translate" msgid "The plugin associated with the Cura project could not be found on the Ultimaker Marketplace. As the plugin may be required to slice the project it might not be possible to correctly slice the file." -msgstr "Curaプロジェクトに関連付けられたプラグインが Ultimakerマーケットプレイスで見つかりませんでした。プロジェクトをスライスするためにプラグインが必要な場合があるため、ファイルを正しくスライスできない可能性があります。" +msgstr "Curaプロジェクトに関連付けられたプラグインがUltimakerマーケットプレイスで見つかりませんでした。プロジェクトをスライスするためにプラグインが必要な場合があるため、ファイルを正しくスライスできない可能性があります。" msgctxt "@info:title" msgid "The print job was successfully submitted" @@ -4618,7 +4642,7 @@ msgstr "%1 が認識されていないためこの構成は利用できません msgctxt "@text:window" msgid "This is a Cura Universal project file. Would you like to open it as a Cura project or Cura Universal Project or import the models from it?" -msgstr "これはCura Universalのプロジェクトファイルです。Cura Project,またはCura Universal Projectとして開きますか？それともそこからモデルをインポートしますか？" +msgstr "これはCura Universal Projectファイルです。Cura ProjectまたはCura Universal Projectとして開きますか？それともそこからモデルをインポートしますか？" msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" @@ -4626,7 +4650,7 @@ msgstr "これはCuraのプロジェクトファイルです。プロジェク msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." -msgstr "このフィラメントは %1にリンクすプロパティーを共有する。" +msgstr "この材料は%1の構成とリンクされています。" msgctxt "@label" msgid "This package will be installed after restarting." @@ -4663,12 +4687,14 @@ msgstr "このプロファイルはプリンターによりデフォルトを使 msgctxt "@label" msgid "This project contains materials or plugins that are currently not installed in Cura.
    Install the missing packages and reopen the project." -msgstr "このプロジェクトには、現在Curaにインストールされていない素材またはプラグインが含まれています。
    不足しているパッケージをインストールすると、プロジェクトが再度開きます。" +msgstr "このプロジェクトには、現在Curaにインストールされていない材料またはプラグインが含まれています。
    不足しているパッケージをインストールすると、プロジェクトが再度開きます。" msgctxt "@label" msgid "This setting has a value that is different from the profile.\n\nClick to restore the value of the profile." -msgstr "この設定にプロファイルと異なった値があります。" -"プロファイルの値を戻すためにクリックしてください。" +msgstr "" +"設定された値がプロファイルと異なります。\n" +"\n" +"クリックするとプロファイルの値に戻します。" msgctxt "@item:tooltip" msgid "This setting has been hidden by the active machine and will not be visible." @@ -4677,7 +4703,7 @@ msgstr "この設定がアクティブなプリンターにより非表示にな msgctxt "@item:tooltip %1 is list of setting names" msgid "This setting has been hidden by the value of %1. Change the value of that setting to make this setting visible." msgid_plural "This setting has been hidden by the values of %1. Change the values of those settings to make this setting visible." -msgstr[0] "この設定は %1 の値で非表示になっています。その設定値を変更すると設定の非表示が解除されます。" +msgstr[0] "この設定は%1の値により表示されていません。%1の値を変更すると表示されるようになります。" msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." @@ -4685,8 +4711,10 @@ msgstr "この設定は常に全てのエクストルーダーに共有されて msgctxt "@label" msgid "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value." -msgstr "このセッティングは通常計算されます、今は絶対値に固定されています。" -"計算された値に変更するためにクリックを押してください。" +msgstr "" +"この設定は通常の場合計算されますが、現状は絶対値に固定されています。\n" +"\n" +"クリックすると計算された値に戻します。" msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." @@ -4698,15 +4726,15 @@ msgstr "この設定はエクストルーダー固有の競合する値から取 msgctxt "@tooltip Don't translate 'Universal Cura Project'" msgid "This setting may not perform well while exporting to Universal Cura Project, Users are asked to add it at their own risk." -msgstr "この設定は,Universal Cura Projectへのエクスポート中に適切に機能しない可能性があります。ユーザーは自己責任で追加するように求められます。" +msgstr "この設定は、Universal Cura Projectへのエクスポート中に適切に機能しない可能性があります。自己責任で追加するかどうか確認されます。" msgctxt "@tooltip Don't translate 'Universal Cura Project'" msgid "This setting may not perform well while exporting to Universal Cura Project. Users are asked to add it at their own risk." -msgstr "この設定は,Universal Cura Projectへのエクスポート中に適切に機能しない可能性があります。ユーザーは自己責任で追加するように求められます。" +msgstr "この設定はUniversal Cura Projectへのエクスポート中に適切に機能しない可能性があります。自己責任で追加するか確認されます。" msgctxt "@info:warning" msgid "This version is not intended for production use. If you encounter any issues, please report them on our GitHub page, mentioning the full version {self.getVersion()}" -msgstr "このバージョンは、運用環境での使用を目的としたｍのではありません。問題が発生した場合は、GitHubページでフルバージョン{self.getVersion()}を記載して報告してください。" +msgstr "このバージョンは、製品開発での使用を目的としたものではありません。問題が発生した場合は、GitHubページでフルバージョン {self.getVersion()} を記載して報告してください。" msgctxt "@label" msgid "Time estimation" @@ -4726,11 +4754,11 @@ msgstr "接続を確立するには、{website_link}にアクセスしてくだ msgctxt "@label" msgid "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted." -msgstr "プリントの成功率を上げるために、ビルドプレートを今調整できます。’次のポジションに移動’をクリックすると。" +msgstr "プリントの成功率を上げるために、ビルドプレートを調整可能になりました。「次のポジションに移動」をクリックすると、ノズルの移動先を調整できます。" msgctxt "@label" msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." -msgstr "印刷ジョブをネットワークを介してプリンターに直接送信するには、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターを WIFI ネットワークに接続します。Cura をプリンタに接続していない場合でも、USB ドライブを使用して g コードファイルをプリンターに転送することはできます。" +msgstr "印刷ジョブをネットワーク上のプリンターに直接送信するため、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターをWiFiネットワークに接続されていることを確認してください。Curaをプリンタに接続していない場合でも、USBドライブを使用してg-codeファイルをプリンターに転送することができます。" msgctxt "@message {printer_name} is replaced with the name of the printer" msgid "To remove {printer_name} permanently, visit {digital_factory_link}" @@ -4738,7 +4766,7 @@ msgstr "{printer_name}を完全に削除するには、{digital_factory_link}に msgctxt "@action:inmenu" msgid "Toggle Full Screen" -msgstr "留め金 フルスクリーン" +msgstr "全画面表示切替" msgctxt "@label" msgid "Top / Bottom" @@ -4774,7 +4802,7 @@ msgstr "移動" msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." -msgstr "現行バージョンより上の Cura バックアップをリストアしようとしました。" +msgstr "現行バージョンより上のCuraバックアップをリストアしようとしました。" msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." @@ -4806,7 +4834,7 @@ msgstr "タイプ" msgctxt "name" msgid "UFP Reader" -msgstr "UFP リーダー" +msgstr "UFPリーダー" msgctxt "name" msgid "UFP Writer" @@ -4830,7 +4858,7 @@ msgstr "UltiMaker認定材料" msgctxt "@text:window" msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "UltiMaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために匿名データを収集します。以下は、共有されるすべてのデータの例です：" +msgstr "UltiMaker Curaは、印刷品質とユーザーエクスペリエンスを向上させるために匿名データを収集します。以下は、共有されるすべてのデータの例です：" msgctxt "@item:inlistbox" msgid "UltiMaker Format Package" @@ -4882,12 +4910,13 @@ msgstr "以下のローカルEnginePluginサーバーの実行可能ファイル msgctxt "@info:plugin_failed" msgid "Unable to kill running EnginePlugin: {self._plugin_id}\nAccess is denied." -msgstr "実行中のEnginePluginを強制終了できません：{self._plugin_id}" +msgstr "" +"実行中のEnginePluginを強制終了できません: {self._plugin_id}\n" "アクセスが拒否されました。" msgctxt "@info" msgid "Unable to reach the UltiMaker account server." -msgstr "UltiMaker アカウントサーバーに到達できません。" +msgstr "UltiMakerアカウントサーバーに到達できません。" msgctxt "@text" msgid "Unable to read example data file." @@ -4907,7 +4936,7 @@ msgstr "プライムタワーまたはプライム位置が無効なためスラ msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." -msgstr "無効な Extruder %s に関連付けられている造形物があるため、スライスできません。" +msgstr "無効なエクストルーダー %s に関連付けられている造形物があるため、スライスできません。" msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" @@ -4939,7 +4968,7 @@ msgstr "利用できないプリンター" msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" -msgstr "モデルを非グループ化" +msgstr "モデルグループ解除" msgctxt "@button" msgid "Uninstall" @@ -4955,11 +4984,11 @@ msgstr "Universal Cura Project" msgctxt "@action:description Don't translate 'Universal Cura Project'" msgid "Universal Cura Project files can be printed on different 3D printers while retaining positional data and selected settings. When exported, all models present on the build plate will be included along with their current position, orientation, and scale. You can also select which per-extruder or per-model settings should be included to ensure proper printing." -msgstr "Universal Cura Projectファイルは,位置データと選択した設定を保持したまま,さまざまな3Dプリンタで印刷することができます。エクスポートすると,ビルドプレート上に存在するすべてのモデルが,現在の位置,方向,スケールとともに含まれます。適切な印刷を保証するために,エクストルーダーごとまたはモデルごとにどの設定を含めるかを選択することもできます。" +msgstr "Universal Cura Projectファイルは座標情報と選択した設定を保持し、さまざまな3Dプリンタで印刷することができます。エクスポートすると、ビルドプレート上に存在するすべてのモデルに、現在の位置、方向、拡大率が含まれます。適切な印刷を保証するために、エクストルーダーごとまたはモデルごとにどの設定を含めるかを選択することもできます。" msgctxt "@label Description for development tool" msgid "Universal build system configuration" -msgstr "ユニバーサルビルドシステム設定" +msgstr "ユニバーサルビルドシステム構成" msgctxt "@label" msgid "Unknown" @@ -4987,7 +5016,7 @@ msgstr "不明なエラー。" msgctxt "@label" msgid "Unlink Material" -msgstr "フィラメントをリンクを外す" +msgstr "材料をリンクから外す" msgctxt "@label:status" msgid "Unreachable" @@ -5019,11 +5048,11 @@ msgstr "既存を更新する" msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" -msgstr "プロファイルを現在のセッティング" +msgstr "プロファイルを現在の設定で更新/上書きする" msgctxt "@action:button" msgid "Update profile." -msgstr "プロフィールを更新します。" +msgstr "プロファイルを更新します。" msgctxt "@info:title" msgid "Update your printer" @@ -5043,111 +5072,111 @@ msgstr "更新中..." msgctxt "description" msgid "Upgrades configurations from Cura 2.1 to Cura 2.2." -msgstr "Cura 2.1 からCura 2.2のコンフィグレーションアップグレート。" +msgstr "Cura 2.1 からCura 2.2に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 2.2 to Cura 2.4." -msgstr "Cura 2.2 からCura 2.4のコンフィグレーションアップグレート。" +msgstr "Cura 2.2 からCura 2.4に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." -msgstr "Cura 2.5 からCura 2.6のコンフィグレーションアップグレート。" +msgstr "Cura 2.5 からCura 2.6に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." -msgstr "Cura 2.6 からCura 2.7のコンフィグレーションアップグレート。" +msgstr "Cura 2.6 からCura 2.7に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 2.7 to Cura 3.0." -msgstr "Cura 2.7からCura 3.0のコンフィグレーションアップグレート。" +msgstr "Cura 2.7からCura 3.0に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 3.0 to Cura 3.1." -msgstr "Cura 3.0からCura 3.1のコンフィグレーションアップグレート。" +msgstr "Cura 3.0からCura 3.1に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 3.2 to Cura 3.3." -msgstr "Cura 3.2からCura 3.3のコンフィグレーションアップグレート。" +msgstr "Cura 3.2からCura 3.3に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 3.3 to Cura 3.4." -msgstr "Cura 3.3からCura 3.4のコンフィグレーションアップグレート。" +msgstr "Cura 3.3からCura 3.4に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 3.4 to Cura 3.5." -msgstr "Cura 3.4 から Cura 3.5 のコンフィグレーションアップグレート。" +msgstr "Cura 3.4 から Cura 3.5 に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 3.5 to Cura 4.0." -msgstr "Cura 3.5 から Cura 4.0 のコンフィグレーションアップグレート。" +msgstr "Cura 3.5からCura 4.0に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.0 to Cura 4.1." -msgstr "Cura 4.0 から Cura 4.1 のコンフィグレーションアップグレート。" +msgstr "Cura 4.0 から Cura 4.1 に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." -msgstr "コンフィギュレーションを Cura 4.1 から Cura 4.2 にアップグレートする。" +msgstr "Cura 4.1からCura 4.2に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.11 to Cura 4.12." -msgstr "Cura 4.11からCura 4.12に設定をアップグレードします。" +msgstr "Cura 4.11からCura 4.12に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.13 to Cura 5.0." -msgstr "Cura 4.13からCura 5.0に設定をアップグレードします。" +msgstr "Cura 4.13からCura 5.0に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.2 to Cura 4.3." -msgstr "Cura 4.2からCura 4.3の設定をアップグレードします。" +msgstr "Cura 4.2からCura 4.3に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "Cura 4.3からCura 4.4へのコンフィグレーションアップグレート。" +msgstr "Cura 4.3からCura 4.4に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.4 to Cura 4.5." -msgstr "Cura 4.4からCura 4.5に設定をアップグレードします。" +msgstr "Cura 4.4からCura 4.5に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.5 to Cura 4.6." -msgstr "Cura 4.5からCura 4.6に設定をアップグレードします。" +msgstr "Cura 4.5からCura 4.6に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2." -msgstr "構成をCura 4.6.0からCura 4.6.2に更新します。" +msgstr "Cura 4.6.0からCura 4.6.2に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.6.2 to Cura 4.7." -msgstr "構成をCura 4.6.2からCura 4.7に更新します。" +msgstr "Cura 4.6.2からCura 4.7に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.7 to Cura 4.8." -msgstr "Cura 4.7からCura 4.8に設定をアップグレードします。" +msgstr "Cura 4.7からCura 4.8に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "Cura 4.8からCura 4.9に設定をアップグレードします。" +msgstr "Cura 4.8からCura 4.9に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "Cura 4.9からCura 4.10に設定をアップグレードします。" +msgstr "Cura 4.9からCura 4.10に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 5.2 to Cura 5.3." -msgstr "Cura 5.2からCura 5.3のコンフィグレーションアップグレート。" +msgstr "Cura 5.2からCura 5.3に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 5.3 to Cura 5.4." -msgstr "構成をCura 5.3からCura 5.4にアップグレードします。" +msgstr "Cura 5.3からCura 5.4に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 5.4 to Cura 5.5." -msgstr "構成をCura 5.4からCura 5.5にアップグレードします。" +msgstr "Cura 5.4からCura 5.5に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 5.6 to Cura 5.7." -msgstr "構成をCura 5.6からCura 5.7にアップグレードします。" +msgstr "Cura 5.6からCura 5.7に構成をアップグレードします。" msgctxt "@action:button" msgid "Upload custom Firmware" @@ -5163,7 +5192,7 @@ msgstr "バックアップをアップロードしています..." msgctxt "@option:check" msgid "Use a single instance of Cura" -msgstr "Curaの単一インスタンスを使用" +msgstr "単一のCuraインスタンスを使用" msgctxt "@label" msgid "Use glue for better adhesion with this material combination." @@ -5175,11 +5204,11 @@ msgstr "ユーザー用使用許諾契約" msgctxt "@label Description for application dependency" msgid "Utility functions, including an image loader" -msgstr "画像ローダーなどを含むユーティリティ機能" +msgstr "画像ローダーなどのユーティリティ機能" msgctxt "@label Description for application dependency" msgid "Utility library, including Voronoi generation" -msgstr "ボロノイ図生成を含むユーティリティライブラリ" +msgstr "ボロノイ図生成などのユーティリティライブラリー" msgctxt "@title:column" msgid "Value" @@ -5187,51 +5216,51 @@ msgstr "値" msgctxt "name" msgid "Version Upgrade 2.1 to 2.2" -msgstr "2.1 から2.2にバージョンアップグレート" +msgstr "バージョン2.1 から2.2へのアップグレード" msgctxt "name" msgid "Version Upgrade 2.2 to 2.4" -msgstr "2.2 から2.4にバージョンアップグレート" +msgstr "バージョン2.2 から2.4へのアップグレード" msgctxt "name" msgid "Version Upgrade 2.5 to 2.6" -msgstr "2.5から2.6にバージョンアップグレート" +msgstr "バージョン2.5から2.6へのアップグレード" msgctxt "name" msgid "Version Upgrade 2.6 to 2.7" -msgstr "2.6から2.7にバージョンアップグレート" +msgstr "バージョン2.6から2.7へのアップグレード" msgctxt "name" msgid "Version Upgrade 2.7 to 3.0" -msgstr "2.7から3.0にバージョンアップグレート" +msgstr "バージョン2.7から3.0へのアップグレード" msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" -msgstr "3.0から3.1にバージョンアップグレート" +msgstr "バージョン3.0から3.1へのアップグレード" msgctxt "name" msgid "Version Upgrade 3.2 to 3.3" -msgstr "3.2から3.3にバージョンアップグレート" +msgstr "バージョン3.2から3.3へのアップグレード" msgctxt "name" msgid "Version Upgrade 3.3 to 3.4" -msgstr "3.3から3.4にバージョンアップグレート" +msgstr "バージョン3.3から3.4へのアップグレード" msgctxt "name" msgid "Version Upgrade 3.4 to 3.5" -msgstr "3.4 から 3.5 にバージョンアップグレート" +msgstr "バージョン3.4 から 3.5へのアップグレード" msgctxt "name" msgid "Version Upgrade 3.5 to 4.0" -msgstr "3.5 から 4.0 にバージョンアップグレート" +msgstr "バージョン3.5 から 4.0へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.0 to 4.1" -msgstr "4.0 から 4.1 にバージョンアップグレート" +msgstr "バージョン4.0 から 4.1 へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.1 to 4.2" -msgstr "4.0 から 4.1 にバージョンアップグレート" +msgstr "バージョン4.0 から 4.1 へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.11 to 4.12" @@ -5243,15 +5272,15 @@ msgstr "バージョン4.13から5.0へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.2 to 4.3" -msgstr "4.2から4.3にバージョンをアップグレート" +msgstr "バージョン4.2から4.3へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.3 to 4.4" -msgstr "4.3から4.4にバージョンアップグレート" +msgstr "バージョン4.3から4.4へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.4 to 4.5" -msgstr "4.4から4.5にバージョンアップグレート" +msgstr "バージョン4.4から4.5へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.5 to 4.6" @@ -5259,11 +5288,11 @@ msgstr "バージョン4.5から4.6へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.6.0 to 4.6.2" -msgstr "4.6.0から4.6.2へのバージョン更新" +msgstr "バージョン4.6.0から4.6.2へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.6.2 to 4.7" -msgstr "4.6.2から4.7へのバージョン更新" +msgstr "バージョン4.6.2から4.7へのアップグレード" msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" @@ -5279,19 +5308,19 @@ msgstr "バージョン4.9から4.10へのアップグレード" msgctxt "name" msgid "Version Upgrade 5.2 to 5.3" -msgstr "5.2から5.3にバージョンアップグレート" +msgstr "バージョン5.2から5.3へのアップグレード" msgctxt "name" msgid "Version Upgrade 5.3 to 5.4" -msgstr "5.3から5.4へのバージョンアップ" +msgstr "バージョン5.3から5.4へのアップグレード" msgctxt "name" msgid "Version Upgrade 5.4 to 5.5" -msgstr "5.4から5.5へのバージョンアップ" +msgstr "バージョン5.4から5.5へのアップグレード" msgctxt "name" msgid "Version Upgrade 5.6 to 5.7" -msgstr "5.6から5.7へのバージョンアップ" +msgstr "バージョン5.6から5.7へのアップグレード" msgctxt "@button" msgid "View printers in Digital Factory" @@ -5299,7 +5328,7 @@ msgstr "Digital Factoryでプリンターを表示する" msgctxt "@label" msgid "View type" -msgstr "タイプ表示" +msgstr "表示タイプ" msgctxt "@label link to technical assistance" msgid "View user manuals online" @@ -5307,7 +5336,7 @@ msgstr "ユーザーマニュアルをオンラインで見る" msgctxt "@label" msgid "Viewport behavior" -msgstr "ビューポイント機能" +msgstr "表示動作" msgctxt "@action:inmenu" msgid "Visible Settings" @@ -5355,11 +5384,11 @@ msgstr "選択したファイルの中に複数のG-codeが存在します。1 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" -msgstr "選択したファイルの中に複数のプロジェクトが存在します。1ファイルのみ一度に開けます。ファイルからモデルを先に取り込むことをお勧めします。続けますか？" +msgstr "選択したファイルの中に複数のプロジェクトが存在します。一度に1つのプロジェクトファイルのみを開けます。ファイルからモデルを先に取り込むことをお勧めします。続行してもよろしいですか？" msgctxt "@info" msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "クラウドプリンターのウェブカムフィードをUltiMaker Curaから見ることができません。「プリンター管理」をクリックして、Ultimaker Digital Factoryにアクセスし、このウェブカムを見ます。" +msgstr "クラウドプリンターのウェブカメラフィードをUltiMaker Curaで表示できません。「プリンター管理」をクリックして、Ultimaker Digital Factoryにアクセスし、このウェブカメラを表示します。" msgctxt "@button" msgid "Website" @@ -5371,23 +5400,23 @@ msgstr "どのプリンターをセットアップしますか？" msgctxt "@info:tooltip" msgid "What type of camera navigation should be used?" -msgstr "どのタイプのカメラナビゲーションを使用する必要がありますか？" +msgstr "使用するカメラナビゲーションの種類" msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" -msgstr "どのような種類のカメラレンダリングを使用する必要がありますか?" +msgstr "使用するカメラレンダリングの種類" msgctxt "@action:inmenu menubar:help" msgid "What's New" -msgstr "新情報" +msgstr "新着情報" msgctxt "@label" msgid "What's New" -msgstr "新情報" +msgstr "新着情報" msgctxt "@title:window" msgid "What's New" -msgstr "新情報" +msgstr "新着情報" msgctxt "@info:tooltip" msgid "When checking for updates, check for both stable and for beta releases." @@ -5399,7 +5428,7 @@ msgstr "アップデートを確認する際に、安定版リリースのみを msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." -msgstr "プロファイル内を変更し異なるプロファイルにしました、どこの変更点を保持、破棄したいのダイアログが表示されます、また何度もダイアログが表示されないようにデフォルト機能を選ぶことができます。" +msgstr "別のプロファイルに切り替える際、変更を保持するかどうかを選択するダイアログを表示するか、もしくはデフォルトの動作を選択してダイアログを表示しないかを選択します。" msgctxt "@button" msgid "Why do I need to sync material profiles?" @@ -5407,7 +5436,7 @@ msgstr "材料プロファイルを同期する必要があるのはなぜです msgctxt "@action:label" msgid "Width (mm)" -msgstr "幅（mm）" +msgstr "幅 (mm)" msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5423,11 +5452,11 @@ msgstr "X（幅）" msgctxt "@label" msgid "X max" -msgstr "最大X" +msgstr "X座標最大値" msgctxt "@label" msgid "X min" -msgstr "X分" +msgstr "X座標最小値" msgctxt "name" msgid "X-Ray View" @@ -5435,7 +5464,7 @@ msgstr "透視ビュー" msgctxt "@item:inlistbox" msgid "X-Ray view" -msgstr "透視ビューイング" +msgstr "透視ビュー" msgctxt "@label" msgid "X/Y" @@ -5451,15 +5480,15 @@ msgstr "X3Dリーダー" msgctxt "@label" msgid "Y (Depth)" -msgstr "Y (奥行き)" +msgstr "Y（奥行き）" msgctxt "@label" msgid "Y max" -msgstr "最大Y" +msgstr "Y座標最大値" msgctxt "@label" msgid "Y min" -msgstr "Y分" +msgstr "Y座標最小値" msgctxt "@info" msgid "Yes" @@ -5467,7 +5496,8 @@ msgstr "はい" msgctxt "@label" msgid "You are about to remove all printers from Cura. This action cannot be undone.\nAre you sure you want to continue?" -msgstr "Curaからすべてのプリンターを削除しようとしています。この操作は元に戻せません。" +msgstr "" +"Curaからすべてのプリンターを削除しようとしています。この操作は元に戻せません。\n" "続行してもよろしいですか？" msgctxt "@label" @@ -5499,11 +5529,11 @@ msgstr "パッケージをインストールするにはライセンスに同意 msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." -msgstr "変更を有効にするために{}を終了して再始動する必要があります。" +msgstr "変更を有効にするために{}を終了して再起動する必要があります。" msgctxt "@dialog:info" msgid "You will need to restart Cura before your backup is restored. Do you want to close Cura now?" -msgstr "バックアップをリストアする前に Cura を再起動する必要があります。今すぐ Cura を閉じますか？" +msgstr "バックアップをリストアする前に Curaを再起動する必要があります。今すぐCuraを閉じますか？" msgctxt "@info:status" msgid "You will receive a confirmation via email when the print job is approved" @@ -5523,8 +5553,9 @@ msgstr "新しいプリンターがUltiMaker Curaに自動的に表示されま msgctxt "@info:status" msgid "Your printer {printer_name} could be connected via cloud.\n Manage your print queue and monitor your prints from anywhere connecting your printer to Digital Factory" -msgstr "Your printer {printer_name} could be connected via cloud." -" Manage your print queue and monitor your prints from anywhere connecting your printer to Digital Factory" +msgstr "" +"プリンター{printer_name}はクラウドを通じて接続可能です。\n" +"プリンターをDigital Factoryに接続して、どこからでも印刷のキュー管理や監視を行えます。" msgctxt "@label" msgid "Z" @@ -5532,15 +5563,15 @@ msgstr "Z" msgctxt "@label" msgid "Z (Height)" -msgstr "Z (高さ)" +msgstr "Z（高さ）" msgctxt "@label Description for application dependency" msgid "ZeroConf discovery library" -msgstr "ZeroConfディスカバリーライブラリー" +msgstr "ZeroConf名前解決ライブラリー" msgctxt "@action:button" msgid "Zoom toward mouse direction" -msgstr "マウスの方向にズームする" +msgstr "マウスの方向にズーム" msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." @@ -5596,11 +5627,11 @@ msgstr "{}プラグインのダウンロードに失敗しました" msgctxt "@label" msgid "Combination not recommended. Load BB core to slot 1 (left) for better reliability." -msgstr "組み合わせは推奨されません。信頼性を高めるため,BBコアをスロット1（左）に装填してください。" +msgstr "組み合わせは推奨されません。信頼性を高めるため、BBコアをスロット1（左）に装填してください。" msgctxt "@item:inlistbox" msgid "Makerbot Sketch Printfile" -msgstr "メーカーボット スケッチ プリントファイル" +msgstr "Makerbot Sketchプリントファイル" msgctxt "@label:textbox" msgid "Search Printer" @@ -5608,15 +5639,15 @@ msgstr "プリンターを検索" msgctxt "@text:window" msgid "This is a Cura Universal project file. Would you like to open it as a Cura Universal Project or import the models from it?" -msgstr "これはCura Universalプロジェクトファイルです。Cura Universalプロジェクトとして開きますか？それとも,そこからモデルをインポートしますか？" +msgstr "これはCura Universal Projectファイルです。Cura Universal Projectとして開きますか？それともそこからモデルをインポートしますか？" msgctxt "@action:inmenu menubar:help" msgid "Export Package For Technical Support" -msgstr "技術サポート用のパッケージをエクスポート" +msgstr "技術サポート用にパッケージをエクスポート" msgctxt "@info:status" msgid "Unable to send the model data to the engine. Please try again, or contact support." -msgstr "モデルデータをエンジンに送信できません。もう一度試すか,サポートにお問い合わせください。" +msgstr "モデルデータをエンジンに送信できません。もう一度試すか、サポートにお問い合わせください。" msgctxt "@info:status" msgid "Unable to send the model data to the engine. Please try to use a less detailed model, or reduce the number of instances." diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 22508ca62f9..c132e601c01 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-13 09:02+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2024-10-27 13:25+0000\n" +"Last-Translator: h1data \n" +"Language-Team: Japanese \n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,15 +14,15 @@ msgstr "" msgctxt "platform_adhesion description" msgid "Adhesion" -msgstr "密着性" +msgstr "接着" msgctxt "material_diameter description" msgid "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament." -msgstr "使用するフィラメントの太さの調整　この値を使用するフィラメントの太さと一致させてください。" +msgstr "使用するフィラメントの太さの調整。この値を使用するフィラメントの太さと一致させてください。" msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" -msgstr "ビルドプレート密着性" +msgstr "ビルドプレートとの接着" msgctxt "material_diameter label" msgid "Diameter" @@ -30,7 +30,7 @@ msgstr "直径" msgctxt "machine_extruder_end_code description" msgid "End g-code to execute when switching away from this extruder." -msgstr "このエクストルーダーから切り替えた時に G-Code の終了を実行します。" +msgstr "エクストルーダーの最終位置をこのエクストルーダーから切り替えた時に終了G-Codeを実行します。" msgctxt "extruder_nr label" msgid "Extruder" @@ -38,7 +38,7 @@ msgstr "エクストルーダー" msgctxt "machine_extruder_end_code label" msgid "Extruder End G-Code" -msgstr "エクストルーダーがG-Codeを終了する" +msgstr "エクストルーダー終了G-Code" msgctxt "machine_extruder_end_code_duration label" msgid "Extruder End G-Code Duration" @@ -46,15 +46,15 @@ msgstr "エクストルーダー終了Gコードの時間" msgctxt "machine_extruder_end_pos_abs label" msgid "Extruder End Position Absolute" -msgstr "エクストルーダーのエンドポジションの絶対値" +msgstr "エクストルーダー終了位置の絶対値" msgctxt "machine_extruder_end_pos_x label" msgid "Extruder End Position X" -msgstr "エクストルーダーエンド位置X" +msgstr "エクストルーダー終了位置X座標" msgctxt "machine_extruder_end_pos_y label" msgid "Extruder End Position Y" -msgstr "エクストルーダーエンド位置Y" +msgstr "エクストルーダー終了位置Y座標" msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" @@ -74,7 +74,7 @@ msgstr "エクストルーダープリント冷却ファン" msgctxt "machine_extruder_start_code label" msgid "Extruder Start G-Code" -msgstr "エクストルーダーがG-Codeを開始する" +msgstr "エクストルーダー開始G-Code" msgctxt "machine_extruder_start_code_duration label" msgid "Extruder Start G-Code Duration" @@ -82,15 +82,15 @@ msgstr "エクストルーダー開始Gコードの時間" msgctxt "machine_extruder_start_pos_abs label" msgid "Extruder Start Position Absolute" -msgstr "エクストルーダーのスタート位置の絶対値" +msgstr "エクストルーダーの開始位置の絶対値" msgctxt "machine_extruder_start_pos_x label" msgid "Extruder Start Position X" -msgstr "エクストルーダー　スタート位置X" +msgstr "エクストルーダー開始位置X座標" msgctxt "machine_extruder_start_pos_y label" msgid "Extruder Start Position Y" -msgstr "エクストルーダースタート位置Y" +msgstr "エクストルーダー開始位置Y座標" msgctxt "machine_settings label" msgid "Machine" @@ -98,23 +98,23 @@ msgstr "プリンター" msgctxt "machine_settings description" msgid "Machine specific settings" -msgstr "プリンター詳細設定" +msgstr "プリンター固有の設定" msgctxt "machine_extruder_end_pos_abs description" msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head." -msgstr "ヘッドの既存の認識位置よりもエクストルーダーの最終位置を絶対位置とする。" +msgstr "エクストルーダーの最終位置を、ヘッドの最後の地点からの相対位置ではなく絶対値にします。" msgctxt "machine_extruder_start_pos_abs description" msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head." -msgstr "ヘッドの最後の既知位置からではなく、エクストルーダーのスタート位置を絶対位置にします。" +msgstr "エクストルーダーの開始位置を、ヘッドの最後の地点からの相対位置ではなく、絶対値にします。" msgctxt "material description" msgid "Material" -msgstr "マテリアル" +msgstr "材料" msgctxt "material label" msgid "Material" -msgstr "マテリアル" +msgstr "材料" msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" @@ -126,31 +126,31 @@ msgstr "ノズルID" msgctxt "machine_nozzle_offset_x label" msgid "Nozzle X Offset" -msgstr "Xノズルオフセット" +msgstr "ノズルX座標オフセット" msgctxt "machine_nozzle_offset_y label" msgid "Nozzle Y Offset" -msgstr "Yノズルオフセット" +msgstr "ノズルY座標オフセット" msgctxt "machine_extruder_start_code description" msgid "Start g-code to execute when switching to this extruder." -msgstr "このエクストルーダーに切り替えた時に G-Code の開始を実行します。" +msgstr "このエクストルーダーに切り替えた時に開始G-Codeを実行します。" msgctxt "extruder_prime_pos_x description" msgid "The X coordinate of the position where the nozzle primes at the start of printing." -msgstr "プリント開始時のノズルの位置を表すX座標。" +msgstr "プリント開始時における主要ノズル地点のX座標。" msgctxt "extruder_prime_pos_y description" msgid "The Y coordinate of the position where the nozzle primes at the start of printing." -msgstr "プリント開始時にノズル位置を表すY座標。" +msgstr "プリント開始時における主要ノズル地点のY座標。" msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." -msgstr "印刷開始時にノズルがポジションを確認するZ座標。" +msgstr "プリント開始時における主要ノズル地点のZ座標。" msgctxt "extruder_nr description" msgid "The extruder train used for printing. This is used in multi-extrusion." -msgstr "エクストルーダーの列。デュアルノズル印刷時に使用。" +msgstr "印刷に使用するエクストルーダーの列。デュアルノズル印刷時に使用。" msgctxt "machine_nozzle_size description" msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size." @@ -158,7 +158,7 @@ msgstr "ノズルの内径。標準以外のノズルを使用する場合は、 msgctxt "machine_nozzle_id description" msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"." -msgstr "\"AA 0.4\"や\"BB 0.8\"などのノズルID。" +msgstr "\"AA 0.4\" や \"BB 0.8\" など、エクストルーダーのノズルID。" msgctxt "machine_extruder_cooling_fan_number description" msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." @@ -166,35 +166,35 @@ msgstr "このエクストルーダーに関連付けられているプリント msgctxt "machine_extruder_end_code_duration description" msgid "The time it takes to execute the end g-code, when switching away from this extruder." -msgstr "このエクストルーダーから切り替えるときに,終了Gコードを実行するのにかかる時間。" +msgstr "このエクストルーダーから切り替えるときに、終了Gコードを実行するのにかかる時間。" msgctxt "machine_extruder_start_code_duration description" msgid "The time it'll take to execute the start g-code, when switching to this extruder." -msgstr "このエクストルーダーに切り替えるときに,開始Gコードを実行するのにかかる時間。" +msgstr "このエクストルーダーに切り替えるときに、開始Gコードを実行するのにかかる時間。" msgctxt "machine_extruder_end_pos_x description" msgid "The x-coordinate of the ending position when turning the extruder off." -msgstr "エクストルーダーを切った際のX座標の最終位置。" +msgstr "エクストルーダーをオフにする際の終了位置X座標。" msgctxt "machine_nozzle_offset_x description" msgid "The x-coordinate of the offset of the nozzle." -msgstr "ノズルのX軸のオフセット。" +msgstr "ノズルのX座標のオフセット。" msgctxt "machine_extruder_start_pos_x description" msgid "The x-coordinate of the starting position when turning the extruder on." -msgstr "エクストルーダーのX座標のスタート位置。" +msgstr "エクストルーダーをオンにする際の開始位置X座標。" msgctxt "machine_extruder_end_pos_y description" msgid "The y-coordinate of the ending position when turning the extruder off." -msgstr "エクストルーダーを切った際のY座標の最終位置。" +msgstr "エクストルーダーをオフにする際の終了位置Y座標。" msgctxt "machine_nozzle_offset_y description" msgid "The y-coordinate of the offset of the nozzle." -msgstr "ノズルのY軸のオフセット。" +msgstr "ノズルのY座標のオフセット。" msgctxt "machine_extruder_start_pos_y description" msgid "The y-coordinate of the starting position when turning the extruder on." -msgstr "エクストルーダーのY座標のスタート位置。" +msgstr "エクストルーダーをオンにする際の開始位置Y座標。" msgctxt "machine_nozzle_head_distance label" msgid "Nozzle Length" @@ -202,4 +202,4 @@ msgstr "ノズルの長さ" msgctxt "machine_nozzle_head_distance description" msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "ノズルの先端とプリントヘッドの最も低い部分との高低差。" +msgstr "ノズル先端とプリントヘッドの最下部との高さの差。" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 672afaefe30..32f4df3a236 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-13 09:02+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2024-10-27 13:38+0000\n" +"Last-Translator: h1data \n" +"Language-Team: Japanese \n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,11 +14,11 @@ msgstr "" msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " -msgstr "プライムタワーの生成方法:
    • 通常:二次材料が,プライミングされるバケットを作成します
    • インターリーブド:プライムタワーをできるだけまばらに作成します。これにより時間とフィラメントが節約されますが,使用できる材料が互いに接着している場合にのみ可能です。
    " +msgstr "プライムタワーの生成方法:
    • 通常:2番目に優先される材料でバケットを作成します
    • インターリーブド:プライムタワーをできるだけまばらに作成します。これにより時間とフィラメントが節約されますが、使用できる材料が互いに接着している場合にのみ可能です。
    " msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." -msgstr "モデルの周囲のブリムが,他のモデルの望ましくない場所に接触する可能性があります。これにより,この距離内のすべてのブリムがブリムのないモデルから削除されます。" +msgstr "モデルの周囲のブリムが他のモデルの望ましくない場所に接触する可能性があります。これにより、この距離内のすべてのブリムがブリムのないモデルから削除されます。" msgctxt "ironing_inset description" msgid "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print." @@ -42,15 +42,15 @@ msgstr "使用する整数線の方向のリスト。リストの要素は、層 msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストとなり、デフォルトの角度を使用します（面がかなり厚い場合には45度と135度を交互に使用、それ以外では90度を使用）。" +msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストとなり、デフォルトの角度を使用します（境界面がかなり厚い場合には45度と135度を交互に使用、それ以外では90度を使用）。" msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストとなり、デフォルトの角度を使用します（面がかなり厚い場合には45度と135度を交互に使用、それ以外では90度を使用）。" +msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストとなり、デフォルトの角度を使用します（境界面がかなり厚い場合には45度と135度を交互に使用、それ以外では90度を使用）。" msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストとなり、デフォルトの角度を使用します（面がかなり厚い場合には45度と135度を交互に使用、それ以外では90度を使用）。" +msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストとなり、デフォルトの角度を使用します（境界面がかなり厚い場合には45度と135度を交互に使用、それ以外では90度を使用）。" msgctxt "infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns)." @@ -66,7 +66,7 @@ msgstr "プリントヘッドの領域を持つポリゴンのリストは入力 msgctxt "support_tree_branch_reach_limit description" msgid "A recomendation to how far branches can move from the points they support. Branches can violate this value to reach their destination (buildplate or a flat part of the model). Lowering this value will make the support more sturdy, but increase the amount of branches (and because of that material usage/print time) " -msgstr "枝がサポートポイントからどれくらい移動できるかについての推奨値。枝は、目的地（ビルドプレートまたはモデルの平らな部分）に到達するためであればこの値に違反することができます。この値を小さくすることで、サポートをより頑丈にすることができますが、枝の量が増加します（材料の使用量やプリント時間も増加します）。" +msgstr "枝がサポートポイントからどれくらい移動できるかについての推奨値。枝は、目的地（ビルドプレートまたはモデルの平らな部分）に到達するためであればこの値に違反することができます。この値を小さくすることで、サポートをより頑丈にできますが、枝の量が増加します。（材料の使用量やプリント時間も増加します） " msgctxt "extruder_prime_pos_abs label" msgid "Absolute Extruder Prime Position" @@ -90,12 +90,13 @@ msgstr "適応レイヤーは、レイヤーの高さをモデルの形状に合 msgctxt "infill_wall_line_count description" msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "インフィルエリア周辺に外壁を追加します。このような壁は、上層/底層ラインにたるみを作ります。つまり、一部の外壁材料の費用で同じ品質を実現するためには、必要な上層/底層スキンが少ないことを意味します。" -"この機能は、インフィルポリゴン接合と組み合わせて、構成が正しい場合、移動または引き戻しが必要なく、すべてのインフィルを1つの押出経路に接続することができます。" +msgstr "" +"インフィル領域の周りにウォールを追加します。追加されたウォールによってトップ/ボトム面の線に生じるたるみを少なくし、トップ/ボトム面の材料を追加した場合と同等の品質で印刷できることになります。\n" +"この機能はインフィルポリゴン接合と組み合わせて、正しく設定した場合、移動や引き戻しなしに全てのインフィル領域を1つの造形パスにまとめることができます。" msgctxt "platform_adhesion description" msgid "Adhesion" -msgstr "密着性" +msgstr "接着" msgctxt "material_adhesion_tendency label" msgid "Adhesion Tendency" @@ -103,11 +104,11 @@ msgstr "接着傾向" msgctxt "skin_overlap description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines, as a percentage of the line widths of the skin lines and the innermost wall. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any percentage over 50% may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." -msgstr "壁とスキンの中央ライン（のエンドポイント）が交差する量（スキンラインのライン幅と壁の最内部に対する割合）を調整します。わずかな交差によって、壁がスキンにしっかりつながります。スキンと壁のライン幅が同じで、割合が50%を超えると、スキンが壁を通過している可能性があります。これは、その時点で、スキン押出機のノズルの位置が、すでに壁の真ん中を過ぎている可能性があるためです。" +msgstr "スキンラインのライン幅とウォールの最内部に対する割合として、ウォールとスキンの中央ラインの終端が重なる量を調整します。わずかな重複によって、ウォールがスキンと堅く接合されます。スキンとウォールのライン幅が等しくかつ割合が50%を超えると、スキンがウォールを通過している可能性があります。これは、その時点でスキンエクストルーダーのノズル位置が、すでにウォールの中央を過ぎている可能性があるためです。" msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." -msgstr "壁とスキンの中央ライン（のエンドポイント）が交差する量を調整します。わずかな交差によって、壁がスキンにしっかりつながります。スキンと壁のライン幅が同じで、壁の幅が半分以上の値になると、スキンが壁を通過している可能性があります。これは、その時点で、スキン押出機のノズルの位置が、すでに壁の真ん中を過ぎている可能性があるためです。" +msgstr "ウォールとスキンの中央ラインの終端が重なる量を調整します。わずかな交差によって、ウォールがスキンと堅く接合されます。スキンとウォールのライン幅が等しくかつ割合が50%を超えると、スキンがウォールを通過している可能性があります。これは、その時点でスキンエクストルーダーのノズル位置が、すでにウォールの中央を過ぎている可能性があるためです。" msgctxt "infill_sparse_density description" msgid "Adjusts the density of infill of the print." @@ -115,7 +116,7 @@ msgstr "プリントのインフィルの密度を調整します。" msgctxt "support_interface_density description" msgid "Adjusts the density of the roofs and floors of the support structure. A higher value results in better overhangs, but the supports are harder to remove." -msgstr "サポート材のルーフとフロアの密度を調整します　大きな値ではオーバーハングでの成功率があがりますが、サポート材が除去しにくくなります。" +msgstr "サポート材のルーフとフロアの密度を調整します。大きな値ではオーバーハングでの成功率があがりますが、サポート材が除去しにくくなります。" msgctxt "support_tree_top_rate description" msgid "Adjusts the density of the support structure used to generate the tips of the branches. A higher value results in better overhangs, but the supports are harder to remove. Use Support Roof for very high values or ensure support density is similarly high at the top." @@ -127,11 +128,11 @@ msgstr "サポート材の密度を調整します。大きな値ではオーバ msgctxt "material_diameter description" msgid "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament." -msgstr "使用するフィラメントの太さの調整　この値を使用するフィラメントの太さと一致させてください。" +msgstr "使用するフィラメントの太さの調整。この値を使用するフィラメントの太さと一致させてください。" msgctxt "support_type description" msgid "Adjusts the placement of the support structures. The placement can be set to touching build plate or everywhere. When set to everywhere the support structures will also be printed on the model." -msgstr "サポート材の配置を調整します。配置はTouching BuildplateまたはEveryWhereに設定することができます。EveryWhereに設定した場合、サポート材がモデルの上にもプリントされます。" +msgstr "サポート材の配置を調整します。配置はTouching BuildplateまたはEveryWhereに設定できます。EveryWhereに設定した場合、サポート材がモデルの上にもプリントされます。" msgctxt "prime_tower_wipe_enabled description" msgid "After printing the prime tower with one nozzle, wipe the oozed material from the other nozzle off on the prime tower." @@ -139,7 +140,7 @@ msgstr "1本のノズルでプライムタワーを印刷した後、もう片 msgctxt "retraction_hop_after_extruder_switch description" msgid "After the machine switched from one extruder to the other, the build plate is lowered to create clearance between the nozzle and the print. This prevents the nozzle from leaving oozed material on the outside of a print." -msgstr "マシーンが1つのエクストルーダーからもう一つのエクストルーダーに切り替えられた際、ビルドプレートが下降して、ノズルと印刷物との間に隙間が形成される。これによりノズルが造形物の外側にはみ出たマテリアルを残さないためである。" +msgstr "プリンターが別のエクストルーダーに切り替えた際、ビルドプレートが下降してノズルと印刷物との間に隙間が形成されます。これによりノズルに造形物からはみ出した材料が残らないようにします。" msgctxt "retraction_combing option all" msgid "All" @@ -155,11 +156,11 @@ msgstr "プリントの解像度に影響を与えるすべての設定。これ msgctxt "user_defined_print_order_enabled description" msgid "Allows you to order the object list to manually set the print sequence. First object from the list will be printed first." -msgstr "オブジェクトリストを並べ替えて,印刷順序を手動で設定できます。リストの最初のオブジェクトが最初に印刷されます。" +msgstr "オブジェクトリストを並べ替えて、印刷順序を手動で設定できます。リストの最初のオブジェクトが最初に印刷されます。" msgctxt "alternate_extra_perimeter label" msgid "Alternate Extra Wall" -msgstr "代替予備壁" +msgstr "代替の追加ウォール" msgctxt "alternate_carve_order label" msgid "Alternate Mesh Removal" @@ -167,7 +168,7 @@ msgstr "代替メッシュの削除" msgctxt "material_alternate_walls label" msgid "Alternate Wall Directions" -msgstr "ウォールの代替の向き" +msgstr "代替ウォールの向き" msgctxt "material_alternate_walls description" msgid "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing." @@ -199,19 +200,19 @@ msgstr "各レイヤーのサポート用ポリゴンに適用されるオフセ msgctxt "support_bottom_offset description" msgid "Amount of offset applied to the floors of the support." -msgstr "サポートのフロアに適用されるオフセット量。" +msgstr "サポートのフロアに適用されるオフセット値。" msgctxt "support_roof_offset description" msgid "Amount of offset applied to the roofs of the support." -msgstr "サポートのルーフに適用されるオフセット量。" +msgstr "サポートのルーフに適用されるオフセット値。" msgctxt "support_interface_offset description" msgid "Amount of offset applied to the support interface polygons." -msgstr "サポートインターフェイスポリゴンに適用されるオフセット量。" +msgstr "サポート境界面ポリゴンに適用されるオフセット値。" msgctxt "wipe_retraction_amount description" msgid "Amount to retract the filament so it does not ooze during the wipe sequence." -msgstr "拭き取りシーケンス中に出ないように押し戻すフィラメントの量。" +msgstr "拭き取りシーケンス中に出ないように引き戻すフィラメントの量。" msgctxt "sub_div_rad_add description" msgid "An addition to the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to a thicker shell of small cubes near the boundary of the model." @@ -235,27 +236,27 @@ msgstr "エクストルーダーのオフセットを座標システムに適用 msgctxt "interlocking_enable description" msgid "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials." -msgstr "モデルが接触する箇所に、インターロックビーム構造を生成します。その結果、モデル、特に異なる材料でプリントされたモデル間の密着性が向上します。" +msgstr "モデルが接触する箇所に、インターロックビーム構造を生成します。その結果、モデル、特に異なる材料でプリントされたモデル間の接着が向上します。" msgctxt "travel_avoid_other_parts label" msgid "Avoid Printed Parts When Traveling" -msgstr "移動は印刷したパーツを回避する" +msgstr "移動中に印刷したパーツを回避" msgctxt "travel_avoid_supports label" msgid "Avoid Supports When Traveling" -msgstr "移動はサポートを回避する" +msgstr "移動中にサポートを回避" msgctxt "z_seam_position option back" msgid "Back" -msgstr "戻る" +msgstr "後方" msgctxt "z_seam_position option backleft" msgid "Back Left" -msgstr "後方左" +msgstr "左後方" msgctxt "z_seam_position option backright" msgid "Back Right" -msgstr "後方右" +msgstr "右後方" msgctxt "machine_gcode_flavor option BFB" msgid "Bits from Bytes" @@ -279,7 +280,7 @@ msgstr "底層初期レイヤー" msgctxt "bottom_skin_expand_distance label" msgid "Bottom Skin Expand Distance" -msgstr "底面展開距離" +msgstr "底面拡張距離" msgctxt "bottom_skin_preshrink label" msgid "Bottom Skin Removal Width" @@ -391,15 +392,15 @@ msgstr "ブリッジサードスキンの速度" msgctxt "bridge_wall_coast label" msgid "Bridge Wall Coasting" -msgstr "ブリッジ壁コースティング" +msgstr "ブリッジウォールコースティング" msgctxt "bridge_wall_material_flow label" msgid "Bridge Wall Flow" -msgstr "ブリッジ壁フロー" +msgstr "ブリッジウォールフロー" msgctxt "bridge_wall_speed label" msgid "Bridge Wall Speed" -msgstr "ブリッジ壁速度" +msgstr "ブリッジウォール速度" msgctxt "adhesion_type option brim" msgid "Brim" @@ -431,7 +432,7 @@ msgstr "ブリム幅" msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" -msgstr "ビルドプレート密着性" +msgstr "ビルドプレートとの接着" msgctxt "adhesion_extruder_nr label" msgid "Build Plate Adhesion Extruder" @@ -495,7 +496,7 @@ msgstr "コースティングのボリューム" msgctxt "coasting_enable description" msgid "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to print the last piece of the extrusion path in order to reduce stringing." -msgstr "コースティングは、それぞれの造形ラインの最後の部分をトラベルパスで置き換えます。はみ出た材料は、糸引きを減らすために造形ライン最後の部分を印刷するために使用される。" +msgstr "コースティングは、それぞれの造形パスの最後の部分をトラベルパスで置き換えます。はみ出た材料は、糸引きを減らすために造形ライン最後の部分を印刷するために使用されます。" msgctxt "retraction_combing label" msgid "Combing Mode" @@ -503,7 +504,7 @@ msgstr "コーミングモード" msgctxt "retraction_combing description" msgid "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is off, the material will retract and the nozzle moves in a straight line to the next point. It is also possible to avoid combing over top/bottom skin areas or to only comb within the infill." -msgstr "コーミングは、走行時にすでに印刷された領域内にノズルを保ちます。その結果、移動距離はわずかに長くなりますが、引き込みの必要性は減ります。コーミングがオフの場合、フィラメントの引き戻しを行い、ノズルは次のポイントまで直線移動します。また、インフィルのみにてコーミングすることにより、トップとボトムのスキン領域上での櫛通りを回避できます。" +msgstr "コーミングは、走行時にすでに印刷された領域内にノズルを保ちます。その結果、移動距離はわずかに長くなりますが、引き込みの必要性は減ります。コーミングがオフの場合、材料の引き戻しを行い、ノズルは次のポイントまで直線移動します。また、インフィルのみコーミングすることにより、トップとボトムのスキン領域上でのコーミングを回避できます。" msgctxt "command_line_settings label" msgid "Command Line Settings" @@ -575,7 +576,7 @@ msgstr "上層/底層ポリゴンに接合" msgctxt "connect_infill_polygons description" msgid "Connect infill paths where they run next to each other. For infill patterns which consist of several closed polygons, enabling this setting greatly reduces the travel time." -msgstr "互いに次に実行するインフィルパスに接合します。いくつかの閉じられたポリゴンを含むインフィルパターンの場合、この設定を有効にすることにより、移動時間が大幅に短縮されます。" +msgstr "互いに次に実行するインフィルパスに接合します。いくつかの閉じられたポリゴンを含むインフィルパターンの場合、この設定を有効にすることにより移動時間が大幅に短縮されます。" msgctxt "support_connect_zigzags description" msgid "Connect the ZigZags. This will increase the strength of the zig zag support structure." @@ -587,7 +588,7 @@ msgstr "サポートライン両端を接続します。この設定を有効に msgctxt "zig_zaggify_infill description" msgid "Connect the ends where the infill pattern meets the inner wall using a line which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduce the effects of infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used." -msgstr "内壁の形状に沿ったラインを使用してインフィルパターンと内壁が合うところで接合します。この設定を有効にすると、インフィルが壁により密着するようになり、垂直面の品質に対するインフィルの影響が軽減します。この設定を無効にすると、材料の使用量が減ります。" +msgstr "内側のウォール形状に沿ったラインを使用してインフィルパターンと内側のウォールが合うところで接合します。この設定を有効にすると、インフィルがウォールにより接着するようになり、垂直面の品質に対するインフィルの影響が軽減します。この設定を無効にすると、材料の使用量が減ります。" msgctxt "connect_skin_polygons description" msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." @@ -659,7 +660,7 @@ msgstr "メッシュ切断" msgctxt "material_flow_temp_graph description" msgid "Data linking material flow (in mm3 per second) to temperature (degrees Celsius)." -msgstr "マテリアルフロー(毎秒 3mm) と温度 (° c) をリンクします。" +msgstr "材料フロー (毎秒3mm) と温度 (℃) をリンクします。" msgctxt "machine_acceleration label" msgid "Default Acceleration" @@ -703,7 +704,7 @@ msgstr "ブリッジを検出し、ブリッジを印刷しながらて印刷速 msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." -msgstr "ウォールをプリントする順序を決定します。アウターウォールを先にプリントすると、インナーウォールの不具合が外側に影響しないため、寸法精度が向上します。一方、アウターウォールを後からプリントすると、オーバーハングをプリントする際にうまく積み重ねることができます。インナーウォールの合計が奇数の場合、「中央の最後のライン」は必ず最後にプリントされます。" +msgstr "ウォールをプリントする順序を決定します。外側のウォールを先にプリントすると、内側のウォールの不具合が外側に影響しないため、寸法精度が向上します。一方、外側のウォールを後からプリントすると、オーバーハングをプリントする際にうまく積み重ねることができます。内側のウォールの合計が奇数の場合、「中央の最後のライン」は必ず最後にプリントされます。" msgctxt "infill_mesh_order description" msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." @@ -731,7 +732,7 @@ msgstr "ビルドプレートに到達したときに、すべての枝が達成 msgctxt "adhesion_type description" msgid "Different options that help to improve both priming your extrusion and adhesion to the build plate. Brim adds a single layer flat area around the base of your model to prevent warping. Raft adds a thick grid with a roof below the model. Skirt is a line printed around the model, but not connected to the model." -msgstr "エクストルーダーとビルドプレートへの接着両方を改善するのに役立つさまざまなオプション。 Brimは、モデルのベースの周りに単一レイヤーを平面的に追加して、ワーピングを防止します。 Raftは、モデルの下に太いグリッドを追加します。スカートはモデルの周りに印刷されたラインですが、モデルには接続されていません。" +msgstr "エクストルーダーとビルドプレートへの接着方法を改善するのに役立つさまざまなオプション。ブリムは、モデルのベースの周りに単一レイヤーを平面的に追加して、歪みを防ぎます。ラフトはモデルの下に太いグリッドを追加します。スカートはモデルの周囲に印刷されるラインで、モデルには接続されません。" msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -771,19 +772,19 @@ msgstr "サポート構造の上部/下部からプリントまでの距離で msgctxt "infill_wipe_dist description" msgid "Distance of a travel move inserted after every infill line, to make the infill stick to the walls better. This option is similar to infill overlap, but without extrusion and only on one end of the infill line." -msgstr "インフィルラインごとに挿入された移動距離は壁のインフィルへの接着をより良くします。このオプションは、インフィルオーバーラップに似ていますが、押出なく、インフィルラインの片側にのみあります。" +msgstr "インフィルがウォールにより接着するための、インフィルラインが終わるたびに追加される移動の距離です。このオプションはインフィル重複に似ていますが、吐出がなくインフィルラインの片側の端に適用されます。" msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." -msgstr "外壁の後に挿入された移動の距離はZシームをよりよく隠します。" +msgstr "Zシームを更に隠すための、外側のウォールの後に追加する移動の距離です。" msgctxt "draft_shield_dist description" msgid "Distance of the draft shield from the print, in the X/Y directions." -msgstr "ドラフトシールドと造形物のX / Y方向の距離。" +msgstr "ドラフトシールドと造形物のX/Y方向の距離。" msgctxt "ooze_shield_dist description" msgid "Distance of the ooze shield from the print, in the X/Y directions." -msgstr "壁（ooze shield）の造形物からの距離。" +msgstr "壁 (ooze shield) の造形物からの距離。" msgctxt "support_xy_distance_overhang description" msgid "Distance of the support structure from the overhang in the X/Y directions." @@ -899,7 +900,7 @@ msgstr "サポートフロアを有効にする" msgctxt "support_interface_enable label" msgid "Enable Support Interface" -msgstr "サポートインタフェースを有効にする" +msgstr "サポート境界面を有効にする" msgctxt "support_roof_enable label" msgid "Enable Support Roof" @@ -919,19 +920,19 @@ msgstr "モデルの周りに壁（ooze shield）を作る。これを生成す msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." -msgstr "印刷プロセスのレポートを有効にして,問題の検出の可能性があるしきい値を設定します。" +msgstr "印刷プロセスのレポートを有効にして、問題の検出の可能性があるしきい値を設定します。" msgctxt "small_skin_on_surface description" msgid "Enable small (up to 'Small Top/Bottom Width') regions on the topmost skinned layer (exposed to air) to be filled with walls instead of the default pattern." -msgstr "最上位のスキンレイヤー（空気にさらされている）上の小さな（最大「小さな上部/下部幅」）領域を、デフォルトパターンの代わりに壁で埋められるようにします。" +msgstr "最上位のスキンレイヤー（空気にさらされている）上の小さな（最大「小さな上部/下部幅」）領域を、デフォルトパターンの代わりにウォールで埋められるようにします。" msgctxt "jerk_enabled description" msgid "Enables adjusting the jerk of print head when the velocity in the X or Y axis changes. Increasing the jerk can reduce printing time at the cost of print quality." -msgstr "X または Y 軸の速度が変更する際、プリントヘッドのジャークを調整することができます。ジャークを増やすことは、印刷時間を短縮できますがプリントの質を損ねます。" +msgstr "XまたはY軸の速度が変わる際、プリントヘッドのジャーク調整を有効にします。ジャークを増やすことで印刷時間を短縮できますが、プリントの品質は低下します。" msgctxt "acceleration_enabled description" msgid "Enables adjusting the print head acceleration. Increasing the accelerations can reduce printing time at the cost of print quality." -msgstr "プリントヘッドのスピード調整の有効化　加速度の増加は印刷時間を短縮しますが印刷の質を損ねます。" +msgstr "プリントヘッドのスピード調整を有効にします。加速度の増加は印刷時間を短縮しますが印刷の質を損ねます。" msgctxt "cool_fan_enabled description" msgid "Enables the print cooling fans while printing. The fans improve print quality on layers with short layer times and bridging / overhangs." @@ -939,7 +940,7 @@ msgstr "印刷中の冷却ファンを有効にします。ファンは、短い msgctxt "machine_end_gcode label" msgid "End G-code" -msgstr "G-codeの終了" +msgstr "終了G-code" msgctxt "material_end_of_filament_purge_length label" msgid "End of Filament Purge Length" @@ -967,7 +968,7 @@ msgstr "排他" msgctxt "experimental label" msgid "Experimental" -msgstr "実験" +msgstr "実験的" msgctxt "z_seam_corner option z_seam_corner_outer" msgid "Expose Seam" @@ -983,7 +984,7 @@ msgstr "強めのスティッチングは、穴をメッシュで塞いでデー msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" -msgstr "外側インフィル壁の数" +msgstr "追加インフィルウォールの数" msgctxt "skin_outline_count label" msgid "Extra Skin Wall Count" @@ -1083,7 +1084,7 @@ msgstr "フロー警告" msgctxt "material_flow_layer_0 description" msgid "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value." -msgstr "初期レイヤーの流量補修:初期レイヤーの マテリアル吐出量はこの値の乗算で計算されます。" +msgstr "初期レイヤーの流量補修：初期レイヤーの材料吐出量はこの値の乗算で計算されます。" msgctxt "skin_material_flow_layer_0 description" msgid "Flow compensation on bottom lines of the first layer" @@ -1127,15 +1128,15 @@ msgstr "最初のレイヤーの最も外側のウォールライン上のフロ msgctxt "wall_0_material_flow description" msgid "Flow compensation on the outermost wall line." -msgstr "最外壁のフロー補正。" +msgstr "最も外側のウォールのフロー補正。" msgctxt "wall_0_material_flow_roofing description" msgid "Flow compensation on the top surface outermost wall line." -msgstr "最外の壁ラインにおける流量補正。" +msgstr "最も外側のウォールラインにおける流量補正。" msgctxt "wall_x_material_flow_roofing description" msgid "Flow compensation on top surface wall lines for all wall lines except the outermost one." -msgstr "最外のラインを除く、全ての壁ラインにおけるトップサーフェス壁ラインのフロー補正" +msgstr "最外のラインを除く、全てのウォールラインにおける最上部ウォールラインのフロー補正" msgctxt "skin_material_flow description" msgid "Flow compensation on top/bottom lines." @@ -1147,15 +1148,15 @@ msgstr "最も外側のウォールラインを除くすべてのウォールラ msgctxt "wall_x_material_flow description" msgid "Flow compensation on wall lines for all wall lines except the outermost one." -msgstr "最外壁以外の壁のフロー補正。" +msgstr "最も外側以外のウォールのフロー補正。" msgctxt "wall_material_flow description" msgid "Flow compensation on wall lines." -msgstr "壁のフロー補正。" +msgstr "ウォールラインのフロー補正。" msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "流れの補修: 押出されるマテリアルの量は、この値から乗算されます。" +msgstr "流れの補修：吐出される材料の量は、この値から乗算されます。" msgctxt "meshfix_fluid_motion_angle label" msgid "Fluid Motion Angle" @@ -1179,19 +1180,19 @@ msgstr "フラッシュパージ速度" msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." -msgstr "ノズルサイズの1～2倍程度の薄い構造の場合、モデルの厚さに合わせてライン幅を変更する必要があります。この設定は、ウォールに許容される最小ライン幅を制御します。ジオメトリーの厚さが、Nのウォールが幅広く、N+1のウォールが狭い場所で、NからN+1のウォールに移行するため、最小ライン幅は本質的に最大ライン幅も決定します。ウォールラインの許容最大幅は、最小ウォールライン幅の2倍です。" +msgstr "ノズルサイズの1～2倍程度の薄い構造の場合、モデルの厚さに合わせてライン幅が接着するよう変更する必要があります。この設定は、ウォールに許容される最小ライン幅を制御します。ジオメトリーの厚さが、Nのウォールが幅広く、N+1のウォールが狭い場所で、NからN+1のウォールに移行するため、最小ライン幅は本質的に最大ライン幅も決定します。ウォールラインの許容最大幅は、最小ウォールライン幅の2倍です。" msgctxt "z_seam_position option front" msgid "Front" -msgstr "前" +msgstr "前方" msgctxt "z_seam_position option frontleft" msgid "Front Left" -msgstr "前左" +msgstr "左前方" msgctxt "z_seam_position option frontright" msgid "Front Right" -msgstr "前方右" +msgstr "右前方" msgctxt "draft_shield_height_limitation option full" msgid "Full" @@ -1223,17 +1224,15 @@ msgstr "G-codeフレーバー" msgctxt "machine_end_gcode description" msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "最後に実行するG-codeコマンドは、" -"で区切ります。" +msgstr "最後に実行されるG-codeコマンド。複数ある場合は改行で区切ります。" msgctxt "machine_start_gcode description" msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "最初に実行するG-codeコマンドは、" -"で区切ります。" +msgstr "最初に実行されるG-codeコマンド。複数ある場合は改行で区切ります。" msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." -msgstr "マテリアルのGUID。これは自動的に設定されます。" +msgstr "材料のGUID。これは自動的に設定されます。" msgctxt "gantry_height label" msgid "Gantry Height" @@ -1245,15 +1244,15 @@ msgstr "インターロック構造の生成" msgctxt "support_enable label" msgid "Generate Support" -msgstr "サポート開始" +msgstr "サポートを生成" msgctxt "support_brim_enable description" msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." -msgstr "最初の層のインフィルエリア内ブリムを生成します。このブリムは、サポートの周囲ではなく、サポートの下に印刷されます。この設定を有効にすると、サポートのビルドプレートへの吸着性が高まります。" +msgstr "最初の層のインフィルエリア内ブリムを生成します。このブリムは、サポートの周囲ではなく、サポートの下に印刷されます。この設定を有効にすると、サポートのビルドプレートへの接着が向上します。" msgctxt "support_interface_enable description" msgid "Generate a dense interface between the model and the support. This will create a skin at the top of the support on which the model is printed and at the bottom of the support, where it rests on the model." -msgstr "モデルとサポートの間に密なインターフェースを生成します。これにより、モデルが印刷されているサポートの上部、モデル上のサポートの下部にスキンが作成されます。" +msgstr "モデルとサポートの間に密な境界面を生成します。これにより、モデルが印刷されているサポートの上部、モデル上のサポートの下部にスキンが作成されます。" msgctxt "support_bottom_enable description" msgid "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support." @@ -1321,7 +1320,7 @@ msgstr "Griffin" msgctxt "group_outer_walls label" msgid "Group Outer Walls" -msgstr "外壁をグループ化" +msgstr "外側のウォールをグループ化" msgctxt "infill_pattern option gyroid" msgid "Gyroid" @@ -1361,11 +1360,11 @@ msgstr "シーム表示/非表示" msgctxt "hole_xy_offset label" msgid "Hole Horizontal Expansion" -msgstr "穴の水平展開" +msgstr "穴の水平拡張" msgctxt "hole_xy_offset_max_diameter label" msgid "Hole Horizontal Expansion Max Diameter" -msgstr "穴の水平展開の最大直径" +msgstr "穴の水平拡張の最大直径" msgctxt "small_hole_max_size description" msgid "Holes and part outlines with a diameter smaller than this will be printed using Small Feature Speed." @@ -1373,7 +1372,7 @@ msgstr "これより直径が小さな輪郭の穴とパーツは、Small Featur msgctxt "xy_offset label" msgid "Horizontal Expansion" -msgstr "水平展開" +msgstr "水平拡張" msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" @@ -1393,7 +1392,7 @@ msgstr "流量の変化を補正するためにフィラメントを移動する msgctxt "material_break_retracted_position description" msgid "How far to retract the filament in order to break it cleanly." -msgstr "フィラメントをきれいに引き出すにはフィラメントをどこまで引き戻すか。" +msgstr "フィラメントをきれいに引き出すためフィラメントをどこまで引き戻すか。" msgctxt "material_break_preparation_speed description" msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." @@ -1417,7 +1416,7 @@ msgstr "材料を乾燥保管容器の外に置くことができる期間。" msgctxt "machine_steps_per_mm_x description" msgid "How many steps of the stepper motor will result in one millimeter of movement in the X direction." -msgstr "X 方向に 1 ミリメートルの移動でステップモーターが行うステップの数を示します。" +msgstr "X方向に1ミリメートルの移動によりステップモーターが行うステップの数を示します。" msgctxt "machine_steps_per_mm_y description" msgid "How many steps of the stepper motor will result in one millimeter of movement in the Y direction." @@ -1445,7 +1444,7 @@ msgstr "プリンタ起動gcodeスクリプト完了時に、各エクストル msgctxt "support_interface_priority description" msgid "How support interface and support will interact when they overlap. Currently only implemented for support roof." -msgstr "サポートインターフェイスとサポートが重なる場合にどのように相互作用するかを示します。現在、サポートルーフにのみ実装されています。" +msgstr "サポート境界面とサポートが重なる場合にどのように相互作用するかを示します。現在、サポートルーフにのみ実装されています。" msgctxt "support_tree_min_height_to_model description" msgid "How tall a branch has to be if it is placed on the model. Prevents small blobs of support. This setting is ignored when a branch is supporting a support roof." @@ -1469,19 +1468,19 @@ msgstr "異なる数のウォール間を相次いで行き来する場合は、 msgctxt "raft_base_margin description" msgid "If the raft base is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print." -msgstr "ラフトベースが有効になっている場合,これはモデルの周囲の追加のラフト領域であり,ラフトも与えられます。このマージンを増やすとより強いラフトを作ることができますが,より多くの材料を使用し,プリントのために残される領域は少なくなります。" +msgstr "ラフト土台が有効の場合、ラフト自体で構成される追加のラフト領域がモデルの周囲に作成されます。このマージンを増やすことで、より多くの材料を使いプリントの領域が狭くなる一方、より強いラフトを作ることができます。" msgctxt "raft_margin description" msgid "If the raft is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print." -msgstr "ラフトが有効になっている場合、モデルの周りに余分なラフト領域ができます。値を大きくするとより強力なラフトができますが、多くの材料を使用し、造形範囲は少なくなります。" +msgstr "ラフトが有効の場合、ラフト自体で構成される追加のラフト領域がモデルの周囲に作成されます。このマージンを増やすことで、より多くの材料を使いプリントの領域が狭くなる一方、より強いラフトを作ることができます。" msgctxt "raft_interface_margin description" msgid "If the raft middle is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print." -msgstr "ラフトの中央が有効になっている場合,これはモデルの周囲の追加のラフト領域であり,ラフトも与えられます。このマージンを増やすとより強いラフトを作ることができますが,より多くの材料を使用し,プリントのために残される領域は少なくなります。" +msgstr "ラフト中間層が有効の場合、ラフト自体で構成される追加のラフト領域がモデルの周囲に作成されます。このマージンを増やすことで、より多くの材料を使いプリントの領域が狭くなる一方、より強いラフトを作ることができます。" msgctxt "raft_surface_margin description" msgid "If the raft top is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print." -msgstr "ラフトの上部が有効になっている場合,これはモデルの周囲の追加のラフト領域であり,ラフトも与えられます。このマージンを増やすとより強いラフトを作ることができますが,より多くの材料を使用し,プリントのために残される領域は少なくなります。" +msgstr "ラフト上層部が有効の場合、ラフト自体で構成される追加のラフト領域がモデルの周囲に作成されます。このマージンを増やすことで、より多くの材料を使いプリントの領域が狭くなる一方、より強いラフトを作ることができます。" msgctxt "meshfix_union_all description" msgid "Ignore the internal geometry arising from overlapping volumes within a mesh and print the volumes as one. This may cause unintended internal cavities to disappear." @@ -1493,7 +1492,7 @@ msgstr "ビルドプレート温度を含む" msgctxt "material_print_temp_prepend label" msgid "Include Material Temperatures" -msgstr "マテリアル温度を含む" +msgstr "材料の温度を含む" msgctxt "slicing_tolerance option inclusive" msgid "Inclusive" @@ -1561,11 +1560,11 @@ msgstr "インフィルオーバーハング角度" msgctxt "infill_overlap_mm label" msgid "Infill Overlap" -msgstr "インフィル公差" +msgstr "インフィル重複" msgctxt "infill_overlap label" msgid "Infill Overlap Percentage" -msgstr "インフィル公差量" +msgstr "インフィル重複率" msgctxt "infill_pattern label" msgid "Infill Pattern" @@ -1589,11 +1588,11 @@ msgstr "インフィル移動距離" msgctxt "infill_offset_x label" msgid "Infill X Offset" -msgstr "インフィルXオフセット" +msgstr "インフィルX座標オフセット" msgctxt "infill_offset_y label" msgid "Infill Y Offset" -msgstr "インフィルYオフセット" +msgstr "インフィルY座標オフセット" msgctxt "initial_bottom_layers label" msgid "Initial Bottom Layers" @@ -1621,15 +1620,15 @@ msgstr "初期レイヤーフロー" msgctxt "layer_height_0 label" msgid "Initial Layer Height" -msgstr "初期レイヤー高さ" +msgstr "初期レイヤーの高さ" msgctxt "xy_offset_layer_0 label" msgid "Initial Layer Horizontal Expansion" -msgstr "初期層水平展開" +msgstr "初期層水平拡張" msgctxt "wall_x_material_flow_layer_0 label" msgid "Initial Layer Inner Wall Flow" -msgstr "初期レイヤーインナーウォールのフロー" +msgstr "初期レイヤー内側ウォールのフロー" msgctxt "jerk_layer_0 label" msgid "Initial Layer Jerk" @@ -1641,7 +1640,7 @@ msgstr "初期レイヤーのライン幅" msgctxt "wall_0_material_flow_layer_0 label" msgid "Initial Layer Outer Wall Flow" -msgstr "初期レイヤーアウターウォールのフロー" +msgstr "初期レイヤーにおける外側ウォールのフロー" msgctxt "acceleration_print_layer_0 label" msgid "Initial Layer Print Acceleration" @@ -1677,7 +1676,7 @@ msgstr "初期レイヤー移動速度" msgctxt "layer_0_z_overlap label" msgid "Initial Layer Z Overlap" -msgstr "初期レイヤーZのオーバーラップ" +msgstr "初期レイヤーZ座標の重なり" msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" @@ -1685,23 +1684,23 @@ msgstr "初期印刷温度" msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" -msgstr "内壁加速度" +msgstr "内側ウォールの加速度" msgctxt "wall_x_extruder_nr label" msgid "Inner Wall Extruder" -msgstr "内壁用エクストルーダー" +msgstr "内側ウォール用エクストルーダー" msgctxt "jerk_wall_x label" msgid "Inner Wall Jerk" -msgstr "内壁ジャーク" +msgstr "内側ウォールジャーク" msgctxt "speed_wall_x label" msgid "Inner Wall Speed" -msgstr "内壁速度" +msgstr "内側ウォール速度" msgctxt "wall_x_material_flow label" msgid "Inner Wall(s) Flow" -msgstr "内壁のフロー" +msgstr "内側ウォールのフロー" msgctxt "wall_line_width_x label" msgid "Inner Wall(s) Line Width" @@ -1709,7 +1708,7 @@ msgstr "内側ウォールライン幅" msgctxt "wall_0_inset description" msgid "Inset applied to the path of the outer wall. If the outer wall is smaller than the nozzle, and printed after the inner walls, use this offset to get the hole in the nozzle to overlap with the inner walls instead of the outside of the model." -msgstr "外壁の経路にはめ込む。外壁がノズルよりも小さく、内壁の後に造形されている場合は、オフセットを使用して、ノズルの穴をモデルの外側ではなく内壁と重なるようにします。" +msgstr "外側ウォールの経路にはめ込む。外側ウォールがノズルよりも小さく、外側ウォールの後に造形されている場合は、オフセットを使用して、ノズルの穴をモデルの外側ではなく外側ウォールと重なるようにします。" msgctxt "brim_location option inside" msgid "Inside Only" @@ -1721,11 +1720,11 @@ msgstr "内側から外側へ" msgctxt "support_interface_priority option interface_lines_overwrite_support_area" msgid "Interface lines preferred" -msgstr "インターフェイスラインを優先" +msgstr "境界面のラインを優先" msgctxt "support_interface_priority option interface_area_overwrite_support_area" msgid "Interface preferred" -msgstr "インターフェイスを優先" +msgstr "境界面を優先" msgctxt "prime_tower_mode option interleaved" msgid "Interleaved" @@ -1797,7 +1796,7 @@ msgstr "この材料は加熱時にきれいに分解するタイプ (結晶性) msgctxt "material_is_support_material description" msgid "Is this material typically used as a support material during printing." -msgstr "この素材が一般的にプリント時のサポート材として使用されるかどうかを示します。" +msgstr "この材料が一般的にプリント時のサポート材として使用されるかどうかを示します。" msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." @@ -1809,31 +1808,31 @@ msgstr "スティッチできない部分を保持" msgctxt "layer_height label" msgid "Layer Height" -msgstr "レイヤー高さ" +msgstr "レイヤーの高さ" msgctxt "layer_start_x label" msgid "Layer Start X" -msgstr "レイヤー始点X" +msgstr "レイヤー始点X座標" msgctxt "layer_start_y label" msgid "Layer Start Y" -msgstr "レイヤー始点Y" +msgstr "レイヤー始点Y座標" msgctxt "raft_base_thickness description" msgid "Layer thickness of the base raft layer. This should be a thick layer which sticks firmly to the printer build plate." -msgstr "ベースラフト層の層厚さ。プリンタのビルドプレートにしっかりと固着する厚い層でなければなりません。" +msgstr "ラフトの土台となる層の厚さ。プリンターのビルドプレートにしっかり接着する厚い層でなければなりません。" msgctxt "raft_interface_thickness description" msgid "Layer thickness of the middle raft layer." -msgstr "中間のラフト層の層の厚さ。" +msgstr "中間のラフト層の厚さ。" msgctxt "raft_surface_thickness description" msgid "Layer thickness of the top raft layers." -msgstr "トップラフト層の層厚。" +msgstr "トップラフト層の厚さ。" msgctxt "support_skip_zag_per_mm description" msgid "Leave out a connection between support lines once every N millimeter to make the support structure easier to break away." -msgstr "サポート毎行Nミリ時に、サポートの接続をわざと外し、後のサポート材の構造をもろくし、壊れやすくする。" +msgstr "Nミリメートルごとに1度ずつサポートラインの接続をしないことで、サポート材を外れやすくします。" msgctxt "z_seam_position option left" msgid "Left" @@ -1869,7 +1868,7 @@ msgstr "枝到達距離制限" msgctxt "support_tree_limit_branch_reach description" msgid "Limit how far each branch should travel from the point it supports. This can make the support more sturdy, but will increase the amount of branches (and because of that material usage/print time)" -msgstr "各枝がサポートポイントからどれくらい移動するかを制限します。これにより、サポートをより頑丈にすることができますが、枝の量が増加します（材料の使用量やプリント時間も増加します）。" +msgstr "各枝がサポートポイントからどれくらい移動するかを制限します。これにより、サポートをより頑丈にできますが、枝の量が増加します（材料の使用量やプリント時間も増加します）。" msgctxt "bv_temp_warn_limit description" msgid "Limit on Build Volume Temperature warning for detection." @@ -1897,7 +1896,7 @@ msgstr "検出するフロー警告の制限。" msgctxt "cutting_mesh description" msgid "Limit the volume of this mesh to within other meshes. You can use this to make certain areas of one mesh print with different settings and with a whole different extruder." -msgstr "このメッシュの大きさをを他のメッシュ内に制限します。この設定を使用することで、1つの特定のメッシュ領域の設定を、、全く別のエクストルーダーで作成することができます。" +msgstr "このメッシュの大きさをを他のメッシュ内に制限します。この設定を使用することで、1つの特定のメッシュ領域の設定を、全く別のエクストルーダーで作成できます。" msgctxt "draft_shield_height_limitation option limited" msgid "Limited" @@ -1969,7 +1968,7 @@ msgstr "プリンターの幅" msgctxt "machine_settings description" msgid "Machine specific settings" -msgstr "プリンター詳細設定" +msgstr "プリンター固有の設定" msgctxt "conical_overhang_enabled label" msgid "Make Overhang Printable" @@ -1977,11 +1976,11 @@ msgstr "オーバーハング印刷可能" msgctxt "multiple_mesh_overlap description" msgid "Make meshes which are touching each other overlap a bit. This makes them bond together better." -msgstr "触れているメッシュを少し重ねてください。これによって、より良い接着をします。" +msgstr "触れているメッシュを少し重ねます。これによって、メッシュ同士の接着をより良くします。" msgctxt "support_conical_enabled description" msgid "Make support areas smaller at the bottom than at the overhang." -msgstr "オーバーハング部分よりも底面の支持領域を小さくする。" +msgstr "オーバーハング底面のサポート領域を小さくします。" msgctxt "support_mesh_drop_down description" msgid "Make support everywhere below the support mesh, so that there's no overhang in the support mesh." @@ -1993,8 +1992,9 @@ msgstr "最後のヘッドの既知位置からではなく、エクストルー msgctxt "layer_0_z_overlap description" msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "エアギャップで失われたフィラメントを補うために,モデルの1つ目と2つ目の層をZ方向にオーバーラップさせます。最初のモデルレイヤーより上のすべてのモデルは,この量だけ下にシフトされます。" -"この設定により,2つ目のレイヤーが最初のレイヤーの下に印刷される場合があることに注意してください。これは意図された動作です。" +msgstr "" +"エアギャップで失われたフィラメントを補うために、モデルの1つ目と2つ目の層をZ方向で重なるようにします。最初のモデルレイヤーより上のすべてのモデルは、この量だけ下にシフトされます。\n" +"この設定により、2つ目のレイヤーが最初のレイヤーの下に印刷される場合があることに注意してください。これは意図された動作です。" msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2014,11 +2014,11 @@ msgstr "Marlin (Volumetric)" msgctxt "material description" msgid "Material" -msgstr "マテリアル" +msgstr "材料" msgctxt "material label" msgid "Material" -msgstr "マテリアル" +msgstr "材料" msgctxt "material_brand label" msgid "Material Brand" @@ -2026,7 +2026,7 @@ msgstr "材料のブランド" msgctxt "material_guid label" msgid "Material GUID" -msgstr "マテリアルGUID" +msgstr "材料GUID" msgctxt "material_type label" msgid "Material Type" @@ -2042,15 +2042,15 @@ msgstr "引き戻しのない最大コム距離" msgctxt "machine_max_acceleration_x label" msgid "Maximum Acceleration X" -msgstr "最大加速度X" +msgstr "X軸最大加速度" msgctxt "machine_max_acceleration_y label" msgid "Maximum Acceleration Y" -msgstr "最大加速度Y" +msgstr "Y軸最大加速度" msgctxt "machine_max_acceleration_z label" msgid "Maximum Acceleration Z" -msgstr "最大加速度Z" +msgstr "Z軸最大加速度" msgctxt "support_tree_angle label" msgid "Maximum Branch Angle" @@ -2094,7 +2094,7 @@ msgstr "最大引き戻し回数" msgctxt "max_skin_angle_for_expansion label" msgid "Maximum Skin Angle for Expansion" -msgstr "表面展開最大角" +msgstr "表面拡張最大角" msgctxt "machine_max_feedrate_e label" msgid "Maximum Speed E" @@ -2102,15 +2102,15 @@ msgstr "最大速度E" msgctxt "machine_max_feedrate_x label" msgid "Maximum Speed X" -msgstr "最大速度X" +msgstr "X軸最大速度" msgctxt "machine_max_feedrate_y label" msgid "Maximum Speed Y" -msgstr "最大速度Y" +msgstr "Y軸最大速度" msgctxt "machine_max_feedrate_z label" msgid "Maximum Speed Z" -msgstr "最大速度Z" +msgstr "Z軸最大速度" msgctxt "support_tower_maximum_supported_diameter label" msgid "Maximum Tower-Supported Diameter" @@ -2142,7 +2142,7 @@ msgstr "スパース（疎）であると見なされるインフィルの最大 msgctxt "support_tower_maximum_supported_diameter description" msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "特殊なサポートタワーにより支持される小さな領域のX / Y方向の最小直径。" +msgstr "特殊なサポートタワーにより支持される小さな領域のX/Y方向の最小直径。" msgctxt "max_extrusion_before_wipe description" msgid "Maximum material that can be extruded before another nozzle wipe is initiated. If this value is less than the volume of material required in a layer, the setting has no effect in this layer, i.e. it is limited to one wipe per layer." @@ -2158,15 +2158,15 @@ msgstr "メッシュ修正" msgctxt "mesh_position_x label" msgid "Mesh Position X" -msgstr "メッシュ位置X" +msgstr "メッシュ位置X座標" msgctxt "mesh_position_y label" msgid "Mesh Position Y" -msgstr "メッシュ位置Y" +msgstr "メッシュ位置Y座標" msgctxt "mesh_position_z label" msgid "Mesh Position Z" -msgstr "メッシュ位置Z" +msgstr "メッシュ位置Z座標" msgctxt "infill_mesh_order label" msgid "Mesh Processing Rank" @@ -2190,7 +2190,7 @@ msgstr "スタンバイ温度までの最短時間" msgctxt "bridge_wall_min_length label" msgid "Minimum Bridge Wall Length" -msgstr "ブリッジ壁の最小長さ" +msgstr "ブリッジウォール長さの最小値" msgctxt "min_even_wall_line_width label" msgid "Minimum Even Wall Line Width" @@ -2230,7 +2230,7 @@ msgstr "最小ポリゴン円周" msgctxt "min_skin_width_for_expansion label" msgid "Minimum Skin Width for Expansion" -msgstr "表面展開最小角" +msgstr "表面拡張最小幅" msgctxt "cool_min_speed label" msgid "Minimum Speed" @@ -2246,7 +2246,7 @@ msgstr "最小サポートフロア領域" msgctxt "minimum_interface_area label" msgid "Minimum Support Interface Area" -msgstr "最小サポートインターフェイス領域" +msgstr "サポート境界面の最小面積" msgctxt "minimum_roof_area label" msgid "Minimum Support Roof Area" @@ -2270,7 +2270,7 @@ msgstr "最小ウォールライン幅" msgctxt "minimum_interface_area description" msgid "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support." -msgstr "サポートインターフェイスポリゴンの最小領域サイズ。この値より小さい領域のポリゴンは通常のサポートとしてプリントされます。" +msgstr "サポート境界面ポリゴンの最小領域サイズ。この値より小さい領域のポリゴンは通常のサポートとしてプリントされます。" msgctxt "minimum_support_area description" msgid "Minimum area size for support polygons. Polygons which have an area smaller than this value will not be generated." @@ -2326,7 +2326,7 @@ msgstr "複数のスカートラインを使用すると、小さなモデル形 msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." -msgstr "最初のレイヤーに線幅の乗数です。この値を増やすと、ベッドの接着性が向上します。" +msgstr "最初のレイヤーにおけるライン幅の乗数です。この値を増やすと、ベッドとの接着が向上します。" msgctxt "material_no_load_move_factor label" msgid "No Load Move Factor" @@ -2390,7 +2390,7 @@ msgstr "ノズルID" msgctxt "machine_nozzle_head_distance label" msgid "Nozzle Length" -msgstr "ノズル長さ" +msgstr "ノズルの長さ" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2402,7 +2402,7 @@ msgstr "ノズルスイッチ押し戻し速度" msgctxt "switch_extruder_retraction_speed label" msgid "Nozzle Switch Retract Speed" -msgstr "ノズルスイッチ引き込み速度" +msgstr "ノズルスイッチ引き戻し速度" msgctxt "switch_extruder_retraction_amount label" msgid "Nozzle Switch Retraction Distance" @@ -2442,7 +2442,7 @@ msgstr "天井面の表面に近づく際にインフィル密度が半減する msgctxt "gradual_support_infill_steps description" msgid "Number of times to reduce the support infill density by half when getting further below top surfaces. Areas which are closer to top surfaces get a higher density, up to the Support Infill Density." -msgstr "天井面より下に遠ざかる際にサポートのインフィル密度が半減する回数　天井面に近い領域ほど高い密度となり、サポートのインフィル密度になります。" +msgstr "天井面より下に遠ざかる際にサポートのインフィル密度が半減する回数。天井面に近い領域ほど高い密度となり、サポートのインフィル密度になります。" msgctxt "infill_pattern option tetrahedral" msgid "Octet" @@ -2454,15 +2454,15 @@ msgstr "オフ" msgctxt "mesh_position_x description" msgid "Offset applied to the object in the x direction." -msgstr "オブジェクトの X 方向に適用されたオフセット。" +msgstr "オブジェクトのX方向に適用されるオフセット。" msgctxt "mesh_position_y description" msgid "Offset applied to the object in the y direction." -msgstr "オブジェクトのY 方向適用されたオフセット。" +msgstr "オブジェクトのY方向に適用されるオフセット。" msgctxt "mesh_position_z description" msgid "Offset applied to the object in the z direction. With this you can perform what was used to be called 'Object Sink'." -msgstr "オブジェクトの Z 方向に適用されたオフセット。この 'オブジェクト シンク' と呼ばれていたものを再現できます。" +msgstr "オブジェクトのZ方向に適用されるオフセット。これにより、オブジェクトが沈んでいる様子を再現できます。" msgctxt "machine_use_extruder_offset_to_offset_coords label" msgid "Offset with Extruder" @@ -2482,7 +2482,7 @@ msgstr "1つずつ" msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." -msgstr "走行時に印刷部品への衝突を避けるため、水平移動で回避できない造形物上を移動するときは、Zホップを実行します。" +msgstr "移動中に印刷部品への衝突を避けるため、水平移動で回避できない造形物上を移動するときは、Zホップを実行します。" msgctxt "ironing_only_highest_layer description" msgid "Only perform ironing on the very last layer of the mesh. This saves time if the lower layers don't need a smooth surface finish." @@ -2502,11 +2502,11 @@ msgstr "最適な枝範囲" msgctxt "optimize_wall_printing_order label" msgid "Optimize Wall Printing Order" -msgstr "壁印刷順序の最適化" +msgstr "ウォール印刷順序を最適化" msgctxt "optimize_wall_printing_order description" msgid "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization. First layer is not optimized when choosing brim as build plate adhesion type." -msgstr "撤回と移動距離を減らすために、壁のプリント順序を最適化します。ほとんどの部品がこの設定を有効にしている方が良い印刷結果につながりますが、実際には時間がかかることがありますので、最適化の有無に関わらず印刷時間を比較してください。ビルドプレートの接着タイプにブリムを選択すると最初のレイヤーは最適化されません。" +msgstr "引き戻しと移動距離を減らすために、壁のプリント順序を最適化します。ほとんどの部品がこの設定を有効にしている方が良い印刷結果につながりますが、実際には時間がかかることがありますので、最適化の有無に関わらず印刷時間を比較してください。ビルドプレートの接着タイプにブリムを選択すると最初のレイヤーは最適化されません。" msgctxt "machine_nozzle_tip_outer_diameter label" msgid "Outer Nozzle Diameter" @@ -2514,23 +2514,23 @@ msgstr "ノズル外径" msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" -msgstr "外壁加速度" +msgstr "外側ウォール加速度" msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" -msgstr "外壁用エクストルーダー" +msgstr "外側ウォール用エクストルーダー" msgctxt "wall_0_material_flow label" msgid "Outer Wall Flow" -msgstr "外壁のフロー" +msgstr "外側ウォールのフロー" msgctxt "wall_0_inset label" msgid "Outer Wall Inset" -msgstr "外壁はめ込み" +msgstr "外側ウォールはめ込み" msgctxt "jerk_wall_0 label" msgid "Outer Wall Jerk" -msgstr "外壁ジャーク" +msgstr "外側ウォールジャーク" msgctxt "wall_line_width_0 label" msgid "Outer Wall Line Width" @@ -2538,15 +2538,15 @@ msgstr "外側ウォールライン幅" msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" -msgstr "外壁速度" +msgstr "外側ウォール速度" msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" -msgstr "外壁移動距離" +msgstr "外側ウォールワイプ距離" msgctxt "group_outer_walls description" msgid "Outer walls of different islands in the same layer are printed in sequence. When enabled the amount of flow changes is limited because walls are printed one type at a time, when disabled the number of travels between islands is reduced because walls in the same islands are grouped." -msgstr "同じレイヤー内の異なる島の外壁は順次印刷されます。有効にすると、壁は1つの種類ずつ印刷されるため、フローの変化量が制限されます。無効にすると、同じ島の壁がグループ化されるため、島間の移動回数が減少します。" +msgstr "同じレイヤー内の異なる島の外側ウォールは順次印刷されます。有効にすると、ウォールは1つの種類ずつ印刷されるため、フローの変化量が制限されます。無効にすると、同じ島のウォールがグループ化されるため、島間の移動回数が減少します。" msgctxt "brim_location option outside" msgid "Outside Only" @@ -2558,15 +2558,15 @@ msgstr "外側から内側へ" msgctxt "wall_overhang_angle label" msgid "Overhanging Wall Angle" -msgstr "張り出し壁アングル" +msgstr "オーバーハングウォール角" msgctxt "wall_overhang_speed_factor label" msgid "Overhanging Wall Speed" -msgstr "張り出し壁速度" +msgstr "オーバーハングウォール速度" msgctxt "wall_overhang_speed_factor description" msgid "Overhanging walls will be printed at this percentage of their normal print speed." -msgstr "張り出し壁は、この割合で通常の印刷速度で印刷されます。" +msgstr "オーバーハングウォールは、通常の印刷速度に対して指定された割合で印刷されます。" msgctxt "wipe_pause description" msgid "Pause after the unretract." @@ -2574,7 +2574,7 @@ msgstr "引き戻し前に一時停止します。" msgctxt "bridge_fan_speed description" msgid "Percentage fan speed to use when printing bridge walls and skin." -msgstr "ブリッジ壁とスキンを印刷する際に使用するファン速度の割合。" +msgstr "ブリッジウォールとスキンを印刷する際に使用するファン速度の割合。" msgctxt "bridge_fan_speed_2 description" msgid "Percentage fan speed to use when printing the second bridge skin layer." @@ -2590,7 +2590,7 @@ msgstr "サードブリッジのスキンレイヤーを印刷する際に使用 msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." -msgstr "この量よりも小さい円周を持つスライスレイヤーのポリゴンは、除外されます。値を小さくすると、スライス時間のコストで、メッシュの解像度が高くなります。つまり、ほとんどが高解像 SLA プリンター、極小多機能 3D モデルです。" +msgstr "この量よりも小さい円周を持つスライスレイヤーのポリゴンが除外されます。値を小さくすると、スライス時間が増加しますがメッシュの解像度が高くなります。多くの場合、高解像SLAプリンターや非常に小さく細かい3Dモデル向けの設定です。" msgctxt "support_tree_angle_slow label" msgid "Preferred Branch Angle" @@ -2598,7 +2598,7 @@ msgstr "希望枝角度" msgctxt "wall_transition_filter_deviation description" msgid "Prevent transitioning back and forth between one extra wall and one less. This margin extends the range of line widths which follow to [Minimum Wall Line Width - Margin, 2 * Minimum Wall Line Width + Margin]. Increasing this margin reduces the number of transitions, which reduces the number of extrusion starts/stops and travel time. However, large line width variation can lead to under- or overextrusion problems." -msgstr "1つ外側のウォールと1つ内側のウォールの間を行き来することを防止します。このマージンは、続くライン幅の範囲を［最小ウォールライン幅 - マージン, 2 * 最小ウォールライン幅 + マージン］に拡張します。このマージンを増やすと移行の回数が減り、押出の開始/停止回数が減少し、移動時間が短縮されます。ただし、ライン幅の変化が大きいと、押出不足や押出過多の問題が発生することがあります。" +msgstr "1つ外側のウォールと1つ内側のウォールの間を行き来することを防止します。このマージンは、続くライン幅の範囲を［最小ウォールライン幅 - マージン, 2 * 最小ウォールライン幅 + マージン］に拡張します。このマージンを増やすと移行の回数が減り、押出の開始/停止回数が減少し、移動時間が短縮されます。ただし、ライン幅の変化が大きいと、押出不足や押出過多の問題が発生する場合があります。" msgctxt "acceleration_prime_tower label" msgid "Prime Tower Acceleration" @@ -2686,15 +2686,15 @@ msgstr "印刷速度" msgctxt "fill_outline_gaps label" msgid "Print Thin Walls" -msgstr "薄壁印刷" +msgstr "薄いウォールを印刷" msgctxt "brim_location description" msgid "Print a brim on the outside of the model, inside, or both. Depending on the model, this helps reducing the amount of brim you need to remove afterwards, while ensuring a proper bed adhesion." -msgstr "モデルの外側,内側,またはその両方にブリムを印刷します。モデルによっては,これによりベッドの適切な接着を確保しながら,後で取り外す必要があるブリムの量を減らすことができます。" +msgstr "モデルの外側、内側、またはその両方にブリムを印刷します。モデルによっては、これによりベッドの適切な接着を確保しながら、後で取り外す必要があるブリムの量を減らすことができます。" msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." -msgstr "印刷物の横にタワーを造形して、ノズル交換後にフィラメントの調整をします。" +msgstr "印刷物の隣に、ノズルを切り替えた後の材料でタワーを作成します。" msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." @@ -2714,7 +2714,7 @@ msgstr "ノズルサイズよりも細い壁を作ります。" msgctxt "raft_surface_monotonic description" msgid "Print raft top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes the surface look more consistent, which is also visible on the model bottom surface." -msgstr "ラフト上面のラインを,常に単一方向の隣接するラインと重なる順序で印刷します。これにより,印刷に少し時間がかかりますが,表面の見た目がより均一になり,これはモデルの底面にも表示されます。" +msgstr "ラフト上層部のラインを、常に単一方向の隣接するラインと重なる順序で印刷します。これにより印刷に少し時間がかかりますが、モデルの表面や底面の見た目がより均一になります。" msgctxt "bridge_skin_speed_2 description" msgid "Print speed to use when printing the second bridge skin layer." @@ -2734,8 +2734,7 @@ msgstr "印刷温度警告" msgctxt "infill_before_walls description" msgid "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface." -msgstr "壁より前にインフィルをプリントします　はじめに壁をプリントするとより精密な壁になりますが、オーバーハングのプリントは悪化します" -"はじめにインフィルをプリントすると丈夫な壁になりますが、インフィルの模様が時折表面から透けて表れます。" +msgstr "ウォールより前にインフィルをプリントします。ウォールからプリントするとより精密な壁になりますが、オーバーハングのプリントは悪化します。インフィルからプリントすると丈夫な壁になりますが、インフィルの模様が時折表面から透けて表れます。" msgctxt "roofing_monotonic description" msgid "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." @@ -2759,7 +2758,7 @@ msgstr "最も内側のスカートラインを複数のレイヤーに分けて msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." -msgstr "すべてのレイヤーごとに予備の壁を印刷します。このようにして、インフィルは余分な壁の間に挟まれ、より強い印刷物が得られる。" +msgstr "すべてのレイヤーごとに予備のウォールを印刷します。これによりインフィルは追加の壁に挟まれ、より強い印刷物が得られます。" msgctxt "resolution label" msgid "Quality" @@ -2779,63 +2778,63 @@ msgstr "ラフト間のラップ" msgctxt "raft_base_margin label" msgid "Raft Base Extra Margin" -msgstr "ラフトベースの追加マージン" +msgstr "ラフト土台の追加マージン" msgctxt "raft_base_extruder_nr label" msgid "Raft Base Extruder" -msgstr "ラフトベースエクストルーダー" +msgstr "ラフト土台用エクストルーダー" msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" -msgstr "ラフトベースファン速度" +msgstr "ラフト土台ファン速度" msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" -msgstr "ラフトベースラインスペース" +msgstr "ラフト土台のライン間隔" msgctxt "raft_base_line_width label" msgid "Raft Base Line Width" -msgstr "ラフトベースライン幅" +msgstr "ラフト土台のライン幅" msgctxt "raft_base_acceleration label" msgid "Raft Base Print Acceleration" -msgstr "ラフトベース印刷加速度" +msgstr "ラフト土台の印刷加速度" msgctxt "raft_base_jerk label" msgid "Raft Base Print Jerk" -msgstr "ラフトベース印刷ジャーク" +msgstr "ラフト土台の印刷ジャーク" msgctxt "raft_base_speed label" msgid "Raft Base Print Speed" -msgstr "ラフトベース印刷速度" +msgstr "ラフト土台の印刷速度" msgctxt "raft_base_smoothing label" msgid "Raft Base Smoothing" -msgstr "ラフトベースのスムージング" +msgstr "ラフト土台のスムージング" msgctxt "raft_base_thickness label" msgid "Raft Base Thickness" -msgstr "ラフトベース厚さ" +msgstr "ラフト土台の厚さ" msgctxt "raft_base_wall_count label" msgid "Raft Base Wall Count" -msgstr "ラフトベースウォール数" +msgstr "ラフト土台のウォール数" msgctxt "raft_margin label" msgid "Raft Extra Margin" -msgstr "ラフトの余分なマージン" +msgstr "ラフトの追加マージン" msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" -msgstr "ラフトファン速度" +msgstr "ラフトのファン速度" msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" -msgstr "ラフトの中央の追加マージン" +msgstr "ラフト中間層の追加マージン" msgctxt "raft_interface_extruder_nr label" msgid "Raft Middle Extruder" -msgstr "ラフト中間エクストルーダー" +msgstr "ラフト中間層用エクストルーダー" msgctxt "raft_interface_fan_speed label" msgid "Raft Middle Fan Speed" @@ -2843,11 +2842,11 @@ msgstr "ラフト中間層ファン速度" msgctxt "raft_interface_layers label" msgid "Raft Middle Layers" -msgstr "ラフト中間レイヤー" +msgstr "ラフト中間層レイヤー数" msgctxt "raft_interface_line_width label" msgid "Raft Middle Line Width" -msgstr "ラフト中央ライン幅" +msgstr "ラフト中間層ライン幅" msgctxt "raft_interface_acceleration label" msgid "Raft Middle Print Acceleration" @@ -2859,23 +2858,23 @@ msgstr "ラフト中間層印刷ジャーク" msgctxt "raft_interface_speed label" msgid "Raft Middle Print Speed" -msgstr "ラフト中間印刷速度" +msgstr "ラフト中間層印刷速度" msgctxt "raft_interface_smoothing label" msgid "Raft Middle Smoothing" -msgstr "ラフト中央のスムージング" +msgstr "ラフト中間層スムージング" msgctxt "raft_interface_line_spacing label" msgid "Raft Middle Spacing" -msgstr "ラフト中間スペース" +msgstr "ラフト中間層スペース" msgctxt "raft_interface_thickness label" msgid "Raft Middle Thickness" -msgstr "ラフト中央厚さ" +msgstr "ラフト中間層の厚さ" msgctxt "raft_interface_wall_count label" msgid "Raft Middle Wall Count" -msgstr "ラフト中央の壁の数" +msgstr "ラフト中間層のウォール数" msgctxt "raft_acceleration label" msgid "Raft Print Acceleration" @@ -2891,31 +2890,31 @@ msgstr "ラフト印刷速度" msgctxt "raft_smoothing label" msgid "Raft Smoothing" -msgstr "ラフト補整" +msgstr "ラフトスムージング" msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" -msgstr "ラフト上部の追加マージン" +msgstr "ラフト上層部の追加マージン" msgctxt "raft_surface_extruder_nr label" msgid "Raft Top Extruder" -msgstr "ラフトトップエクストルーダー" +msgstr "ラフト上層部用エクストルーダー" msgctxt "raft_surface_fan_speed label" msgid "Raft Top Fan Speed" -msgstr "ラフト上層ファン速度" +msgstr "ラフト上層部ファン速度" msgctxt "raft_surface_thickness label" msgid "Raft Top Layer Thickness" -msgstr "ラフト最上層厚さ" +msgstr "ラフト上層部の厚さ" msgctxt "raft_surface_layers label" msgid "Raft Top Layers" -msgstr "ラフト最上層" +msgstr "ラフト上層部レイヤー数" msgctxt "raft_surface_line_width label" msgid "Raft Top Line Width" -msgstr "ラフト最上ライン幅" +msgstr "ラフト上層部ライン幅" msgctxt "raft_surface_acceleration label" msgid "Raft Top Print Acceleration" @@ -2923,27 +2922,27 @@ msgstr "ラフト上層層印刷加速度" msgctxt "raft_surface_jerk label" msgid "Raft Top Print Jerk" -msgstr "ラフト上層印刷ジャーク" +msgstr "ラフト上層部印刷ジャーク" msgctxt "raft_surface_speed label" msgid "Raft Top Print Speed" -msgstr "ラフト上層印刷速度" +msgstr "ラフト上層部印刷速度" msgctxt "raft_surface_smoothing label" msgid "Raft Top Smoothing" -msgstr "ラフト上部のスムージング" +msgstr "ラフト上層部のスムージング" msgctxt "raft_surface_line_spacing label" msgid "Raft Top Spacing" -msgstr "ラフト最上面スペース" +msgstr "ラフト上層部スペース" msgctxt "raft_surface_wall_count label" msgid "Raft Top Wall Count" -msgstr "ラフト上部の壁の数" +msgstr "ラフト上層部のウォール数" msgctxt "raft_wall_count label" msgid "Raft Wall Count" -msgstr "ラフトの壁の数" +msgstr "ラフトのウォール数" msgctxt "z_seam_type option random" msgid "Random" @@ -2959,7 +2958,7 @@ msgstr "どのインフィルラインが最初に印刷されるかをランダ msgctxt "magic_fuzzy_skin_enabled description" msgid "Randomly jitter while printing the outer wall, so that the surface has a rough and fuzzy look." -msgstr "外壁を印刷する際に振動が起こり、表面が粗くてぼやける。" +msgstr "外側のウォールを印刷する際ランダムに振動を起こし、表面を粗くぼやけた見た目にします。" msgctxt "machine_shape option rectangular" msgid "Rectangular" @@ -2999,7 +2998,7 @@ msgstr "重複メッシュの削除" msgctxt "raft_base_remove_inside_corners label" msgid "Remove Raft Base Inside Corners" -msgstr "ラフトベースの内側の角を削除" +msgstr "ラフト土台内側の角を削除" msgctxt "raft_remove_inside_corners label" msgid "Remove Raft Inside Corners" @@ -3007,15 +3006,15 @@ msgstr "ラフト内側コーナーの削除" msgctxt "raft_interface_remove_inside_corners label" msgid "Remove Raft Middle Inside Corners" -msgstr "ラフト中央の内側の角を削除" +msgstr "ラフト中間層内側の角を削除" msgctxt "raft_surface_remove_inside_corners label" msgid "Remove Raft Top Inside Corners" -msgstr "ラフト上部の内側の角を削除" +msgstr "ラフト上層部の内側の角を削除" msgctxt "carve_multiple_volumes description" msgid "Remove areas where multiple meshes are overlapping with each other. This may be used if merged dual material objects overlap with each other." -msgstr "複数のメッシュが重なっている領域を削除します。これは、結合された2つのマテリアルのオブジェクトが互いに重なっている場合に使用されます。" +msgstr "複数のメッシュが重なっている領域を削除します。これは、結合された2つの材料のオブジェクトが互いに重なっている場合に使用されます。" msgctxt "remove_empty_first_layers description" msgid "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle." @@ -3023,15 +3022,15 @@ msgstr "最初に印刷したレイヤーの下に空のレイヤーがある場 msgctxt "raft_base_remove_inside_corners description" msgid "Remove inside corners from the raft base, causing the raft to become convex." -msgstr "ラフトベースから内側の角を取り除き,ラフトを凸状にします。" +msgstr "ラフト土台から内側の角を取り除き、ラフトを凸状にします。" msgctxt "raft_interface_remove_inside_corners description" msgid "Remove inside corners from the raft middle part, causing the raft to become convex." -msgstr "ラフトの中央から内側の角を取り除き,ラフトを凸状にします。" +msgstr "ラフト中間層から内側の角を取り除き、ラフトを凸状にします。" msgctxt "raft_surface_remove_inside_corners description" msgid "Remove inside corners from the raft top part, causing the raft to become convex." -msgstr "ラフトの上部から内側の角を取り除き,ラフトを凸状にします。" +msgstr "ラフト上層部から内側の角を取り除き、ラフトを凸状にします。" msgctxt "raft_remove_inside_corners description" msgid "Remove inside corners from the raft, causing the raft to become convex." @@ -3051,7 +3050,7 @@ msgstr "Repetier" msgctxt "skin_outline_count description" msgid "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material." -msgstr "上部/下部パターンの最も外側の部分を同心円の線で置き換えます。 1つまたは2つの線を使用すると、トップ部分の造形が改善されます。" +msgstr "上部/下部パターンの最も外側の部分を同心円の線で置き換えます。 1つまたは2つの線を使用すると、インフィル材料で開始するトップ部分の造形が改善されます。" msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" @@ -3059,11 +3058,11 @@ msgstr "設定されたしきい値を超えたイベントのレポート" msgctxt "support_tree_rest_preference label" msgid "Rest Preference" -msgstr "希望配置" +msgstr "土台設定" msgctxt "travel_retract_before_outer_wall label" msgid "Retract Before Outer Wall" -msgstr "外壁の前に引き戻す" +msgstr "外側ウォールの前に引き戻す" msgctxt "retract_at_layer_change label" msgid "Retract at Layer Change" @@ -3071,11 +3070,11 @@ msgstr "レイヤー変更時に引き戻す" msgctxt "retraction_enable description" msgid "Retract the filament when the nozzle is moving over a non-printed area." -msgstr "ノズルが印刷しないで良い領域を移動する際にフィラメントを引き戻す。" +msgstr "ノズルが印刷しない領域を移動する際にフィラメントを引き戻します。" msgctxt "wipe_retraction_enable description" msgid "Retract the filament when the nozzle is moving over a non-printed area." -msgstr "ノズルが印刷しないで良い領域を移動する際にフィラメントを引き戻す。" +msgstr "ノズルが印刷しない領域を移動する際にフィラメントを引き戻します。" msgctxt "retract_at_layer_change description" msgid "Retract the filament when the nozzle is moving to the next layer." @@ -3087,7 +3086,7 @@ msgstr "引き戻し距離" msgctxt "retraction_extra_prime_amount label" msgid "Retraction Extra Prime Amount" -msgstr "余分な押し戻し量の引き戻し" +msgstr "引き戻し後の押し出し量" msgctxt "retraction_min_travel label" msgid "Retraction Minimum Travel" @@ -3095,11 +3094,11 @@ msgstr "引き戻し最小移動距離" msgctxt "retraction_prime_speed label" msgid "Retraction Prime Speed" -msgstr "押し戻し速度の取り消し" +msgstr "引き戻し後の押し戻し速度" msgctxt "retraction_retract_speed label" msgid "Retraction Retract Speed" -msgstr "引き戻し速度の取り消し" +msgstr "引き戻し速度" msgctxt "retraction_speed label" msgid "Retraction Speed" @@ -3115,7 +3114,7 @@ msgstr "ファン速度を0～1にスケール" msgctxt "machine_scale_fan_speed_zero_to_one description" msgid "Scale the fan speed to be between 0 and 1 instead of between 0 and 256." -msgstr "ファン速度は0〜256ではなく、0〜1になるようスケールします。" +msgstr "ファン速度を0～256ではなく、0～1でスケールします。" msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" @@ -3175,15 +3174,15 @@ msgstr "スキンエッジサポートの厚さ" msgctxt "expand_skins_expand_distance label" msgid "Skin Expand Distance" -msgstr "表面展開距離" +msgstr "表面拡張距離" msgctxt "skin_overlap_mm label" msgid "Skin Overlap" -msgstr "表面公差" +msgstr "表面重複" msgctxt "skin_overlap label" msgid "Skin Overlap Percentage" -msgstr "表面公差量" +msgstr "表面重複率" msgctxt "skin_preshrink label" msgid "Skin Removal Width" @@ -3191,11 +3190,11 @@ msgstr "表面除去幅" msgctxt "min_skin_width_for_expansion description" msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "これより狭いスキン領域は展開されません。モデル表面に、垂直に近い斜面がある場合に作成される狭いスキン領域の拡大を回避するためです。" +msgstr "これより狭いスキン領域は拡張されません。モデル表面に、垂直に近い斜面がある場合に作成される狭いスキン領域の拡大を回避するためです。" msgctxt "support_zag_skip_count description" msgid "Skip one in every N connection lines to make the support structure easier to break away." -msgstr "毎行Nミリ時に、サポートの接続をわざとスキップし、後のサポート材の構造をもろくし、壊れやすくする。" +msgstr "Nミリメートルごとに1度、サポートの接続をスキップして、サポート材を外れやすくします。" msgctxt "support_skip_some_zags description" msgid "Skip some support line connections to make the support structure easier to break away. This setting is applicable to the Zig Zag support infill pattern." @@ -3287,7 +3286,7 @@ msgstr "小型形体は通常のプリント速度に対してこの割合でプ msgctxt "small_skin_width description" msgid "Small top/bottom regions are filled with walls instead of the default top/bottom pattern. This helps to avoids jerky motions. Off for the topmost (air-exposed) layer by default (see 'Small Top/Bottom On Surface')." -msgstr "小さな上部/下部領域は、デフォルトの上部/下部パターンの代わりに壁で埋められます。これにより、ぎくしゃくした動きを防げます。デフォルトでは最上位の（空気にさらされている）レイヤーはオフになっています（「表面の小さな上部/下部」を参照）。" +msgstr "小さな上部/下部領域は、デフォルトの上部/下部パターンの代わりにウォールで構成されます。これにより、ぎくしゃくした動きを防げます。デフォルトでは最上位の（空気にさらされている）レイヤーはオフになっています（「表面の小さな上部/下部」を参照）。" msgctxt "brim_smart_ordering label" msgid "Smart Brim" @@ -3307,11 +3306,11 @@ msgstr "らせん状の輪郭を滑らかにしてZシームの視認性を低 msgctxt "retraction_extra_prime_amount description" msgid "Some material can ooze away during a travel move, which can be compensated for here." -msgstr "マテリアルによっては、移動中に滲み出てきてしまうときがあり、ここで調整することができます。" +msgstr "材料によっては移動中に滲み出てきてしまう場合があり、これにより調整できます。" msgctxt "wipe_retraction_extra_prime_amount description" msgid "Some material can ooze away during a wipe travel moves, which can be compensated for here." -msgstr "いくつかの材料は、ワイプ移動中ににじみ出るためここで補償することができます。" +msgstr "材料によってはワイプ移動中に滲み出てきてしまう場合があり、これにより調整できます。" msgctxt "blackmagic label" msgid "Special Modes" @@ -3343,7 +3342,7 @@ msgstr "スタンバイ温度" msgctxt "machine_start_gcode label" msgid "Start G-code" -msgstr "G-Codeの開始" +msgstr "開始G-Code" msgctxt "z_seam_type description" msgid "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker." @@ -3431,7 +3430,7 @@ msgstr "支持材床面フロー" msgctxt "support_bottom_offset label" msgid "Support Floor Horizontal Expansion" -msgstr "サポートフロア水平展開" +msgstr "サポートフロア水平拡張" msgctxt "jerk_support_bottom label" msgid "Support Floor Jerk" @@ -3467,7 +3466,7 @@ msgstr "支持材のフロー" msgctxt "support_offset label" msgid "Support Horizontal Expansion" -msgstr "サポート水平展開" +msgstr "サポート水平拡張" msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" @@ -3495,55 +3494,55 @@ msgstr "サポートインフィル速度" msgctxt "acceleration_support_interface label" msgid "Support Interface Acceleration" -msgstr "サポートインタフェース加速度" +msgstr "サポート境界面加速度" msgctxt "support_interface_density label" msgid "Support Interface Density" -msgstr "サポートインタフェース密度" +msgstr "サポート境界面密度" msgctxt "support_interface_extruder_nr label" msgid "Support Interface Extruder" -msgstr "サポートインタフェースエクストルーダー" +msgstr "サポート境界面用エクストルーダー" msgctxt "support_interface_material_flow label" msgid "Support Interface Flow" -msgstr "支持材界面フロー" +msgstr "サポート境界面フロー" msgctxt "support_interface_offset label" msgid "Support Interface Horizontal Expansion" -msgstr "サポートインターフェイス水平展開" +msgstr "サポート境界面水平拡張" msgctxt "jerk_support_interface label" msgid "Support Interface Jerk" -msgstr "サポートインタフェースジャーク" +msgstr "サポート境界面ジャーク" msgctxt "support_interface_angles label" msgid "Support Interface Line Directions" -msgstr "サポート面のライン方向" +msgstr "サポート境界面のライン方向" msgctxt "support_interface_line_width label" msgid "Support Interface Line Width" -msgstr "サポート面のライン幅" +msgstr "サポート境界面のライン幅" msgctxt "support_interface_pattern label" msgid "Support Interface Pattern" -msgstr "サポートインタフェースパターン" +msgstr "サポート境界面パターン" msgctxt "support_interface_priority label" msgid "Support Interface Priority" -msgstr "サポートインターフェイスの優先順位" +msgstr "サポート境界面の優先順位" msgctxt "speed_support_interface label" msgid "Support Interface Speed" -msgstr "サポートインタフェース速度" +msgstr "サポート境界面の速度" msgctxt "support_interface_height label" msgid "Support Interface Thickness" -msgstr "サポートインタフェース厚さ" +msgstr "サポート境界面の厚さ" msgctxt "support_interface_wall_count label" msgid "Support Interface Wall Line Count" -msgstr "サポートインターフェースのウォールライン数" +msgstr "サポート境界面のウォールライン数" msgctxt "jerk_support label" msgid "Support Jerk" @@ -3595,7 +3594,7 @@ msgstr "支持材天井面フロー" msgctxt "support_roof_offset label" msgid "Support Roof Horizontal Expansion" -msgstr "サポートルーフ水平展開" +msgstr "サポートルーフ水平拡張" msgctxt "jerk_support_roof label" msgid "Support Roof Jerk" @@ -3703,7 +3702,7 @@ msgstr "最も内側のブリムラインと2番目に内側のブリムライ msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." -msgstr "交差するメッシュがどのレイヤーに属しているかを切り替えることで、オーバーラップしているメッシュを絡み合うようにします。この設定をオフにすると、一方のメッシュはオーバーラップ内のすべてのボリュームを取得し、他方のメッシュは他から削除されます。" +msgstr "重複するメッシュがどのレイヤーに属しているかを切り替えることで、重なったメッシュが絡み合うようにします。この設定をオフにすると、一方のメッシュは重複内すべてのボリュームを取得し、他方のメッシュは他から削除されます。" msgctxt "adaptive_layer_height_threshold description" msgid "Target horizontal distance between two adjacent layers. Reducing this setting causes thinner layers to be used to bring the edges of the layers closer together." @@ -3711,7 +3710,7 @@ msgstr "隣接する2つのレイヤー間の目標水平距離。この設定 msgctxt "layer_start_x description" msgid "The X coordinate of the position near where to find the part to start printing each layer." -msgstr "各レイヤーのプリントを開始する部分をしめすX座標。" +msgstr "各レイヤーの印刷を開始する基準地点のX座標。" msgctxt "z_seam_x description" msgid "The X coordinate of the position near where to start printing each part in a layer." @@ -3720,11 +3719,11 @@ msgstr "レイヤー内の各印刷を開始するX座" msgctxt "extruder_prime_pos_x description" msgid "The X coordinate of the position where the nozzle primes at the start of printing." -msgstr "プリント開始時のノズルの位置を表すX座標。" +msgstr "プリント開始時における主要ノズル地点のX座標。" msgctxt "layer_start_y description" msgid "The Y coordinate of the position near where to find the part to start printing each layer." -msgstr "各レイヤーのプリントを開始する部分をしめすY座標。" +msgstr "各レイヤーの印刷を開始する基準地点のY座標。" msgctxt "z_seam_y description" msgid "The Y coordinate of the position near where to start printing each part in a layer." @@ -3732,11 +3731,11 @@ msgstr "レイヤー内の各パーツの印刷を開始する場所の近くの msgctxt "extruder_prime_pos_y description" msgid "The Y coordinate of the position where the nozzle primes at the start of printing." -msgstr "プリント開始時にノズル位置を表すY座標。" +msgstr "プリント開始時における主要ノズル地点のY座標。" msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." -msgstr "印刷開始時にノズルがポジションを確認するZ座標。" +msgstr "プリント開始時における主要ノズル地点のZ座標。" msgctxt "acceleration_print_layer_0 description" msgid "The acceleration during the printing of the initial layer." @@ -3748,11 +3747,11 @@ msgstr "初期レイヤーの加速度。" msgctxt "acceleration_travel_layer_0 description" msgid "The acceleration for travel moves in the initial layer." -msgstr "最初のレイヤー時の加速度。" +msgstr "初期レイヤーに適用される移動加速度。" msgctxt "jerk_travel_layer_0 description" msgid "The acceleration for travel moves in the initial layer." -msgstr "移動加速度は最初のレイヤーに適用されます。" +msgstr "初期レイヤーに適用される移動加速度。" msgctxt "acceleration_wall_x description" msgid "The acceleration with which all inner walls are printed." @@ -3788,7 +3787,7 @@ msgstr "ラフトの中間層印刷時の加速度。" msgctxt "acceleration_wall_0 description" msgid "The acceleration with which the outermost walls are printed." -msgstr "最も外側の壁をプリントする際の加速度。" +msgstr "最も外側のウォールをプリントする際の加速度。" msgctxt "acceleration_prime_tower description" msgid "The acceleration with which the prime tower is printed." @@ -3816,15 +3815,15 @@ msgstr "サポート材プリント時の加速スピード。" msgctxt "raft_surface_acceleration description" msgid "The acceleration with which the top raft layers are printed." -msgstr "ラフトのトップ印刷時の加速度。" +msgstr "ラフトの上層部印刷時の加速度。" msgctxt "acceleration_wall_x_roofing description" msgid "The acceleration with which the top surface inner walls are printed." -msgstr "上面内壁が印刷される際の加速度" +msgstr "最上部内側のウォールをプリントする際の加速度。" msgctxt "acceleration_wall_0_roofing description" msgid "The acceleration with which the top surface outermost walls are printed." -msgstr "上面の最外壁が印刷される際の加速度" +msgstr "最上部の最も外側のウォールが印刷される際の加速度。" msgctxt "acceleration_wall description" msgid "The acceleration with which the walls are printed." @@ -3844,15 +3843,15 @@ msgstr "移動中の加速度。" msgctxt "ironing_flow description" msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "アイロン時にノズルから出しておくフィラメントの量。多少出しておくと裂け目を綺麗にします。ただ出し過ぎると吐出過多になり、端が荒れます。" +msgstr "通常のスキンラインに対してアイロン時にノズルから吐出するフィラメントの量。ノズルが常に材料で満たされた状態を保つことで、表面の溝を埋めるのに役立ちます。ただし多過ぎると側面が粗くなります。" msgctxt "infill_overlap description" msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルと壁のオーバーラップ量 (インフィルライン幅に対する%)。少しのオーバーラップによって壁がインフィルにしっかりつながります。" +msgstr "インフィルのライン幅に対する割合で示される、インフィルとウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルと壁が交差する量、わずかな交差によって壁がインフィルにしっかりつながります。" +msgstr "インフィルと壁が重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "switch_extruder_retraction_amount description" msgid "The amount of retraction when switching extruders. Set to 0 for no retraction at all. This should generally be the same as the length of the heat zone." @@ -3876,7 +3875,7 @@ msgstr "基部に向かって徐々に太くなる枝の直径の角度。角度 msgctxt "support_conical_angle description" msgid "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top." -msgstr "円錐形のサポートの傾きの角度。 0度は垂直であり、90度は水平である。角度が小さいと、サポートはより頑丈になりますが、より多くのマテリアルが必要になります。負の角度は、サポートのベースがトップよりも広くなります。" +msgstr "円錐形のサポートの傾きの角度。 0度は垂直で、90度は水平になります。角度が小さいとサポートはより頑丈になりますが、より多くの材料が必要になります。負の角度は、サポートのベースがトップよりも広くなります。" msgctxt "magic_fuzzy_skin_point_density description" msgid "The average density of points introduced on each polygon in a layer. Note that the original points of the polygon are discarded, so a low density results in a reduction of the resolution." @@ -3896,7 +3895,7 @@ msgstr "プリントヘッド移動のデフォルトの加速度。" msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "印刷中のデフォルトの温度。これはマテリアルの基本温度となります。他のすべての造形温度はこの値に基づいてオフセットする必要があります" +msgstr "印刷中のデフォルトの温度。これは材料の基本温度となります。他のすべての造形温度はこの値に基づいてオフセットされます" msgctxt "default_material_bed_temperature description" msgid "The default temperature used for the heated build plate. This should be the \"base\" temperature of a build plate. All other print temperatures should use offsets based on this value" @@ -3912,7 +3911,7 @@ msgstr "サポート構造のフロアの密度です。高い値は、サポー msgctxt "support_roof_density description" msgid "The density of the roofs of the support structure. A higher value results in better overhangs, but the supports are harder to remove." -msgstr "サポート材のルーフの部分の密度を調整します　大きな値ではオーバーハングの成功率があがりますが、サポート材が除去しにくくなります。" +msgstr "サポート材のルーフ部分の密度を調整します。値を大きくするとオーバーハングの成功率が上がりますが、サポート材が除去しにくくなります。" msgctxt "bridge_skin_density_2 description" msgid "The density of the second bridge skin layer. Values less than 100 will increase the gaps between the skin lines." @@ -3960,15 +3959,15 @@ msgstr "ノズルが既に印刷された部分を移動する際の間隔。" msgctxt "raft_base_line_spacing description" msgid "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate." -msgstr "ベースラフト層のラフトライン間の距離。広い間隔は、ブルドプレートからのラフトの除去を容易にする。" +msgstr "ラフトの土台層のラフトライン間の距離。間隔を広くすると、ラフトをブルドプレートから外すのが簡単になります。" msgctxt "raft_interface_line_spacing description" msgid "The distance between the raft lines for the middle raft layer. The spacing of the middle should be quite wide, while being dense enough to support the top raft layers." -msgstr "中間ラフト層とラフト線の間の距離。中央の間隔はかなり広くなければならず、トップラフト層を支えるために十分な密度でなければならない。" +msgstr "ラフトの中間層とラフトラインとの距離。中間層の間隔はかなり広くなければならず、ラフトの上層部を支えるために十分な密度であるべきです。" msgctxt "raft_surface_line_spacing description" msgid "The distance between the raft lines for the top raft layers. The spacing should be equal to the line width, so that the surface is solid." -msgstr "上のラフト層とラフト線の間の距離。間隔は線の幅と同じにして、サーフェスがソリッドになるようにします。" +msgstr "ラフトの上層部とラフト線との距離。サーフェスが強固になるよう、間隔は線の幅と同じなるようにします。" msgctxt "prime_tower_raft_base_line_spacing description" msgid "The distance between the raft lines for the unique prime tower raft layer. Wide spacing makes for easy removal of the raft from the build plate." @@ -3976,7 +3975,7 @@ msgstr "プライムタワーラフト層の独自のラフトライン間の距 msgctxt "interlocking_depth description" msgid "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion." -msgstr "インターロック構造を生成するモデル間の境界からの距離（セル単位）。セルが少なすぎると密着性が低下します。" +msgstr "インターロック構造を生成するモデル間の境界からの距離（セル単位）。セルが少なすぎると接着が低下します。" msgctxt "brim_width description" msgid "The distance from the model to the outermost brim line. A larger brim enhances adhesion to the build plate, but also reduces the effective print area." @@ -3992,15 +3991,15 @@ msgstr "ノズルからの熱がフィラメントに伝達される距離。" msgctxt "bottom_skin_expand_distance description" msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" +msgstr "スキンがインフィルまで到達する距離です。高い値の場合、スキンはインフィルのパターンに隣接しやすく、近接するウォールのレイヤーもスキンに接着しやすくなります。低い値の場合、材料の使用量を節約します。" msgctxt "expand_skins_expand_distance description" msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" +msgstr "スキンがインフィルまで到達する距離です。高い値の場合、スキンはインフィルのパターンに隣接しやすく、近接するウォールのレイヤーもスキンに接着しやすくなります。低い値の場合、材料の使用量を節約します。" msgctxt "top_skin_expand_distance description" msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" +msgstr "スキンがインフィルまで到達する距離です。高い値の場合、スキンはインフィルのパターンに隣接しやすく、近接するウォールのレイヤーもスキンに接着しやすくなります。低い値の場合、材料の使用量を節約します。" msgctxt "wipe_move_distance description" msgid "The distance to move the head back and forth across the brush." @@ -4048,7 +4047,7 @@ msgstr "スカートまたはブリムをプリントする際に使用するエ msgctxt "adhesion_extruder_nr description" msgid "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion." -msgstr "スカート/ブリム/ラフトをプリントする際のエクストルーダー。これはマルチエクストルージョン時に使用されます。" +msgstr "スカート/ブリム/ラフトをプリントする際のエクストルーダー。複数のエクストルーダーがある場合に使用されます。" msgctxt "support_extruder_nr description" msgid "The extruder train to use for printing the support. This is used in multi-extrusion." @@ -4060,7 +4059,7 @@ msgstr "ラフトのトップレイヤーをプリントする際に使用する msgctxt "infill_extruder_nr description" msgid "The extruder train used for printing infill. This is used in multi-extrusion." -msgstr "インフィル造形時に使われるExtruder。デュアルノズルの場合に利用します。" +msgstr "インフィル造形時に使われるエクストルーダー。デュアルノズルの場合に利用します。" msgctxt "wall_x_extruder_nr description" msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion." @@ -4068,7 +4067,7 @@ msgstr "内壁印刷用のエクストルーダー。デュアルノズル印刷 msgctxt "wall_0_extruder_nr description" msgid "The extruder train used for printing the outer wall. This is used in multi-extrusion." -msgstr "外壁印刷用のエクストルーダー。デュアルノズル印刷時に使用。" +msgstr "外側ウォール印刷用のエクストルーダー。デュアルノズル印刷時に使用。" msgctxt "top_bottom_extruder_nr description" msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." @@ -4088,7 +4087,7 @@ msgstr "ベースラフト層印刷時のファン速度。" msgctxt "raft_interface_fan_speed description" msgid "The fan speed for the middle raft layer." -msgstr "ミドルラフト印刷時のファンの速度。" +msgstr "ミドルラフト層印刷時のファンの速度。" msgctxt "raft_fan_speed description" msgid "The fan speed for the raft." @@ -4108,7 +4107,7 @@ msgstr "画像ファイルの位置。この画像の輝度値でサポートの msgctxt "speed_slowdown_layers description" msgid "The first few layers are printed slower than the rest of the model, to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers." -msgstr "最初の数層は印刷失敗の可能性を軽減させるために、設定した印刷スピードよりも遅く印刷されます。" +msgstr "ビルドプレートとの接着をより良くして印刷成功する可能性を向上させるために、最初の数層を残りのモデルよりも遅く印刷します。スピードはこのレイヤー数にわたって段階的に上昇します。" msgctxt "raft_airgap description" msgid "The gap between the final raft layer and the first layer of the model. Only the first layer is raised by this amount to lower the bonding between the raft layer and the model. Makes it easier to peel off the raft." @@ -4148,7 +4147,7 @@ msgstr "Zホップを実行するときの高さ。" msgctxt "layer_height description" msgid "The height of each layer in mm. Higher values produce faster prints in lower resolution, lower values produce slower prints in higher resolution." -msgstr "各レイヤーの高さ（mm）。値を大きくすると早く印刷しますが荒くなり、小さくすると印刷が遅くなりますが造形が綺麗になります。" +msgstr "各レイヤーの高さ (mm)。値を大きくすると早く印刷しますが荒くなり、小さくすると印刷が遅くなりますが造形が綺麗になります。" msgctxt "gradual_infill_step_height description" msgid "The height of infill of a given density before switching to half the density." @@ -4168,7 +4167,7 @@ msgstr "インターロック構造のビームの高さ（レイヤー数単位 msgctxt "layer_height_0 description" msgid "The height of the initial layer in mm. A thicker initial layer makes adhesion to the build plate easier." -msgstr "初期レイヤーの高さ（mm）。厚い初期層はビルドプレートへの接着を容易にする。" +msgstr "初期レイヤーの高さ (mm)。初期レイヤーが厚くなるとビルドプレートに接着しやすくなります。" msgctxt "prime_tower_base_height description" msgid "The height of the prime tower base. Increasing this value will result in a more sturdy prime tower because the base will be wider. If this setting is too low, the prime tower will not have a sturdy base." @@ -4184,8 +4183,9 @@ msgstr "最初のブリムラインとプリントの最初のレイヤーの輪 msgctxt "skirt_gap description" msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "スカートと印刷の最初の層の間の水平距離。" -"これは最小距離です。複数のスカートラインがこの距離から外側に展開されます。" +msgstr "" +"スカートと印刷の最初の層の間の水平距離。\n" +"これは最小距離です。複数のスカートラインがこの距離から外側に拡張されます。" msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4213,7 +4213,7 @@ msgstr "ミドルラフト層印刷時のジャーク。" msgctxt "raft_jerk description" msgid "The jerk with which the raft is printed." -msgstr "ラフトが印刷時のジャーク。" +msgstr "ラフト印刷時のジャーク。" msgctxt "raft_surface_jerk description" msgid "The jerk with which the top raft layers are printed." @@ -4221,15 +4221,15 @@ msgstr "トップラフト層印刷時のジャーク。" msgctxt "bottom_skin_preshrink description" msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" +msgstr "削除するスキンエリアの最大幅。この値より小さいすべてのスキンエリアが削除されます。これにより、モデルの傾斜表面の上部/下部スキンに費やす時間や材料の量を制限できます。" msgctxt "skin_preshrink description" msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" +msgstr "削除するスキンエリアの最大幅。この値より小さいすべてのスキンエリアは削除されます。これにより、モデルの傾斜表面の上部/下部スキンに費やす時間や材料の量を制限できます。" msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" +msgstr "削除するスキンエリアの最大幅。この値より小さいすべてのスキンエリアが削除されます。これにより、モデルの傾斜表面の上部/下部スキンに費やす時間や材料の量を制限できます。" msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." @@ -4241,7 +4241,7 @@ msgstr "通常速度と最速の間でしきい値を設定する積層時間。 msgctxt "retraction_amount description" msgid "The length of material retracted during a retraction move." -msgstr "引き戻されるマテリアルの長さ。" +msgstr "引き戻される材料の長さ。" msgctxt "prime_tower_base_curve_magnitude description" msgid "The magnitude factor used for the slope of the prime tower base. If you increase this value, the base will become slimmer. If you decrease it, the base will become thicker." @@ -4253,7 +4253,7 @@ msgstr "プリンターに取り付けられているビルドプレートの材 msgctxt "adaptive_layer_height_variation description" msgid "The maximum allowed height different from the base layer height." -msgstr "基準レイヤー高さと比較して許容される最大の高さ。" +msgstr "基準レイヤーの高さと比較して許容される最大の高さ。" msgctxt "ooze_shield_angle description" msgid "The maximum angle a part in the ooze shield will have. With 0 degrees being vertical, and 90 degrees being horizontal. A smaller angle leads to less failed ooze shields, but more material." @@ -4269,7 +4269,7 @@ msgstr "モデルを中心に枝を伸ばす際の枝の最大角度。枝を垂 msgctxt "conical_overhang_hole_size description" msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." -msgstr "モデル底部にある穴の最大領域（「オーバーハング印刷可能」で削除する前の値）。これより小さい穴は保持されます。値が0 mm²の場合、モデル底部にあるすべての穴は充填されます。" +msgstr "モデル底部にある穴の最大領域（「オーバーハング印刷可能」で削除する前の値）。これより小さい穴は保持されます。値が0mm²の場合、モデル底部にあるすべての穴は充填されます。" msgctxt "meshfix_maximum_deviation description" msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." @@ -4277,7 +4277,7 @@ msgstr "最大解像度設定の解像度を下げるときに許容される最 msgctxt "support_join_distance description" msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." -msgstr "支持材間における X/Y 軸方向の最大距離。個別の支持材間の距離がこの値よりも近い場合、支持材は 1 つにマージされます。" +msgstr "サポート材間におけるX/Y軸方向の最大距離。サポート材同士の距離がこの値よりも近い場合、サポート材は1つにマージされます。" msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." @@ -4285,7 +4285,7 @@ msgstr "流量の変化を補正するためにフィラメントを移動する msgctxt "meshfix_maximum_extrusion_area_deviation description" msgid "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller." -msgstr "直線から中間点を削除する際に許容される、押出領域の最大偏差。長い直線では中間点が幅の変化点の役割を果たすこともあります。そのため、中間点を削除すると、ラインの幅が均一になり、結果として押出領域が少し減る（または増える）ことになります。この値を大きくすると、削除が許容される幅の変化点となる中間点が増えるため、真っ直ぐで平行なウォールの間で多少の押出不足（または過多）が発生することがあります。プリントの精度は落ちますが、G-codeは小さくなります。" +msgstr "直線から中間点を削除する際に許容される、押出領域の最大偏差。長い直線では中間点が幅の変化点の役割を果たすこともあります。そのため、中間点を削除すると、ラインの幅が均一になり、結果として押出領域が少し減る（または増える）ことになります。この値を大きくすると、削除が許容される幅の変化点となる中間点が増えるため、真っ直ぐで平行なウォールの間で多少の押出不足（または過多）が発生する場合があります。プリントの精度は落ちますが、G-codeは小さくなります。" msgctxt "jerk_print_layer_0 description" msgid "The maximum instantaneous velocity change during the printing of the initial layer." @@ -4325,7 +4325,7 @@ msgstr "プライムタワーがプリントされる際の最大瞬間速度を msgctxt "jerk_support_interface description" msgid "The maximum instantaneous velocity change with which the roofs and floors of support are printed." -msgstr "どのルーフとフロアのサポート部分を印刷するかによって最大瞬間速度は変化します。" +msgstr "サポートのルーフとフロアを印刷する際の最大瞬間速度変化です。" msgctxt "jerk_support_roof description" msgid "The maximum instantaneous velocity change with which the roofs of support are printed." @@ -4361,7 +4361,7 @@ msgstr "トップとボトムのレイヤーを印刷する際の最大瞬間速 msgctxt "jerk_travel description" msgid "The maximum instantaneous velocity change with which travel moves are made." -msgstr "移動する際の最大瞬時速度の変更。" +msgstr "移動開始時の瞬間速度変化の最大値。" msgctxt "prime_tower_max_bridging_distance description" msgid "The maximum length of the branches which may be printed over the air." @@ -4397,11 +4397,11 @@ msgstr "プリントヘッドの最小移動速度。" msgctxt "material_initial_print_temperature description" msgid "The minimal temperature while heating up to the Printing Temperature at which printing can already start." -msgstr "加熱中、印刷を開始することができる最低の温度。" +msgstr "加熱中、印刷を開始できる最低の温度。" msgctxt "machine_min_cool_heat_time_window description" msgid "The minimal time an extruder has to be inactive before the nozzle is cooled. Only when an extruder is not used for longer than this time will it be allowed to cool down to the standby temperature." -msgstr "ノズルが冷却される前にエクストルーダーが静止しなければならない最短時間。この時間より長時間エクストルーダーを使用しない場合にのみ、スタンバイ温度に冷却することができます。" +msgstr "ノズルが冷却される前にエクストルーダーが静止しなければならない最短時間。この時間より長時間エクストルーダーを使用しない場合にのみ、スタンバイ温度に冷却されます。" msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." @@ -4413,7 +4413,7 @@ msgstr "サポート材がつくオーバーハングの最小角度。0° の msgctxt "retraction_min_travel description" msgid "The minimum distance of travel needed for a retraction to happen at all. This helps to get fewer retractions in a small area." -msgstr "フィラメントを引き戻す際に必要な最小移動距離。これは、短い距離内での引き戻しの回数を減らすために役立ちます。" +msgstr "引き戻しに必要な最小移動距離。これは、短い距離内での引き戻しの回数を減らすために役立ちます。" msgctxt "skirt_brim_minimal_length description" msgid "The minimum length of the skirt or brim. If this length is not reached by all skirt or brim lines together, more skirt or brim lines will be added until the minimum length is reached. Note: If the line count is set to 0 this is ignored." @@ -4421,11 +4421,11 @@ msgstr "スカートまたはブリム最短の長さ。この長さにすべて msgctxt "min_odd_wall_line_width description" msgid "The minimum line width for middle line gap filler polyline walls. This setting determines at which model thickness we switch from printing two wall lines, to printing two outer walls and a single central wall in the middle. A higher Minimum Odd Wall Line Width leads to a higher maximum even wall line width. The maximum odd wall line width is calculated as 2 * Minimum Even Wall Line Width." -msgstr "中央ラインギャップフィラーのポリラインウォールの最小ライン幅。この設定は、2本のウォールラインのプリントから、2個のアウターウォールと中央の1個の中心ウォールのプリントに切り替わるモデルの厚さを決定します。最小奇数ウォールライン幅を大きくすると、最大偶数ウォールライン幅も大きくなります。最大奇数ウォールライン幅は、2×最小偶数ウォールライン幅として計算されます。" +msgstr "中央ラインギャップフィラーのポリラインウォールの最小ライン幅。この設定は、2本のウォールラインのプリントから、2個の外側ウォールと中央の1個の中心ウォールのプリントに切り替わるモデルの厚さを決定します。最小奇数ウォールライン幅を大きくすると、最大偶数ウォールライン幅も大きくなります。最大奇数ウォールライン幅は、2×最小偶数ウォールライン幅として計算されます。" msgctxt "min_even_wall_line_width description" msgid "The minimum line width for normal polygonal walls. This setting determines at which model thickness we switch from printing a single thin wall line, to printing two wall lines. A higher Minimum Even Wall Line Width leads to a higher maximum odd wall line width. The maximum even wall line width is calculated as Outer Wall Line Width + 0.5 * Minimum Odd Wall Line Width." -msgstr "通常の多角形ウォールの最小ライン幅。この設定は、1本の薄いウォールラインのプリントから、2本のウォールラインのプリントに切り替わるモデルの厚さを決定します。最小偶数ウォールライン幅を大きくすると、最大奇数ウォールライン幅も大きくなります。最大偶数ウォールライン幅は、アウターウォールライン幅 + 0.5 * 最小奇数ウォールライン幅として計算されます。" +msgstr "通常の多角形ウォールの最小ライン幅。この設定は、1本の薄いウォールラインのプリントから、2本のウォールラインのプリントに切り替わるモデルの厚さを決定します。最小偶数ウォールライン幅を大きくすると、最大奇数ウォールライン幅も大きくなります。最大偶数ウォールライン幅は、外側ウォールライン幅 + 0.5 * 最小奇数ウォールライン幅として計算されます。" msgctxt "cool_min_speed description" msgid "The minimum print speed, despite slowing down due to the minimum layer time. When the printer would slow down too much, the pressure in the nozzle would be too low and result in bad print quality." @@ -4433,11 +4433,11 @@ msgstr "最遅印刷速度。印刷の速度が遅すぎると、ノズル内の msgctxt "meshfix_maximum_resolution description" msgid "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway." -msgstr "スライス後の線分の最小サイズ。これを増やすと、メッシュの解像度が低くなります。これにより、プリンタが g コードの処理速度に追いつくことができ、処理できないメッシュの詳細を取り除いてスライス速度を速めます。" +msgstr "スライス後の線分の最小サイズ。これを増やすと、メッシュの解像度が低くなります。これにより、プリンタが g-codeの処理速度に追いつくことができ、処理できないメッシュの詳細を取り除いてスライス速度を速めます。" msgctxt "meshfix_maximum_travel_resolution description" msgid "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate." -msgstr "スライス後の移動線分の最小サイズ。これを増やすと、移動の跡が滑らかでなくなります。これにより、プリンタが g コードの処理速度に追いつくことができますが、精度が低下します。" +msgstr "スライス後の移動線分の最小サイズ。これを増やすと、移動の跡が滑らかでなくなります。これにより、プリンタがg-codeの処理速度に追いつくことができますが、精度が低下します。" msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." @@ -4445,11 +4445,11 @@ msgstr "ステアステップ効果を発揮するための、エリアの最小 msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." -msgstr "一つのレイヤーに最低限費やす時間。1つの層に必ず設定された時間を費やすため、場合によってはプリントに遅れが生じます。しかしこれにより、次の層をプリントする前に造形物を適切に冷却することができます。 Lift Headが無効になっていて、最小速度を下回った場合、最小レイヤー時間よりも短くなる場合があります。" +msgstr "1つのレイヤーに最低限費やす時間。1つの層に必ず設定された時間を費やすため、場合によってはプリントに遅れが生じます。これにより、次の層をプリントする前に造形物を適切に冷却できます。ヘッド持ち上げが無効になっていて、最小速度を下回った場合、最小レイヤー時間よりも短くなる場合があります。" msgctxt "prime_tower_min_volume description" msgid "The minimum volume for each layer of the prime tower in order to purge enough material." -msgstr "プライムタワーの各層の最小容積。" +msgstr "十分な材料を吐出するための、プライムタワーにおける各層の最小容積。" msgctxt "support_tree_max_diameter_increase_by_merges_when_support_to_model description" msgid "The most the diameter of a branch that has to connect to the model may increase by merging with branches that could reach the buildplate. Increasing this reduces print time, but increases the area of support that rests on model" @@ -4461,7 +4461,7 @@ msgstr "3Dプリンターの機種名。" msgctxt "machine_nozzle_id description" msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"." -msgstr "\"AA 0.4\"や\"BB 0.8\"などのノズルID。" +msgstr "\"AA 0.4\" や \"BB 0.8\" など、エクストルーダーのノズルID。" msgctxt "travel_avoid_other_parts description" msgid "The nozzle avoids already printed parts when traveling. This option is only available when combing is enabled." @@ -4481,7 +4481,7 @@ msgstr "ラフトのベースレイヤーにある線状パターンの周囲に msgctxt "raft_interface_wall_count description" msgid "The number of contours to print around the linear pattern in the middle layers of the raft." -msgstr "ラフトの中間層の線形パターンの周囲に印刷する輪郭の数。" +msgstr "ラフトの中間層で線形パターンの周囲に印刷する輪郭の数。" msgctxt "raft_surface_wall_count description" msgid "The number of contours to print around the linear pattern in the top layers of the raft." @@ -4505,7 +4505,7 @@ msgstr "ラフトのベースと表面の間にあるレイヤーの数。これ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." -msgstr "ブリムに使用される線数。ブリムの線数は、ビルドプレートへの接着性を向上させるだけでなく、有効な印刷面積を減少させる。" +msgstr "ブリムに使用される線数。ブリムの線数は、ビルドプレートへの接着性を向上させるだけでなく、有効な印刷面積を減少させます。" msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." @@ -4529,19 +4529,19 @@ msgstr "サポートインフィルを囲むウォールの数。ウォールを msgctxt "support_bottom_wall_count description" msgid "The number of walls with which to surround support interface floor. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used." -msgstr "サポートインターフェースフロアを囲むウォールの数。ウォールを加えることにより、サポートの印刷の信頼性が高まり、オーバーハングを支えやすくなりますが、印刷時間が長くなり、使用する材料の量が増えます。" +msgstr "サポート境界面の底を囲むウォールの数。ウォールを加えることにより、サポートの印刷の信頼性が高まり、オーバーハングを支えやすくなりますが、印刷時間が長くなり、使用する材料の量が増えます。" msgctxt "support_roof_wall_count description" msgid "The number of walls with which to surround support interface roof. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used." -msgstr "サポートインターフェースルーフを囲むウォールの数。ウォールを加えることにより、サポートの印刷の信頼性が高まり、オーバーハングを支えやすくなりますが、印刷時間が長くなり、使用する材料の量が増えます。" +msgstr "サポート境界面のルーフを囲むウォールの数。ウォールを加えることにより、サポートの印刷の信頼性が高まり、オーバーハングを支えやすくなりますが、印刷時間が長くなり、使用する材料の量が増えます。" msgctxt "support_interface_wall_count description" msgid "The number of walls with which to surround support interface. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used." -msgstr "サポートインターフェースを囲むウォールの数。ウォールを加えることにより、サポートの印刷の信頼性が高まり、オーバーハングを支えやすくなりますが、印刷時間が長くなり、使用する材料の量が増えます。" +msgstr "サポート境界面を囲むウォールの数。ウォールを加えることにより、サポートの印刷の信頼性が高まり、オーバーハングを支えやすくなりますが、印刷時間が長くなり、使用する材料の量が増えます。" msgctxt "wall_distribution_count description" msgid "The number of walls, counted from the center, over which the variation needs to be spread. Lower values mean that the outer walls don't change in width." -msgstr "中心から数えて、変化を広げる必要のあるウォールの数。値が小さいほど、アウターウォールの幅が変化しないことを意味します。" +msgstr "中心から数えて、変化を広げる必要のあるウォールの数。値が小さいほど、外側のウォール幅が変化しないことを意味します。" msgctxt "wall_line_count description" msgid "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number." @@ -4581,7 +4581,7 @@ msgstr "サポートのフロアが印刷されるパターン。" msgctxt "support_interface_pattern description" msgid "The pattern with which the interface of the support with the model is printed." -msgstr "モデルとサポートのインタフェースが印刷されるパターン。" +msgstr "モデルとサポートの境界面が印刷されるパターン。" msgctxt "support_roof_pattern description" msgid "The pattern with which the roofs of the support are printed." @@ -4617,19 +4617,19 @@ msgstr "四方でクロス3Dパターンが交差するポケットの大きさ msgctxt "coasting_min_volume description" msgid "The smallest volume an extrusion path should have before allowing coasting. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly. This value should always be larger than the Coasting Volume." -msgstr "コースティングに必要な最小の容積。より小さい押出経路の場合、ボーデンチューブにはより少ない圧力しか蓄積されないので、コースティングの容積は比例する。この値は、常に、コースティングのボリュームよりも大きな必要があります。" +msgstr "コースティングに必要な最小の容積。より小さい造形パスの場合、ボーデンチューブにはより少ない圧力しか蓄積されないため、コースティングの容積は比例して小さくなります。この値は、常にコースティングのボリュームよりも大きくする必要があります。" msgctxt "machine_nozzle_cool_down_speed description" msgid "The speed (°C/s) by which the nozzle cools down averaged over the window of normal printing temperatures and the standby temperature." -msgstr "ノズルが冷却される速度（℃/ s）は、通常の印刷温度とスタンバイ温度のウィンドウにわたって平均化されています。" +msgstr "通常の印刷時とスタンバイ時のウィンドウで平均化された、ノズルが冷却される速度 (℃/秒) 。" msgctxt "machine_nozzle_heat_up_speed description" msgid "The speed (°C/s) by which the nozzle heats up averaged over the window of normal printing temperatures and the standby temperature." -msgstr "ノズルが加熱する速度（℃/ s）は、通常の印刷時温度とスタンバイ時温度にて平均化されています。" +msgstr "通常の印刷時とスタンバイ時のウィンドウで平均化された、ノズルが過熱される速度 (℃/秒) 。" msgctxt "speed_wall_x description" msgid "The speed at which all inner walls are printed. Printing the inner wall faster than the outer wall will reduce printing time. It works well to set this in between the outer wall speed and the infill speed." -msgstr "内側のウォールをプリントする速度　外壁より内壁を高速でプリントすると、印刷時間の短縮になります。外壁のプリント速度とインフィルのプリント速度の中間に設定するのが適切です。" +msgstr "内側のウォールをプリントする速度。外側より内側のウォールを高速でプリントすると、印刷時間の短縮になります。外側ウォールのプリント速度とインフィルのプリント速度の中間に設定するのが適切です。" msgctxt "bridge_skin_speed description" msgid "The speed at which bridge skin regions are printed." @@ -4645,7 +4645,7 @@ msgstr "印刷スピード。" msgctxt "raft_base_speed description" msgid "The speed at which the base raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high." -msgstr "ベースラフト層が印刷される速度。これは、ノズルから出てくるマテリアルの量がかなり多いので、ゆっくりと印刷されるべきである。" +msgstr "ベースラフト層が印刷される速度。ノズルから出てくる材料の量が増加するため、印刷がとても遅くなります。" msgctxt "bridge_wall_speed description" msgid "The speed at which the bridge walls are printed." @@ -4685,7 +4685,7 @@ msgstr "ワイプ引き戻し中にフィラメントが引き戻される時の msgctxt "switch_extruder_retraction_speed description" msgid "The speed at which the filament is retracted during a nozzle switch retract." -msgstr "ノズル切り替え中のフィラメントの引き込み速度。" +msgstr "ノズル切り替え中のフィラメントの引き戻し速度。" msgctxt "retraction_retract_speed description" msgid "The speed at which the filament is retracted during a retraction move." @@ -4705,19 +4705,19 @@ msgstr "フロアのサポートがプリントされる速度。低速で印刷 msgctxt "speed_support_infill description" msgid "The speed at which the infill of support is printed. Printing the infill at lower speeds improves stability." -msgstr "サポート材のインフィルをプリントする速度　低速でプリントすると安定性が向上します。" +msgstr "サポート材のインフィルをプリントする速度。低速でプリントすると安定性が向上します。" msgctxt "raft_interface_speed description" msgid "The speed at which the middle raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high." -msgstr "ミドルラフト層が印刷される速度。ノズルから出てくるマテリアルの量がかなり多いので、ゆっくりと印刷されるべきである。" +msgstr "ミドルラフト層が印刷される速度。ノズルから吐出される材料の量がかなり多くなると、印刷がとても遅くなります。" msgctxt "speed_wall_0 description" msgid "The speed at which the outermost walls are printed. Printing the outer wall at a lower speed improves the final skin quality. However, having a large difference between the inner wall speed and the outer wall speed will affect quality in a negative way." -msgstr "最も外側のウォールをプリントする速度。外側の壁を低速でプリントすると表面の質が改善しますが、内壁と外壁のプリント速度の差が大きすぎると、印刷の質が悪化します。" +msgstr "最も外側のウォールをプリントする速度。外側のウォールを低速でプリントすると表面の質が改善しますが、内側と外側のウォールでプリント速度の差が大きすぎると、印刷の質が悪化します。" msgctxt "speed_prime_tower description" msgid "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal." -msgstr "プライムタワーをプリントする速度です。異なるフィラメントの印刷で密着性が最適ではない場合、低速にてプライム タワーをプリントすることでより安定させることができます。" +msgstr "プライムタワーをプリントする速度。異なるフィラメントの印刷で接着性が最適ではない場合、低速でプライムタワーをプリントすることでより安定させることができます。" msgctxt "cool_fan_speed description" msgid "The speed at which the print cooling fans spin." @@ -4733,11 +4733,11 @@ msgstr "ルーフとフロアのサポート材をプリントする速度。低 msgctxt "speed_support_roof description" msgid "The speed at which the roofs of support are printed. Printing them at lower speeds can improve overhang quality." -msgstr "ルーフとフロアのサポート材をプリントする速度　これらを低速でプリントするとオーバーハングの品質を向上できます。" +msgstr "ルーフとフロアのサポート材をプリントする速度。これらを低速でプリントするとオーバーハングの品質を向上できます。" msgctxt "skirt_brim_speed description" msgid "The speed at which the skirt and brim are printed. Normally this is done at the initial layer speed, but sometimes you might want to print the skirt or brim at a different speed." -msgstr "スカートとブリムのプリント速度　通常は一層目のスピードと同じですが、異なる速度でスカートやブリムをプリントしたい場合に設定してください。" +msgstr "スカートとブリムのプリント速度。通常は一層目のスピードと同じですが、異なる速度でスカートやブリムをプリントしたい場合に設定してください。" msgctxt "speed_support description" msgid "The speed at which the support structure is printed. Printing support at higher speeds can greatly reduce printing time. The surface quality of the support structure is not important since it is removed after printing." @@ -4749,15 +4749,15 @@ msgstr "トップラフト層が印刷される速度。この値はノズルが msgctxt "speed_wall_x_roofing description" msgid "The speed at which the top surface inner walls are printed." -msgstr "上面内壁が印刷される速度" +msgstr "上面内壁が印刷される速度。" msgctxt "speed_wall_0_roofing description" msgid "The speed at which the top surface outermost wall is printed." -msgstr "上面の最外壁が印刷される速度" +msgstr "上面の最外壁が印刷される速度。" msgctxt "speed_z_hop description" msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." -msgstr "Z 軸ホップに対して垂直 Z 軸方向の動きが行われる速度。これは通常、ビルドプレートまたはマシンのガントリーが動きにくいため、印刷速度よりも低くなります。" +msgstr "Z軸ホップに対する垂直Z軸方向移動の速度。通常、ビルドプレートまたはプリンターの台が動きにくいため印刷速度よりも遅くなります。" msgctxt "speed_wall description" msgid "The speed at which the walls are printed." @@ -4769,7 +4769,7 @@ msgstr "上部表面通過時の速度。" msgctxt "material_break_speed description" msgid "The speed at which to retract the filament in order to break it cleanly." -msgstr "フィラメントをきれいに引き出すために維持すべきフィラメントの引戻し速度。" +msgstr "フィラメントをきれいに引き出すために維持すべきフィラメントの引き戻し速度。" msgctxt "speed_roofing description" msgid "The speed at which top surface skin layers are printed." @@ -4785,7 +4785,7 @@ msgstr "移動中のスピード。" msgctxt "coasting_speed description" msgid "The speed by which to move during coasting, relative to the speed of the extrusion path. A value slightly under 100% is advised, since during the coasting move the pressure in the bowden tube drops." -msgstr "コースティング中の移動速度。印刷時の経路の速度設定に比例します。ボーデンチューブの圧力が低下するので、100％よりわずかに低い値が推奨される。" +msgstr "コースティング中の移動速度。造形パスの速度設定に比例します。ボーデンチューブの圧力が低下するので、100％よりわずかに低い値が推奨される。" msgctxt "speed_layer_0 description" msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." @@ -4793,11 +4793,11 @@ msgstr "初期レイヤーでの速度。ビルドプレートへの接着を改 msgctxt "speed_print_layer_0 description" msgid "The speed of printing for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "一層目をプリントする速度　ビルトプレートへの接着を向上するため低速を推奨します。" +msgstr "一層目をプリントする速度。ビルトプレートへの接着を向上するため低速を推奨します。" msgctxt "speed_travel_layer_0 description" msgid "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate. The value of this setting can automatically be calculated from the ratio between the Travel Speed and the Print Speed." -msgstr "最初のレイヤーを印刷する際のトラベルスピード。低速の方が、ビルドプレート剥がれるリスクを軽減することができます。この設定の値は、移動速度と印刷速度の比から自動的に計算されます。" +msgstr "最初のレイヤーを印刷する際の移動スピード。造形物がビルドプレートが剥がれてしまうのを防ぐため、低速にすることをお薦めします。この設定の値は、移動速度と印刷速度の比から自動的に計算されます。" msgctxt "material_break_temperature description" msgid "The temperature at which the filament is broken for a clean break." @@ -4845,7 +4845,7 @@ msgstr "スキンエッジをサポートする追加のインフィルの厚さ msgctxt "support_interface_height description" msgid "The thickness of the interface of the support where it touches with the model on the bottom or the top." -msgstr "底面または上部のモデルと接触するサポートのインターフェイスの厚さ。" +msgstr "底面または上部のモデルと接触するサポート境界面の厚さ。" msgctxt "support_bottom_height description" msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests." @@ -4869,15 +4869,15 @@ msgstr "壁の厚さ。この値をラインの幅で割ることで壁の数が msgctxt "infill_sparse_thickness description" msgid "The thickness per layer of infill material. This value should always be a multiple of the layer height and is otherwise rounded." -msgstr "インフィルマテリアルの層ごとの厚さ。この値は常にレイヤーの高さの倍数でなければなりません。" +msgstr "層ごとのインフィル材料の厚さ。この値は常にレイヤーの高さの倍数でなければなりません。" msgctxt "support_infill_sparse_thickness description" msgid "The thickness per layer of support infill material. This value should always be a multiple of the layer height and is otherwise rounded." -msgstr "サポートのインフィルの厚さ。この値はレイヤーの倍数にする必要があり、違う場合は倍数に近い値に設定されます。" +msgstr "サポートのインフィル材料の厚さ。この値はレイヤーの倍数にする必要があり、異なる場合は倍数に近い値に設定されます。" msgctxt "machine_gcode_flavor description" msgid "The type of g-code to be generated." -msgstr "生成するG-codeの種類です。" +msgstr "生成するG-codeの種類。" msgctxt "material_type description" msgid "The type of material used." @@ -4893,7 +4893,7 @@ msgstr "造形可能領域の幅（X方向）。" msgctxt "support_brim_width description" msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." -msgstr "サポートの下に印刷されるブリムの幅。ブリムが大きいほど、追加材料の費用でビルドプレートへの接着性が強化されます。" +msgstr "サポートの下に印刷されるブリムの幅。ブリムが大きいほど、材料の使用が増える代わりにビルドプレートへの接着性が強化されます。" msgctxt "interlocking_beam_width description" msgid "The width of the interlocking structure beams." @@ -4909,11 +4909,11 @@ msgstr "プライムタワーの幅。" msgctxt "magic_fuzzy_skin_thickness description" msgid "The width within which to jitter. It's advised to keep this below the outer wall width, since the inner walls are unaltered." -msgstr "振動が起こる幅。内壁は変更されていないので、これを外壁の幅より小さく設定することをお勧めします。" +msgstr "振動が起こる幅。内側ウォールに対しては適用されないので、この値は外側ウォールの幅より小さく設定することをお勧めします。" msgctxt "retraction_extrusion_window description" msgid "The window in which the maximum retraction count is enforced. This value should be approximately the same as the retraction distance, so that effectively the number of times a retraction passes the same patch of material is limited." -msgstr "最大の引き戻し回数。この値は引き戻す距離と同じであることで、引き戻しが効果的に行われます。" +msgstr "最大引き戻し回数が強制される幅。この値は引き戻し処理とほぼ同じで、同じ材料の塊における引き戻しが制限される場合に有効です。" msgctxt "prime_tower_position_x description" msgid "The x coordinate of the position of the prime tower." @@ -4933,11 +4933,11 @@ msgstr "この設定は、ブリッジ壁が始まる直前に、エクストル msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." -msgstr "この設定は,ラフトベースのアウトラインの内側の角をどの程度丸くするかを制御します。内側の角は,ここで指定した値と等しい半径の半円に丸められます。この設定では,ラフトの輪郭にある円より小さい穴も削除されます。" +msgstr "この設定は、ラフト土台のアウトラインの内側の角をどの程度丸くするかを制御します。内側の角はここで指定した値と等しい半径の半円に丸められます。この設定では、ラフトの輪郭にある円より小さい穴も削除されます。" msgctxt "raft_interface_smoothing description" msgid "This setting controls how much inner corners in the raft middle outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." -msgstr "この設定は,ラフトの中央のアウトラインの内側の角をどの程度丸くするかを制御します。内側の角は,ここで指定した値と等しい半径の半円に丸められます。この設定では,ラフトの輪郭にある円より小さい穴も削除されます。" +msgstr "この設定は、ラフト中間層のアウトラインの内側の角をどの程度丸くするかを制御します。内側の角は、ここで指定した値と等しい半径の半円に丸められます。この設定では、ラフトの輪郭にある円より小さい穴も削除されます。" msgctxt "raft_smoothing description" msgid "This setting controls how much inner corners in the raft outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." @@ -4945,7 +4945,7 @@ msgstr "この設定は、ラフトの輪郭の内側の角がどの程度丸め msgctxt "raft_surface_smoothing description" msgid "This setting controls how much inner corners in the raft top outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." -msgstr "この設定は,ラフト上部の輪郭の内側の角をどの程度丸くするかを制御します。内側の角は,ここで指定した値と等しい半径の半円に丸められます。この設定では,ラフトの輪郭にある円より小さい穴も削除されます。" +msgstr "この設定は、ラフト上層部の輪郭の内側の角をどの程度丸くするかを制御します。内側の角は、ここで指定した値と等しい半径の半円に丸められます。この設定ではラフトの輪郭にある円より小さい穴も削除されます。" msgctxt "retraction_count_max description" msgid "This setting limits the number of retractions occurring within the minimum extrusion distance window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues." @@ -4977,7 +4977,7 @@ msgstr "上部レイヤー" msgctxt "top_skin_expand_distance label" msgid "Top Skin Expand Distance" -msgstr "上面展開距離" +msgstr "上面拡張距離" msgctxt "top_skin_preshrink label" msgid "Top Skin Removal Width" @@ -5001,19 +5001,19 @@ msgstr "上面内壁の流れ" msgctxt "acceleration_wall_0_roofing label" msgid "Top Surface Outer Wall Acceleration" -msgstr "上面外壁加速度" +msgstr "上面外側ウォール加速度" msgctxt "wall_0_material_flow_roofing label" msgid "Top Surface Outer Wall Flow" -msgstr "上面最外壁の流れ" +msgstr "上面外側ウォールのフロー" msgctxt "jerk_wall_0_roofing label" msgid "Top Surface Outer Wall Jerk" -msgstr "上面内壁の最大瞬間速度変化" +msgstr "上面内側ウォールジャーク" msgctxt "speed_wall_0_roofing label" msgid "Top Surface Outer Wall Speed" -msgstr "上面の最外壁速度" +msgstr "上面外側ウォール速度" msgctxt "acceleration_roofing label" msgid "Top Surface Skin Acceleration" @@ -5121,19 +5121,19 @@ msgstr "ファイルから読み込むときに、モデルに適用するトラ msgctxt "travel label" msgid "Travel" -msgstr "移動" +msgstr "移動経路" msgctxt "acceleration_travel label" msgid "Travel Acceleration" -msgstr "移動か速度" +msgstr "移動加速度" msgctxt "travel_avoid_distance label" msgid "Travel Avoid Distance" -msgstr "移動回避距離" +msgstr "移動経路の回避距離" msgctxt "jerk_travel label" msgid "Travel Jerk" -msgstr "移動ジャーク" +msgstr "トラベルジャーク" msgctxt "speed_travel label" msgid "Travel Speed" @@ -5181,7 +5181,7 @@ msgstr "Ultimaker 2" msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" -msgstr "重複量" +msgstr "重複部分を統合" msgctxt "bridge_wall_min_length description" msgid "Unsupported walls shorter than this will be printed using the normal wall settings. Longer unsupported walls will be printed using the bridge wall settings." @@ -5205,7 +5205,7 @@ msgstr "プリントヘッドの移動に異なるジャーク値を使用しま msgctxt "relative_extrusion description" msgid "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the g-code. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any g-code script is output." -msgstr "絶対押出ではなく、相対押出を使用します。相対Eステップを使用すると、G-codeの後処理が容易になります。ただし、すべてのプリンタでサポートされているわけではありません。絶対的Eステップと比較して、材料の量にごくわずかな偏差が生じることがあります。この設定に関係なく、G-codeスクリプトが出力される前にエクストルーダーのモードは常に絶対値にて設定されています。" +msgstr "絶対押出ではなく、相対押出を使用します。相対Eステップを使用すると、G-codeのポストプロセッシングが容易になります。ただし、すべてのプリンタでサポートされているわけではありません。絶対的Eステップと比較して、材料の量にごくわずかな偏差が生じることがあります。この設定に関係なく、G-codeスクリプトが出力される前にエクストルーダーのモードは常に絶対値にて設定されています。" msgctxt "support_use_towers description" msgid "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof." @@ -5213,7 +5213,7 @@ msgstr "特殊なタワーを使用して、小さなオーバーハングして msgctxt "infill_mesh description" msgid "Use this mesh to modify the infill of other meshes with which it overlaps. Replaces infill regions of other meshes with regions for this mesh. It's suggested to only print one Wall and no Top/Bottom Skin for this mesh." -msgstr "このメッシュを使用して、重なる他のメッシュのインフィルを変更します。他のメッシュのインフィル領域を改なメッシュに置き換えます。これを利用する場合、1つのWallだけを印刷しTop / Bottom Skinは使用しないことをお勧めします。" +msgstr "このメッシュを使用して、重なる他のメッシュのインフィルを変更します。他のメッシュのインフィル領域を新たなメッシュに置き換えます。トップ/ボトムスキンがない1つの壁だけを印刷する場合のみ設定を推奨します。" msgctxt "support_mesh description" msgid "Use this mesh to specify support areas. This can be used to generate support structure." @@ -5233,7 +5233,7 @@ msgstr "垂直スケールファクタ収縮補正" msgctxt "slicing_tolerance description" msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface." -msgstr "スライスされたレイヤーにおける垂直方向の公差です。レイヤーの輪郭は通常、各レイヤーの厚さの中間を通る断面で生成されます（中間）。代わりに、レイヤーごとに、ボリューム内にレイヤーの厚さの分だけ入り込んだエリアにしたり（排他）、レイヤー内の任意の位置まで入り込んだエリアにしたりする（包括）こともできます。排他は最も細かく、包括は最もフィットし、中間は元の表面に最も近くなります。" +msgstr "スライスされたレイヤーにおける垂直方向の公差です。レイヤーの輪郭は通常、各レイヤーの厚さの中間を通る断面で生成されます（中間）。代わりに、レイヤーごとに、ボリューム内にレイヤーの厚さの分だけ入り込んだエリアにしたり（排他）、レイヤー内の任意の位置まで入り込んだエリアにしたりする（包括）こともできます。包括は最も細かく、排他は最もフィットし、中間は元の表面に最も近くなります。" msgctxt "material_bed_temp_wait label" msgid "Wait for Build Plate Heatup" @@ -5329,7 +5329,7 @@ msgstr "ゼロを超える場合、この距離より長い移動量をコーミ msgctxt "hole_xy_offset_max_diameter description" msgid "When greater than zero, the Hole Horizontal Expansion is gradually applied on small holes (small holes are expanded more). When set to zero the Hole Horizontal Expansion will be applied to all holes. Holes larger than the Hole Horizontal Expansion Max Diameter are not expanded." -msgstr "0より大きい場合、穴の水平展開が小さい穴に対して徐々に適用されます（小さい穴はさらに展開されます）。0に設定すると、すべての穴に穴の水平展開が適用されます。穴の水平展開の最大直径より大きい穴は展開されません。" +msgstr "0より大きい場合、穴の水平拡張が小さい穴に対して徐々に適用されます（小さい穴はさらに拡張されます）。0に設定すると、すべての穴に穴の水平拡張が適用されます。穴の水平拡張の最大直径より大きい穴は拡張されません。" msgctxt "hole_xy_offset description" msgid "When greater than zero, the Hole Horizontal Expansion is the amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes. When this setting is enabled it can be further tuned with Hole Horizontal Expansion Max Diameter." @@ -5361,7 +5361,7 @@ msgstr "モデルの垂直方向に少数層のみの小さなギャップがあ msgctxt "wall_transition_angle description" msgid "When to create transitions between even and odd numbers of walls. A wedge shape with an angle greater than this setting will not have transitions and no walls will be printed in the center to fill the remaining space. Reducing this setting reduces the number and length of these center walls, but may leave gaps or overextrude." -msgstr "偶数個と奇数個のウォールの間で移行を行うタイミング。この設定より大きい角度のくさび形状では移行が行われず、残りのスペースを埋めるために中心にウォールがプリントされることはありません。この設定を小さくすると、これらの中心にあるウォールの数と長さが減りますが、隙間ができたり、押し出されすぎたりすることがあります。" +msgstr "偶数個と奇数個のウォールの間で移行を行うタイミング。この設定より大きい角度のくさび形状では移行が行われず、残りのスペースを埋めるために中心にウォールがプリントされることはありません。この設定を小さくすると、これらの中心にあるウォールの数と長さが減りますが、隙間ができたり、押し出されすぎたりする場合があります。" msgctxt "wall_transition_length description" msgid "When transitioning between different numbers of walls as the part becomes thinner, a certain amount of space is allotted to split or join the wall lines." @@ -5373,27 +5373,27 @@ msgstr "拭き取りの際、ビルドプレートが下降してノズルとプ msgctxt "retraction_hop_enabled description" msgid "Whenever a retraction is done, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate." -msgstr "引き戻しが完了すると、ビルドプレートが下降してノズルとプリントの間に隙間ができます。ノズルの走行中に造形物に当たるのを防ぎ、造形物をビルドプレートから剥がしてしまう現象を減らします。" +msgstr "引き戻し終了時にビルドプレートを下降させてノズルと造形物の間に隙間を作ります。ノズルが移動中に造形物に当たり造形物をビルドプレートから剥がしてしまう可能性を減らします。" msgctxt "support_xy_overrides_z description" msgid "Whether the Support X/Y Distance overrides the Support Z Distance or vice versa. When X/Y overrides Z the X/Y distance can push away the support from the model, influencing the actual Z distance to the overhang. We can disable this by not applying the X/Y distance around overhangs." -msgstr "X /Y方向のサポートの距離がZ方向のサポートの距離を上書きしようとする時やまたその逆も同様。X または Y がZを上書きする際、X Y 方向の距離は印刷物からオーバーハングする Z 方向の距離に影響を及ぼしながらサポートを押しのけようとします。オーバー ハング周りのX Yの距離を無効にすることで、無効にできる。" +msgstr "サポートのX/Y軸方向距離でZ軸の距離を上書きするかどうか。XまたはY軸がZ軸を上書きする際、X/Y軸方向の距離は印刷物からオーバーハングするZ軸方向の距離に影響を及ぼしながらサポートを押しのけようとします。オーバー ハングにおけるX/Y軸方向距離を指定しないことで、無効にできます。" msgctxt "machine_center_is_zero description" msgid "Whether the X/Y coordinates of the zero position of the printer is at the center of the printable area." -msgstr "プリンタのゼロポジションのX / Y座標が印刷可能領域の中心にあるかどうか。" +msgstr "プリンタのゼロポジションのX/Y座標が印刷可能領域の中心にあるかどうか。" msgctxt "machine_endstop_positive_direction_x description" msgid "Whether the endstop of the X axis is in the positive direction (high X coordinate) or negative (low X coordinate)." -msgstr "X 軸のエンドストップがプラス方向（高い X 座標）またはマイナス方向（低い X 座標）のいずれかを示します。" +msgstr "X軸の終端がプラス方向（高いX座標）またはマイナス方向（低いX座標）のいずれかを示します。" msgctxt "machine_endstop_positive_direction_y description" msgid "Whether the endstop of the Y axis is in the positive direction (high Y coordinate) or negative (low Y coordinate)." -msgstr "Y 軸のエンドストップがプラス方向（高い Y 座標）またはマイナス方向（低い Y 座標）のいずれかを示します。" +msgstr "Y軸の終端がプラス方向（高いY座標）またはマイナス方向（低いY座標）のいずれかを示します。" msgctxt "machine_endstop_positive_direction_z description" msgid "Whether the endstop of the Z axis is in the positive direction (high Z coordinate) or negative (low Z coordinate)." -msgstr "Z 軸のエンドストップがプラス方向（高い Z 座標）またはマイナス方向（低い Z 座標）のいずれかを示します。" +msgstr "Z軸の終端がプラス方向（高いZ座標）またはマイナス方向（低いZ座標）のいずれかを示します。" msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." @@ -5413,7 +5413,7 @@ msgstr "機器が造形温度を安定化処理できるかどうかです。" msgctxt "center_object description" msgid "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved." -msgstr "オブジェクトが保存された座標系を使用する代わりにビルドプラットフォームの中間(0,0)にオブジェクトを配置するかどうか。" +msgstr "オブジェクトが保存された座標系を使用する代わりにビルドプラットフォームの中間 (0,0) にオブジェクトを配置するかどうか。" msgctxt "machine_nozzle_temp_enabled description" msgid "Whether to control temperature from Cura. Turn this off to control nozzle temperature from outside of Cura." @@ -5437,7 +5437,7 @@ msgstr "開始時にビルドプレートが温度に達するまで待つコマ msgctxt "prime_blob_enable description" msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time." -msgstr "印刷する前にフィラメントの小さな塊を作るかどうか。この設定をオンにすると、エクストルーダーがノズルにおいて印刷予定のマテリアルの下準備をします。印刷後ブリムまたはスカートも、上記と同じような意味を持ちます。この設定をオフにすると時間の節約にはなります。" +msgstr "印刷する前にフィラメントで小さな塊を作るかどうか。この設定をオンにすると、エクストルーダーは印刷前の時点でノズルに材料を用意します。印刷後ブリムまたはスカートも、同様に動作するため、この設定をオフにすると時間の節約になります。" msgctxt "print_sequence description" msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes." @@ -5485,7 +5485,7 @@ msgstr "サポートのフロアのラインの一幅。" msgctxt "support_roof_line_width description" msgid "Width of a single support roof line." -msgstr "サポートルーフのライン一幅。" +msgstr "1つのサポートルーフラインの幅。" msgctxt "support_line_width description" msgid "Width of a single support structure line." @@ -5565,7 +5565,7 @@ msgstr "ワイプ引き戻し時の余分押し戻し量" msgctxt "wipe_retraction_prime_speed label" msgid "Wipe Retraction Prime Speed" -msgstr "ワイプ引き戻し下準備速度" +msgstr "ワイプ引き戻し後の押し出し速度" msgctxt "wipe_retraction_retract_speed label" msgid "Wipe Retraction Retract Speed" @@ -5593,7 +5593,7 @@ msgstr "非アクティブなツールに一時コマンドを送信した後に msgctxt "machine_endstop_positive_direction_x label" msgid "X Endstop in Positive Direction" -msgstr "プラス方向の X エンドストップ" +msgstr "プラス方向のX軸終端" msgctxt "wipe_brush_pos_x description" msgid "X location where wipe script will start." @@ -5605,11 +5605,11 @@ msgstr "X/YがZを上書き" msgctxt "machine_endstop_positive_direction_y label" msgid "Y Endstop in Positive Direction" -msgstr "プラス方向の Y エンドストップ" +msgstr "Y軸終端がプラス方向" msgctxt "machine_endstop_positive_direction_z label" msgid "Z Endstop in Positive Direction" -msgstr "プラス方向の Z エンドストップ" +msgstr "Z自給終端がプラス方向" msgctxt "retraction_hop_after_extruder_switch label" msgid "Z Hop After Extruder Switch" @@ -5629,7 +5629,7 @@ msgstr "印刷パーツに対するZホップ" msgctxt "speed_z_hop label" msgid "Z Hop Speed" -msgstr "Z 軸ホップ速度" +msgstr "Z軸ホップ速度" msgctxt "retraction_hop_enabled label" msgid "Z Hop When Retracted" @@ -5649,11 +5649,11 @@ msgstr "相対Zシーム" msgctxt "z_seam_x label" msgid "Z Seam X" -msgstr "ZシームX" +msgstr "ZシームX座標" msgctxt "z_seam_y label" msgid "Z Seam Y" -msgstr "ZシームY" +msgstr "ZシームY座標" msgctxt "support_xy_overrides_z option z_overrides_xy" msgid "Z overrides X/Y" @@ -5697,11 +5697,11 @@ msgstr "ジグザグ" msgctxt "travel description" msgid "travel" -msgstr "移動" +msgstr "移動経路" msgctxt "cool_during_extruder_switch description" msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "ノズル切り替え中に冷却ファンを作動させるかどうか。これは,ノズルの冷却スピードを上げてにじみを減らすのに役立ちます:
    • 変更なし:ファンを以前の状態に維持します
    • 最後の押出機のみ:最後に使用した押出機のファンをオンにしますが,他の押出機のファン（もしあれば）はオフにします。これは,完全に別個の押出機がある場合に有用です。
    • すべてのファン:ノズル切り替え中にすべてのファンをオンにします。これは,冷却ファンが1つのみの場合,または複数のファンが互いに接近している場合に有用です。
    " +msgstr "ノズル切り替え中に冷却ファンを作動させるかどうか。これによりノズルの冷却スピードを上げてにじみを減らすのに役立ちます：
    • 変更なし：ファンを以前の状態に維持します
    • 最後のエクストルーダーのみ：最後に使用したエクストルーダーのファンをオンにしますが、もし他のエクストルーダーがあればファンをオフにします。これは、完全に別個のエクストルーダーがある場合に有用です。
    • すべてのファン：ノズル切り替え中にすべてのファンをオンにします。これは、冷却ファンが1つのみの場合、または複数のファンが互いに接近している場合に有用です。
    " msgctxt "cool_during_extruder_switch option all_fans" msgid "All fans" @@ -5709,11 +5709,11 @@ msgstr "すべてのファン" msgctxt "cool_during_extruder_switch label" msgid "Cooling during extruder switch" -msgstr "押出機切り替え中の冷却" +msgstr "エクストルーダー切替中に冷却" msgctxt "support_z_seam_away_from_model description" msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "サポート構造のZシームと実際の3Dモデルとの間の空間的な関係を管理します。この制御は,ユーザーがプリント後にプリントモデルに損傷を与えたり跡を残したりすることなく,サポート構造をシームレスに取り外せるようにするために,非常に重要です。" +msgstr "サポート構造のZシームと実際の3Dモデルとの間の空間的な関係を管理します。この制御は、プリントした造形物に損傷を与えたり跡を残したりすることなくサポート構造をシームレスに取り外せるようにするために非常に重要です。" msgctxt "support_z_seam_min_distance label" msgid "Min Z Seam Distance from Model" @@ -5721,31 +5721,31 @@ msgstr "モデルからの最小Zシーム距離" msgctxt "support_infill_density_multiplier_initial_layer description" msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "サポート材の初期層におけるインフィルのマルチプライヤー。この数字を増やすことで,ベッド接着力を高めることができます。" +msgstr "サポート材の初期層におけるインフィル密度の倍率です。この値を増やすことで、ベッドとの接着力を高めることができます。" msgctxt "cool_during_extruder_switch option only_last_extruder" msgid "Only last extruder" -msgstr "最後の押出機のみ" +msgstr "最後のエクストルーダーのみ" msgctxt "z_seam_on_vertex description" msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Zシームをポリゴンの頂点に配置します。これをオフに切り替えることで,頂点と頂点の間にもシームを配置することができます。（サポートのないオーバーハングへのシーム配置制限は上書きさないことに留意してください。）" +msgstr "Zシームをポリゴンの頂点に配置します。これをオフに切り替えることで、頂点と頂点の間にもシームを配置できます。（サポートのないオーバーハングへのシーム配置制限は上書きされないことに留意してください。）" msgctxt "prime_tower_min_shell_thickness label" msgid "Prime Tower Minimum Shell Thickness" -msgstr "プライムタワー最小シェル厚" +msgstr "プライムタワーにおけるシェル厚さの最小値" msgctxt "raft_base_flow label" msgid "Raft Base Flow" -msgstr "ラフトベース フロー" +msgstr "ラフト土台フロー量" msgctxt "raft_base_infill_overlap_mm label" msgid "Raft Base Infill Overlap" -msgstr "ラフトベース インフィル オーバーラップ" +msgstr "ラフト土台インフィル重複" msgctxt "raft_base_infill_overlap label" msgid "Raft Base Infill Overlap Percentage" -msgstr "ラフトベース インフィル オーバーラップ比率" +msgstr "ラフト土台インフィル重複率" msgctxt "raft_flow label" msgid "Raft Flow" @@ -5753,35 +5753,35 @@ msgstr "ラフトフロー" msgctxt "raft_interface_flow label" msgid "Raft Interface Flow" -msgstr "ラフトインターフェース フロー" +msgstr "ラフト境界面フロー量" msgctxt "raft_interface_infill_overlap_mm label" msgid "Raft Interface Infill Overlap" -msgstr "ラフトインターフェース インフィルオーバーラップ" +msgstr "ラフト境界面インフィル重複" msgctxt "raft_interface_infill_overlap label" msgid "Raft Interface Infill Overlap Percentage" -msgstr "ラフトインターフェース インフィルオーバーラップ比率" +msgstr "ラフト境界面インフィル重複率" msgctxt "raft_interface_z_offset label" msgid "Raft Interface Z Offset" -msgstr "ラフトインターフェース Zオフセット" +msgstr "ラフト境界面のZオフセット" msgctxt "raft_surface_flow label" msgid "Raft Surface Flow" -msgstr "ラフトサーフェス フロー" +msgstr "ラフト表層フロー量" msgctxt "raft_surface_infill_overlap_mm label" msgid "Raft Surface Infill Overlap" -msgstr "ラフトサーフェス インフィルオーバーラップ" +msgstr "ラフト表面インフィル重複" msgctxt "raft_surface_infill_overlap label" msgid "Raft Surface Infill Overlap Percentage" -msgstr "ラフトサーフェス インフィルオーバーラップ比率" +msgstr "ラフト表面インフィル重複率" msgctxt "raft_surface_z_offset label" msgid "Raft Surface Z Offset" -msgstr "ラフトサーフェス Zオフセット" +msgstr "ラフト表層のZオフセット" msgctxt "seam_overhang_angle label" msgid "Seam Overhanging Wall Angle" @@ -5789,7 +5789,7 @@ msgstr "シームオーバーハンギング ウォール角度" msgctxt "support_infill_density_multiplier_initial_layer label" msgid "Support Infill Density Multiplier Initial Layer" -msgstr "サポートインフィル密度マルチプライヤー初期層 " +msgstr "サポートインフィル密度を初期層の倍数にする" msgctxt "support_z_seam_away_from_model label" msgid "Support Z Seam Away from Model" @@ -5797,47 +5797,47 @@ msgstr "サポートZシームをモデルから離す" msgctxt "raft_base_flow description" msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフトベースのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで,接着力やラフト構造の強度を向上させることができます。" +msgstr "ラフト土台のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フロー量を増やすことで、接着力やラフト構造の強度を向上させることができます。" msgctxt "raft_interface_flow description" msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフトインターフェースのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで,接着力やラフト構造の強度を向上させることができます。" +msgstr "ラフト境界面のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで、接着力やラフト構造の強度を向上させることができます。" msgctxt "raft_flow description" msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフトのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで,接着力やラフト構造の強度を向上させることができます。" +msgstr "ラフトのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで、接着力やラフト構造の強度を向上させることができます。" msgctxt "raft_surface_flow description" msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフトサーフェスのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで,接着力やラフト構造の強度を向上させることができます。" +msgstr "ラフト表面のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フロー量を増やすことで、接着力やラフト構造の強度を向上させることができます。" msgctxt "raft_base_infill_overlap description" msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフトベースのウォールとのオーバーラップの量（インフィルラインの幅に対する割合）。わずかにオーバーラップさせることで,ウォールをインフィルにしっかりと接続することができます。" +msgstr "インフィルとラフト土台のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_base_infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフトベースのウォールとのオーバーラップの量。わずかにオーバーラップさせることで,ウォールをインフィルにしっかりと接続することができます。" +msgstr "インフィルとラフト土台のウォールとの重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_interface_infill_overlap description" msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフトインターフェースのウォールとのオーバーラップの量（インフィルラインの幅に対する割合）。わずかにオーバーラップさせることで,ウォールをインフィルにしっかりと接続することができます。" +msgstr "インフィルとラフト境界面のウォールとの重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_interface_infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフトインターフェースのウォールとのオーバーラップの量。わずかにオーバーラップさせることで,ウォールをインフィルにしっかりと接続することができます。" +msgstr "インフィルとラフト境界面のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_surface_infill_overlap description" msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフトサーフェスのウォールとのオーバーラップの量（インフィルラインの幅に対する割合）。わずかにオーバーラップさせることで,ウォールをインフィルにしっかりと接続することができます。" +msgstr "インフィルとラフト表面のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_surface_infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフトサーフェスのウォールとのオーバーラップの量。わずかにオーバーラップさせることで,ウォールをインフィルにしっかりと接続することができます。" +msgstr "インフィルとラフト表面のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "support_z_seam_min_distance description" msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "Z軸シームにおける,モデルとそのサポート構造との間の距離。" +msgstr "Z軸シームにおける、モデルとそのサポート構造との間の距離。" msgctxt "prime_tower_min_shell_thickness description" msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." @@ -5845,7 +5845,7 @@ msgstr "プライムタワーシェルの最小の厚さ。厚くすることで msgctxt "seam_overhang_angle description" msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "ウォールのシームがこの角度以上にオーバーハングしないようにしてください。値が90の場合,どのウォールもオーバーハングとして扱われません。" +msgstr "ウォールのシームがこの角度以上にオーバーハングしないよう試みます。値が90の場合、どのウォールもオーバーハングとして扱われません。" msgctxt "cool_during_extruder_switch option unchanged" msgid "Unchanged" @@ -5853,27 +5853,27 @@ msgstr "変更なし" msgctxt "raft_interface_z_offset description" msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "ラフトインターフェースの第1層をプリントする際に,このオフセット値で平行移動し,ベースとインターフェースとの間の接着力をカスタマイズしてください。オフセット値をマイナスにすると接着力が向上します。" +msgstr "ラフト境界面の第1層をプリントする際に、土台と境界面との接着を調整するためこのオフセット値だけ平行移動します。オフセット値をマイナスにすると接着力が向上します。" msgctxt "raft_surface_z_offset description" msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "ラフトサーフェスの第1層をプリントする際に,このオフセット値で平行移動し,インターフェースとサーフェスとの間の接着力をカスタマイズしてください。オフセット値をマイナスにすると接着力が向上します。" +msgstr "ラフト表面の第1層をプリントする際、境界面と表面との接着を調整するためこのオフセット値だけ移動します。オフセット値をマイナスにすると接着力が向上します。" msgctxt "z_seam_on_vertex label" msgid "Z Seam On Vertex" -msgstr "頂点のZシーム" +msgstr "Zシームを頂点に配置" msgctxt "extra_infill_lines_to_support_skins description" msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "インフィルパターンにラインを追加して,上のスキンをサポートします。 このオプションは,下のインフィルが上にプリントされるスキンレイヤーを正しくサポートしていないために,複雑な形状のスキンに時々現れる穴やプラスチックの塊を防ぎます。「ウォール」はスキンのアウトラインのみをサポートしますが,「ウォールとライン」はスキンを構成するラインの端もサポートします。" +msgstr "インフィルパターンにラインを追加して、上にあるスキンをサポートします。このオプションは、下のインフィルが上にプリントされるスキンレイヤーを正しくサポートしていないことにより複雑な形状のスキンに時々現れる、穴やプラスチックの塊を防ぎます。「ウォール」はスキンのアウトラインのみをサポートするのに対して、「ウォールとライン」はスキンを構成するラインの端もサポートします。" msgctxt "build_fan_full_at_height label" msgid "Build Fan Speed at Height" -msgstr "高さでのビルドファンの速度" +msgstr "高さでのビルドファン速度" msgctxt "build_fan_full_layer label" msgid "Build Fan Speed at Layer" -msgstr "レイヤーでのビルドファンの速度" +msgstr "レイヤーでのビルドファン速度" msgctxt "build_volume_fan_nr label" msgid "Build volume fan number" @@ -5881,11 +5881,11 @@ msgstr "ビルドボリュームファンの数" msgctxt "scarf_split_distance description" msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "スカーフシームに沿って押し出す際のフロー変更における各ステップの長さを決定します。距離が短いほど,より正確になりますが,Gコードはより複雑になります。" +msgstr "スカーフシームに沿って押し出す際のフロー変更における各ステップの長さを決定します。距離が短いほどより精密になりますが、Gコードはより複雑になります。" msgctxt "scarf_joint_seam_length description" msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "スカーフシームの長さを決定します。これは,Zシームをより目立たなくするシームタイプです。効果を得るには,0より大きい値にする必要があります。" +msgstr "Zシームをより目立たなくする、スカーフシームの長さを決定します。効果を得るには、0より大きい値にする必要があります。" msgctxt "gradual_flow_discretisation_step_size description" msgid "Duration of each step in the gradual flow change" @@ -5893,7 +5893,7 @@ msgstr "段階的なフローの変化におけるステップごとの継続時 msgctxt "gradual_flow_enabled description" msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "段階的なフローの変化を有効にします。有効にすると,フローは目標フローまで段階的に増減します。これは,押し出しモーターの始動/停止時にフローがすぐに変化しないボーデンチューブを備えたプリンターに便利です。" +msgstr "段階的なフローの変化を有効にします。有効にすると、フロー量は目標フローまで段階的に増加/減少します。これは、エクストルーダーモーターの始動/停止時にフローがすぐに変化しないボーデンチューブを備えたプリンターに便利です。" msgctxt "extra_infill_lines_to_support_skins label" msgid "Extra Infill Lines To Support Skins" @@ -5901,7 +5901,7 @@ msgstr "スキンをサポートするための追加のインフィルライン msgctxt "reset_flow_duration description" msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "この値より長い移動の場合,素材フローはパスの目標フローにリセットされます。" +msgstr "この値より長い移動の場合、材料フローはパスの目標フローにリセットされます。" msgctxt "gradual_flow_discretisation_step_size label" msgid "Gradual flow discretisation step size" @@ -5933,23 +5933,23 @@ msgstr "なし" msgctxt "wall_0_acceleration label" msgid "Outer Wall Acceleration" -msgstr "アウターウォールの加速" +msgstr "外側ウォールにおける加速度" msgctxt "wall_0_deceleration label" msgid "Outer Wall Deceleration" -msgstr "アウターウォールの減速" +msgstr "外側ウォールにおける減速" msgctxt "wall_0_end_speed_ratio label" msgid "Outer Wall End Speed Ratio" -msgstr "アウターウォールの終了速度比" +msgstr "外側ウォールにおける終了速度の比率" msgctxt "wall_0_speed_split_distance label" msgid "Outer Wall Speed Split Distance" -msgstr "アウターウォールの速度スプリットの距離" +msgstr "外側ウォールでの速度スプリットの距離" msgctxt "wall_0_start_speed_ratio label" msgid "Outer Wall Start Speed Ratio" -msgstr "アウターウォールの開始速度比" +msgstr "外側ウォールにおける開始速度の比率" msgctxt "reset_flow_duration label" msgid "Reset flow duration" @@ -5961,7 +5961,7 @@ msgstr "スカーフシームの長さ" msgctxt "scarf_joint_seam_start_height_ratio label" msgid "Scarf Seam Start Height" -msgstr "スカーフシームの開始の高さ" +msgstr "スカーフシームを開始する高さ" msgctxt "scarf_split_distance label" msgid "Scarf Seam Step Length" @@ -5969,39 +5969,39 @@ msgstr "スカーフシームのステップ長" msgctxt "build_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "ファンが通常の速度で回転する高さ。下のレイヤーでは,ファンは初期速度から通常速度まで徐々に加速します。" +msgstr "通常速度でファンが回転するときの高さ。ここより下層レイヤーでは初期ファンのスピードから通常の速度まで徐々に増加します。" msgctxt "build_fan_full_layer description" msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "ビルドファンが最大速度で回転するレイヤー。この値は計算され,整数に丸められます。" +msgstr "ビルドファンが最大速度で回転するレイヤー。この値は計算され整数に丸められます。" msgctxt "build_volume_fan_nr description" msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "ビルドボリュームを冷却するファンの数。これが0に設定されている場合,ビルドボリュームファンがないことを意味します。" +msgstr "ビルドボリュームを冷却するファンの数。これが0に設定されている場合、ビルドボリュームファンがないことを意味します。" msgctxt "scarf_joint_seam_start_height_ratio description" msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "スカーフシームが始まる,選択したレイヤーの高さの比率。数値が低いほど,シームは高くなります。効果を得るには,100未満にする必要があります。" +msgstr "スカーフシーム開始時の、選択したレイヤーの高さの比率。数値が低いほどシームは高くなります。効果を得るには値を100未満にする必要があります。" msgctxt "wall_0_acceleration description" msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "これは,アウターウォールをプリントする際における最高速度に達するまでの加速度です。" +msgstr "外側ウォールをプリントする際における最高速度に達するまでの加速度です。" msgctxt "wall_0_deceleration description" msgid "This is the deceleration with which to end printing an outer wall." -msgstr "これは,アウターウォールのプリントを終了する際の減速度です。" +msgstr "外側ウォールのプリントを終了する際の減速度です。" msgctxt "wall_0_speed_split_distance description" msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "これは,アウターウォールの加減速を適用するために長いパスを分割する際の押し出しパスの最大長です。距離が短いほど,より正確ですが,より冗長なGコードが作成されます。" +msgstr "外側ウォールの加減速を適用するために長いパスを分割する際の造形パスの最大長です。距離が短いほど精度が上がりますが、Gコードが冗長になります。" msgctxt "wall_0_end_speed_ratio description" msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "これは,アウターウォールをプリントする際における終了時の最高速度の比率です。" +msgstr "外側ウォールをプリントする際における終了時の最高速度の比率です。" msgctxt "wall_0_start_speed_ratio description" msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "これは,アウターウォールをプリントする際における開始時の最高速度の比率です。" +msgstr "外側ウォールをプリントする際における開始時の最高速度の比率です。" msgctxt "extra_infill_lines_to_support_skins option walls" msgid "Walls Only" @@ -6013,4 +6013,4 @@ msgstr "ウォールとライン" msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "この角度を超えて張り出したウォールは,張り出したウォールの設定を使用してプリントされます。値が90の場合,張り出したウォールとして扱われることはありません。サポートによって支えられている張り出しも,張り出したウォールとして扱われません。さらに,張り出しが半分未満のラインも,張り出しとして扱われません。" +msgstr "この角度を超えるオーバーハングとなるウォールは、オーバーハングの設定を用いてプリントされます。値が90の場合、どのウォールもオーバーハングとして扱われません。サポートにより支えられているオーバーハングについてもオーバーハングとして扱われません。さらに、半分未満がオーバーハングとなっているラインもまたオーバーハングとして扱われません。" From 91237876f0ebf3da5b50ece218e725f22b170cfb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 27 Oct 2024 17:56:22 +0100 Subject: [PATCH 047/276] Remove obsolete overrides --- resources/definitions/eazao_m500.def.json | 2 -- resources/definitions/eazao_m600.def.json | 2 -- resources/definitions/eazao_m700.def.json | 2 -- resources/definitions/eazao_potter.def.json | 2 -- resources/definitions/eazao_zero.def.json | 2 -- 5 files changed, 10 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 70ab78a5a66..366ff92c29c 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 35a946e25e5..309888d3022 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 8459b3625da..e4f165fe0bc 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 20.0 }, diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 0ff84ab4291..ab704b17634 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 25.0 }, diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index df6f4faa183..7ee8e24ceec 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, "preferred_quality_type": "normal" }, @@ -60,7 +59,6 @@ "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "value": 0 }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 25.0 }, From a18a25027481f0d087729082a28ba211187f50b4 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 27 Oct 2024 18:04:35 +0100 Subject: [PATCH 048/276] Remove obsolete override for cool_fan_enabled Since the material has cool fan speed at 100. cool fan enabled set to false would make that setting redundant. --- resources/definitions/eazao_m500.def.json | 1 - resources/definitions/eazao_m600.def.json | 1 - resources/definitions/eazao_m700.def.json | 1 - resources/definitions/eazao_potter.def.json | 1 - resources/definitions/eazao_zero.def.json | 1 - 5 files changed, 5 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 366ff92c29c..965dc3b520d 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 309888d3022..ece6cdac681 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index e4f165fe0bc..37816843e3b 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index ab704b17634..7811014658e 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 3 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 3 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 7ee8e24ceec..490a7cab9e0 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -19,7 +19,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, "bottom_layers": { "value": 3 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 3 }, "jerk_print": { "value": 10 }, From aca2879a3e1deb63054b5199a7653980318614cb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 27 Oct 2024 18:13:10 +0100 Subject: [PATCH 049/276] retraction_combing_max_distance override with same value as fdmprinter Remove obsolete override setting. --- resources/definitions/eazao_zero.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 490a7cab9e0..cd572df9245 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -56,7 +56,6 @@ "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_combing_max_distance": { "value": 0 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, From 951dfb7cf687a15c8a493e6cb19325d7389742d8 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 28 Oct 2024 15:26:44 +0100 Subject: [PATCH 050/276] additional corrections UM nylon 175 doesn't exist in fdm_material im-pla GUID has been updated on fdm_material reference id for PETG is pet https://github.com/Ultimaker/fdm_materials/blob/ce6549e8820b95b0763212993a9a1ebf73fd287b/ultimaker_petg_175.xml.fdm_material#L10C9-L10C59 --- cura/PrinterOutput/FormatMaps.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index b22aad74414..3a03da71fdf 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -34,13 +34,12 @@ class FormatMaps: "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, "nylon-cf": {"name": "Nylon CF", "guid": "17abb865-ca73-4ccd-aeda-38e294c9c60b"}, - "nylon": {"name": "Nylon", "guid": "9475b03d-fd19-48a2-b7b5-be1fb46abb02"}, - "petg": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, + "pet": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "im-pla": {"name": "Tough", "guid": "96fca5d9-0371-4516-9e96-8e8182677f3c"} + "im-pla": {"name": "Tough", "guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} # /!\ When changing this list, make sure the changes are reported accordingly on Digital Factory } From 1ed7600a715866b11068f094b01ba6302d3f4b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udio=20=27Patola=27=20Sampaio?= Date: Tue, 29 Oct 2024 03:53:51 +0100 Subject: [PATCH 051/276] Updated pt_BR strings for Cura 5.9 --- resources/i18n/pt_BR/cura.po | 12 ++-- resources/i18n/pt_BR/fdmextruder.def.json.po | 6 +- resources/i18n/pt_BR/fdmprinter.def.json.po | 58 ++++++++++---------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 8df5995a82c..925401f9e89 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Cura 5.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-09 14:27+0200\n" -"PO-Revision-Date: 2024-07-23 03:24+0200\n" +"PO-Revision-Date: 2024-10-28 04:18+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -1566,7 +1566,7 @@ msgstr "Exportar Material" msgctxt "@action:inmenu menubar:help" msgid "Export Package For Technical Support" -msgstr "" +msgstr "Exportar Pacote Para Suporte Técnico" msgctxt "@title:window" msgid "Export Profile" @@ -5054,11 +5054,11 @@ msgstr "Não foi possível ler o arquivo de dados de exemplo." msgctxt "@info:status" msgid "Unable to send the model data to the engine. Please try again, or contact support." -msgstr "" +msgstr "Não foi possível enviar os dados de modelo para o engine. Por favor tente novamente ou contacte o suporte." msgctxt "@info:status" msgid "Unable to send the model data to the engine. Please try to use a less detailed model, or reduce the number of instances." -msgstr "" +msgstr "Não foi possível enviar os dados do modelo para o engine. Por favor use um modelo menos detalhado ou reduza o número de instâncias." msgctxt "@info:title" msgid "Unable to slice" @@ -5323,7 +5323,7 @@ msgstr "Atualiza configurações do Cura 5.6 para o Cura 5.7." msgctxt "description" msgid "Upgrades configurations from Cura 5.8 to Cura 5.9." -msgstr "" +msgstr "Atualiza configurações do Cura 5.8 para o Cura 5.9." msgctxt "@action:button" msgid "Upload custom Firmware" @@ -5471,7 +5471,7 @@ msgstr "Atualização de Versão de 5.6 para 5.7" msgctxt "name" msgid "Version Upgrade 5.8 to 5.9" -msgstr "" +msgstr "Atualização de Versão de 5.8 para 5.9" msgctxt "@button" msgid "View printers in Digital Factory" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index 16bdc106792..722c48e06df 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2024-10-09 14:27+0000\n" -"PO-Revision-Date: 2024-04-01 22:39+0200\n" +"PO-Revision-Date: 2024-10-28 04:20+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -131,7 +131,7 @@ msgstr "ID do Bico" msgctxt "machine_nozzle_head_distance label" msgid "Nozzle Length" -msgstr "" +msgstr "Comprimento do Bico" msgctxt "machine_nozzle_offset_x label" msgid "Nozzle X Offset" @@ -163,7 +163,7 @@ msgstr "O extrusor usado para impressão. Isto é usado em multi-extrusão." msgctxt "machine_nozzle_head_distance description" msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "" +msgstr "A diferença de altura entre a ponta do bico e a parte inferior da cabeça de impressão." msgctxt "machine_nozzle_size description" msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size." diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 786c24bebab..11d6d8ffb6e 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 5.7\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2024-10-09 14:27+0000\n" -"PO-Revision-Date: 2024-07-24 04:19+0200\n" +"PO-Revision-Date: 2024-10-29 03:52+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -99,7 +99,7 @@ msgstr "Camadas adaptativas fazem a computação das alturas de camada depender msgctxt "extra_infill_lines_to_support_skins description" msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "" +msgstr "Adiciona filetes extras no padrão de preenchimento para apoiar os contornos acima. Esta opção previne furos ou bolhas de plástico que algumas vezes aparecem em contornos de formas complexas devido ao preenchimento abaixo não apoiar corretamente o contorno de cima. 'Paredes' faz suportar apenas os extremos do contorno, enquanto que 'Paredes e Linhas' faz também suportar extremos de filetes que perfazem o contorno." msgctxt "infill_wall_line_count description" msgid "" @@ -451,11 +451,11 @@ msgstr "Largura do Brim" msgctxt "build_fan_full_at_height label" msgid "Build Fan Speed at Height" -msgstr "" +msgstr "Velocidade de Construção da Ventoinha na Altura" msgctxt "build_fan_full_layer label" msgid "Build Fan Speed at Layer" -msgstr "" +msgstr "Velocidade de Construção da Ventoinha na Camada" msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" @@ -499,7 +499,7 @@ msgstr "Aviso de temperatura do Volume de Construção" msgctxt "build_volume_fan_nr label" msgid "Build volume fan number" -msgstr "" +msgstr "Número da ventoinha de volume de construção" msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." @@ -739,11 +739,11 @@ msgstr "Detectar pontes e modificar a velocidade de impressão, de fluxo e ajust msgctxt "scarf_split_distance description" msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "" +msgstr "Determina o comprimento de cada passo na mudança de fluxo ao extrudar pela emenda scarf. Uma distância menor resultará em um G-code mais preciso porém também mais complexo." msgctxt "scarf_joint_seam_length description" msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "" +msgstr "Determina o comprimento da emenda scarf, um tipo de emenda que procura tornar a junção do eixo Z menos visível. Deve ser maior que 0 pra se tornar efetivo." msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." @@ -1035,7 +1035,7 @@ msgstr "Costura Extensa tenta costurar furos abertos na malha fechando o furo co msgctxt "extra_infill_lines_to_support_skins label" msgid "Extra Infill Lines To Support Skins" -msgstr "" +msgstr "Linhas de Preenchimento Extras Para Apoiar Contornos" msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" @@ -2451,7 +2451,7 @@ msgstr "Nenhuma" msgctxt "extra_infill_lines_to_support_skins option none" msgid "None" -msgstr "" +msgstr "Nenhuma" msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" @@ -2627,15 +2627,15 @@ msgstr "Aceleração da Parede Exterior" msgctxt "wall_0_acceleration label" msgid "Outer Wall Acceleration" -msgstr "" +msgstr "Aceleração da Parede Externa" msgctxt "wall_0_deceleration label" msgid "Outer Wall Deceleration" -msgstr "" +msgstr "Deceleração da Parede Externa" msgctxt "wall_0_end_speed_ratio label" msgid "Outer Wall End Speed Ratio" -msgstr "" +msgstr "Proporção de Velocidade do Fim da Parede Externa" msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" @@ -2663,11 +2663,11 @@ msgstr "Velocidade da Parede Exterior" msgctxt "wall_0_speed_split_distance label" msgid "Outer Wall Speed Split Distance" -msgstr "" +msgstr "Distância de Divisão de Velocidade da Parede Externa" msgctxt "wall_0_start_speed_ratio label" msgid "Outer Wall Start Speed Ratio" -msgstr "" +msgstr "Raio de Velocidade do Começo da Parede Externa" msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" @@ -3311,15 +3311,15 @@ msgstr "Compensação de Fator de Encolhimento" msgctxt "scarf_joint_seam_length label" msgid "Scarf Seam Length" -msgstr "" +msgstr "Comprimento da Emenda Scarf" msgctxt "scarf_joint_seam_start_height_ratio label" msgid "Scarf Seam Start Height" -msgstr "" +msgstr "Altura Inicial da Emenda Scarf" msgctxt "scarf_split_distance label" msgid "Scarf Seam Step Length" -msgstr "" +msgstr "Comprimento de Passo da Emenda Scarf" msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" @@ -4379,7 +4379,7 @@ msgstr "A altura acima das partes horizontais do modelo onde criar o molde." msgctxt "build_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "" +msgstr "A altura em que as ventoinhas giram na velocidade regular. Nas camadas abaixo a velocidade de ventoinha gradualmente aumenta da Velocidade Inicial de Ventoinha para a Velocidade Regular." msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." @@ -4491,7 +4491,7 @@ msgstr "A maior largura das áreas de contorno superiores que serão removidas. msgctxt "build_fan_full_layer description" msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "" +msgstr "A camada em que as ventoinhas giram na velocidade total. Este valor é calculado e arredondado para um número inteiro." msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." @@ -4779,7 +4779,7 @@ msgstr "O número de filetes usado para o brim de suporte. Mais filetes melhoram msgctxt "build_volume_fan_nr description" msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "" +msgstr "O número da ventoinha que refrigera o volume de construção. Se isto for colocado em 0, significa que não há ventoinha do volume de construção." msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." @@ -4875,7 +4875,7 @@ msgstr "A mudança instantânea máxima de velocidade em uma direção para a ca msgctxt "scarf_joint_seam_start_height_ratio description" msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "" +msgstr "A proporção da altura de camada selecionada em que a emenda scarf começará. Um número menor resultará em maior altura de emenda. Deve ser menor que 100 para se tornar efetivo." msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." @@ -5207,23 +5207,23 @@ msgstr "Este ajuste controla a distância que o extrusor deve parar de extrudar msgctxt "wall_0_acceleration description" msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "" +msgstr "Esta é a aceleração com a qual se alcança a velocidade máxima ao imprimir uma parede externa." msgctxt "wall_0_deceleration description" msgid "This is the deceleration with which to end printing an outer wall." -msgstr "" +msgstr "Esta é a deceleração com que terminar a impressão de uma parede externa." msgctxt "wall_0_speed_split_distance description" msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "" +msgstr "Este é o máximo comprimento de um caminho de extrusão ao dividir um caminho maior para aplicar a aceleração ou deceleração de parede externa. Uma distância maior criará um G-code mais preciso mas também mais extenso." msgctxt "wall_0_end_speed_ratio description" msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "" +msgstr "Esta é a proporção da velocidade máxima com que terminar a impressão de uma parede externa." msgctxt "wall_0_start_speed_ratio description" msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "" +msgstr "Esta é a proporção da velocidade máxima com que começar a impressão de uma parede externa." msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." @@ -5607,15 +5607,15 @@ msgstr "Paredes" msgctxt "extra_infill_lines_to_support_skins option walls" msgid "Walls Only" -msgstr "" +msgstr "Paredes Somente" msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" msgid "Walls and Lines" -msgstr "" +msgstr "Paredes e Linhas" msgctxt "wall_overhang_angle description" msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "" +msgstr "Paredes com seção pendente maior que este ângulo serão impressas usando ajustes de seções pendentes de perede. Quando este valor for 90, nenhuma parede será tratada como seção pendente. Seções pendentes apoiadas por suporte não serão tratadas como pendentes também. Além disso, qualquer filete que for menos da metade pendente também não será tratado como pendente." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." From 52824c487272e5f28e9ac0f7b126aca19008b5de Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 29 Oct 2024 13:18:04 +0100 Subject: [PATCH 052/276] Build: Make pseudo-code into something that should work for all OS's. part of CURA-12229 --- conandata.yml | 18 ++++++++++++------ conanfile.py | 7 ++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index b3a71a4b50e..735e1ce9e08 100644 --- a/conandata.yml +++ b/conandata.yml @@ -125,12 +125,18 @@ pyinstaller: Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" blacklist: - - "libassimp.so" - - "PyQt6/Qt6/qml/QtQuick3D" # directory - - "libqtquick3deffectplugin.so" - - "libqtquick3dphysicshelpersplugin.so" - - "libqtquick3dparticleeffectsplugin.so" - - "etc......." + - [ "assimp" ] + - [ "qt", "charts" ] + - [ "qt", "coap" ] + - [ "qt", "data", "vis" ] + - [ "qt", "lab", "animat" ] + - [ "qt", "mqtt" ] + - [ "qt", "net", "auth" ] + - [ "qt", "quick3d" ] + - [ "qt", "timeline" ] + - [ "qt", "virt", "key" ] + - [ "qt", "wayland", "compos" ] + - [ "qt", "5", "compat" ] pycharm_targets: - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja module_name: Cura diff --git a/conanfile.py b/conanfile.py index be515c876d3..9461ba6c1d5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -283,7 +283,12 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e # filter all binary files in binaries on the blacklist blacklist = pyinstaller_metadata["blacklist"] - filtered_binaries = [b for b in binaries if b not in blacklist] + filtered_binaries = [b for b in binaries if any([all([(part in b) for part in parts]) for parts in blacklist])] + + # TEMP: print to make sure -- remove this before merge + print("specifically don't include:") + print(set(binaries) - set(filtered_binaries)) + print("=== === ===") with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( From 2d9e7a347ffbf8468a838c92fbb5b6d9784ac631 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 29 Oct 2024 13:49:24 +0100 Subject: [PATCH 053/276] Build: Fix inverted filter condition for libraries. Noticed that we _only_ kept the libraries we _didn't_ want, instead of the inverse :-p part of CURA-12229 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 9461ba6c1d5..0062431f34f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -283,7 +283,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e # filter all binary files in binaries on the blacklist blacklist = pyinstaller_metadata["blacklist"] - filtered_binaries = [b for b in binaries if any([all([(part in b) for part in parts]) for parts in blacklist])] + filtered_binaries = [b for b in binaries if not any([all([(part in b) for part in parts]) for parts in blacklist])] # TEMP: print to make sure -- remove this before merge print("specifically don't include:") From e0f0e9407b6e5f092b69a85e16fde5484f64ab0c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 29 Oct 2024 16:14:19 +0100 Subject: [PATCH 054/276] Build: Filter didn't work because the filename was in a tuple. part of CURA-12229 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 0062431f34f..d684e10ea4e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -283,7 +283,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e # filter all binary files in binaries on the blacklist blacklist = pyinstaller_metadata["blacklist"] - filtered_binaries = [b for b in binaries if not any([all([(part in b) for part in parts]) for parts in blacklist])] + filtered_binaries = [b for b in binaries if not any([all([(part in b[0].lower()) for part in parts]) for parts in blacklist])] # TEMP: print to make sure -- remove this before merge print("specifically don't include:") From 35ca2d6deab0e6865d645320ef85acfd11c3e81c Mon Sep 17 00:00:00 2001 From: h1data Date: Wed, 30 Oct 2024 12:16:23 +0900 Subject: [PATCH 055/276] tweaks common terms for Japanese translation --- resources/i18n/ja_JP/cura.po | 10 ++++---- resources/i18n/ja_JP/fdmprinter.def.json.po | 26 ++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 0976b8ee80d..4b0761b174c 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-13 09:02+0100\n" -"PO-Revision-Date: 2024-10-27 12:31+0000\n" +"PO-Revision-Date: 2024-10-30 02:53+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" "Language: ja_JP\n" @@ -2806,7 +2806,7 @@ msgstr "G-codeは一度に1つしか読み込めません。{0}の取り込み msgctxt "@message" msgid "Oops! We encountered an unexpected error during your slicing process. Rest assured, we've automatically received the crash logs for analysis, if you have not disabled data sharing in your preferences. To assist us further, consider sharing your project details on our issue tracker." -msgstr "申し訳ありません。スライス処理中に予期せぬエラーが発生しました。設定でデータ共有を無効にしていない場合は、クラッシュログを自動的に受信し分析を行います。また、Issue trackerでプロジェクトの詳細を共有いただけると助かります。" +msgstr "申し訳ありません。スライス処理中に予期せぬエラーが発生しました。環境設定でデータ共有を無効にしていない場合は、クラッシュログを自動的に受信し分析を行います。また、Issue trackerでプロジェクトの詳細を共有いただけると助かります。" msgctxt "@action:button" msgid "Open" @@ -2926,7 +2926,7 @@ msgstr[0] "%1個の設定を上書きします。" msgctxt "@title:menu menubar:toplevel" msgid "P&references" -msgstr "プレファレンス(&R)" +msgstr "環境設定(&R)" msgctxt "@item:inlistbox" msgid "PNG Image" @@ -3891,7 +3891,7 @@ msgstr "表示項目設定" msgctxt "@info:progress" msgid "Setting up preferences..." -msgstr "プレファレンスをセットアップ中..." +msgstr "環境設定をセットアップ中..." msgctxt "@info:progress" msgid "Setting up scene..." @@ -4237,7 +4237,7 @@ msgstr "強度" msgctxt "description" msgid "Submits anonymous slice info. Can be disabled through preferences." -msgstr "匿名のスライス情報を登録します。設定により無効になる可能性があります。" +msgstr "匿名のスライス情報を登録します。環境設定により無効になる場合があります。" msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 32f4df3a236..357208a3b7e 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-13 09:02+0100\n" -"PO-Revision-Date: 2024-10-27 13:38+0000\n" +"PO-Revision-Date: 2024-10-30 02:17+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" "Language: ja_JP\n" @@ -1560,11 +1560,11 @@ msgstr "インフィルオーバーハング角度" msgctxt "infill_overlap_mm label" msgid "Infill Overlap" -msgstr "インフィル重複" +msgstr "インフィルの重なり" msgctxt "infill_overlap label" msgid "Infill Overlap Percentage" -msgstr "インフィル重複率" +msgstr "インフィルの重なり (%)" msgctxt "infill_pattern label" msgid "Infill Pattern" @@ -3178,11 +3178,11 @@ msgstr "表面拡張距離" msgctxt "skin_overlap_mm label" msgid "Skin Overlap" -msgstr "表面重複" +msgstr "表面の重なり" msgctxt "skin_overlap label" msgid "Skin Overlap Percentage" -msgstr "表面重複率" +msgstr "表面の重なり (%)" msgctxt "skin_preshrink label" msgid "Skin Removal Width" @@ -5741,11 +5741,11 @@ msgstr "ラフト土台フロー量" msgctxt "raft_base_infill_overlap_mm label" msgid "Raft Base Infill Overlap" -msgstr "ラフト土台インフィル重複" +msgstr "ラフト土台でのインフィルの重なり" msgctxt "raft_base_infill_overlap label" msgid "Raft Base Infill Overlap Percentage" -msgstr "ラフト土台インフィル重複率" +msgstr "ラフト土台でのインフィルの重なり (%)" msgctxt "raft_flow label" msgid "Raft Flow" @@ -5757,11 +5757,11 @@ msgstr "ラフト境界面フロー量" msgctxt "raft_interface_infill_overlap_mm label" msgid "Raft Interface Infill Overlap" -msgstr "ラフト境界面インフィル重複" +msgstr "ラフト境界面でのインフィルの重なり" msgctxt "raft_interface_infill_overlap label" msgid "Raft Interface Infill Overlap Percentage" -msgstr "ラフト境界面インフィル重複率" +msgstr "ラフト境界面でのインフィルの重なり (%)" msgctxt "raft_interface_z_offset label" msgid "Raft Interface Z Offset" @@ -5773,11 +5773,11 @@ msgstr "ラフト表層フロー量" msgctxt "raft_surface_infill_overlap_mm label" msgid "Raft Surface Infill Overlap" -msgstr "ラフト表面インフィル重複" +msgstr "ラフト表面でのインフィルの重なり" msgctxt "raft_surface_infill_overlap label" msgid "Raft Surface Infill Overlap Percentage" -msgstr "ラフト表面インフィル重複率" +msgstr "ラフト表面でのインフィルの重なり (%)" msgctxt "raft_surface_z_offset label" msgid "Raft Surface Z Offset" @@ -5817,11 +5817,11 @@ msgstr "インフィルとラフト土台のウォールが重なる量（イン msgctxt "raft_base_infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト土台のウォールとの重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" +msgstr "インフィルとラフト土台のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_interface_infill_overlap description" msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト境界面のウォールとの重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" +msgstr "インフィルとラフト境界面のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "raft_interface_infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." From cf836c29cb47ffb784cd965f50508fa415903b36 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 30 Oct 2024 08:45:58 +0100 Subject: [PATCH 056/276] Build: Outright remove the unwanted binaries, just to be sure. This is needed on Windows at the moment, which doesn't actually parse that file, but does execute the method. part of CURA-12229 --- conanfile.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d684e10ea4e..d2ecd6e3e47 100644 --- a/conanfile.py +++ b/conanfile.py @@ -285,11 +285,13 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e blacklist = pyinstaller_metadata["blacklist"] filtered_binaries = [b for b in binaries if not any([all([(part in b[0].lower()) for part in parts]) for parts in blacklist])] - # TEMP: print to make sure -- remove this before merge - print("specifically don't include:") - print(set(binaries) - set(filtered_binaries)) - print("=== === ===") + # In case the installer isn't actually pyinstaller (Windows at the moment), outright remove the offending files: + specifically_delete = set(binaries) - set(filtered_binaries) + for (unwanted_path, _) in specifically_delete: + print(f"delete: {unwanted_path}") + os.remove(unwanted_path) + # Write the actual file: with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( name = str(self.options.display_name).replace(" ", "-"), From d730f42f5f510bcaf535e3b4bb6a9dc72d229955 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 30 Oct 2024 13:48:44 +0100 Subject: [PATCH 057/276] Allow very high acceleration and deceleration CURA-12235 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 54d92af015f..31cffc4dc36 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8987,7 +8987,7 @@ "type": "float", "default_value": 20.0, "minimum_value": 1.0, - "maximum_value": 1000.0, + "maximum_value": 100000.0, "unit": "mm/s\u00b2", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_extruder": true, @@ -9014,7 +9014,7 @@ "type": "float", "default_value": 20.0, "minimum_value": 1.0, - "maximum_value": 1000.0, + "maximum_value": 100000.0, "unit": "mm/s\u00b2", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_extruder": true, From 2aed655c8b238b17dc879cb8ae7326e15ba0832a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 30 Oct 2024 15:07:00 +0100 Subject: [PATCH 058/276] Build: Really try to make sure unwanted binaries are gone. part of CURA-12229 --- conanfile.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/conanfile.py b/conanfile.py index d2ecd6e3e47..3b24d6b991f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -217,6 +217,56 @@ def _generate_cura_version(self, location): python_installs=self._python_installs(), )) + def _delete_unwanted_binaries(self, root): + dynamic_binary_file_exts = [".so", ".dylib", ".dll", ".pyd", ".pyi"] + prohibited = [ + "qt5compat", + "qtcharts", + "qtcoap", + "qtdatavis3d", + "qtlottie", + "qtmqtt", + "qtnetworkauth", + "qtquick3d", + "qtquick3dphysics", + "qtquicktimeline", + "qtvirtualkeyboard", + "qtwayland" + ] + forbiddens = [x.encode() for x in prohibited] + to_remove_files = [] + to_remove_dirs = [] + for root, dir_, files in os.walk(root): + for filename in files: + if not any([(x in filename) for x in dynamic_binary_file_exts]): + continue + pathname = os.path.join(root, filename) + still_exist = True + for forbidden in prohibited: + if forbidden.lower() in str(pathname).lower(): + to_remove_files.append(pathname) + still_exist = False + break + if not still_exist: + continue + with open(pathname, "rb") as file: + bytez = file.read().lower() + for forbidden in forbiddens: + if bytez.find(forbidden) >= 0: + to_remove_files.append(pathname) + for dirname in dir_: + for forbidden in prohibited: + if forbidden.lower() == str(dirname).lower(): + pathname = os.path.join(root, dirname) + to_remove_dirs.append(pathname) + break + for file in to_remove_files: + os.remove(file) + print(f"deleted file: {file}") + for dir_ in to_remove_dirs: + os.remove(dir_) + print(f"deleted dir_: {dir_}") + def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] @@ -416,8 +466,10 @@ def generate(self): for dependency in self.dependencies.host.values(): for bindir in dependency.cpp_info.bindirs: + self._delete_unwanted_binaries(bindir) copy(self, "*.dll", bindir, str(self._site_packages), keep_path = False) for libdir in dependency.cpp_info.libdirs: + self._delete_unwanted_binaries(libdir) copy(self, "*.pyd", libdir, str(self._site_packages), keep_path = False) copy(self, "*.pyi", libdir, str(self._site_packages), keep_path = False) copy(self, "*.dylib", libdir, str(self._base_dir.joinpath("lib")), keep_path = False) @@ -507,6 +559,11 @@ def deploy(self): self._generate_cura_version(os.path.join(self._site_packages, "cura")) + self._delete_unwanted_binaries(self._site_packages) + self._delete_unwanted_binaries(self.package_folder) + self._delete_unwanted_binaries(self._base_dir) + self._delete_unwanted_binaries(self._share_dir) + entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self._base_dir, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), From cd2e4220f0c4616a7e15fc9673a691a16f599d83 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 30 Oct 2024 15:49:02 +0100 Subject: [PATCH 059/276] Build: Don't remove dir with os.remove use rmdir instead. part of CURA-12229 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 3b24d6b991f..1f86867ae8e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -264,7 +264,7 @@ def _delete_unwanted_binaries(self, root): os.remove(file) print(f"deleted file: {file}") for dir_ in to_remove_dirs: - os.remove(dir_) + rmdir(self, dir_) print(f"deleted dir_: {dir_}") def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): From 341e6a6b62501788350ab363e4d5c4307194548e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 30 Oct 2024 16:04:51 +0100 Subject: [PATCH 060/276] Add exclude material rule for eazao_clay --- resources/definitions/ultimaker_method.def.json | 1 + resources/definitions/ultimaker_methodx.def.json | 1 + resources/definitions/ultimaker_methodxl.def.json | 1 + resources/definitions/ultimaker_sketch.def.json | 1 + resources/definitions/ultimaker_sketch_sprint.def.json | 1 + 5 files changed, 5 insertions(+) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index ced7411148c..53f7ba8be39 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -16,6 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 7700f2d3058..607af6c626a 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -16,6 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 9faf3c4a86b..f942d1618bc 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -16,6 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index b9353cc7bb2..a5483f8f64a 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -16,6 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index cc03781c00a..f8d392fe1ff 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -16,6 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", From 86f12f62f72d2cbc252386b50fc87ba3ef9b260d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 30 Oct 2024 17:02:42 +0100 Subject: [PATCH 061/276] Build: Some files may have already been removed. Symlinks for example? part of CURA-12229 --- conanfile.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 1f86867ae8e..73336e41f3f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -261,11 +261,17 @@ def _delete_unwanted_binaries(self, root): to_remove_dirs.append(pathname) break for file in to_remove_files: - os.remove(file) - print(f"deleted file: {file}") + try: + os.remove(file) + print(f"deleted file: {file}") + except Exception as ex: + print(f"WARNING: Attempt to delete file {file} results in: {str(ex)}") for dir_ in to_remove_dirs: - rmdir(self, dir_) - print(f"deleted dir_: {dir_}") + try: + rmdir(self, dir_) + print(f"deleted dir_: {dir_}") + except Exception as ex: + print(f"WARNING: Attempt to delete folder {dir_} results in: {str(ex)}") def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): pyinstaller_metadata = self.conan_data["pyinstaller"] @@ -338,8 +344,11 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e # In case the installer isn't actually pyinstaller (Windows at the moment), outright remove the offending files: specifically_delete = set(binaries) - set(filtered_binaries) for (unwanted_path, _) in specifically_delete: - print(f"delete: {unwanted_path}") - os.remove(unwanted_path) + try: + os.remove(unwanted_path) + print(f"delete: {unwanted_path}") + except Exception as ex: + print(f"WARNING: Attempt to delete binary {unwanted_path} results in: {str(ex)}") # Write the actual file: with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: From 54a521eed653b597095b0ba2ba81d65942bfa366 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 1 Nov 2024 10:32:13 +0100 Subject: [PATCH 062/276] add preferred material eazao_clay to definitions --- resources/definitions/eazao_m500.def.json | 1 + resources/definitions/eazao_m600.def.json | 1 + resources/definitions/eazao_m700.def.json | 1 + resources/definitions/eazao_potter.def.json | 1 + resources/definitions/eazao_zero.def.json | 1 + 5 files changed, 5 insertions(+) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 965dc3b520d..f4ad1dd03e9 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index ece6cdac681..e76d9239094 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 37816843e3b..98e35f46e1b 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 7811014658e..110ea1efb50 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index cd572df9245..d4ae902fa6f 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": From 47b4cc6dee920112bbd88afeb5e31e31e5978920 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 1 Nov 2024 15:54:49 +0100 Subject: [PATCH 063/276] Replace s with S in Nozzle size --- resources/i18n/cs_CZ/cura.po | 2 +- resources/i18n/cura.pot | 2 +- resources/i18n/de_DE/cura.po | 2 +- resources/i18n/es_ES/cura.po | 2 +- resources/i18n/fi_FI/cura.po | 2 +- resources/i18n/fr_FR/cura.po | 2 +- resources/i18n/hu_HU/cura.po | 2 +- resources/i18n/it_IT/cura.po | 2 +- resources/i18n/ja_JP/cura.po | 2 +- resources/i18n/ko_KR/cura.po | 2 +- resources/i18n/nl_NL/cura.po | 2 +- resources/i18n/pl_PL/cura.po | 2 +- resources/i18n/pt_BR/cura.po | 2 +- resources/i18n/pt_PT/cura.po | 2 +- resources/i18n/ru_RU/cura.po | 2 +- resources/i18n/tr_TR/cura.po | 2 +- resources/i18n/zh_CN/cura.po | 2 +- resources/i18n/zh_TW/cura.po | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index f3a07dca99b..7eda7f927ab 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -2841,7 +2841,7 @@ msgid "Nozzle offset Y" msgstr "Y offset trysky" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Velikost trysky" msgctxt "@label" diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 1a466d8f274..e766a3613c9 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -2678,7 +2678,7 @@ msgid "Nozzle offset Y" msgstr "" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "" msgctxt "@label" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index aa51c9c1129..a356da33811 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -2757,7 +2757,7 @@ msgid "Nozzle offset Y" msgstr "Y-Versatz Düse" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Düsengröße" msgctxt "@label" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index adc60bb75b0..674e6e7dae5 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -2757,7 +2757,7 @@ msgid "Nozzle offset Y" msgstr "Desplazamiento de la tobera sobre el eje Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Tamaño de la tobera" msgctxt "@label" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 6948d8a3b77..08e8051bef1 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -2816,7 +2816,7 @@ msgid "Nozzle offset Y" msgstr "Suuttimen Y-siirtymä" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Suuttimen koko" msgctxt "@label" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index a91e2fc2ebe..25d961c12c6 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -2755,7 +2755,7 @@ msgid "Nozzle offset Y" msgstr "Décalage buse Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Taille de la buse" msgctxt "@label" diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index 5c546f1d029..ba5a5f9ce5f 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -2826,7 +2826,7 @@ msgid "Nozzle offset Y" msgstr "Fúvóka Y eltolás" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Fúvóka méret" msgctxt "@label" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index b899360d8df..ec6cc7a30da 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -2757,7 +2757,7 @@ msgid "Nozzle offset Y" msgstr "Scostamento Y ugello" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Dimensione ugello" msgctxt "@label" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 4b0761b174c..8cadb6dddf3 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -2765,7 +2765,7 @@ msgid "Nozzle offset Y" msgstr "ノズルオフセットY" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "ノズルサイズ" msgctxt "@label" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index ec7c00ff686..4affaace4f9 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -2752,7 +2752,7 @@ msgid "Nozzle offset Y" msgstr "노즐 오프셋 Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "노즐 크기" msgctxt "@label" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index fd334c04613..5672a1acafb 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -2755,7 +2755,7 @@ msgid "Nozzle offset Y" msgstr "Nozzle-offset Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Maat nozzle" msgctxt "@label" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index bb6f4ad36fe..a7e151e564f 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -2829,7 +2829,7 @@ msgid "Nozzle offset Y" msgstr "Korekcja dyszy Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Rozmiar dyszy" msgctxt "@label" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 925401f9e89..ea1b79ef3f6 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -2842,7 +2842,7 @@ msgid "Nozzle offset Y" msgstr "Deslocamento Y do Bico" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Tamanho do bico" msgctxt "@label" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index d755d2d9d0f..e642e198f1f 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -2758,7 +2758,7 @@ msgid "Nozzle offset Y" msgstr "Desvio Y do Nozzle" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Tamanho do nozzle" msgctxt "@label" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 93543ef4c1f..1e51b4df1e4 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -2767,7 +2767,7 @@ msgid "Nozzle offset Y" msgstr "Смещение сопла по оси Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Диаметр сопла" msgctxt "@label" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 862914d7003..23bed592784 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -2757,7 +2757,7 @@ msgid "Nozzle offset Y" msgstr "Nozül Y ofseti" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "Nozzle boyutu" msgctxt "@label" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 041b9c21f9d..fa3caec9546 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -2752,7 +2752,7 @@ msgid "Nozzle offset Y" msgstr "喷嘴偏移 Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "喷嘴孔径" msgctxt "@label" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 199f1680c19..0240df1a059 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -2827,7 +2827,7 @@ msgid "Nozzle offset Y" msgstr "噴頭偏移 Y" msgctxt "@label" -msgid "Nozzle size" +msgid "Nozzle Size" msgstr "噴頭孔徑" msgctxt "@label" From a225097d94d0b0a0977d4f205c081f81934d5bb3 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 1 Nov 2024 17:07:11 +0100 Subject: [PATCH 064/276] add the variant with small s as well Unclear where it's used and should be kept --- resources/i18n/cs_CZ/cura.po | 4 ++++ resources/i18n/cura.pot | 4 ++++ resources/i18n/de_DE/cura.po | 4 ++++ resources/i18n/es_ES/cura.po | 4 ++++ resources/i18n/fi_FI/cura.po | 4 ++++ resources/i18n/fr_FR/cura.po | 4 ++++ resources/i18n/hu_HU/cura.po | 4 ++++ resources/i18n/it_IT/cura.po | 4 ++++ resources/i18n/ja_JP/cura.po | 4 ++++ resources/i18n/ko_KR/cura.po | 4 ++++ resources/i18n/nl_NL/cura.po | 4 ++++ resources/i18n/pl_PL/cura.po | 4 ++++ resources/i18n/pt_BR/cura.po | 4 ++++ resources/i18n/pt_PT/cura.po | 4 ++++ resources/i18n/ru_RU/cura.po | 4 ++++ resources/i18n/tr_TR/cura.po | 4 ++++ resources/i18n/zh_CN/cura.po | 4 ++++ resources/i18n/zh_TW/cura.po | 4 ++++ 18 files changed, 72 insertions(+) diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index 7eda7f927ab..a47909e6f3f 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -2844,6 +2844,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Velikost trysky" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Velikost trysky" + msgctxt "@label" msgid "Number of Copies" msgstr "Počet kopií" diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index e766a3613c9..6541919a19e 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -2681,6 +2681,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "" +msgctxt "@label" +msgid "Nozzle size" +msgstr "" + msgctxt "@label" msgid "Number of Copies" msgstr "" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index a356da33811..39d687a2eca 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -2760,6 +2760,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Düsengröße" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Düsengröße" + msgctxt "@label" msgid "Number of Copies" msgstr "Anzahl Kopien" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 674e6e7dae5..ee260270343 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -2760,6 +2760,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Tamaño de la tobera" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Tamaño de la tobera" + msgctxt "@label" msgid "Number of Copies" msgstr "Número de copias" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 08e8051bef1..7ae63602296 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -2819,6 +2819,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Suuttimen koko" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Suuttimen koko" + msgctxt "@label" msgid "Number of Copies" msgstr "Kopioiden määrä" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 25d961c12c6..b1eada18000 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -2758,6 +2758,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Taille de la buse" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Taille de la buse" + msgctxt "@label" msgid "Number of Copies" msgstr "Nombre de copies" diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index ba5a5f9ce5f..b350cd7bf3f 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -2829,6 +2829,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Fúvóka méret" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Fúvóka méret" + msgctxt "@label" msgid "Number of Copies" msgstr "Másolatok száma" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index ec6cc7a30da..96fd6261e9a 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -2760,6 +2760,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Dimensione ugello" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Dimensione ugello" + msgctxt "@label" msgid "Number of Copies" msgstr "Numero di copie" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 8cadb6dddf3..8c56b50aa03 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -2768,6 +2768,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "ノズルサイズ" +msgctxt "@label" +msgid "Nozzle size" +msgstr "ノズルサイズ" + msgctxt "@label" msgid "Number of Copies" msgstr "コピー数" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 4affaace4f9..de8aef4e00d 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -2755,6 +2755,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "노즐 크기" +msgctxt "@label" +msgid "Nozzle size" +msgstr "노즐 크기" + msgctxt "@label" msgid "Number of Copies" msgstr "복제할 수" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 5672a1acafb..6e1497d5078 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -2758,6 +2758,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Maat nozzle" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Maat nozzle" + msgctxt "@label" msgid "Number of Copies" msgstr "Aantal exemplaren" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index a7e151e564f..36fb5e02e81 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -2832,6 +2832,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Rozmiar dyszy" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Rozmiar dyszy" + msgctxt "@label" msgid "Number of Copies" msgstr "Liczba kopii" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index ea1b79ef3f6..4b7fa00b943 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -2845,6 +2845,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Tamanho do bico" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Tamanho do bico" + msgctxt "@label" msgid "Number of Copies" msgstr "Número de Cópias" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index e642e198f1f..5a3c67b8218 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -2761,6 +2761,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Tamanho do nozzle" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Tamanho do nozzle" + msgctxt "@label" msgid "Number of Copies" msgstr "Número de Cópias" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 1e51b4df1e4..298a30d5ed9 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -2770,6 +2770,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Диаметр сопла" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Диаметр сопла" + msgctxt "@label" msgid "Number of Copies" msgstr "Количество копий" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 23bed592784..c8ad0816e99 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -2760,6 +2760,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "Nozzle boyutu" +msgctxt "@label" +msgid "Nozzle size" +msgstr "Nozzle boyutu" + msgctxt "@label" msgid "Number of Copies" msgstr "Kopya Sayısı" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index fa3caec9546..4a0e1341462 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -2755,6 +2755,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "喷嘴孔径" +msgctxt "@label" +msgid "Nozzle size" +msgstr "喷嘴孔径" + msgctxt "@label" msgid "Number of Copies" msgstr "复制个数" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 0240df1a059..516f6eddbaf 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -2830,6 +2830,10 @@ msgctxt "@label" msgid "Nozzle Size" msgstr "噴頭孔徑" +msgctxt "@label" +msgid "Nozzle size" +msgstr "噴頭孔徑" + msgctxt "@label" msgid "Number of Copies" msgstr "複製個數" From c036576116a4c508ca6d91f4dc26f579b639fbc1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 1 Nov 2024 17:07:55 +0100 Subject: [PATCH 065/276] Fix the missing translation connection Text was assigned directly from the Machine manager without being passed to the catalog --- resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 7acba1e103e..4c462750a6c 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -281,7 +281,7 @@ Item UM.Label { - text: Cura.MachineManager.activeDefinitionVariantsName + text: catalog.i18nc("@label", Cura.MachineManager.activeDefinitionVariantsName) height: parent.height width: selectors.textWidth } From f5efb60b7114f1c037edf93d17838f12385f84bb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 1 Nov 2024 17:33:29 +0100 Subject: [PATCH 066/276] Update to a better logic Also allow for extraction for PO files --- .../ConfigurationMenu/CustomConfiguration.qml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 4c462750a6c..8b4722ce326 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -281,9 +281,21 @@ Item UM.Label { - text: catalog.i18nc("@label", Cura.MachineManager.activeDefinitionVariantsName) + text: getDefinitionVariantLabel(Cura.MachineManager.activeDefinitionVariantsName) height: parent.height width: selectors.textWidth + + function getDefinitionVariantLabel(name) { + if (name === "Nozzle Size" || name === "Nozzle size") { + return catalog.i18nc("@label", "Nozzle Size"); + } else if (name === "Print Core" || name === "Print core") { + return catalog.i18nc("@label", "Print Core"); + } else if (name === "Extruder") { + return catalog.i18nc("@label", "Extruder"); + } else { + return ""; // Or a default label if needed + } + } } Cura.PrintSetupHeaderButton From f809a159e5c5291dd61c0a6435bd8786938ed928 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 4 Nov 2024 09:19:22 +0100 Subject: [PATCH 067/276] Provide better French translation for scarf seam --- resources/i18n/fr_FR/fdmprinter.def.json.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index ad47da9d1eb..2bb48bae5d1 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -5879,11 +5879,11 @@ msgstr "Numéro du ventilateur de volume de construction" msgctxt "scarf_split_distance description" msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Détermine la longueur de chaque étape du changement de flux lors de l'extrusion le long de la couture du foulard. Une distance plus petite se traduira par un code G plus précis mais aussi plus complexe." +msgstr "Détermine la longueur de chaque étape du changement de flux lors de l'extrusion le long de la jointure biaisée. Une distance plus petite se traduira par un G-code plus précis mais aussi plus complexe." msgctxt "scarf_joint_seam_length description" msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Détermine la longueur du joint d'écharpe, un type de joint qui devrait rendre le joint Z moins visible. La valeur doit être supérieure à 0 pour être efficace." +msgstr "Détermine la longueur de la jointure biaisée, un type de jointure qui devrait rendre la jointure en Z moins visible. La valeur doit être supérieure à 0 pour être active." msgctxt "gradual_flow_discretisation_step_size description" msgid "Duration of each step in the gradual flow change" @@ -5955,15 +5955,15 @@ msgstr "Réinitialiser la durée du débit" msgctxt "scarf_joint_seam_length label" msgid "Scarf Seam Length" -msgstr "Longueur de la couture de l'écharpe" +msgstr "Longueur de la jointure biaisée" msgctxt "scarf_joint_seam_start_height_ratio label" msgid "Scarf Seam Start Height" -msgstr "Hauteur de départ de la couture de l'écharpe" +msgstr "Hauteur de départ de la jointure biaisée" msgctxt "scarf_split_distance label" msgid "Scarf Seam Step Length" -msgstr "Longueur du pas de couture de l'écharpe" +msgstr "Longueur du pas de la jointure biaisée" msgctxt "build_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." @@ -5979,7 +5979,7 @@ msgstr "Le numéro du ventilateur qui refroidit le volume de construction. S'il msgctxt "scarf_joint_seam_start_height_ratio description" msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Le ratio de la hauteur de couche sélectionnée à laquelle la couture de l'écharpe commencera. Un nombre inférieur entraînera une plus grande hauteur de couture. Il doit être inférieur à 100 pour être efficace." +msgstr "Le ratio de la hauteur de couche sélectionnée à laquelle la jointure biaisée commencera. Un nombre inférieur entraînera une plus grande hauteur de biais. Il doit être inférieur à 100 pour être actif." msgctxt "wall_0_acceleration description" msgid "This is the acceleration with which to reach the top speed when printing an outer wall." From 5f9828dbd8813d1da9eeef80b7f0f31047800211 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 4 Nov 2024 12:03:15 +0100 Subject: [PATCH 068/276] Add variant names to source translation files CURA-12255 --- resources/i18n/cs_CZ/fdmprinter.def.json.po | 102 ++- resources/i18n/de_DE/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/es_ES/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/fdmprinter.def.json.pot | 102 ++- resources/i18n/fi_FI/fdmprinter.def.json.po | 102 ++- resources/i18n/fr_FR/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/hu_HU/fdmprinter.def.json.po | 102 ++- resources/i18n/it_IT/fdmprinter.def.json.po | 794 +++++++++-------- resources/i18n/ja_JP/fdmprinter.def.json.po | 783 +++++++++-------- resources/i18n/ko_KR/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/nl_NL/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/pl_PL/fdmprinter.def.json.po | 102 ++- resources/i18n/pt_BR/fdmprinter.def.json.po | 102 ++- resources/i18n/pt_PT/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/ru_RU/fdmprinter.def.json.po | 789 +++++++++-------- resources/i18n/tr_TR/fdmprinter.def.json.po | 791 +++++++++-------- resources/i18n/zh_CN/fdmprinter.def.json.po | 795 ++++++++++-------- resources/i18n/zh_TW/fdmprinter.def.json.po | 102 ++- .../ConfigurationMenu/CustomConfiguration.qml | 20 +- 19 files changed, 5642 insertions(+), 3790 deletions(-) diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index 8ecc8509d2c..a49f6f3616d 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2023-02-16 20:35+0100\n" "Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" @@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Materiál navíc pro extruzi po změně trysky." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Primární pozice extruderu X" @@ -1061,6 +1065,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "První Z pozice extruderu" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extrudery sdílí ohřívač" @@ -1415,6 +1423,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Má vyhřívanou podložku" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Rychlost zahřívání" @@ -1455,6 +1467,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Horizontální faktor zvětšení pro kompenzaci smrštění" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Jak daleko může být filament natažen, než se rozbije při zahřátí." @@ -1883,6 +1903,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Rozmazat jen okrajové části modelu a žádné díry modelu." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Ponechat odpojené plochy" @@ -2477,14 +2517,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Ne na vnějším povrchu" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Úhel trysky" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Průměr trysky" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Zakázané oblasti pro trysku" @@ -2493,6 +2545,10 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ID trysky" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Velikost trysky" + msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" msgstr "Množství materiálu navíc pro změnu trysky" @@ -2513,6 +2569,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Retrakční rychlost přepnutí trysek" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Počet extrůderů" @@ -2801,6 +2865,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Akcelerace tisku" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Trh při tisku" @@ -2829,6 +2901,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Vytiskněte věž vedle tisku, která slouží k naplnění materiálu po každém přepnutí trysky." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Výplňové struktury tiskněte pouze tam, kde by měly být podporovány vrcholy modelu. Pokud to povolíte, sníží se doba tisku a spotřeba materiálu, ale vede k nestejnoměrné pevnosti objektu." @@ -2877,6 +2953,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Tisknout horní / dolní linky v takovém pořadí, aby se navazující linky překrývaly ve stejném směru. Tisk zabere trochu více času, ale hladké povrchy budou vypadat více jednolité." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Teplota při tisku" @@ -3909,6 +3989,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Prohodí pořadí tisku vnitřní a druhé nejvnitřnější čáry límce. Toto usnadňuje odstraňování límce." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Přepněte do kterého protínajícího se svazku sítí bude patřit každá vrstva, takže překrývající se očka se protnou. Vypnutí tohoto nastavení způsobí, že jedna z sítí získá veškerý objem v překrytí, zatímco je odstraněna z ostatních sítí." @@ -5261,6 +5349,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Model bude zvětšen tímto faktorem, aby bylo kompenzováno smrštění materiálu po vychladnutí." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Vrchní vrstvy" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 3c02e0f373d..b5ceee1416f 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "So erzeugen Sie den Prime Tower:
    • Normal: Erstellen Sie ein Bucket, in dem sekundäre Materialien grundiert werden
    • Verschachtelt: Erstellen Sie einen Prime Tower so spärlich wie möglich. Das spart Zeit und Filament, ist aber nur möglich, wenn die verwendeten Materialien aneinander haften
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Ob die Kühlventilatoren während eines Düsenwechsels aktiviert werden sollen. Dies kann helfen, das Auslaufen zu reduzieren, indem die Düse schneller gekühlt wird:
    • Unverändert: Lassen Sie die Ventilatoren wie zuvor
    • Nur letzter Extruder: Schalten Sie den Ventilator des zuletzt verwendeten Extruders ein, aber die anderen aus (falls vorhanden). Dies ist nützlich, wenn Sie völlig separate Extruder haben.
    • Alle Ventilatoren: Schalten Sie alle Ventilatoren während des Düsenwechsels ein. Dies ist nützlich, wenn Sie einen einzelnen Kühllüfter oder mehrere Lüfter haben, die nahe beieinander stehen.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Ein Rand um ein Modell kann ein anderes Modell an einer Stelle berühren, an der Sie sie nicht haben wollen. Dies entfernt alle Ränder innerhalb dieser Entfernung von Modellen ohne Rand." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Die Funktion Anpassschichten berechnet die Schichthöhe je nach Form des Modells." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Fügen Sie zusätzliche Linien in das Füllmuster ein, um darüber liegende Schichten zu stützen. Diese Option verhindert Löcher oder Kunststoffklumpen, die manchmal bei komplex geformten Schichten auftreten, weil die darunter liegende Füllung die darüber liegende Schicht nicht richtig stützt. „Walls\" (Wände) unterstützt nur die Umrisse der Schicht, während „Walls and Lines\" (Wände und Linien) auch die Enden der Linien unterstützt, aus denen die Schicht besteht." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Fügen Sie zusätzliche Wände um den Füllbereich hinzu. Derartige Wände können zu einem verringerten Absacken der oberen/unteren Außenhautlinien beitragen, was bedeutet, dass Sie weniger Außenhautschichten oben/unten bei derselben Qualität von Kosten für zusätzliches Material benötigen." -" Diese Funktion ist verknüpfbar mit „Füllungspolygone verbinden“, um alle Füllungen mit einem einzigen Extrusionspfad zu verbinden, ohne dass hierzu Vorwärtsbewegungen oder Rückzüge erforderlich sind, sofern die richtige Konfiguration gewählt wurde." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Fügen Sie zusätzliche Wände um den Füllbereich hinzu. Derartige Wände können zu einem verringerten Absacken der oberen/unteren Außenhautlinien beitragen, was bedeutet, dass Sie weniger Außenhautschichten oben/unten bei derselben Qualität von Kosten für zusätzliches Material benötigen. Diese Funktion ist verknüpfbar mit „Füllungspolygone verbinden“, um alle Füllungen mit einem einzigen Extrusionspfad zu verbinden, ohne dass hierzu Vorwärtsbewegungen oder Rückzüge erforderlich sind, sofern die richtige Konfiguration gewählt wurde." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Alle gleichzeitig" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Alle Lüfter" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Alle Einstellungen, die die Auflösung des Drucks beeinflussen. Diese Einstellungen haben große Auswirkung auf die Qualität (und Druckdauer)." @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Breite des Brim-Elements" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Gebläsegeschwindigkeit in der Höhe aufbauen" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Gebläsegeschwindigkeit in der Schicht aufbauen" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Druckplattenhaftung" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Build-Volumen-Temperatur Warnung" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Volumen-Gebläsezahl aufbauen" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Durch Aktivieren dieser Einstellung erhält Ihr Prime-Turm einen Rand, auch wenn das Modell keinen hat. Wenn Sie eine stabilere Basis für einen hohen Turm möchten, können Sie die Basis-Höhe erhöhen." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Kühlung" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Kühlung während des Extruderwechsels" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Kreuz" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Erkennt Brücken und ändert die Druckgeschwindigkeit, Fluss- und Lüftereinstellungen während des Drucks von Brücken." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Bestimmt die Länge jedes Schritts bei der Änderung des Flusses beim Extrudieren entlang der Kappnaht. Ein kleinerer Abstand führt zu einem präziseren, aber auch komplexeren G-Code." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Bestimmt die Länge der Kappnaht, einer Nahtart, die die Z-Naht weniger sichtbar machen sollte. Muss höher als 0 sein, um wirksam zu sein." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Bestimmt die Reihenfolge, in der die Wände gedruckt werden. Das frühe Drucken der Außenwände hilft bei der Maßgenauigkeit, da Fehler von Innenwänden nicht an die Außenseite weitergegeben werden können. Wenn sie jedoch später gedruckt werden, ist ein Stapeldruck besser möglich, wenn Überhänge gedruckt werden. Bei einer ungleichmäßigen Anzahl an Gesamtinnenwänden wird die „mittlere letzte Linie“ immer zuletzt gedruckt." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Duale Extrusion" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Dauer jedes Schritts bei der sukzessiven Durchflusssänderung" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Elliptisch" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Aktiviert den äußeren Sickerschutz. Damit wird eine Hülle um das Modell erstellt, die eine zweite Düse abstreift, wenn diese auf derselben Höhe wie die erste Düse steht." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Aktivieren Sie sukzessive Durchflussänderungen. Wenn diese Option aktiviert ist, wird der Durchfluss sukzessiv auf den angestrebten Durchfluss erhöht/verringert. Dies ist nützlich für Drucker mit einem Bowdenschlauch, bei denen der Durchfluss nicht sofort geändert wird, wenn der Extrudermotor startet/stoppt." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Aktivieren Sie die Druckprozess-Berichterstattung, um Schwellenwerte für eine mögliche Fehlererkennung festzulegen." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Extensives Stitching versucht die Löcher im Netz mit sich berührenden Polygonen abzudecken. Diese Option kann eine lange Verarbeitungszeit in Anspruch nehmen." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Zusätzliche Fülllinien zur Unterstützung von Schichten" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Zusätzliche Füllung Wandlinien" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Nach einem Düsenwechsel zusätzlich bereitzustellendes Material." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "X-Position Extruder-Einzug" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Z-Position Extruder-Einzug" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extruder teilen sich Heizelement" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Ausspülgeschwindigkeit" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Für jede Verfahrbewegung, die länger als dieser Wert ist, wird der Materialfluss auf den Sollwegfluss zurückgesetzt." + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Bei dünnen Strukturen, die etwa ein- bis zweimal so groß sind wie die Düse, müssen die Linienstärken an die Dicke des Modells angepasst werden. Mit dieser Einstellung wird die Mindestlinienstärke für die Wände festgelegt. Die minimalen Linienstärken bestimmen gleichzeitig auch die maximalen Linienstärken, da wir bei einer gewissen Stärke der Geometrie von N- auf N+1-Wände übergehen, wobei die N-Wände breit und die N+1-Wände schmal sind. Die maximale Wandlinienstärke beträgt das Doppelte der minimalen Wandlinienstärke." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "G-Code-Variante" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "G-Code-Befehle, die am Ende ausgeführt werden sollen – getrennt durch " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "G-Code-Befehle, die am Ende ausgeführt werden sollen – getrennt durch ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "G-Code-Befehle, die zu Beginn ausgeführt werden sollen – getrennt durch " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "G-Code-Befehle, die zu Beginn ausgeführt werden sollen – getrennt durch ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Stufenweise Füllungsschritte Stützstruktur" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Umfang des Diskretisierungsvorgangs bei sukzessivem Durchfluss" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Sukzessiver Durchfluss aktiviert" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Maximale Beschleunigung bei sukzessivem Durchfluss" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Reduzieren Sie die Temperatur allmählich auf diesen Wert, wenn Sie aufgrund der Mindestzeit für eine Schicht mit reduzierter Geschwindigkeit drucken." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Mit beheizter Druckplatte" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Aufheizgeschwindigkeit" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Schrumpfungskompensation für horizontalen Skalierungsfaktor" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Streckmaß für das Filament im erhitzten Zustand, bevor es bricht." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Anfängliche Drucktemperatur" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Maximale Durchflussbeschleunigung bei der Anfangsschicht" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Beschleunigung Innenwand" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Es werden nur die Umrisse der Teile gejittert und nicht die Löcher der Teile." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Unterbrochene Flächen beibehalten" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Bevorzugen Sie eine absolute Einzugsposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Lassen Sie die erste und zweite Ebene des Modells in Z-Richtung überlappen, um das im Luftspalt verlorene Filament auszugleichen. Alle Modelle oberhalb der ersten Modellebene werden um diesen Betrag nach unten verschoben." -"Es kann vorkommen, dass aufgrund dieser Einstellung die zweite Ebene unterhalb der ersten Ebene gedruckt wird. Dieses Verhalten ist beabsichtigt." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Lassen Sie die erste und zweite Ebene des Modells in Z-Richtung überlappen, um das im Luftspalt verlorene Filament auszugleichen. Alle Modelle oberhalb der ersten Modellebene werden um diesen Betrag nach unten verschoben.Es kann vorkommen, dass aufgrund dieser Einstellung die zweite Ebene unterhalb der ersten Ebene gedruckt wird. Dieses Verhalten ist beabsichtigt." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Verwalten Sie die räumliche Beziehung zwischen der Z-Naht der Stützstruktur und dem eigentlichen 3D-Modell. Diese Steuerung ist entscheidend, da sie es Benutzern ermöglicht, die nahtlose Entfernung von Stützstrukturen nach dem Drucken sicherzustellen, ohne Schäden zu verursachen oder Spuren auf dem gedruckten Modell zu hinterlassen." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Maximale Bewegungsauflösung" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Maximale Beschleunigung für sukzessive Durchflussänderungen" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "Die maximale Beschleunigung für den Motor der X-Richtung" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Mitte" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Min. Z-Naht-Abstand vom Modell" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Mindestbreite der Form" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Mindestfläche für die Dächer der Stützstruktur. Polygone, die eine kleinere Fläche als diesen Wert aufweisen, werden als normale Stützstruktur gedruckt." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Mindestgeschwindigkeit für sukzessive Durchflussänderungen bei der Anfangsschicht" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Mindeststärke dünner Merkmale. Modellmerkmale, die dünner sind als dieser Wert, werden nicht gedruckt, während Merkmale, die dicker als die Mindeststärke sind, auf die Mindestwandlinienstärke verbreitert werden." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Mehrere Skirt-Linien ermöglichen eine bessere Materialbereitstellung für die Extrusion für kleine Modelle. Wird dieser Wert auf 0 eingestellt, wird kein Skirt erstellt." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Multiplikator für die Füllung der ersten Schichten der Stütze. Eine Erhöhung dieses Wertes kann die Haftung des Bettes verbessern." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Multiplikator der Linienbreite der ersten Schicht. Eine Erhöhung dieses Werts verbessert möglicherweise die Betthaftung." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Keine" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Keine" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Keine" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Nicht auf der Außenfläche" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Düsenwinkel" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Düsendurchmesser" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Unzulässige Bereiche für die Düse" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Düsen-ID" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Düsenlänge" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Düsengröße" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Düsenwechsel Rückzugsgeschwindigkeit" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Anzahl Extruder" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "Nacheinander" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Nur letzter Extruder" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Führen Sie nur einen Z-Sprung aus, wenn Sie über gedruckte Teile fahren, die nicht durch eine horizontale Bewegung vermeidbar sind, indem Sie gedruckte Teile während der Fahrt vermeiden." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Beschleunigung Außenwand" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Beschleunigung der Außenwand" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Verlangsamung der Außenwand" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Endgeschwindigkeitsverhältnis der Außenwand" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Extruder Außenwand" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Geschwindigkeit Außenwand" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Geschwindigkeitsaufteilung der Außenwand" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Anfangsgeschwindigkeitsverhältnis der Außenwand" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Wipe-Abstand der Außenwand" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Prozentwert der Lüfterdrehzahl für das Drucken der dritten Brücken-Außenhautschicht." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Platzieren Sie die Z-Naht auf einem Polygonscheitelpunkt. Wenn Sie dies ausschalten, können Sie die Naht auch zwischen Scheitelpunkten platzieren. (Beachten Sie, dass dies nicht die Beschränkungen für die Platzierung der Naht auf einem nicht unterstützten Überhang aufhebt)." + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Polygone in geschnittenen Schichten, die einen Umfang unter diesem Wert haben, werden ausgefiltert. Niedrigere Werte führen zu einem Mesh mit höherer Auflösung zulasten der Slicing-Zeit. Dies gilt in erster Linie für SLA-Drucker mit höherer Auflösung und sehr kleine 3D-Modelle mit zahlreichen Details." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Prime Tower Maximaler Überbrückungsabstand" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Mindeststärke der Schale des Prime Tower" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Mindestvolumen Einzugsturm" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Beschleunigung Druck" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Ruckfunktion Drucken" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Drucken Sie einen Turm neben dem Druck, der zum Einziehen des Materials nach jeder Düsenschaltung dient." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Drucken Sie Füllstrukturen nur dort, wo das Modell gestützt werden soll. Die Aktivierung dieser Option reduziert die Druckdauer und den Materialverbrauch, führt jedoch zu einer ungleichmäßigen Objektdicke." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Obere/Untere Linien werden in einer Reihenfolge gedruckt, so dass sie sich mit benachbarten Linien immer in gleicher Richtung überschneiden. Dies erfordert etwas mehr Zeit für den Druck, lässt aber flache Oberflächen gleichmäßiger aussehen." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Drucktemperatur" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Lüfterdrehzahl für Raft-Basis" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Raft-Basisfluss" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Raft-Basis-Füllüberlappung" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Raft-Basis-Füllüberlappungsprozentsatz" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Linienabstand der Raft-Basis" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Lüfterdrehzahl für Raft" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Raft-Fluss" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Raft-Schnittstellenfluss" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Raft-Schnittstellen-Füllüberlappung" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Raft-Schnittstellen-Füllüberlappungsprozentsatz" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Raft-Schnittstellen-Z-Versatz" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Floßmitte Extra-Rand" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Raft-Glättung" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Raft-Oberflächenfluss" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Raft-Oberflächen-Füllüberlappung" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Raft-Oberflächen-Füllüberlappungsprozentsatz" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Raft-Oberflächen-Z-Versatz" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Floß Oberseite Extra-Rand" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Meldung von Ereignissen, die über die eingestellten Schwellenwerte hinausgehen" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Durchflussdauer zurücksetzen" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Präferenz Auflagestelle" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Kompensation der Schrumpfung des Skalierungsfaktors" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Kappnahtlänge" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Kappnaht-Starthöhe" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Kappnaht-Schrittlänge" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "Szene verfügt über Stütznetze" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Präferenz Nahtkante" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Winkel überhängender Nahtwand" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Druckreihenfolge manuell einstellen" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Beschleunigung Stützstrukturfüllung" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Stützen-Fülldichtemultiplikator-Anfangsschicht" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Extruder für Füllung Stützstruktur" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Z-Abstand der Stützstruktur" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Stützen-Z-Naht vom Modell weg" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Stützlinien priorisiert" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Vertauschen Sie die Druckreihenfolge der innersten und der zweitinnersten Brim-Linie, um die Entfernung des Brims zu erleichtern." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Schaltet mit jeder Schicht das Volumen zu den entsprechenden Netzüberschneidungen, sodass die überlappenden Netze miteinander verwebt werden. Durch Abschalten dieser Funktion erhält eines der Netze das gesamte Volumen der Überlappung, während es von den anderen Netzen entfernt wird." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "Die Beschleunigung, mit der Bewegungen durchgeführt werden." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "Die Materialmenge relativ zu einer normalen Außenhautlinie, um während des Glättens zu extrudieren. Indem die Düse gefüllt bleibt, können einige Spalten in der oberen Schicht gefüllt werden, allerdings führt zu viel davon zu einer übermäßigen Extrudierung und Markierungen seitlich der Oberfläche." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie während des Drucks der Raftbasis extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Das Ausmaß des Überlappens zwischen der Füllung und den Wänden als Prozentwert der Füllungslinienbreite. Ein leichtes Überlappen ermöglicht es den Wänden, eine solide Verbindung mit der Füllung herzustellen." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie während des Drucks der Raft-Oberfläche extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie beim Bedrucken des Rafts extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie während des Drucks der Floßoberfläche extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "Die Materialmenge relativ zu einer normalen Außenhautlinie, um während des Glättens zu extrudieren. Indem die Düse gefüllt bleibt, können einige Spalten in der oberen Schicht gefüllt werden, allerdings führt zu viel davon zu einer übermäßigen Extrudierung und Markierungen seitlich der Oberfläche." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Das Ausmaß des Überlappens zwischen der Füllung und den Wänden als Prozentwert der Füllungslinienbreite. Ein leichtes Überlappen ermöglicht es den Wänden, eine solide Verbindung mit der Füllung herzustellen." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden des Raftbodens, als Prozentsatz der Breite der Fülllinie. Eine geringe Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden des Raftbodens. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden der Raft-Schnittstelle, in Prozent der Breite der Füllungslinie. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden an der Raft-Schnittstelle. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden der Raft-Oberfläche als Prozentsatz der Fülllinienbreite. Eine leichte Überlappung einen festen Anschluss der Wände an die Füllung." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden an der Raft-Schnittstelle. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "Der Abstand zwischen den Glättungslinien." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "Der Abstand zwischen dem Modell und seiner Stützstruktur an der Z-Achsen-Naht." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "Der Abstand zwischen der Düse und den bereits gedruckten Teilen, wenn diese bei Bewegungen umgangen werden." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "Bezeichnet die Höhe über horizontalen Teilen Ihres Modell, in der die Form gedruckt wird." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "Die Höhe, auf der sich die Lüfter bei normaler Lüftergeschwindigkeit drehen. Bei den Schichten darunter erhöht sich die Lüftergeschwindigkeit allmählich von der anfänglichen Lüftergeschwindigkeit bis zur normalen Lüftergeschwindigkeit." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "Die Höhe, auf der die Lüfter mit Normaldrehzahl laufen. In den Schichten darunter wird die Lüfterdrehzahl schrittweise von der anfänglichen Lüfterdrehzahl bis zur Normaldrehzahl angehoben." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "Der Höhenunterschied zwischen der Düsenspitze und dem Brückensystem (X- und Y-Achsen)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "Der Höhenunterschied zwischen der Düsenspitze und dem untersten Bereich des Druckkopfes." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "Der Höhenunterschied bei Ausführung eines Z-Sprungs nach Extruder-Wechsel." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "Der horizontale Abstand zwischen der ersten Brim-Linie und der Kontur der ersten Schicht des Drucks. Eine kleine Spalte kann das Entfernen des Brims vereinfachen, wobei trotzdem alle thermischen Vorteile genutzt werden können." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Der horizontale Abstand zwischen dem Skirt und der ersten Schicht des Drucks." -"Es handelt sich dabei um den Mindestabstand. Ab diesem Abstand werden mehrere Skirt-Linien in äußerer Richtung angebracht." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "Der horizontale Abstand zwischen dem Skirt und der ersten Schicht des Drucks.Es handelt sich dabei um den Mindestabstand. Ab diesem Abstand werden mehrere Skirt-Linien in äußerer Richtung angebracht." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "Dies bezeichnet die größte Breite der zu entfernenden oberen Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der oberen Außenhaut an abgeschrägten Flächen des Modells unterstützen." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "Die Schicht, bei der sich die Lüfter des Druckers mit voller Lüftergeschwindigkeit drehen. Dieser Wert wird berechnet und auf eine ganze Zahl gerundet." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "Die Schicht, bei der die Lüfter mit Normaldrehzahl laufen. Wenn Normaldrehzahl des Lüfters bei Höhe eingestellt ist, wird dieser Wert berechnet und auf eine ganze Zahl auf- oder abgerundet." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "Die Mindestneigung des Bereichs zur Erstellung einer Stützstufe. Bei niedrigeren Werten lassen sich die Stützstrukturen an flachen Neigungen leichter entfernen. Zu niedrige Werte können allerdings zu widersprüchlichen Ergebnissen an anderen Teilen des Modells führen." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "Die Mindestdicke der Prime-Tower-Hülle. Sie können sie erhöhen, um den Prime-Tower stärker zu machen." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "Die Mindestzeit, die für eine Schicht aufgewendet wird. Hierdurch wird der Drucker verlangsamt, um mindestens die hier eingestellte Zeit für eine Schicht aufzuwenden. Dadurch kann das gedruckte Material angemessen abkühlen, bevor die folgende Schicht gedruckt wird. Die Schichten können dennoch weniger als die Mindestzeit für eine Schicht erfordern, wenn die Funktion Druckkopf anheben deaktiviert ist und die Mindestgeschwindigkeit andernfalls verletzt würde." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Die Anzahl der Linien für die Brim-Stützstruktur. Eine größere Anzahl von Brim-Linien verbessert die Haftung am Druckbett, jedoch erhöht sich hierdurch der Materialverbrauch." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "Die Nummer des Lüfters, der das Druckvolumen kühlt. Wenn dieser Wert auf 0 gesetzt ist, bedeutet dies, dass es keinen Lüfter für das Druckvolumen gibt" + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "Die Anzahl der Oberflächenschichten auf der zweiten Raft-Schicht. Dabei handelt es sich um komplett gefüllte Schichten, auf denen das Modell ruht. Bei der Verwendung von 2 Schichten entsteht eine glattere Oberfläche als bei einer Schicht." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "Die maximale unmittelbare Geschwindigkeitsänderung für die erste Schicht." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "Das Verhältnis der ausgewählten Schichthöhe, bei der die Kappnaht beginnt. Eine niedrigere Zahl führt zu einer größeren Nahthöhe. Muss niedriger als 100 sein, um wirksam zu sein." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "Die Form der Druckplatte ohne Berücksichtigung nicht druckbarer Bereiche." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Damit wird der Abstand für das unmittelbare Coasting des Extruders vor Beginn einer Brückenwand gesteuert. Ein Coasting vor Brückenstart kann den Druck in der Düse reduzieren und eine flachere Brücke produzieren." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Dies ist die Beschleunigung, mit der die Höchstgeschwindigkeit beim Drucken einer Außenwand erreicht wird." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Dies ist die Verlangsamung, mit der der Druck einer Außenwand beendet wird." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Dies ist die maximale Länge eines Extrusionspfads beim Aufteilen eines längeren Pfads, um die Beschleunigung/Verlangsamung der Außenwand anzuwenden. Ein kleinerer Abstand erzeugt einen präziseren, aber auch ausführlicheren G-Code." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Dies ist das Verhältnis der Höchstgeschwindigkeit zum Ende beim Drucken einer Außenwand." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Dies ist das Verhältnis der Höchstgeschwindigkeit zu Beginn des Drucks einer Außenwand." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Diese Einstellung steuert, wie stark die Innenecken in der Kontur des Floßbodens abgerundet werden. Die Innenecken werden zu einem Halbkreis mit einem Radius abgerundet, der dem hier angegebenen Wert entspricht. Mit dieser Einstellung werden auch Löcher im Umriss des Floßes entfernt, die kleiner als ein solcher Kreis sind." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Um die Schrumpfung des Materials beim Abkühlen zu kompensieren, wird das Modell mit diesem Faktor skaliert." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Obere Schichten" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Stammdurchmesser" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Versuchen Sie, Nähte an Wänden zu vermeiden, die mehr als diesen Winkel überhängen. Wenn der Wert 90 beträgt, werden keine Wände als überhängend behandelt." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Unverändert" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Überlappende Volumen vereinen" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Wände" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Nur Wände" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Wände und Linien" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Wände, die über diesen Winkel hinaus hängen, werden mithilfe der Einstellungen für Winkel für überhängende Wände gedruckt. Wenn der Wert 90 beträgt, werden keine Wände als überhängend behandelt. Überhänge, die von Stützstrukturen gestützt werden, werden ebenfalls nicht als Überhang behandelt." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Wände, die über diesen Winkel hinaus überhängen, werden mit den Einstellungen für überhängende Wände gedruckt. Bei einem Wert von 90 werden keine Wände als überhängend behandelt. Ein Überhang, der von einer Stütze gestützt wird, wird ebenfalls nicht als Überhang behandelt. Darüber hinaus wird auch jede Linie, die weniger als halb überhängt, nicht als Überhang behandelt." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Die extrudierte Materialmenge beim Drucken von Brückenwänden wird mit diesem Wert multipliziert." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Beim Drucken der ersten Schicht der Raft-Schnittstelle verschieben Sie um diesen Versatz, um die Haftung zwischen Basis und Schnittstelle anzupassen. Ein negativer Versatz sollte die Haftung verbessern." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Beim Drucken der ersten Schicht der Raft-Oberfläche verschieben Sie um diesen Versatz, um die Haftung zwischen Schnittstelle und Oberfläche anzupassen. Ein negativer Versatz sollte die Haftung verbessern." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Die extrudierte Materialmenge beim Drucken der zweiten Brücken-Außenhautschicht wird mit diesem Wert multipliziert." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Justierung der Z-Naht" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Z-Naht auf Scheitelpunkt" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Position der Z-Naht" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "Bewegungen" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Ob die Kühlventilatoren während eines Düsenwechsels aktiviert werden sollen. Dies kann helfen, das Auslaufen zu reduzieren, indem die Düse schneller gekühlt wird:
    • Unverändert: Lassen Sie die Ventilatoren wie zuvor
    • Nur letzter Extruder: Schalten Sie den Ventilator des zuletzt verwendeten Extruders ein, aber die anderen aus (falls vorhanden). Dies ist nützlich, wenn Sie völlig separate Extruder haben.
    • Alle Ventilatoren: Schalten Sie alle Ventilatoren während des Düsenwechsels ein. Dies ist nützlich, wenn Sie einen einzelnen Kühllüfter oder mehrere Lüfter haben, die nahe beieinander stehen.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Alle Lüfter" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Kühlung während des Extruderwechsels" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Verwalten Sie die räumliche Beziehung zwischen der Z-Naht der Stützstruktur und dem eigentlichen 3D-Modell. Diese Steuerung ist entscheidend, da sie es Benutzern ermöglicht, die nahtlose Entfernung von Stützstrukturen nach dem Drucken sicherzustellen, ohne Schäden zu verursachen oder Spuren auf dem gedruckten Modell zu hinterlassen." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Min. Z-Naht-Abstand vom Modell" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Multiplikator für die Füllung der ersten Schichten der Stütze. Eine Erhöhung dieses Wertes kann die Haftung des Bettes verbessern." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Nur letzter Extruder" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Platzieren Sie die Z-Naht auf einem Polygonscheitelpunkt. Wenn Sie dies ausschalten, können Sie die Naht auch zwischen Scheitelpunkten platzieren. (Beachten Sie, dass dies nicht die Beschränkungen für die Platzierung der Naht auf einem nicht unterstützten Überhang aufhebt)." - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Mindeststärke der Schale des Prime Tower" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Raft-Basisfluss" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Raft-Basis-Füllüberlappung" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Raft-Basis-Füllüberlappungsprozentsatz" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Raft-Fluss" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Raft-Schnittstellenfluss" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Raft-Schnittstellen-Füllüberlappung" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Raft-Schnittstellen-Füllüberlappungsprozentsatz" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Raft-Schnittstellen-Z-Versatz" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Raft-Oberflächenfluss" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Raft-Oberflächen-Füllüberlappung" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Raft-Oberflächen-Füllüberlappungsprozentsatz" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Raft-Oberflächen-Z-Versatz" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Winkel überhängender Nahtwand" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Stützen-Fülldichtemultiplikator-Anfangsschicht" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Stützen-Z-Naht vom Modell weg" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie während des Drucks der Raftbasis extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie während des Drucks der Raft-Oberfläche extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie beim Bedrucken des Rafts extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Die Materialmenge, die im Vergleich zu einer normalen Extrusionslinie während des Drucks der Floßoberfläche extrudiert wird. Ein erhöhter Durchfluss kann die Haftung und die strukturelle Festigkeit des Rafts verbessern." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden des Raftbodens, als Prozentsatz der Breite der Fülllinie. Eine geringe Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden des Raftbodens. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden der Raft-Schnittstelle, in Prozent der Breite der Füllungslinie. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden an der Raft-Schnittstelle. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden der Raft-Oberfläche als Prozentsatz der Fülllinienbreite. Eine leichte Überlappung einen festen Anschluss der Wände an die Füllung." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Der Überlappungsgrad zwischen der Füllung und den Wänden an der Raft-Schnittstelle. Eine leichte Überlappung ermöglicht einen festen Anschluss der Wände an die Füllung." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "Der Abstand zwischen dem Modell und seiner Stützstruktur an der Z-Achsen-Naht." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "Die Mindestdicke der Prime-Tower-Hülle. Sie können sie erhöhen, um den Prime-Tower stärker zu machen." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Versuchen Sie, Nähte an Wänden zu vermeiden, die mehr als diesen Winkel überhängen. Wenn der Wert 90 beträgt, werden keine Wände als überhängend behandelt." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Unverändert" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Beim Drucken der ersten Schicht der Raft-Schnittstelle verschieben Sie um diesen Versatz, um die Haftung zwischen Basis und Schnittstelle anzupassen. Ein negativer Versatz sollte die Haftung verbessern." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Beim Drucken der ersten Schicht der Raft-Oberfläche verschieben Sie um diesen Versatz, um die Haftung zwischen Schnittstelle und Oberfläche anzupassen. Ein negativer Versatz sollte die Haftung verbessern." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Z-Naht auf Scheitelpunkt" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Fügen Sie zusätzliche Linien in das Füllmuster ein, um darüber liegende Schichten zu stützen. Diese Option verhindert Löcher oder Kunststoffklumpen, die manchmal bei komplex geformten Schichten auftreten, weil die darunter liegende Füllung die darüber liegende Schicht nicht richtig stützt. „Walls\" (Wände) unterstützt nur die Umrisse der Schicht, während „Walls and Lines\" (Wände und Linien) auch die Enden der Linien unterstützt, aus denen die Schicht besteht." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Gebläsegeschwindigkeit in der Höhe aufbauen" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Düsenlänge" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Gebläsegeschwindigkeit in der Schicht aufbauen" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "Der Höhenunterschied zwischen der Düsenspitze und dem untersten Bereich des Druckkopfes." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Volumen-Gebläsezahl aufbauen" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Bestimmt die Länge jedes Schritts bei der Änderung des Flusses beim Extrudieren entlang der Kappnaht. Ein kleinerer Abstand führt zu einem präziseren, aber auch komplexeren G-Code." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Bestimmt die Länge der Kappnaht, einer Nahtart, die die Z-Naht weniger sichtbar machen sollte. Muss höher als 0 sein, um wirksam zu sein." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Dauer jedes Schritts bei der sukzessiven Durchflusssänderung" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Aktivieren Sie sukzessive Durchflussänderungen. Wenn diese Option aktiviert ist, wird der Durchfluss sukzessiv auf den angestrebten Durchfluss erhöht/verringert. Dies ist nützlich für Drucker mit einem Bowdenschlauch, bei denen der Durchfluss nicht sofort geändert wird, wenn der Extrudermotor startet/stoppt." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Zusätzliche Fülllinien zur Unterstützung von Schichten" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Für jede Verfahrbewegung, die länger als dieser Wert ist, wird der Materialfluss auf den Sollwegfluss zurückgesetzt." - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Umfang des Diskretisierungsvorgangs bei sukzessivem Durchfluss" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Sukzessiver Durchfluss aktiviert" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Maximale Beschleunigung bei sukzessivem Durchfluss" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Maximale Durchflussbeschleunigung bei der Anfangsschicht" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Maximale Beschleunigung für sukzessive Durchflussänderungen" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Mindestgeschwindigkeit für sukzessive Durchflussänderungen bei der Anfangsschicht" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Keine" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Beschleunigung der Außenwand" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Verlangsamung der Außenwand" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Endgeschwindigkeitsverhältnis der Außenwand" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Geschwindigkeitsaufteilung der Außenwand" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Anfangsgeschwindigkeitsverhältnis der Außenwand" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Durchflussdauer zurücksetzen" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Kappnahtlänge" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Kappnaht-Starthöhe" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Kappnaht-Schrittlänge" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "Die Höhe, auf der sich die Lüfter bei normaler Lüftergeschwindigkeit drehen. Bei den Schichten darunter erhöht sich die Lüftergeschwindigkeit allmählich von der anfänglichen Lüftergeschwindigkeit bis zur normalen Lüftergeschwindigkeit." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "Die Schicht, bei der sich die Lüfter des Druckers mit voller Lüftergeschwindigkeit drehen. Dieser Wert wird berechnet und auf eine ganze Zahl gerundet." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Die Nummer des Lüfters, der das Druckvolumen kühlt. Wenn dieser Wert auf 0 gesetzt ist, bedeutet dies, dass es keinen Lüfter für das Druckvolumen gibt" - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Das Verhältnis der ausgewählten Schichthöhe, bei der die Kappnaht beginnt. Eine niedrigere Zahl führt zu einer größeren Nahthöhe. Muss niedriger als 100 sein, um wirksam zu sein." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Dies ist die Beschleunigung, mit der die Höchstgeschwindigkeit beim Drucken einer Außenwand erreicht wird." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Dies ist die Verlangsamung, mit der der Druck einer Außenwand beendet wird." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Dies ist die maximale Länge eines Extrusionspfads beim Aufteilen eines längeren Pfads, um die Beschleunigung/Verlangsamung der Außenwand anzuwenden. Ein kleinerer Abstand erzeugt einen präziseren, aber auch ausführlicheren G-Code." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Dies ist das Verhältnis der Höchstgeschwindigkeit zum Ende beim Drucken einer Außenwand." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Dies ist das Verhältnis der Höchstgeschwindigkeit zu Beginn des Drucks einer Außenwand." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Nur Wände" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Wände und Linien" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Wände, die über diesen Winkel hinaus überhängen, werden mit den Einstellungen für überhängende Wände gedruckt. Bei einem Wert von 90 werden keine Wände als überhängend behandelt. Ein Überhang, der von einer Stütze gestützt wird, wird ebenfalls nicht als Überhang behandelt. Darüber hinaus wird auch jede Linie, die weniger als halb überhängt, nicht als Überhang behandelt." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Wände, die über diesen Winkel hinaus hängen, werden mithilfe der Einstellungen für Winkel für überhängende Wände gedruckt. Wenn der Wert 90 beträgt, werden keine Wände als überhängend behandelt. Überhänge, die von Stützstrukturen gestützt werden, werden ebenfalls nicht als Überhang behandelt." diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 6ba45f2f0b3..a001762e9d6 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Cómo generar la torre de imprimación:
    • Normal: cree un cubo en el que los materiales secundarios estén imprimados
    • Intercalada: cree una torre de imprimación lo más dispersa posible. Esto ahorrará tiempo y filamento, pero solo es posible si los materiales utilizados se adhieren entre sí
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Si se activan los ventiladores de refrigeración durante un cambio de boquilla. Esto puede contribuir a que se rebaje lo que rezuma al refrigerar la boquilla más rápido:
    • Sin cambios: mantenga los ventiladores como estaban anteriormente
    • Solo el último extrusor: encienda el ventilador del último extrusor usado, pero apague los demás (si los hay). Esto es útil si tiene extrusores completamente separados.
    • Todos los ventiladores: encienda todos los ventiladores durante el cambio de boquilla. Esto es útil si tiene un solo ventilador de refrigeración o varios ventiladores que estén juntos entre ellos.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Un borde alrededor de un modelo puede tocar a otro modelo donde no lo desee. Esto elimina todo el borde dentro de esta distancia de los modelos sin borde." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Las capas de adaptación calculan las alturas de las capas dependiendo de la forma del modelo." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Añade líneas adicionales en el patrón de relleno para soportar las pieles de arriba. Esta opción evita los agujeros o las manchas de plástico que a veces aparecen en las pieles de formas complejas, debido a que el relleno de abajo no soporta correctamente la capa de piel que se está imprimiendo arriba. \"Muros\" soporta solo los contornos de la piel, mientras que \"Muros y líneas\" soporta también los extremos de las líneas que componen la piel." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Agregar paredes adicionales alrededor del área de relleno. Estas paredes pueden hacer que las líneas del forro superior/inferior se aflojen menos, lo que significa que necesitaría menos capas de forro superior/inferior para obtener la misma calidad utilizando algo más de material." -"Puede utilizar esta función junto a la de Conectar polígonos de relleno para conectar todo el relleno en una única trayectoria de extrusión sin necesidad de desplazamientos ni retracciones si se configura correctamente." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Agregar paredes adicionales alrededor del área de relleno. Estas paredes pueden hacer que las líneas del forro superior/inferior se aflojen menos, lo que significa que necesitaría menos capas de forro superior/inferior para obtener la misma calidad utilizando algo más de material.Puede utilizar esta función junto a la de Conectar polígonos de relleno para conectar todo el relleno en una única trayectoria de extrusión sin necesidad de desplazamientos ni retracciones si se configura correctamente." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Todos a la vez" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Todos los ventiladores" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Todos los ajustes que influyen en la resolución de la impresión. Estos ajustes tienen una gran repercusión en la calidad (y en el tiempo de impresión)." @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Ancho del borde" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Construir velocidad del ventilador en altura" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Construir velocidad de abanico en capa" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Adherencia de la placa de impresión" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Advertencia de temperatura de volumen de construcción" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Número del ventilador de volumen de construcción" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Al habilitar esta configuración, tu torre de cebado tendrá un borde, incluso si el modelo no lo tiene. Si quieres una base más robusta para una torre alta, puedes aumentar la altura de la base." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Refrigeración" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Refrigeración durante el cambio de extrusor" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Cruz" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Detección de puentes y modificación de los ajustes de velocidad de impresión, flujo y ventilador durante la impresión de puentes." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Determina la longitud de cada paso en el cambio de flujo al extruir a lo largo de la costura de la bufanda. Una distancia menor dará como resultado un código G más preciso pero también más complejo." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Determina la longitud de la costura de la bufanda, un tipo de costura que debería hacer menos visible la costura Z. Debe ser superior a 0 para ser eficaz." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Determina el orden de impresión de las paredes. Empezar imprimiendo las paredes exteriores ayuda a la precisión dimensional, ya que evita que los defectos de las paredes interiores se propaguen al exterior. Sin embargo, si las imprime más tarde, podrá apilarlas mejor cuando se impriman los voladizos. Cuando hay una cantidad impar de paredes interiores totales, la «última línea central» siempre se imprime en último lugar." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Extrusión doble" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Duración de cada intervalo en el cambio de flujo gradual" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Elíptica" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Activar la placa de rezumado exterior. Esto crea un perímetro alrededor del modelo que suele limpiar una segunda tobera si se encuentra a la misma altura que la primera." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Habilite cambios de flujo gradual. Al habilitarse, el flujo se incrementa/decrementa gradualmente hasta el flujo objetivo. Esto es útil para impresoras con tubo bowden en las que el flujo no cambia inmediatamente cuando el motor extrusor arranca o se detiene." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Habilite la generación de informes de procesos de impresión para establecer valores umbral para la posible detección de fallos." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Cosido amplio intenta coser los agujeros abiertos en la malla cerrando el agujero con polígonos que se tocan. Esta opción puede agregar una gran cantidad de tiempo de procesamiento." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Líneas de relleno adicionales para soportar las pieles" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Recuento de líneas de pared adicional" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Material adicional que debe cebarse tras el cambio de tobera." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Posición de preparación del extrusor sobre el eje X" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posición de preparación del extrusor sobre el eje Z" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Calentador compartido de extrusores" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Velocidad de purga de descarga" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Para cualquier movimiento de desplazamiento superior a este valor, el flujo material se restablece al flujo objetivo de las trayectorias" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Para estructuras delgadas, aproximadamente una o dos veces el tamaño de la boquilla, los anchos de línea deben cambiarse para que coincidan con el grosor del modelo. Esta configuración controla el ancho de línea mínimo permitido para las paredes. Los anchos de línea mínimos también determinan de forma inherente los anchos de línea máximos, ya que la transición de N a N + 1 paredes se realiza con un grosor geométrico donde N paredes son anchas y N + 1 paredes son estrechas. La línea perimetral más ancha posible es el doble del ancho mínimo de la línea perimetral." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Tipo de GCode" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "Los comandos de GCode que se ejecutarán justo al final separados por -" +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "Los comandos de GCode que se ejecutarán justo al final separados por -." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "Los comandos de GCode que se ejecutarán justo al inicio separados por - " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "Los comandos de GCode que se ejecutarán justo al inicio separados por - ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Escalones de relleno de soporte" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Tamaño del intervalo para discretización de flujo gradual" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Flujo gradual habilitado" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Flujo gradual de aceleración máxima" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Reduzca gradualmente a esta temperatura cuando imprima a velocidades bajas debido al tiempo mínimo de capa." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Tiene una placa de impresión caliente" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocidad de calentamiento" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Factor de escala horizontal para la compensación de la contracción" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Hasta dónde puede estirarse el filamento antes de que se rompa mientras se calienta." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Temperatura de impresión inicial" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Aceleración máxima de flujo de capa inicial" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Aceleración de pared interior" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Use solo los contornos de las piezas, no los orificios de las piezas." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Mantener caras desconectadas" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "La posición de preparación del extrusor se considera absoluta, en lugar de relativa a la última ubicación conocida del cabezal." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Haga que la primera y la segunda capa del modelo se solapen en la dirección Z para compensar el filamento perdido en el entrehierro. Todos los modelos situados por encima de la primera capa del modelo se desplazarán hacia abajo en esta medida." -"Cabe señalar que a veces la segunda capa se imprime por debajo de la capa inicial debido a este ajuste. Este es el comportamiento previsto." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Haga que la primera y la segunda capa del modelo se solapen en la dirección Z para compensar el filamento perdido en el entrehierro. Todos los modelos situados por encima de la primera capa del modelo se desplazarán hacia abajo en esta medida.Cabe señalar que a veces la segunda capa se imprime por debajo de la capa inicial debido a este ajuste. Este es el comportamiento previsto." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Administre la relación espacial entre la juntura z de la estructura de apoyo y el modelo 3D real. Este control es esencial, ya que permite a los usuarios asegurar que la extracción de las estructuras de apoyo después de la impresión sea impecable, sin causar daños ni dejar marcas en el modelo impreso." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Resolución de desplazamiento máximo" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Aceleración máxima para cambios graduales de flujo" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "Aceleración máxima del motor de la dirección X" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Media" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Distancia de juntura Z mínima del modelo" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Ancho de molde mínimo" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Tamaño del área mínima para los techos del soporte. Los polígonos que posean un área de menor tamaño que este valor se imprimirán como soporte normal." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Velocidad mínima para cambios graduales de flujo en la primera capa" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Espesor mínimo de características delgadas. Las características del modelo que sean más delgadas que este valor no se imprimirán, mientras que las características más gruesas que el tamaño mínimo de la característica se estirarán hasta el ancho mínimo de la línea perimetral." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Líneas de falda múltiples sirven para preparar la extrusión mejor para modelos pequeños. Con un ajuste de 0 se desactivará la falda." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Multiplicador para el relleno en las capas iniciales del apoyo. Aumentar esto puede ayudar a que se adhiera la capa." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Multiplicador del ancho de la línea de la primera capa. Si esta se aumenta, se puede mejorar la adherencia a la plataforma." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Ninguno" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Ninguno" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Ninguno" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "No en la superficie exterior" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Ángulo de la tobera" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diámetro de la tobera" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Áreas no permitidas para la tobera" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Id. de la tobera" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Longitud de la tobera" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Tamaño de la tobera" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocidad de retracción del cambio de tobera" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Número de extrusores" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "De uno en uno" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Solo el último extrusor" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Realizar un salto en Z solo al desplazarse por las partes impresas que no puede evitar el movimiento horizontal de la opción Evitar partes impresas al desplazarse." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Aceleración de pared exterior" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Aceleración de la pared exterior" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Desaceleración de la pared exterior" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Relación de velocidad final de la pared exterior" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Extrusor de pared exterior" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Velocidad de pared exterior" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Distancia de división de la velocidad de la pared exterior" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Relación de velocidad inicial de la pared exterior" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Distancia de pasada de la pared exterior" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Velocidad del ventilador en porcentaje que se utiliza para imprimir la tercera capa del forro del puente." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Coloque la juntura z en un vértice de polígono. Si se apaga esto, la juntura se puede colocar también entre vértices. (Tenga en cuenta que esto no hará que se anulen las restricciones sobre la colocación de la juntura en una cobertura sin apoyo)." + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Se filtran los polígonos en capas segmentadas que tienen una circunferencia más pequeña que esta. Los valores más pequeños suponen una resolución de malla mayor a costa de un tiempo de segmentación. Está indicado, sobre todo, para impresoras SLA y modelos 3D muy pequeños con muchos detalles." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Distancia máxima de puenteo de la torre de imprimación" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Grosor mínimo de la carcasa de la torre principal" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Volumen mínimo de la torre auxiliar" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Aceleración de la impresión" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Impulso de impresión" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimir una torre junto a la impresión que sirve para preparar el material tras cada cambio de tobera." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprimir estructuras de relleno solo cuando se deban soportar las partes superiores del modelo. Habilitar esto reduce el tiempo de impresión y el uso de material, pero ocasiona que la resistencia del objeto no sea uniforme." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprime colocando las líneas superior e inferior de modo que siempre se superpongan a las líneas adyacentes en una dirección. Esto lleva un poco más de tiempo de impresión, pero hace que las superficies planas tengan un aspecto más consistente." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura de impresión" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Velocidad del ventilador de la base de la balsa" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Movimiento de la base del conjunto" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Superposición del relleno de la base del conjunto" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Porcentaje de superposición del relleno de la base del conjunto" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Espacio de la línea base de la balsa" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Velocidad del ventilador de la balsa" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Movimiento del conjunto" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Movimiento de la interfaz del conjunto" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Superposición del relleno de la interfaz del conjunto" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Porcentaje de superposición del relleno de la interfaz del conjunto" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Intervalo Z de la interfaz del conjunto" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Margen extra medio de la balsa" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Suavizado de la balsa" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Movimiento de la superficie del conjunto" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Superposición del relleno de la superficie del conjunto" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Porcentaje de superposición del relleno de la superficie del conjunto" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Intervalo Z de la superficie del conjunto" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Margen extra de la parte superior de la balsa" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Informes de eventos que se salen de los umbrales establecidos" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Restablecer duración de flujo" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Preferencia de apoyo" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Factor de escala para la compensación de la contracción" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Longitud de la costura de la bufanda" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Altura de inicio de la costura de la bufanda" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Longitud del paso de la costura de la bufanda" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "La escena tiene mallas de soporte" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Preferencia de esquina de costura" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Ángulo de las paredes que sobresale de las junturas" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Establecer secuencia de impresión manualmente" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Aceleración de relleno de soporte" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Capa inicial de multiplicador de densidad de relleno de apoyo" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Extrusor del relleno de soporte" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Distancia en Z del soporte" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Juntura Z de apoyo fuera del modelo" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Líneas de soporte preferidas" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Intercambie el orden de impresión de las líneas más internas y del segundo borde más interno. De ese modo se mejora la eliminación del borde." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Cambiar la malla a la que pertenecerán los volúmenes que se cruzan en cada capa, de forma que las mallas superpuestas se entrelacen. Desactivar esta opción dará lugar a que una de las mallas reciba todo el volumen de la superposición y que este se elimine de las demás mallas." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "Aceleración a la que se realizan los movimientos de desplazamiento." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "Cantidad de material (relativa a la línea del forro normal) que se extruye durante el alisado. Dejar la tobera llena permite rellenar algunas grietas de la superficie, pero llenarla demasiado puede provocar la sobrextrusión y afectar a la superficie." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión de la base del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes son un porcentaje del ancho de la línea de relleno. Una ligera superposición permite que las paredes estén firmemente unidas al relleno." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión de la interfaz del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión de la superficie del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "Cantidad de material (relativa a la línea del forro normal) que se extruye durante el alisado. Dejar la tobera llena permite rellenar algunas grietas de la superficie, pero llenarla demasiado puede provocar la sobrextrusión y afectar a la superficie." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes son un porcentaje del ancho de la línea de relleno. Una ligera superposición permite que las paredes estén firmemente unidas al relleno." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes de la base del conjunto, como porcentaje de la anchura de la línea del relleno. Una superposición delgada permite que las paredes se unan con firmeza al relleno." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes de la base del conjunto. Una superposición delgada permite que las paredes se unan con firmeza al relleno." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes de la interfaz del conjunto, como porcentaje de la anchura de la línea del relleno. Una superposición delgada permite que las paredes se unan con firmeza al relleno." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes de la interfaz del conjunto. Una superposición delgada permite que las paredes se unan con firmeza al relleno." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes de la superficie del conjunto, como porcentaje de la anchura de la línea del relleno. Una superposición delgada permite que las paredes se unan con firmeza al relleno." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La cantidad de superposición entre el relleno y las paredes de la superficie del conjunto. Una superposición delgada permite que las paredes se unan con firmeza al relleno." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "Distancia entre las líneas del alisado." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "La distancia entre el modelo y su estructura de apoyo en la juntura del eje z." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "Distancia entre la tobera y las partes ya impresas, cuando se evita durante movimientos de desplazamiento." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "Altura por encima de las piezas horizontales del modelo del que imprimir el molde." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "La altura a la que giran los ventiladores a velocidad de ventilador normal. En las capas inferiores, la velocidad de los ventiladores aumenta gradualmente desde la velocidad inicial de los ventiladores hasta la velocidad normal de los ventiladores." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "Altura a la que giran los ventiladores en la velocidad normal del ventilador. En las capas más bajas, la velocidad del ventilador aumenta gradualmente desde la velocidad inicial del ventilador hasta la velocidad normal del ventilador." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "Diferencia de altura entre la punta de la tobera y el sistema del puente (ejes X e Y)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "Diferencia de altura entre la punta de la tobera y la parte más baja del cabezal de impresión." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "Diferencia de altura cuando se realiza un salto en Z después de un cambio de extrusor." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "La distancia horizontal entre la primera línea de borde y el contorno de la primera capa de la impresión. Un pequeño orificio puede facilitar la eliminación del borde al tiempo que proporciona ventajas térmicas." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "La distancia horizontal entre la falda y la primera capa de la impresión." -"Se trata de la distancia mínima. Múltiples líneas de falda se extenderán hacia el exterior a partir de esta distancia." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "La distancia horizontal entre la falda y la primera capa de la impresión.Se trata de la distancia mínima. Múltiples líneas de falda se extenderán hacia el exterior a partir de esta distancia." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "Anchura máxima de las áreas superiores de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro superior en las superficies inclinadas del modelo." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "La capa en la que los ventiladores de la construcción giran a la velocidad máxima del ventilador. Este valor se calcula y redondea a un número entero." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "Capa en la que los ventiladores giran a velocidad normal del ventilador. Si la velocidad normal del ventilador a altura está establecida, este valor se calcula y redondea a un número entero." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "La pendiente mínima de la zona para un efecto del escalón de la escalera de soporte. Los valores más bajos deberían facilitar la extracción del soporte en pendientes poco profundas, pero los valores muy bajos pueden dar resultados realmente contradictorios en otras partes del modelo." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "El grosor mínimo de la carcasa de la torre principal. Puede aumentarla para hacer que la torre principal sea más fuerte." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "Tiempo mínimo empleado en una capa. Esto fuerza a la impresora a ir más despacio, para emplear al menos el tiempo establecido aquí en una capa. Esto permite que el material impreso se enfríe adecuadamente antes de imprimir la siguiente capa. Es posible que el tiempo para cada capa sea inferior al tiempo mínimo si se desactiva Levantar el cabezal o si la velocidad mínima se ve modificada de otro modo." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Número de líneas utilizadas para el borde de soporte. Más líneas de borde mejoran la adhesión a la placa de impresión, pero requieren material adicional." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "El número del ventilador que enfría el volumen de construcción. Si este valor es 0, significa que no hay ventilador de volumen de construcción." + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "Número de capas superiores encima de la segunda capa de la balsa. Estas son las capas en las que se asienta el modelo. Dos capas producen una superficie superior más lisa que una." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "Cambio en la velocidad instantánea máxima de la capa inicial." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "La relación de la altura de capa seleccionada en la que comenzará la costura de la bufanda. Un número menor dará como resultado una mayor altura de la costura. Debe ser inferior a 100 para ser efectivo." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "La forma de la placa de impresión sin tener en cuenta las zonas externas al área de impresión." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Controla la distancia del depósito por inercia del extrusor justo antes de empezar un puente. Un depósito por inercia antes del inicio del puente puede reducir la presión en la tobera y dar como resultado un puente más horizontal." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Esta es la aceleración con la que alcanzar la velocidad máxima al imprimir una pared exterior." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Esta es la deceleración con la que finalizar la impresión de una pared exterior." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Esta es la longitud máxima de una trayectoria de extrusión cuando se divide una trayectoria más larga para aplicar la aceleración/desaceleración de la pared exterior. Una distancia menor creará un código G más preciso, pero también más prolijo." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Esta es la relación de la velocidad máxima con la que se debe terminar al imprimir una pared exterior." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Esta es la relación de la velocidad máxima con la que se debe empezar al imprimir una pared exterior." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Este ajuste controla cuánto se redondean las esquinas interiores en el contorno de la base de la balsa. Las esquinas interiores se redondean a un semicírculo con un radio igual al valor dado aquí. Este ajuste también elimina los huecos en el contorno de la balsa que sean más pequeños que dicho círculo." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Para compensar la contracción del material a medida que se enfría, el modelo se escala con este factor." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Capas superiores" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Diámetro del tronco" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Intente evitar que las junturas de las paredes sobresalgan más que este ángulo. Cuando el valor sea 90, ninguna pared se considerará como que sobresale." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Sin cambiar" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Volúmenes de superposiciones de uniones" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Paredes" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Solo muros" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Muros y líneas" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Las paredes con un ángulo de voladizo mayor que este se imprimirán con los ajustes de voladizo de pared. Cuando el valor sea 90, no se aplicará la condición de voladizo a la pared. El voladizo que se apoya en el soporte tampoco se tratará como voladizo." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Los muros que sobresalgan más de este ángulo se imprimirán utilizando la configuración de muros en voladizo. Cuando el valor es 90, ningún muro se tratará como saliente. Los salientes que se apoyen en soportes tampoco se tratarán como salientes. Además, cualquier línea que tenga menos de la mitad de saliente tampoco se tratará como saliente." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Cuando se imprimen las paredes del puente; la cantidad de material extruido se multiplica por este valor." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Cuando se imprima la primera capa de la interfaz del conjunto, convierta por este intervalo para personalizar la adhesión entre la base y la interfaz. Un intervalo negativo debería mejorar la adhesión." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Cuando se imprima la primera capa de la superficie del conjunto, convierta por este intervalo para personalizar la adhesión entre la interfaz y la superficie. Un intervalo negativo debería mejorar la adhesión." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Cuando se imprime la segunda capa del forro del puente; la cantidad de material extruido se multiplica por este valor." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Alineación de costuras en Z" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Juntura Z en el vértice" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Posición de costura en Z" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "desplazamiento" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Si se activan los ventiladores de refrigeración durante un cambio de boquilla. Esto puede contribuir a que se rebaje lo que rezuma al refrigerar la boquilla más rápido:
    • Sin cambios: mantenga los ventiladores como estaban anteriormente
    • Solo el último extrusor: encienda el ventilador del último extrusor usado, pero apague los demás (si los hay). Esto es útil si tiene extrusores completamente separados.
    • Todos los ventiladores: encienda todos los ventiladores durante el cambio de boquilla. Esto es útil si tiene un solo ventilador de refrigeración o varios ventiladores que estén juntos entre ellos.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Todos los ventiladores" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Refrigeración durante el cambio de extrusor" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Administre la relación espacial entre la juntura z de la estructura de apoyo y el modelo 3D real. Este control es esencial, ya que permite a los usuarios asegurar que la extracción de las estructuras de apoyo después de la impresión sea impecable, sin causar daños ni dejar marcas en el modelo impreso." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Distancia de juntura Z mínima del modelo" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Multiplicador para el relleno en las capas iniciales del apoyo. Aumentar esto puede ayudar a que se adhiera la capa." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Solo el último extrusor" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Coloque la juntura z en un vértice de polígono. Si se apaga esto, la juntura se puede colocar también entre vértices. (Tenga en cuenta que esto no hará que se anulen las restricciones sobre la colocación de la juntura en una cobertura sin apoyo)." - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Grosor mínimo de la carcasa de la torre principal" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Movimiento de la base del conjunto" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Superposición del relleno de la base del conjunto" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Porcentaje de superposición del relleno de la base del conjunto" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Movimiento del conjunto" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Movimiento de la interfaz del conjunto" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Superposición del relleno de la interfaz del conjunto" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Porcentaje de superposición del relleno de la interfaz del conjunto" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Intervalo Z de la interfaz del conjunto" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Movimiento de la superficie del conjunto" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Superposición del relleno de la superficie del conjunto" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Porcentaje de superposición del relleno de la superficie del conjunto" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Intervalo Z de la superficie del conjunto" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Ángulo de las paredes que sobresale de las junturas" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Capa inicial de multiplicador de densidad de relleno de apoyo" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Juntura Z de apoyo fuera del modelo" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión de la base del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión de la interfaz del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La cantidad de material, con relación a una línea de extrusión normal, para extraer durante la impresión de la superficie del conjunto. Tener mayor movimiento puede mejorar la adhesión y la resistencia estructural del conjunto." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes de la base del conjunto, como porcentaje de la anchura de la línea del relleno. Una superposición delgada permite que las paredes se unan con firmeza al relleno." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes de la base del conjunto. Una superposición delgada permite que las paredes se unan con firmeza al relleno." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes de la interfaz del conjunto, como porcentaje de la anchura de la línea del relleno. Una superposición delgada permite que las paredes se unan con firmeza al relleno." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes de la interfaz del conjunto. Una superposición delgada permite que las paredes se unan con firmeza al relleno." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes de la superficie del conjunto, como porcentaje de la anchura de la línea del relleno. Una superposición delgada permite que las paredes se unan con firmeza al relleno." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La cantidad de superposición entre el relleno y las paredes de la superficie del conjunto. Una superposición delgada permite que las paredes se unan con firmeza al relleno." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "La distancia entre el modelo y su estructura de apoyo en la juntura del eje z." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "El grosor mínimo de la carcasa de la torre principal. Puede aumentarla para hacer que la torre principal sea más fuerte." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Intente evitar que las junturas de las paredes sobresalgan más que este ángulo. Cuando el valor sea 90, ninguna pared se considerará como que sobresale." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Sin cambiar" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Cuando se imprima la primera capa de la interfaz del conjunto, convierta por este intervalo para personalizar la adhesión entre la base y la interfaz. Un intervalo negativo debería mejorar la adhesión." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Cuando se imprima la primera capa de la superficie del conjunto, convierta por este intervalo para personalizar la adhesión entre la interfaz y la superficie. Un intervalo negativo debería mejorar la adhesión." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Juntura Z en el vértice" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Añade líneas adicionales en el patrón de relleno para soportar las pieles de arriba. Esta opción evita los agujeros o las manchas de plástico que a veces aparecen en las pieles de formas complejas, debido a que el relleno de abajo no soporta correctamente la capa de piel que se está imprimiendo arriba. \"Muros\" soporta solo los contornos de la piel, mientras que \"Muros y líneas\" soporta también los extremos de las líneas que componen la piel." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Construir velocidad del ventilador en altura" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Longitud de la tobera" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Construir velocidad de abanico en capa" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "Diferencia de altura entre la punta de la tobera y la parte más baja del cabezal de impresión." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Número del ventilador de volumen de construcción" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Determina la longitud de cada paso en el cambio de flujo al extruir a lo largo de la costura de la bufanda. Una distancia menor dará como resultado un código G más preciso pero también más complejo." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Determina la longitud de la costura de la bufanda, un tipo de costura que debería hacer menos visible la costura Z. Debe ser superior a 0 para ser eficaz." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Duración de cada intervalo en el cambio de flujo gradual" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Habilite cambios de flujo gradual. Al habilitarse, el flujo se incrementa/decrementa gradualmente hasta el flujo objetivo. Esto es útil para impresoras con tubo bowden en las que el flujo no cambia inmediatamente cuando el motor extrusor arranca o se detiene." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Líneas de relleno adicionales para soportar las pieles" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Para cualquier movimiento de desplazamiento superior a este valor, el flujo material se restablece al flujo objetivo de las trayectorias" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Tamaño del intervalo para discretización de flujo gradual" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Flujo gradual habilitado" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Flujo gradual de aceleración máxima" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Aceleración máxima de flujo de capa inicial" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Aceleración máxima para cambios graduales de flujo" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Velocidad mínima para cambios graduales de flujo en la primera capa" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Ninguno" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Aceleración de la pared exterior" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Desaceleración de la pared exterior" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Relación de velocidad final de la pared exterior" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Distancia de división de la velocidad de la pared exterior" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Relación de velocidad inicial de la pared exterior" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Restablecer duración de flujo" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Longitud de la costura de la bufanda" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Altura de inicio de la costura de la bufanda" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Longitud del paso de la costura de la bufanda" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "La altura a la que giran los ventiladores a velocidad de ventilador normal. En las capas inferiores, la velocidad de los ventiladores aumenta gradualmente desde la velocidad inicial de los ventiladores hasta la velocidad normal de los ventiladores." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "La capa en la que los ventiladores de la construcción giran a la velocidad máxima del ventilador. Este valor se calcula y redondea a un número entero." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "El número del ventilador que enfría el volumen de construcción. Si este valor es 0, significa que no hay ventilador de volumen de construcción." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "La relación de la altura de capa seleccionada en la que comenzará la costura de la bufanda. Un número menor dará como resultado una mayor altura de la costura. Debe ser inferior a 100 para ser efectivo." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Esta es la aceleración con la que alcanzar la velocidad máxima al imprimir una pared exterior." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Esta es la deceleración con la que finalizar la impresión de una pared exterior." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Esta es la longitud máxima de una trayectoria de extrusión cuando se divide una trayectoria más larga para aplicar la aceleración/desaceleración de la pared exterior. Una distancia menor creará un código G más preciso, pero también más prolijo." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Esta es la relación de la velocidad máxima con la que se debe terminar al imprimir una pared exterior." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Esta es la relación de la velocidad máxima con la que se debe empezar al imprimir una pared exterior." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Solo muros" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Muros y líneas" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Los muros que sobresalgan más de este ángulo se imprimirán utilizando la configuración de muros en voladizo. Cuando el valor es 90, ningún muro se tratará como saliente. Los salientes que se apoyen en soportes tampoco se tratarán como salientes. Además, cualquier línea que tenga menos de la mitad de saliente tampoco se tratará como saliente." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Las paredes con un ángulo de voladizo mayor que este se imprimirán con los ajustes de voladizo de pared. Cuando el valor sea 90, no se aplicará la condición de voladizo a la pared. El voladizo que se apoya en el soporte tampoco se tratará como voladizo." diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index e0af9f2fba8..985c987bfdc 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -6000,3 +6000,103 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "" + +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Print core" +msgstr "" + +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + +msgctxt "variant_name" +msgid "Head" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 7be52d3c5bb..6acf42833e3 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2022-07-15 11:17+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -1046,6 +1046,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "" +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Suulakkeen esitäytön X-sijainti" @@ -1058,6 +1062,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Suulakkeen esitäytön Z-sijainti" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "" @@ -1410,6 +1418,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Sisältää lämmitettävän alustan" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "" @@ -1450,6 +1462,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "" @@ -1878,6 +1898,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "" +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Pidä erilliset pinnat" @@ -2472,14 +2512,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Suuttimen läpimitta" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Suuttimen kielletyt alueet" @@ -2488,6 +2540,10 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Suuttimen tunnus" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Suuttimen koko" + msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" msgstr "" @@ -2508,6 +2564,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Suuttimen vaihdon takaisinvetonopeus" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Suulakkeiden määrä" @@ -2796,6 +2860,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Tulostuksen kiihtyvyys" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Tulostuksen nykäisy" @@ -2824,6 +2896,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Tulosta tulosteen viereen torni, jolla materiaali esitäytetään aina suuttimen vaihdon jälkeen." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "" @@ -2872,6 +2948,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "" +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Tulostuslämpötila" @@ -3904,6 +3984,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Määrittää, mitkä verkon leikkaustilavuudet kuuluvat jokaiseen kerrokseen, jotta limittäiset verkot yhdistetään. Jos tämä asetus poistetaan käytöstä, yksi verkoista saa kaiken tilavuuden limityksessä, ja verkko poistetaan muista verkoista." @@ -5254,6 +5342,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "" +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Yläkerrokset" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index ad47da9d1eb..c779bfd82d6 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Comment générer la tour d'amorçage :
    • Normale : créer un pot dans lequel les matériaux secondaires sont amorcés
    • Entrelacée : créez une tour d'amorçage aussi peu dense que possible. Vous économiserez ainsi du temps et du filament, mais cette opération n'est possible que si les matériaux utilisés adhèrent les uns aux autres
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Permet d'activer ou non les ventilateurs de refroidissement lors d'un changement de buse. Cette option peut aider à réduire le suintement en refroidissant la buse plus rapidement :
    • Inchangé : garder les ventilateurs tels qu'ils étaient auparavant
    • Seulement dernier extrudeur : allumer le ventilateur du dernier extrudeur utilisé, mais éteindre les autres (s'il y en a). Cette option est utile si tu as des extrudeuses complètement séparées.
    • Tous les ventilateurs : cette option est utile si vous avez un seul ventilateur de refroidissement, ou plusieurs ventilateurs qui restent proches les uns des autres.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Une bordure autour d'un modèle peut toucher un autre modèle à un endroit où vous ne le souhaitez pas. Cette fonction supprime toutes les bordures à cette distance des modèles sans bordure." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Cette option calcule la hauteur des couches en fonction de la forme du modèle." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Ajoutez des lignes supplémentaires dans le motif de remplissage pour soutenir les peaux situées au-dessus. Cette option permet d'éviter les trous ou les bulles de plastique qui apparaissent parfois dans les peaux de forme complexe, parce que le remplissage en dessous ne soutient pas correctement la couche de peau imprimée au-dessus. L'option \"Murs\" ne prend en charge que les contours de la peau, tandis que l'option \"Murs et lignes\" prend également en charge les extrémités des lignes qui composent la peau." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Ajoutez des parois supplémentaires autour de la zone de remplissage. De telles parois peuvent réduire l'affaissement des lignes de couche extérieure supérieure / inférieure, réduisant le nombre de couches extérieures supérieures / inférieures nécessaires pour obtenir la même qualité, au prix d'un peu de matériau supplémentaire." -"Configurée correctement, cette fonctionnalité peut être combinée avec « Relier les polygones de remplissage » pour relier tous les remplissages en un seul mouvement d'extrusion sans avoir besoin de déplacements ou de rétractions." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Ajoutez des parois supplémentaires autour de la zone de remplissage. De telles parois peuvent réduire l'affaissement des lignes de couche extérieure supérieure / inférieure, réduisant le nombre de couches extérieures supérieures / inférieures nécessaires pour obtenir la même qualité, au prix d'un peu de matériau supplémentaire.Configurée correctement, cette fonctionnalité peut être combinée avec « Relier les polygones de remplissage » pour relier tous les remplissages en un seul mouvement d'extrusion sans avoir besoin de déplacements ou de rétractions." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Tout en même temps" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Tous les ventilateurs" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Tous les paramètres qui influent sur la résolution de l'impression. Ces paramètres ont un impact conséquent sur la qualité (et la durée d'impression)." @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Largeur de la bordure" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Construire la vitesse du ventilateur en hauteur" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Vitesse du ventilateur de construction à la couche" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Adhérence du plateau" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Avertissement de la température du volume de construction" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Numéro du ventilateur de volume de construction" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "En activant ce paramètre, votre tour d'amorçage aura un bord même si le modèle n'en a pas. Si vous souhaitez une base plus solide pour une tour élevée, vous pouvez augmenter la hauteur de la base." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Refroidissement" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Refroidissement lors de la commutation de l'extrudeuse" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Entrecroisé" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Détecter les ponts et modifier la vitesse d'impression, le débit et les paramètres du ventilateur pendant l'impression des ponts." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Détermine la longueur de chaque étape du changement de flux lors de l'extrusion le long de la couture du foulard. Une distance plus petite se traduira par un code G plus précis mais aussi plus complexe." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Détermine la longueur du joint d'écharpe, un type de joint qui devrait rendre le joint Z moins visible. La valeur doit être supérieure à 0 pour être efficace." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Détermine l'ordre dans lequel les parois sont imprimées. L'impression des parois extérieures plus tôt permet une précision dimensionnelle car les défauts des parois intérieures ne peuvent pas se propager à l'extérieur. Cependant, le fait de les imprimer plus tard leur permet de mieux s'empiler lorsque les saillies sont imprimées. Lorsqu'il y a une quantité totale inégale de parois intérieures, la « dernière ligne centrale » est toujours imprimée en dernier." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Double extrusion" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Durée de chaque pas dans la variation progressive du débit" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Elliptique" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Activer le bouclier de suintage extérieur. Cela créera une coque autour du modèle qui est susceptible d'essuyer une deuxième buse si celle-ci est à la même hauteur que la première buse." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Activer les variations de débit progressives. Lorsque cette option est activée, le débit est augmenté ou réduit progressivement jusqu'au débit souhaité. Cette option est utile pour les imprimantes avec un tube bowden où le débit n'est pas modifié immédiatement lorsque le moteur de l'extrudeur démarre ou s'arrête." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Activez le rapport sur le processus d'impression pour définir des valeurs seuils en vue d'une éventuelle détection d'erreur." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Le raccommodage consiste en la suppression des trous dans le maillage en tentant de fermer le trou avec des intersections entre polygones existants. Cette option peut induire beaucoup de temps de calcul." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Lignes de remplissage supplémentaires pour soutenir les peaux" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Nombre de parois de remplissage supplémentaire" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Matériel supplémentaire à amorcer après le changement de buse." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Extrudeuse Position d'amorçage X" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Extrudeuse Position d'amorçage Z" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Les extrudeurs partagent le chauffage" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Vitesse de purge d'insertion" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Pour tout déplacement supérieur à cette valeur, le débit de matière est réinitialisé au débit souhaité pour les trajectoires" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Pour les structures fines dont la taille correspond à une ou deux fois celle de la buse, il faut modifier la largeur des lignes pour respecter l'épaisseur du modèle. Ce paramètre contrôle la largeur de ligne minimale autorisée pour les parois. Les largeurs de lignes minimales déterminent également les largeurs de lignes maximales, puisque nous passons de N à N+1 parois à une certaine épaisseur géométrique où les N parois sont larges et les N+1 parois sont étroites. La ligne de paroi la plus large possible est égale à deux fois la largeur minimale de la ligne de paroi." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Parfum G-Code" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "Commandes G-Code à exécuter tout à la fin, séparées par " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "Commandes G-Code à exécuter tout à la fin, séparées par ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "Commandes G-Code à exécuter au tout début, séparées par " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "Commandes G-Code à exécuter au tout début, séparées par ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Étapes de remplissage graduel du support" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Taille de pas de la discrétisation du débit progressif" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Débit progressif activé" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Accélération progressive jusqu'au débit max" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Réduisez progressivement à cette température lors de l'impression à des vitesses réduites en raison de la durée minimale d’une couche." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "A un plateau chauffé" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Vitesse de chauffage" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Compensation du rétrécissement du facteur d'échelle horizontale" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Jusqu'où le filament peut être étiré avant qu'il ne se casse, pendant qu'il est chauffé." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Température d’impression initiale" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Accélération maximale du débit lors de la première couche" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Accélération de la paroi intérieure" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "N'agitez que les contours des pièces et non les trous des pièces." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Conserver les faces disjointes" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Rendre la position d'amorçage de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Faites en sorte que la première et la deuxième couche du modèle se chevauchent dans la direction Z pour compenser la perte de filament dans l'entrefer. Tous les modèles situés au-dessus de la première couche du modèle seront décalés vers le bas de cette valeur." -"On peut noter que la deuxième couche est parfois imprimée en dessous de la couche initiale à cause de ce paramètre. Il s'agit d'un comportement voulu." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Faites en sorte que la première et la deuxième couche du modèle se chevauchent dans la direction Z pour compenser la perte de filament dans l'entrefer. Tous les modèles situés au-dessus de la première couche du modèle seront décalés vers le bas de cette valeur.On peut noter que la deuxième couche est parfois imprimée en dessous de la couche initiale à cause de ce paramètre. Il s'agit d'un comportement voulu." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Gérez la relation spatiale entre le joint en Z de la structure de support et le modèle 3D réel. Ce contrôle est essentiel, car il permet aux utilisateurs d'assurer le retrait transparent des structures de support après l'impression, sans endommager le modèle imprimé ni y laisser de marques." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Résolution de déplacement maximum" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Accélération maximale pour les variations de débit progressives" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "Accélération maximale pour le moteur du sens X" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Milieu" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Distance min. du joint Z par rapport au modèle" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Largeur minimale de moule" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Taille minimale de la surface des plafonds du support. Les polygones dont la surface est inférieure à cette valeur ne seront pas imprimés comme support normal." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Vitesse minimale pour les variations de débit progressives pour la première couche" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Épaisseur minimale des entités fines. Les entités de modèle qui sont plus fines que cette valeur ne seront pas imprimées, tandis que les entités plus épaisses que la taille d'entité minimale seront élargies à la largeur minimale de la ligne de paroi." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Une jupe à plusieurs lignes vous aide à mieux préparer votre extrusion pour les petits modèles. Définissez celle valeur sur 0 pour désactiver la jupe." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Multiplicateur pour le remplissage des couches initiales du support. L'augmentation de ce facteur peut contribuer à l'adhérence du lit." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Multiplicateur de la largeur de la ligne sur la première couche. Augmenter le multiplicateur peut améliorer l'adhésion au plateau." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Aucun" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Aucune" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Aucun" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Pas sur la surface extérieure" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Angle de la buse" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diamètre de la buse" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Zones interdites au bec d'impression" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ID buse" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Longueur de la buse" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Taille de la buse" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Vitesse de rétraction de changement de buse" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Nombre d'extrudeuses" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "Un à la fois" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Seulement pour la dernière extrudeuse" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Appliquer un décalage en Z uniquement lors du mouvement au-dessus de pièces imprimées qui ne peuvent être évitées par le mouvement horizontal, via Éviter les pièces imprimées lors du déplacement." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Accélération de la paroi externe" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Accélération du mur extérieur" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Décélération du mur extérieur" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Rapport de vitesse de fin de mur extérieur" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Extrudeuse de paroi externe" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Vitesse d'impression de la paroi externe" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Distance de division de la vitesse de mur extérieur" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Rapport de vitesse de départ du mur extérieur" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Distance d'essuyage paroi extérieure" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Vitesse du ventilateur en pourcentage à utiliser pour l'impression de la troisième couche extérieure du pont." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Placz la couture en Z sur un sommet du polygone. Si vous désactivez cette option, vous pouvez également placer la couture entre les sommets. (Gardez à l'esprit que cela n'annule pas les restrictions imposées au placement de la couture sur un surplomb non supporté.)" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Les polygones en couches tranchées dont la circonférence est inférieure à cette valeur seront filtrés. Des valeurs élevées permettent d'obtenir un maillage de meilleure résolution mais augmentent le temps de découpe. Cette option est principalement destinée aux imprimantes SLA haute résolution et aux modèles 3D de très petite taille avec beaucoup de détails." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Distance maximale de porte-à-faux de la tour d'amorçage" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Épaisseur minimale de l'enveloppe de la tour d'amorçage" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Volume minimum de la tour d'amorçage" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Accélération de l'impression" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Imprimer en saccade" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimer une tour à côté de l'impression qui sert à amorcer le matériau après chaque changement de buse." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprimer les structures de remplissage uniquement là où le haut du modèle doit être supporté, ce qui permet de réduire le temps d'impression et l'utilisation de matériau, mais conduit à une résistance uniforme de l'objet." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprimez les lignes supérieures et inférieures dans un ordre tel qu'elles se chevauchent toujours avec les lignes adjacentes dans une seule direction. Cela prend un peu plus de temps à imprimer, mais les surfaces planes ont l'air plus cohérentes." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Température d’impression" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Vitesse du ventilateur pour la base du radeau" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Débit de base du radeau" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Recouvrement du remplissage de la base du radier" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Pourcentage de chevauchement du remplissage de la base du radier" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Espacement des lignes de base du radeau" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Vitesse du ventilateur pendant le radeau" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Débit du radier" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Débit de l'interface du radier" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Recouvrement de l'interface du radier" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Pourcentage de chevauchement de l'interface du radier" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Décalage Z de l'interface du radeau" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Marge supplémentaire du milieu du radeau" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Lissage de radeau" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Écoulement de la surface du radier" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Chevauchement du remplissage de la surface du radier" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Pourcentage du remplissage de la surface du radier" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Décalage Z de la surface du radier" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Marge supplémentaire de la partie supérieure du radeau" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Rapport sur les événements qui dépassent les seuils fixés" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Réinitialiser la durée du débit" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Préférence d'emplacement" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Mise à l'échelle du facteur de compensation de contraction" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Longueur de la couture de l'écharpe" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Hauteur de départ de la couture de l'écharpe" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Longueur du pas de couture de l'écharpe" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "La scène comporte un maillage de support" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Préférence de jointure d'angle" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Angle du mur en surplomb du joint" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Définir la séquence d'impression manuellement" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Accélération de remplissage du support" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Couche initiale du multiplicateur de densité du support de remplissage" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Extrudeuse de remplissage du support" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Distance Z des supports" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Joint Z du support à l'opposé du modèle" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Priorité aux lignes de support" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Ce paramètre inverse l'ordre d'impression de la ligne de bordure la plus intérieure et de la deuxième ligne de bordure la plus intérieure. La bordure est ainsi plus facile à retirer." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Passe aux volumes d'intersection de maille qui appartiennent à chaque couche, de manière à ce que les mailles qui se chevauchent soient entrelacées. Si vous désactivez ce paramètre, l'une des mailles obtiendra tout le volume dans le chevauchement tandis qu'il est retiré des autres mailles." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "L'accélération selon laquelle les déplacements s'effectuent." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "La quantité de matériau, relative à une ligne de couche extérieure normale, à extruder pendant l'étirage. Le fait de garder la buse pleine aide à remplir certaines des crevasses de la surface supérieure ; mais si la quantité est trop importante, cela entraînera une surextrusion et l'apparition de coupures sur le côté de la surface." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de la base du radeau. L'augmentation du débit peut améliorer l'adhérence et la solidité structurelle de l'empilement." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Le degré de chevauchement entre le remplissage et les parois exprimé en pourcentage de la largeur de ligne de remplissage. Un chevauchement faible permet aux parois de se connecter fermement au remplissage." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de l'interface du radeau. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du radeau." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder lors de l'impression du chevron. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du chevron." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de la surface du radeau. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du chevron." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "La quantité de matériau, relative à une ligne de couche extérieure normale, à extruder pendant l'étirage. Le fait de garder la buse pleine aide à remplir certaines des crevasses de la surface supérieure ; mais si la quantité est trop importante, cela entraînera une surextrusion et l'apparition de coupures sur le côté de la surface." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Le degré de chevauchement entre le remplissage et les parois exprimé en pourcentage de la largeur de ligne de remplissage. Un chevauchement faible permet aux parois de se connecter fermement au remplissage." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantité de chevauchement entre le remplissage et les parois de la base du radeau, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux parois de se raccorder fermement au remplissage." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Le degré de chevauchement entre le remplissage et les parois de la base du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantité de chevauchement entre le remplissage et les murs de l'interface du radier, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantité de chevauchement entre le remplissage et les murs de l'interface du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantité de chevauchement entre le remplissage et les parois de la surface du radier, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantité de chevauchement entre le remplissage et les murs de la surface du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "La distance entre les lignes d'étirage." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "La distance entre le modèle et sa structure de support au niveau de la couture de l'axe z." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "La distance entre la buse et les pièces déjà imprimées lors du contournement pendant les déplacements." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "La hauteur au-dessus des parties horizontales dans votre modèle pour laquelle imprimer le moule." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "Hauteur à laquelle les ventilateurs tournent à la vitesse normale. Dans les couches inférieures, la vitesse du ventilateur passe progressivement de la vitesse initiale à la vitesse normale." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "Hauteur à laquelle les ventilateurs tournent à la vitesse régulière. Pour les couches situées en-dessous, la vitesse des ventilateurs augmente progressivement de la vitesse des ventilateurs initiale jusqu'à la vitesse régulière." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "La différence de hauteur entre la pointe de la buse et le système de portique (axes X et Y)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "La différence de hauteur entre la pointe de la buse et la partie la plus basse de la tête d'impression." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "La différence de hauteur lors de la réalisation d'un décalage en Z après changement d'extrudeuse." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "La distance horizontale entre la première ligne de bordure et le contour de la première couche de l'impression. Un petit trou peut faciliter l'enlèvement de la bordure tout en offrant des avantages thermiques." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "La distance horizontale entre la jupe et la première couche de l’impression." -"Il s’agit de la distance minimale séparant la jupe de l’objet. Si la jupe a d’autres lignes, celles-ci s’étendront vers l’extérieur." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "La distance horizontale entre la jupe et la première couche de l’impression.Il s’agit de la distance minimale séparant la jupe de l’objet. Si la jupe a d’autres lignes, celles-ci s’étendront vers l’extérieur." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "La plus grande largeur des zones de la couche extérieure supérieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure supérieure sur les surfaces obliques du modèle." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "La couche à laquelle les ventilateurs de construction tournent à pleine vitesse. Cette valeur est calculée et arrondie à un nombre entier." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "La couche à laquelle les ventilateurs tournent à la vitesse régulière. Si la vitesse régulière du ventilateur à la hauteur est définie, cette valeur est calculée et arrondie à un nombre entier." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "La pente minimum de la zone pour un effet de marche de support. Des valeurs basses devraient faciliter l'enlèvement du support sur les pentes peu superficielles ; des valeurs très basses peuvent donner des résultats vraiment contre-intuitifs sur d'autres pièces du modèle." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "L'épaisseur minimale de la coque de l'échafaudage principal. Vous pouvez l'augmenter pour rendre l'échafaudage plus solide." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "Temps minimum passé sur une couche. Cela force l'imprimante à ralentir afin de passer au minimum la durée définie ici sur une couche. Cela permet au matériau imprimé de refroidir correctement avant l'impression de la couche suivante. Les couches peuvent néanmoins prendre moins de temps que le temps de couche minimum si « Lift Head  » (Relever Tête) est désactivé et si la vitesse minimum serait autrement non respectée." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Nombre de lignes utilisées pour la bordure du support. L'augmentation du nombre de lignes de bordure améliore l'adhérence au plateau, mais demande un peu de matériau supplémentaire." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "Le numéro du ventilateur qui refroidit le volume de construction. S'il est fixé à 0, cela signifie qu'il n'y a pas de ventilateur de volume de construction." + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "Nombre de couches de surface au-dessus de la deuxième couche du radeau. Il s’agit des couches entièrement remplies sur lesquelles le modèle est posé. En général, deux couches offrent une surface plus lisse qu'une seule." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "Le changement instantané maximal de vitesse pour la couche initiale." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "Le ratio de la hauteur de couche sélectionnée à laquelle la couture de l'écharpe commencera. Un nombre inférieur entraînera une plus grande hauteur de couture. Il doit être inférieur à 100 pour être efficace." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "La forme du plateau sans prendre les zones non imprimables en compte." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Ce paramètre contrôle la distance que l'extrudeuse doit parcourir en roue libre immédiatement avant le début d'une paroi de pont. L'utilisation de la roue libre avant le début du pont permet de réduire la pression à l'intérieur de la buse et d'obtenir un pont plus plat." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Il s'agit de l'accélération permettant d'atteindre la vitesse maximale lors de l'impression d'un mur extérieur." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Il s'agit de la décélération permettant de terminer l'impression d'un mur extérieur." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Il s'agit de la longueur maximale d'un chemin d'extrusion lors de la division d'un chemin plus long pour appliquer l'accélération/décélération du mur extérieur. Une distance plus petite créera un code G plus précis mais aussi plus verbeux." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Il s'agit du ratio de la vitesse maximale à laquelle il faut terminer lors de l'impression d'un mur extérieur." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Il s'agit du rapport entre la vitesse maximale et la vitesse de départ lors de l'impression d'un mur extérieur." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Ce paramètre détermine le degré d'arrondi des coins intérieurs du contour de la base du radeau. Les coins intérieurs sont arrondis à un demi-cercle dont le rayon est égal à la valeur donnée ici. Ce paramètre supprime également les trous dans le contour du radeau qui sont plus petits qu'un tel cercle." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Pour compenser la contraction du matériau lors de son refroidissement, le modèle est mis à l'échelle avec ce facteur." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Couches supérieures" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Diamètre du tronc" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Essayez d'éviter les coutures sur les murs qui dépassent cet angle. Lorsque la valeur est de 90, aucun mur ne sera traité comme étant en surplomb." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Inchangé" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Joindre les volumes se chevauchant" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Parois" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Murs uniquement" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Murs et lignes" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Les parois ayant un angle supérieur à cette valeur seront imprimées en utilisant les paramètres de parois en porte-à-faux. Si la valeur est 90, aucune paroi ne sera considérée comme étant en porte-à-faux. La saillie soutenue par le support ne sera pas non plus considérée comme étant en porte-à-faux." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Les murs qui dépassent de plus de cet angle seront imprimés en utilisant les paramètres des murs en surplomb. Lorsque la valeur est de 90, aucun mur n'est traité comme étant en surplomb. Les surplombs qui sont soutenus par un support ne seront pas non plus traités comme des surplombs. En outre, toute ligne dont le surplomb est inférieur à la moitié ne sera pas non plus traitée comme un surplomb." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Lors de l'impression des parois de pont, la quantité de matériau extrudé est multipliée par cette valeur." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Lors de l'impression de la première couche de l'interface du radeau, ce décalage permet de personnaliser l'adhérence entre la base et l'interface. Un décalage négatif devrait améliorer l'adhérence." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Lors de l'impression de la première couche de la surface du radeau, il faut tenir compte de ce décalage pour personnaliser l'adhérence entre l'interface et la surface. Un décalage négatif devrait améliorer l'adhérence." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Lors de l'impression de la deuxième couche extérieure du pont, la quantité de matériau extrudé est multipliée par cette valeur." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Alignement de la jointure en Z" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Joint en Z sur le sommet" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Position de la jointure en Z" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "déplacement" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Permet d'activer ou non les ventilateurs de refroidissement lors d'un changement de buse. Cette option peut aider à réduire le suintement en refroidissant la buse plus rapidement :
    • Inchangé : garder les ventilateurs tels qu'ils étaient auparavant
    • Seulement dernier extrudeur : allumer le ventilateur du dernier extrudeur utilisé, mais éteindre les autres (s'il y en a). Cette option est utile si tu as des extrudeuses complètement séparées.
    • Tous les ventilateurs : cette option est utile si vous avez un seul ventilateur de refroidissement, ou plusieurs ventilateurs qui restent proches les uns des autres.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Tous les ventilateurs" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Refroidissement lors de la commutation de l'extrudeuse" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Gérez la relation spatiale entre le joint en Z de la structure de support et le modèle 3D réel. Ce contrôle est essentiel, car il permet aux utilisateurs d'assurer le retrait transparent des structures de support après l'impression, sans endommager le modèle imprimé ni y laisser de marques." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Distance min. du joint Z par rapport au modèle" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Multiplicateur pour le remplissage des couches initiales du support. L'augmentation de ce facteur peut contribuer à l'adhérence du lit." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Seulement pour la dernière extrudeuse" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Placz la couture en Z sur un sommet du polygone. Si vous désactivez cette option, vous pouvez également placer la couture entre les sommets. (Gardez à l'esprit que cela n'annule pas les restrictions imposées au placement de la couture sur un surplomb non supporté.)" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Épaisseur minimale de l'enveloppe de la tour d'amorçage" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Débit de base du radeau" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Recouvrement du remplissage de la base du radier" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Pourcentage de chevauchement du remplissage de la base du radier" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Débit du radier" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Débit de l'interface du radier" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Recouvrement de l'interface du radier" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Pourcentage de chevauchement de l'interface du radier" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Décalage Z de l'interface du radeau" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Écoulement de la surface du radier" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Chevauchement du remplissage de la surface du radier" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Pourcentage du remplissage de la surface du radier" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Décalage Z de la surface du radier" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Angle du mur en surplomb du joint" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Couche initiale du multiplicateur de densité du support de remplissage" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Joint Z du support à l'opposé du modèle" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de la base du radeau. L'augmentation du débit peut améliorer l'adhérence et la solidité structurelle de l'empilement." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de l'interface du radeau. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du radeau." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder lors de l'impression du chevron. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du chevron." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de la surface du radeau. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du chevron." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les parois de la base du radeau, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux parois de se raccorder fermement au remplissage." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Le degré de chevauchement entre le remplissage et les parois de la base du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les murs de l'interface du radier, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les murs de l'interface du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les parois de la surface du radier, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les murs de la surface du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "La distance entre le modèle et sa structure de support au niveau de la couture de l'axe z." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "L'épaisseur minimale de la coque de l'échafaudage principal. Vous pouvez l'augmenter pour rendre l'échafaudage plus solide." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Essayez d'éviter les coutures sur les murs qui dépassent cet angle. Lorsque la valeur est de 90, aucun mur ne sera traité comme étant en surplomb." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Inchangé" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Lors de l'impression de la première couche de l'interface du radeau, ce décalage permet de personnaliser l'adhérence entre la base et l'interface. Un décalage négatif devrait améliorer l'adhérence." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Lors de l'impression de la première couche de la surface du radeau, il faut tenir compte de ce décalage pour personnaliser l'adhérence entre l'interface et la surface. Un décalage négatif devrait améliorer l'adhérence." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Joint en Z sur le sommet" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Ajoutez des lignes supplémentaires dans le motif de remplissage pour soutenir les peaux situées au-dessus. Cette option permet d'éviter les trous ou les bulles de plastique qui apparaissent parfois dans les peaux de forme complexe, parce que le remplissage en dessous ne soutient pas correctement la couche de peau imprimée au-dessus. L'option \"Murs\" ne prend en charge que les contours de la peau, tandis que l'option \"Murs et lignes\" prend également en charge les extrémités des lignes qui composent la peau." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Construire la vitesse du ventilateur en hauteur" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Longueur de la buse" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Vitesse du ventilateur de construction à la couche" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "La différence de hauteur entre la pointe de la buse et la partie la plus basse de la tête d'impression." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Numéro du ventilateur de volume de construction" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Détermine la longueur de chaque étape du changement de flux lors de l'extrusion le long de la couture du foulard. Une distance plus petite se traduira par un code G plus précis mais aussi plus complexe." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Détermine la longueur du joint d'écharpe, un type de joint qui devrait rendre le joint Z moins visible. La valeur doit être supérieure à 0 pour être efficace." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Durée de chaque pas dans la variation progressive du débit" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Activer les variations de débit progressives. Lorsque cette option est activée, le débit est augmenté ou réduit progressivement jusqu'au débit souhaité. Cette option est utile pour les imprimantes avec un tube bowden où le débit n'est pas modifié immédiatement lorsque le moteur de l'extrudeur démarre ou s'arrête." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Lignes de remplissage supplémentaires pour soutenir les peaux" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Pour tout déplacement supérieur à cette valeur, le débit de matière est réinitialisé au débit souhaité pour les trajectoires" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Taille de pas de la discrétisation du débit progressif" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Débit progressif activé" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Accélération progressive jusqu'au débit max" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Accélération maximale du débit lors de la première couche" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Accélération maximale pour les variations de débit progressives" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Vitesse minimale pour les variations de débit progressives pour la première couche" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Aucune" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Accélération du mur extérieur" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Décélération du mur extérieur" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Rapport de vitesse de fin de mur extérieur" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Distance de division de la vitesse de mur extérieur" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Rapport de vitesse de départ du mur extérieur" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Réinitialiser la durée du débit" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Longueur de la couture de l'écharpe" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Hauteur de départ de la couture de l'écharpe" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Longueur du pas de couture de l'écharpe" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "Hauteur à laquelle les ventilateurs tournent à la vitesse normale. Dans les couches inférieures, la vitesse du ventilateur passe progressivement de la vitesse initiale à la vitesse normale." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "La couche à laquelle les ventilateurs de construction tournent à pleine vitesse. Cette valeur est calculée et arrondie à un nombre entier." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Le numéro du ventilateur qui refroidit le volume de construction. S'il est fixé à 0, cela signifie qu'il n'y a pas de ventilateur de volume de construction." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Le ratio de la hauteur de couche sélectionnée à laquelle la couture de l'écharpe commencera. Un nombre inférieur entraînera une plus grande hauteur de couture. Il doit être inférieur à 100 pour être efficace." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Il s'agit de l'accélération permettant d'atteindre la vitesse maximale lors de l'impression d'un mur extérieur." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Il s'agit de la décélération permettant de terminer l'impression d'un mur extérieur." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Il s'agit de la longueur maximale d'un chemin d'extrusion lors de la division d'un chemin plus long pour appliquer l'accélération/décélération du mur extérieur. Une distance plus petite créera un code G plus précis mais aussi plus verbeux." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Il s'agit du ratio de la vitesse maximale à laquelle il faut terminer lors de l'impression d'un mur extérieur." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Il s'agit du rapport entre la vitesse maximale et la vitesse de départ lors de l'impression d'un mur extérieur." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Murs uniquement" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Murs et lignes" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Les murs qui dépassent de plus de cet angle seront imprimés en utilisant les paramètres des murs en surplomb. Lorsque la valeur est de 90, aucun mur n'est traité comme étant en surplomb. Les surplombs qui sont soutenus par un support ne seront pas non plus traités comme des surplombs. En outre, toute ligne dont le surplomb est inférieur à la moitié ne sera pas non plus traitée comme un surplomb." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Les parois ayant un angle supérieur à cette valeur seront imprimées en utilisant les paramètres de parois en porte-à-faux. Si la valeur est 90, aucune paroi ne sera considérée comme étant en porte-à-faux. La saillie soutenue par le support ne sera pas non plus considérée comme étant en porte-à-faux." diff --git a/resources/i18n/hu_HU/fdmprinter.def.json.po b/resources/i18n/hu_HU/fdmprinter.def.json.po index 1a0e40680f3..ee2103453e3 100644 --- a/resources/i18n/hu_HU/fdmprinter.def.json.po +++ b/resources/i18n/hu_HU/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2020-03-24 09:43+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: AT-VLOG\n" @@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Egy extra anyagmennyiség, amivel több anyagot tol vissza a fejbe fúvókaváltás után." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Extruder kezdő X helyzet" @@ -1061,6 +1065,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Kezdő Z pozíció" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "" @@ -1417,6 +1425,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Van tárgyasztal fűtés" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Felfűtési sebesség" @@ -1457,6 +1469,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Mennyire húzható ki a szál melegítés közben, szakadás nélkül." @@ -1885,6 +1905,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "" +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Nyílt poligonok megtartása" @@ -2479,14 +2519,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Csúcsszög" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Fúvóka átmérő" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Fúvóka tiltott területek" @@ -2495,6 +2547,10 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Fúvóka ID" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Fúvóka méret" + msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" msgstr "Fúvókaváltási extra visszatolt anyag" @@ -2515,6 +2571,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Fúvókaváltás visszahúzási sebesség" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Extruderek száma" @@ -2803,6 +2867,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Nyomtatási gyorsulás" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Nyomtatás löket" @@ -2831,6 +2903,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Nyomtasson egy tornyot a nyomtatandó tárgy mellett, amely abban segít, hogy a fejben lévő anyagváltást végre tudja hajtani. Kinyomtatja az előtoronyba a fejben marad előző alapanyag maradványokat, így már kitisztult fúvókával tudja a nyomtatást folytatni a nyomtatandó testen." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Csak ott nyomtasson kitöltő szerkezeteket, ahol a felső modellrésznek szüksége van alátámasztásra. Ennek az engedélyezése csökkenti a nyomtatási időt, illetve az anyagszükségletet, azonban a tárgyak belső szilárdsága egyenetlen lehet." @@ -2879,6 +2955,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "" +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Nyomtatási hőmérséklet" @@ -3911,6 +3991,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Bekapcsolja, hogy minden egyes rétegnél, ahol kereszteződő hálók találhatóak, azok fonódjanak össze. Ha kikapcsoljuk ezt az opciót, akkor a kereszteződő hálók közül az egyik megkapja az átfedésben lévő háló teljes térfogatát, míg a többi hálót eltávolítja." @@ -5263,6 +5351,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "" +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Felső rétegek" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 79b199a170b..1cdf8249be1 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Come generare la prime tower:
    • Normale: creare un contenitore in cui vengono preparati i materiali secondari
    • Impilata: creare una prime tower più intervallata possibile. Ciò farà risparmiare tempo e filamento, ma è possibile solo se i materiali utilizzati aderiscono tra loro
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Se attivare le ventole di raffreddamento durante il cambio degli ugelli. Questo può aiutare a ridurre la fuoriuscita di liquido raffreddando l'ugello più velocemente:
    • Invariato:mantiene le ventole come prima
    • Solo ultimo estrusore: attiva la ventola dell'ultimo estrusore utilizzato, ma spegne le altre (se presenti). Utile se hai estrusori completamente separati.
    • Tutte le ventole: attiva tutte le ventole durante il cambio degli ugelli. Utile se hai una singola ventola di raffreddamento o più ventole vicine tra loro.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Un brim intorno a un modello potrebbe toccarne un altro in un punto non desiderato. Ciò rimuove tutto il brim entro questa distanza dai modelli che ne sono sprovvisti." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Gli strati adattivi calcolano l’altezza degli strati in base alla forma del modello." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Aggiunge linee supplementari nel modello di riempimento per supportare gli strati sovrastanti. Questa opzione impedisce la formazione di vuoti o bolle di plastica che a volte compaiono nei modelli più complessi a causa del fatto che il riempimento sottostante non supporta correttamente lo strato stampato al di sopra.'Pareti' supporta solo i margini dello strato, mentre 'Pareti e linee' supporta anche le estremità delle file che compongono lo strato." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Aggiunge pareti supplementari intorno alla zona di riempimento. Queste pareti possono ridurre l’abbassamento delle linee del rivestimento esterno superiore/inferiore, pertanto saranno necessari meno strati di rivestimento esterno superiore/inferiore per ottenere la stessa qualità al costo del materiale supplementare." -"Questa funzione può essere abbinata a Collega poligoni riempimento per collegare tutto il riempimento in un unico percorso di estrusione senza necessità di avanzamenti o arretramenti, se configurata correttamente." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Aggiunge pareti supplementari intorno alla zona di riempimento. Queste pareti possono ridurre l’abbassamento delle linee del rivestimento esterno superiore/inferiore, pertanto saranno necessari meno strati di rivestimento esterno superiore/inferiore per ottenere la stessa qualità al costo del materiale supplementare.Questa funzione può essere abbinata a Collega poligoni riempimento per collegare tutto il riempimento in un unico percorso di estrusione senza necessità di avanzamenti o arretramenti, se configurata correttamente." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Tutti contemporaneamente" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Tutte le ventole" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Indica tutte le impostazioni che influiscono sulla risoluzione della stampa. Queste impostazioni hanno un elevato impatto sulla qualità (e il tempo di stampa)" @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Larghezza del brim" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Velocità della ventola di costruzione per altezza " + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Velocità della ventola di costruzione per strato" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Adesione piano di stampa" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Avviso sulla temperatura del volume di costruzione" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Numero ventola volume di stampa" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Attivando questa impostazione, la tua torre di primerizzazione avrà un bordo, anche se il modello non lo prevede. Se desideri una base più robusta per una torre alta, puoi aumentare l'altezza della base." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Raffreddamento" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Raffreddamento durante il cambio dell'estrusore" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Incrociata" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Rileva i ponti e modifica la velocità di stampa, il flusso e le impostazioni ventola durante la stampa dei ponti." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Determina la lunghezza di ciascun passo nella modifica del flusso durante l'estrusione lungo la cucitura a sciarpa. Una distanza minore determina un codice G più preciso ma anche più complesso." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Determina la lunghezza della cucitura a sciarpa, un tipo di cucitura che dovrebbe rendere la cucitura Z meno visibile. Deve essere superiore a 0 per essere efficace." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Determina l'ordine di stampa delle pareti. La stampa anticipata delle pareti esterne migliora la precisione dimensionale poiché i guasti dalle pareti interne non possono propagarsi all'esterno. Se si esegue la stampa in un momento successivo, tuttavia, è possibile impilarle meglio quando vengono stampati gli sbalzi. Quando c'è una quantità irregolare di pareti interne totali, l'ultima riga centrale viene sempre stampata per ultima." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Doppia estrusione" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Durata di ogni gradino per la variazione graduale del flusso" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Ellittica" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Abilita il riparo esterno del materiale fuoriuscito. Questo crea un guscio intorno al modello per pulitura con un secondo ugello, se è alla stessa altezza del primo ugello." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Abilitare le variazioni graduali del flusso. Quando abilitate, il flusso viene aumentato/diminuito gradualmente fino al flusso target. Ciò è utile per le stampanti dotate di tubo bowden dove il flusso non viene modificato immediatamente all'avvio/arresto del motore dell'estrusore." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Abilita il resoconto del processo di stampa per impostare i valori di soglia per il rilevamento di eventuali errori." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Questa funzione tenta di 'ricucire' i fori aperti nella maglia chiudendo il foro con poligoni a contatto. Questa opzione può richiedere lunghi tempi di elaborazione." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Linee di rinforzo extra per sostenere gli strati superiori" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Conteggio pareti di riempimento supplementari" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Materiale extra per l'innesco dopo il cambio dell'ugello." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Posizione X innesco estrusore" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posizione Z innesco estrusore" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Condivisione del riscaldatore da parte degli estrusori" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Velocità di svuotamento dello scarico" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Per ogni spostamento del percorso superiore a questo valore, il flusso del materiale viene reimpostato su quello target dei percorsi." + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Per strutture sottili, circa una o due volte la dimensione dell'ugello, le larghezze delle linee devono essere modificate per rispettare lo spessore del modello. Questa impostazione controlla la larghezza minima della linea consentita per le pareti. Le larghezze minime delle linee determinano intrinsecamente anche le larghezze massime delle linee, poiché si esegue la transizione da N a N+1 pareti ad uno spessore geometrico in cui le pareti N sono larghe e le pareti N+1 sono strette. La linea perimetrale più larga possible è due volte la larghezza minima della linea perimetrale." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Versione codice G" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "I comandi codice G da eseguire alla fine, separati da " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "I comandi codice G da eseguire alla fine, separati da ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "I comandi codice G da eseguire all’avvio, separati da " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "I comandi codice G da eseguire all’avvio, separati da ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Fasi di riempimento graduale del supporto" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Dimensione del gradino di discretizzazione del flusso graduale" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Flusso graduale abilitato" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Accelerazione massima del flusso graduale" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Riduci gradualmente questa temperatura quando si stampa a velocità ridotte a causa del tempo di strato minimo." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Piano di stampa riscaldato" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocità di riscaldamento" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Fattore di scala orizzontale per la compensazione della contrazione" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "La lunghezza massima di estensione del filamento prima che si rompa durante il riscaldamento." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Temperatura di stampa iniziale" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Accelerazione massima del flusso per lo strato iniziale" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Accelerazione parete interna" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Distorce solo i profili delle parti, non i fori di queste." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Mantenimento delle superfici scollegate" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Rende la posizione di innesco estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Il primo e il secondo strato del modello vanno sovrapposti nella direzione Z per compensare il filamento perso nello spazio vuoto. Tutti i modelli al di sopra del primo strato saranno spostati verso il basso da questa quantità." -"Si può notare che a volte il secondo strato viene stampato al di sotto dello strato iniziale a causa di questa impostazione. Si tratta di un comportamento previsto." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Il primo e il secondo strato del modello vanno sovrapposti nella direzione Z per compensare il filamento perso nello spazio vuoto. Tutti i modelli al di sopra del primo strato saranno spostati verso il basso da questa quantità.Si può notare che a volte il secondo strato viene stampato al di sotto dello strato iniziale a causa di questa impostazione. Si tratta di un comportamento previsto." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Gestisci la relazione spaziale tra la cucitura z della struttura di supporto e il modello 3D effettivo. Questo controllo è fondamentale in quanto consente agli utenti di rimuovere facilmente le strutture di supporto dopo la stampa, senza causare danni o lasciare segni sul modello stampato." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Risoluzione massima di spostamento" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Accelerazione massima per le variazioni graduali del flusso" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "Indica l’accelerazione massima del motore per la direzione X" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Intermedia" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Distanza minima della cucitura z dal modello" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Larghezza minimo dello stampo" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Dimensione minima dell'area per le parti superiori del supporto. I poligoni con un'area più piccola rispetto a questo valore saranno stampati come supporto normale." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Velocità minima per le variazioni graduali del flusso per il primo strato." + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Spessore minimo di feature sottili. Le feature modello che sono più sottili di questo valore non verranno stampate, mentre le feature più spesse delle dimensioni minime della feature verranno ampliate fino alla larghezza minima della linea perimetrale." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Più linee di skirt contribuiscono a migliorare l'avvio dell'estrusione per modelli di piccole dimensioni. L'impostazione di questo valore a 0 disattiverà la funzione skirt." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Moltiplicatore per il riempimento degli strati iniziali del supporto. Aumentarlo può aiutare l'adesione al piano." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Moltiplicatore della larghezza della linea del primo strato Il suo aumento potrebbe migliorare l'adesione al piano." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Nessuno" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Nessuno" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Nessuno" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Non su superficie esterna" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Angolo ugello" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diametro ugello" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Aree ugello non consentite" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ID ugello" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Lunghezza ugello" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Dimensione ugello" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocità di retrazione cambio ugello" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Numero di estrusori" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "Uno alla volta" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Solo l'ultimo estrusore" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Esegue solo uno Z Hop quando si sposta sopra le parti stampate che non possono essere evitate mediante uno spostamento orizzontale con Aggiramento delle parti stampate durante lo spostamento." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Accelerazione parete esterna" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Accelerazione parete esterna" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Decelerazione parete esterna" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Rapporto di velocità finale parete esterna" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Estrusore parete esterna" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Velocità di stampa della parete esterna" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Velocità distanza di divisione della parete esterna" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Rapporto di velocità iniziale parete esterna" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Distanza del riempimento parete esterna" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "La velocità della ventola in percentuale da usare per stampare il terzo strato del rivestimento esterno ponte." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Posiziona la cucitura z su un vertice del poligono. Disattivando questa opzione è possibile posizionare la cucitura anche nello spazio tra i vertici. (Tieni presente che ciò non annullerà le restrizioni sul posizionamento della cucitura su una sporgenza non supportata.)" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "I poligoni in strati sezionati con una circonferenza inferiore a questo valore verranno scartati. I valori inferiori generano una maglia con risoluzione superiore al costo del tempo di sezionamento. È dedicata in particolare alle stampanti SLA ad alta risoluzione e a modelli 3D molto piccoli, ricchi di dettagli." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Distanza massima tra i rami della prime tower" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Spessore minimo del guscio della Prime Tower" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Volume minimo torre di innesco" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Accelerazione di stampa" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk stampa" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Stampa una torre accanto alla stampa che serve per innescare il materiale dopo ogni cambio ugello." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Stampare le strutture di riempimento solo laddove è necessario supportare le sommità del modello. L'abilitazione di questa funzione riduce il tempo di stampa e l'utilizzo del materiale, ma comporta una disuniforme resistenza dell'oggetto." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Stampa linee superiori/inferiori in un ordine che ne causa sempre la sovrapposizione con le linee adiacenti in un singola direzione. Questa operazione richiede un tempo di stampa leggermente superiore ma rende l'aspetto delle superfici piane più uniforme." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura di stampa" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Velocità della ventola per la base del raft" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Flusso del basamento del raft" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Sovrapposizione del riempimento del basamento del raft" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Percentuale di sovrapposizione del riempimento del basamento del raft" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Spaziatura delle linee dello strato di base del raft" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Velocità della ventola per il raft" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Flusso del raft" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Flusso dell'interfaccia del raft" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Sovrapposizione del riempimento dell'interfaccia della zattera" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Percentuale di sovrapposizione del riempimento dell'interfaccia della zattera" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Offset Z dell'interfaccia Raft" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Margine extra della parte centrale del raft" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Smoothing raft" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Flusso della superficie del raft" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Sovrapposizione del riempimento della superficie del raft" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Percentuale di sovrapposizione del riempimento della superficie del raft" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Offset Z della superficie del raft" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Margine extra della parte superiore del raft" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Resoconto degli eventi che superano le soglie impostate" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Reimpostare la durata del flusso" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Preferenza di appoggio" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Fattore di scala per la compensazione della contrazione" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Lunghezza cucitura a sciarpa" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Altezza iniziale cucitura a sciarpa" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Lunghezza passo cucitura a sciarpa" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "La scena è dotata di maglie di supporto" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Preferenze angolo giunzione" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Cucitura sporgente sull'angolo della parete" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Imposta manualmente la sequenza di stampa" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Accelerazione riempimento supporto" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Strato iniziale del moltiplicatore di densità del riempimento di supporto" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Estrusore riempimento del supporto" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Distanza Z supporto" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Supporta la cucitura Z lontano dal modello" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Linee di supporto preferite" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Scambia l'ordine di stampa della prima e seconda linea più interna del brim per agevolarne la rimozione." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Selezionare quali volumi di intersezione maglie appartengono a ciascuno strato, in modo che le maglie sovrapposte diventino interconnesse. Disattivando questa funzione una delle maglie ottiene tutto il volume della sovrapposizione, che viene rimosso dalle altre maglie." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "Indica l’accelerazione alla quale vengono effettuati gli spostamenti." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "Quantità di materiale, relativo ad una normale linea del rivestimento, da estrudere durante la stiratura. Mantenere l'ugello pieno aiuta a riempire alcune delle fessure presenti sulla superficie superiore, ma una quantità eccessiva comporta un'estrusione eccessiva con conseguente puntinatura sui lati della superficie." - -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Indica la quantità di sovrapposizione tra il riempimento e le pareti come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente il saldo collegamento delle pareti al riempimento." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantità di materiale, rispetto a una normale linea di estrusione, da estrudere durante la stampa del basamento del raft. Un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." + +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantità di materiale, relativa a una normale linea di estrusione, da estrudere durante la stampa dell'interfaccia del raft. Un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantità di materiale, relativa ad una normale linea di estrusione, da estrudere durante la stampa del raft. Un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "La quantità di materiale, rispetto ad una normale linea di estrusione, da estrudere durante la stampa della superficie del raft. Avere un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "Quantità di materiale, relativo ad una normale linea del rivestimento, da estrudere durante la stiratura. Mantenere l'ugello pieno aiuta a riempire alcune delle fessure presenti sulla superficie superiore, ma una quantità eccessiva comporta un'estrusione eccessiva con conseguente puntinatura sui lati della superficie." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Indica la quantità di sovrapposizione tra il riempimento e le pareti come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente il saldo collegamento delle pareti al riempimento." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantità di sovrapposizione tra il riempimento e le pareti del basamento del raft, come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantità di sovrapposizione tra il riempimento e le pareti del basamento del raft. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantità di sovrapposizione tra il riempimento e le pareti dell'interfaccia del raft, come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantità di sovrapposizione tra il riempimento e le pareti dell'interfaccia del raft. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al tamponamento." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantità di sovrapposizione tra il riempimento e le pareti della superficie del raft, come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "La quantità di sovrapposizione tra il riempimento e le pareti della superficie del raft. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "Distanza tra le linee di stiratura." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "La distanza tra il modello e la sua struttura di supporto in corrispondenza della cucitura dell'asse z." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "La distanza tra l’ugello e le parti già stampate quando si effettua lo spostamento con aggiramento." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "Altezza sopra le parti orizzontali del modello che stampano lo stampo." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "L'altezza alla quale le ventole girano a velocità regolare. Nei livelli sottostanti la velocità delle ventole aumenta gradualmente da Velocità iniziale della ventola a Velocità regolare della ventola." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "Indica l’altezza alla quale la ventola ruota alla velocità regolare. Agli strati stampati a velocità inferiore la velocità della ventola aumenta gradualmente dalla velocità iniziale a quella regolare." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "La differenza di altezza tra la punta dell’ugello e il sistema gantry (assy X e Y)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "La differenza di altezza tra la punta dell’ugello e la parte inferiore della testina di stampa." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "La differenza di altezza durante l'esecuzione di uno Z Hop dopo il cambio dell'estrusore." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "Distanza orizzontale tra la linea del primo brim e il profilo del primo layer della stampa. Un piccolo interstizio può semplificare la rimozione del brim e allo stesso tempo fornire dei vantaggi termici." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Indica la distanza orizzontale tra lo skirt ed il primo strato della stampa." -"Questa è la distanza minima. Più linee di skirt aumenteranno tale distanza." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "Indica la distanza orizzontale tra lo skirt ed il primo strato della stampa.Questa è la distanza minima. Più linee di skirt aumenteranno tale distanza." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "Larghezza massima delle aree di rivestimento superiore che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento superiore sulle superfici inclinate del modello." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "Lo strato a cui le ventole di costruzione girano alla massima velocità. Questo valore viene calcolato e arrotondato a un numero intero." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "Indica lo strato in corrispondenza del quale la ventola ruota alla velocità regolare. Se è impostata la velocità regolare in altezza, questo valore viene calcolato e arrotondato a un numero intero." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "La pendenza minima dell'area alla quale ha effetto la creazione dei gradini. Valori bassi dovrebbero semplificare la rimozione del supporto sulle pendenze meno profonde, ma in realtà dei valori bassi possono generare risultati molto irrazionali sulle altre parti del modello." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "Lo spessore minimo del guscio della prime tower. Puoi aumentarlo per rendere più resistente la prime tower." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "Indica il tempo minimo dedicato a uno strato. Questo forza la stampante a rallentare, per impiegare almeno il tempo impostato qui per uno strato. Questo consente il corretto raffreddamento del materiale stampato prima di procedere alla stampa dello strato successivo. La stampa degli strati potrebbe richiedere un tempo inferiore al minimo se la funzione Sollevamento della testina è disabilitata e se la velocità minima non viene rispettata." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Corrisponde al numero di linee utilizzate per il brim del supporto. Più linee brim migliorano l’adesione al piano di stampa, ma utilizzano una maggiore quantità di materiale." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "Il numero della ventola che raffredda il volume di stampa. Se è impostato su 0, significa che non è presente alcuna ventola per il volume di stampa." + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "Numero di strati sulla parte superiore del secondo strato del raft. Si tratta di strati completamente riempiti su cui poggia il modello. 2 strati danno come risultato una superficie superiore più levigata rispetto ad 1 solo strato." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "Indica il cambio della velocità istantanea massima dello strato iniziale." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "Il rapporto tra l'altezza dello strato selezionato e l'inizio della cucitura a sciarpa. Un numero più basso comporta un'altezza di cucitura maggiore. Per essere efficace, deve essere inferiore a 100." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "La forma del piano di stampa senza tenere conto delle aree non stampabili." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Questo comanda la distanza che l’estrusore deve percorrere in coasting immediatamente dopo l’inizio di una parete ponte. Il coasting prima dell’inizio del ponte può ridurre la pressione nell’ugello e generare un ponte più piatto." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Si tratta dell'accelerazione con cui si raggiunge la velocità massima quando si stampa una parete esterna." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Si tratta della decelerazione con cui terminare la stampa di una parete esterna." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "È la lunghezza massima di un percorso di estrusione se si divide un percorso più lungo per poter utilizzare l'accelerazione/decelerazione della parete esterna. Una distanza minore crea un codice G più preciso ma anche più laborioso." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Si tratta del rapporto della velocità massima con cui terminare la stampa di una parete esterna." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Questo è il rapporto della velocità massima da cui partire quando si stampa una parete esterna." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Questa impostazione controlla la quantità di arrotondamento degli angoli interni nel contorno della base del raft. Gli angoli interni sono arrotondati a semicerchio con un raggio pari al valore indicato. Questa impostazione rimuove anche i buchi nel contorno del raft che sono più piccoli di tale cerchio." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Per compensare la contrazione del materiale durante il raffreddamento, il modello sarà scalato con questo fattore." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Strati superiori" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Diametro del tronco" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Cercare di evitare giunture su pareti che sporgono più di questo angolo. Quando il valore è 90, nessuna parete verrà considerata sporgente." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Invariato" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Unione dei volumi in sovrapposizione" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Pareti" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Solo pareti" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Pareti e linee" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Le pareti con uno sbalzo superiore a quest'angolo saranno stampate con le impostazioni per le pareti a sbalzo. Se il valore è 90, nessuna parete sarà trattata come parete a sbalzo. Nemmeno lo sbalzo supportato dal supporto sarà trattato come tale." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Le pareti che sporgono più di questo angolo verranno stampate utilizzando le impostazioni per le pareti sporgenti. Con un valore di 90, nessun muro verrà considerato come sporgente. Anche le sporgenze sostenute da un supporto non verranno trattate come tali. Infine, qualsiasi linea che sia meno della metà della sporgenza non verrà gestita come tale." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Quando si stampano le pareti ponte, la quantità di materiale estruso viene moltiplicata per questo valore." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Quando si stampa il primo strato dell'interfaccia del raft, traslare con questo offset per modificare l'adesione tra il basamento e l'interfaccia. Un offset negativo dovrebbe migliorare l'adesione." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Quando si stampa il primo strato della superficie del raft, traslare con questo offset per modificare l'adesione tra l'interfaccia e la superficie. Un offset negativo dovrebbe migliorare l'adesione." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Quando si stampa il secondo strato del rivestimento esterno ponte, la quantità di materiale estruso viene moltiplicata per questo valore." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Allineamento delle giunzioni a Z" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Cucitura Z sul vertice" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Posizione della cucitura in Z" @@ -5697,319 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "spostamenti" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Se attivare le ventole di raffreddamento durante il cambio degli ugelli. Questo può aiutare a ridurre la fuoriuscita di liquido raffreddando l'ugello più velocemente:
    • Invariato:mantiene le ventole come prima
    • Solo ultimo estrusore: attiva la ventola dell'ultimo estrusore utilizzato, ma spegne le altre (se presenti). Utile se hai estrusori completamente separati.
    • Tutte le ventole: attiva tutte le ventole durante il cambio degli ugelli. Utile se hai una singola ventola di raffreddamento o più ventole vicine tra loro.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Tutte le ventole" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Raffreddamento durante il cambio dell'estrusore" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Gestisci la relazione spaziale tra la cucitura z della struttura di supporto e il modello 3D effettivo. Questo controllo è fondamentale in quanto consente agli utenti di rimuovere facilmente le strutture di supporto dopo la stampa, senza causare danni o lasciare segni sul modello stampato." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Distanza minima della cucitura z dal modello" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Moltiplicatore per il riempimento degli strati iniziali del supporto. Aumentarlo può aiutare l'adesione al piano." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Solo l'ultimo estrusore" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Posiziona la cucitura z su un vertice del poligono. Disattivando questa opzione è possibile posizionare la cucitura anche nello spazio tra i vertici. (Tieni presente che ciò non annullerà le restrizioni sul posizionamento della cucitura su una sporgenza non supportata.)" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Spessore minimo del guscio della Prime Tower" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Flusso del basamento del raft" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Sovrapposizione del riempimento del basamento del raft" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Percentuale di sovrapposizione del riempimento del basamento del raft" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Flusso del raft" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Flusso dell'interfaccia del raft" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Sovrapposizione del riempimento dell'interfaccia della zattera" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Percentuale di sovrapposizione del riempimento dell'interfaccia della zattera" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Offset Z dell'interfaccia Raft" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Flusso della superficie del raft" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Sovrapposizione del riempimento della superficie del raft" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Percentuale di sovrapposizione del riempimento della superficie del raft" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Offset Z della superficie del raft" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Cucitura sporgente sull'angolo della parete" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Strato iniziale del moltiplicatore di densità del riempimento di supporto" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Supporta la cucitura Z lontano dal modello" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantità di materiale, rispetto a una normale linea di estrusione, da estrudere durante la stampa del basamento del raft. Un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantità di materiale, relativa a una normale linea di estrusione, da estrudere durante la stampa dell'interfaccia del raft. Un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantità di materiale, relativa ad una normale linea di estrusione, da estrudere durante la stampa del raft. Un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantità di materiale, rispetto ad una normale linea di estrusione, da estrudere durante la stampa della superficie del raft. Avere un flusso maggiore può migliorare l'adesione e la resistenza strutturale del raft." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantità di sovrapposizione tra il riempimento e le pareti del basamento del raft, come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantità di sovrapposizione tra il riempimento e le pareti del basamento del raft. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantità di sovrapposizione tra il riempimento e le pareti dell'interfaccia del raft, come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantità di sovrapposizione tra il riempimento e le pareti dell'interfaccia del raft. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al tamponamento." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantità di sovrapposizione tra il riempimento e le pareti della superficie del raft, come percentuale della larghezza della linea di riempimento. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantità di sovrapposizione tra il riempimento e le pareti della superficie del raft. Una leggera sovrapposizione consente alle pareti di connettersi saldamente al riempimento." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "La distanza tra il modello e la sua struttura di supporto in corrispondenza della cucitura dell'asse z." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "Lo spessore minimo del guscio della prime tower. Puoi aumentarlo per rendere più resistente la prime tower." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Cercare di evitare giunture su pareti che sporgono più di questo angolo. Quando il valore è 90, nessuna parete verrà considerata sporgente." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Invariato" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Quando si stampa il primo strato dell'interfaccia del raft, traslare con questo offset per modificare l'adesione tra il basamento e l'interfaccia. Un offset negativo dovrebbe migliorare l'adesione." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Quando si stampa il primo strato della superficie del raft, traslare con questo offset per modificare l'adesione tra l'interfaccia e la superficie. Un offset negativo dovrebbe migliorare l'adesione." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Cucitura Z sul vertice" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Aggiunge linee supplementari nel modello di riempimento per supportare gli strati sovrastanti. Questa opzione impedisce la formazione di vuoti o bolle di plastica che a volte compaiono nei modelli più complessi a causa del fatto che il riempimento sottostante non supporta correttamente lo strato stampato al di sopra." -"'Pareti' supporta solo i margini dello strato, mentre 'Pareti e linee' supporta anche le estremità delle file che compongono lo strato." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Velocità della ventola di costruzione per altezza " +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Lunghezza ugello" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Velocità della ventola di costruzione per strato" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "La differenza di altezza tra la punta dell’ugello e la parte inferiore della testina di stampa." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Numero ventola volume di stampa" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Determina la lunghezza di ciascun passo nella modifica del flusso durante l'estrusione lungo la cucitura a sciarpa. Una distanza minore determina un codice G più preciso ma anche più complesso." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Determina la lunghezza della cucitura a sciarpa, un tipo di cucitura che dovrebbe rendere la cucitura Z meno visibile. Deve essere superiore a 0 per essere efficace." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Durata di ogni gradino per la variazione graduale del flusso" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Abilitare le variazioni graduali del flusso. Quando abilitate, il flusso viene aumentato/diminuito gradualmente fino al flusso target. Ciò è utile per le stampanti dotate di tubo bowden dove il flusso non viene modificato immediatamente all'avvio/arresto del motore dell'estrusore." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Linee di rinforzo extra per sostenere gli strati superiori" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Per ogni spostamento del percorso superiore a questo valore, il flusso del materiale viene reimpostato su quello target dei percorsi." - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Dimensione del gradino di discretizzazione del flusso graduale" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Flusso graduale abilitato" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Accelerazione massima del flusso graduale" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Accelerazione massima del flusso per lo strato iniziale" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Accelerazione massima per le variazioni graduali del flusso" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Velocità minima per le variazioni graduali del flusso per il primo strato." - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Nessuno" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Accelerazione parete esterna" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Decelerazione parete esterna" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Rapporto di velocità finale parete esterna" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Velocità distanza di divisione della parete esterna" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Rapporto di velocità iniziale parete esterna" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Reimpostare la durata del flusso" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Lunghezza cucitura a sciarpa" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Altezza iniziale cucitura a sciarpa" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Lunghezza passo cucitura a sciarpa" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "L'altezza alla quale le ventole girano a velocità regolare. Nei livelli sottostanti la velocità delle ventole aumenta gradualmente da Velocità iniziale della ventola a Velocità regolare della ventola." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "Lo strato a cui le ventole di costruzione girano alla massima velocità. Questo valore viene calcolato e arrotondato a un numero intero." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Il numero della ventola che raffredda il volume di stampa. Se è impostato su 0, significa che non è presente alcuna ventola per il volume di stampa." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Il rapporto tra l'altezza dello strato selezionato e l'inizio della cucitura a sciarpa. Un numero più basso comporta un'altezza di cucitura maggiore. Per essere efficace, deve essere inferiore a 100." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Si tratta dell'accelerazione con cui si raggiunge la velocità massima quando si stampa una parete esterna." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Si tratta della decelerazione con cui terminare la stampa di una parete esterna." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "È la lunghezza massima di un percorso di estrusione se si divide un percorso più lungo per poter utilizzare l'accelerazione/decelerazione della parete esterna. Una distanza minore crea un codice G più preciso ma anche più laborioso." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Si tratta del rapporto della velocità massima con cui terminare la stampa di una parete esterna." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Questo è il rapporto della velocità massima da cui partire quando si stampa una parete esterna." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Solo pareti" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Pareti e linee" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Le pareti che sporgono più di questo angolo verranno stampate utilizzando le impostazioni per le pareti sporgenti. Con un valore di 90, nessun muro verrà considerato come sporgente. Anche le sporgenze sostenute da un supporto non verranno trattate come tali. Infine, qualsiasi linea che sia meno della metà della sporgenza non verrà gestita come tale." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Le pareti con uno sbalzo superiore a quest'angolo saranno stampate con le impostazioni per le pareti a sbalzo. Se il valore è 90, nessuna parete sarà trattata come parete a sbalzo. Nemmeno lo sbalzo supportato dal supporto sarà trattato come tale." diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 357208a3b7e..909fc231ba1 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2024-10-30 02:17+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "プライムタワーの生成方法:
    • 通常:2番目に優先される材料でバケットを作成します
    • インターリーブド:プライムタワーをできるだけまばらに作成します。これにより時間とフィラメントが節約されますが、使用できる材料が互いに接着している場合にのみ可能です。
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "ノズル切り替え中に冷却ファンを作動させるかどうか。これによりノズルの冷却スピードを上げてにじみを減らすのに役立ちます：
    • 変更なし：ファンを以前の状態に維持します
    • 最後のエクストルーダーのみ：最後に使用したエクストルーダーのファンをオンにしますが、もし他のエクストルーダーがあればファンをオフにします。これは、完全に別個のエクストルーダーがある場合に有用です。
    • すべてのファン：ノズル切り替え中にすべてのファンをオンにします。これは、冷却ファンが1つのみの場合、または複数のファンが互いに接近している場合に有用です。
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "モデルの周囲のブリムが他のモデルの望ましくない場所に接触する可能性があります。これにより、この距離内のすべてのブリムがブリムのないモデルから削除されます。" @@ -88,8 +92,14 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "適応レイヤーは、レイヤーの高さをモデルの形状に合わせて計算します。" +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "インフィルパターンにラインを追加して、上にあるスキンをサポートします。このオプションは、下のインフィルが上にプリントされるスキンレイヤーを正しくサポートしていないことにより複雑な形状のスキンに時々現れる、穴やプラスチックの塊を防ぎます。「ウォール」はスキンのアウトラインのみをサポートするのに対して、「ウォールとライン」はスキンを構成するラインの端もサポートします。" + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." msgstr "" "インフィル領域の周りにウォールを追加します。追加されたウォールによってトップ/ボトム面の線に生じるたるみを少なくし、トップ/ボトム面の材料を追加した場合と同等の品質で印刷できることになります。\n" "この機能はインフィルポリゴン接合と組み合わせて、正しく設定した場合、移動や引き戻しなしに全てのインフィル領域を1つの造形パスにまとめることができます。" @@ -150,6 +160,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "一度にすべて" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "すべてのファン" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "プリントの解像度に影響を与えるすべての設定。これらの設定は、品質（および印刷時間）に大きな影響を与えます。" @@ -430,6 +444,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "ブリム幅" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "高さでのビルドファン速度" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "レイヤーでのビルドファン速度" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "ビルドプレートとの接着" @@ -470,6 +492,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "ビルドボリューム温度警告" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "ビルドボリュームファンの数" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "この設定を有効にすると、モデルにはない場合でもプライムタワーにブリムが付きます。高いタワーのためにより頑丈なベースが必要な場合は、ベースの高さを増やすことができます。" @@ -614,6 +640,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "冷却" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "エクストルーダー切替中に冷却" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "クロス" @@ -702,6 +732,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "ブリッジを検出し、ブリッジを印刷しながらて印刷速度、フロー、ファンの設定を変更します。" +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "スカーフシームに沿って押し出す際のフロー変更における各ステップの長さを決定します。距離が短いほどより精密になりますが、Gコードはより複雑になります。" + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Zシームをより目立たなくする、スカーフシームの長さを決定します。効果を得るには、0より大きい値にする必要があります。" + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "ウォールをプリントする順序を決定します。外側のウォールを先にプリントすると、内側のウォールの不具合が外側に影響しないため、寸法精度が向上します。一方、外側のウォールを後からプリントすると、オーバーハングをプリントする際にうまく積み重ねることができます。内側のウォールの合計が奇数の場合、「中央の最後のライン」は必ず最後にプリントされます。" @@ -826,6 +864,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "デュアルエクストルーダー" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "段階的なフローの変化におけるステップごとの継続時間" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "楕円形" @@ -918,6 +960,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "モデルの周りに壁（ooze shield）を作る。これを生成することで、一つ目のノズルの高さと2つ目のノズルが同じ高さであったとき、2つ目のノズルを綺麗にします。" +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "段階的なフローの変化を有効にします。有効にすると、フロー量は目標フローまで段階的に増加/減少します。これは、エクストルーダーモーターの始動/停止時にフローがすぐに変化しないボーデンチューブを備えたプリンターに便利です。" + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "印刷プロセスのレポートを有効にして、問題の検出の可能性があるしきい値を設定します。" @@ -982,6 +1028,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "強めのスティッチングは、穴をメッシュで塞いでデータを作成します。このオプションは、長い処理時間が必要となります。" +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "スキンをサポートするための追加のインフィルライン" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "追加インフィルウォールの数" @@ -994,6 +1044,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "ノズル切替え後のプライムに必要な余剰材料。" +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "エクストルーダープライムX位置" @@ -1006,6 +1060,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "エクストルーダーのZ座標" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "エクストルーダーのヒーター共有" @@ -1178,6 +1236,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "フラッシュパージ速度" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "この値より長い移動の場合、材料フローはパスの目標フローにリセットされます。" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "ノズルサイズの1～2倍程度の薄い構造の場合、モデルの厚さに合わせてライン幅が接着するよう変更する必要があります。この設定は、ウォールに許容される最小ライン幅を制御します。ジオメトリーの厚さが、Nのウォールが幅広く、N+1のウォールが狭い場所で、NからN+1のウォールに移行するため、最小ライン幅は本質的に最大ライン幅も決定します。ウォールラインの許容最大幅は、最小ウォールライン幅の2倍です。" @@ -1223,11 +1285,15 @@ msgid "G-code Flavor" msgstr "G-codeフレーバー" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." +msgid "" +"G-code commands to be executed at the very end - separated by \n" +"." msgstr "最後に実行されるG-codeコマンド。複数ある場合は改行で区切ります。" msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." +msgid "" +"G-code commands to be executed at the very start - separated by \n" +"." msgstr "最初に実行されるG-codeコマンド。複数ある場合は改行で区切ります。" msgctxt "material_guid description" @@ -1290,6 +1356,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "サポートインフィル半減回数" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "段階的なフローの離散化ステップのサイズ" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "段階的なフローが有効" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "段階的なフローの最大加速度" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "レイヤー時間が最小であるため、速度を落としてプリントする場合は、この温度まで徐々に下げてください。" @@ -1338,6 +1416,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "加熱式ビルドプレートあり" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "加熱速度" @@ -1378,6 +1460,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "水平スケールファクタ収縮補正" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "加熱中にフィラメントの引き出しが生じる距離。" @@ -1682,6 +1772,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "初期印刷温度" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "初期層の最大フロー加速度" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "内側ウォールの加速度" @@ -1802,6 +1896,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "部品の輪郭のみに振動が起こり、部品の穴には起こりません。" +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "スティッチできない部分を保持" @@ -1991,7 +2105,9 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "最後のヘッドの既知位置からではなく、エクストルーダー現在位置を絶対位置にします。" msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" msgstr "" "エアギャップで失われたフィラメントを補うために、モデルの1つ目と2つ目の層をZ方向で重なるようにします。最初のモデルレイヤーより上のすべてのモデルは、この量だけ下にシフトされます。\n" "この設定により、2つ目のレイヤーが最初のレイヤーの下に印刷される場合があることに注意してください。これは意図された動作です。" @@ -2004,6 +2120,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "サポート構造のZシームと実際の3Dモデルとの間の空間的な関係を管理します。この制御は、プリントした造形物に損傷を与えたり跡を残したりすることなくサポート構造をシームレスに取り外せるようにするために非常に重要です。" + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2240,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "最大移動解像度" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "フローを段階的に変化させるための最大加速度" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "X方向のモーターの最大速度" @@ -2180,6 +2304,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "中間" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "モデルからの最小Zシーム距離" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "最小型幅" @@ -2284,6 +2412,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "サポートのルーフの最小領域サイズ。この値より小さい領域のポリゴンは通常のサポートとしてプリントされます。" +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "第1層のフローを段階的に変化させるための最低速度" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "薄いフィーチャーの最小厚さ。この値より薄いモデルフィーチャーはプリントされず、最小フィーチャーサイズより厚いフィーチャーは最小ウォールライン幅に広げられます。" @@ -2324,6 +2456,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "複数のスカートラインを使用すると、小さなモデル形成時の射出をより良く行うことができます。これを0に設定するとスカートが無効になります。" +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "サポート材の初期層におけるインフィル密度の倍率です。この値を増やすことで、ベッドとの接着力を高めることができます。" + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "最初のレイヤーにおけるライン幅の乗数です。この値を増やすと、ベッドとの接着が向上します。" @@ -2344,6 +2480,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "なし" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "なし" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "なし" @@ -2372,14 +2512,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "外側表面には適用しない" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "ノズル角度" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "ノズル内径" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "ノズル拒否エリア" @@ -2388,9 +2540,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ノズルID" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "ノズルの長さ" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "ノズルサイズ" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2564,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "ノズルスイッチ引き戻し速度" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "エクストルーダーの数" @@ -2480,6 +2640,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "1つずつ" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "最後のエクストルーダーのみ" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "移動中に印刷部品への衝突を避けるため、水平移動で回避できない造形物上を移動するときは、Zホップを実行します。" @@ -2516,6 +2680,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "外側ウォール加速度" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "外側ウォールにおける加速度" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "外側ウォールにおける減速" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "外側ウォールにおける終了速度の比率" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "外側ウォール用エクストルーダー" @@ -2540,6 +2716,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "外側ウォール速度" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "外側ウォールでの速度スプリットの距離" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "外側ウォールにおける開始速度の比率" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "外側ウォールワイプ距離" @@ -2588,6 +2772,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "サードブリッジのスキンレイヤーを印刷する際に使用するファン速度の割合。" +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Zシームをポリゴンの頂点に配置します。これをオフに切り替えることで、頂点と頂点の間にもシームを配置できます。（サポートのないオーバーハングへのシーム配置制限は上書きされないことに留意してください。）" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "この量よりも小さい円周を持つスライスレイヤーのポリゴンが除外されます。値を小さくすると、スライス時間が増加しますがメッシュの解像度が高くなります。多くの場合、高解像SLAプリンターや非常に小さく細かい3Dモデル向けの設定です。" @@ -2636,6 +2824,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "プライムタワーの最大ブリッジ距離" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "プライムタワーにおけるシェル厚さの最小値" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "プライムタワー最小容積" @@ -2668,6 +2860,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "印刷加速度" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "印刷ジャーク" @@ -2696,6 +2896,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "印刷物の隣に、ノズルを切り替えた後の材料でタワーを作成します。" +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "面材構造を印刷するには、モデルの上部がサポートされている必要があります。これを有効にすると、印刷時間と材料の使用量が減少しますが、オブジェクトの強度が不均一になります。" @@ -2744,6 +2948,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "上面/底面のラインを、隣接するラインと常に一方向で重なるような順序でプリントします。これにより、プリントにかかる時間は少し長くなりますが、平らな面の見た目の一貫性が高まります。" +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "印刷温度" @@ -2788,6 +2996,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "ラフト土台ファン速度" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "ラフト土台フロー量" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "ラフト土台でのインフィルの重なり" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "ラフト土台でのインフィルの重なり (%)" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "ラフト土台のライン間隔" @@ -2828,6 +3048,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "ラフトのファン速度" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "ラフトフロー" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "ラフト境界面フロー量" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "ラフト境界面でのインフィルの重なり" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "ラフト境界面でのインフィルの重なり (%)" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "ラフト境界面のZオフセット" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "ラフト中間層の追加マージン" @@ -2892,6 +3132,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "ラフトスムージング" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "ラフト表層フロー量" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "ラフト表面でのインフィルの重なり" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "ラフト表面でのインフィルの重なり (%)" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "ラフト表層のZオフセット" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "ラフト上層部の追加マージン" @@ -3056,6 +3312,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "設定されたしきい値を超えたイベントのレポート" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "フローの継続時間をリセット" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "土台設定" @@ -3120,6 +3380,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "スケールファクタ収縮補正" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "スカーフシームの長さ" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "スカーフシームを開始する高さ" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "スカーフシームのステップ長" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "シーンにサポートメッシュがある" @@ -3128,6 +3400,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "シームコーナー設定" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "シームオーバーハンギング ウォール角度" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "手動で印刷順序を設定する" @@ -3472,6 +3748,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "サポートインフィル加速度" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "サポートインフィル密度を初期層の倍数にする" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "サポート用インフィルエクストルーダー" @@ -3664,6 +3944,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "サポートZ距離" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "サポートZシームをモデルから離す" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "サポートラインを優先" @@ -3700,6 +3984,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "最も内側のブリムラインと2番目に内側のブリムラインのプリント順序を入れ替えます。これにより、ブリムを取り外しやすくします。" +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "重複するメッシュがどのレイヤーに属しているかを切り替えることで、重なったメッシュが絡み合うようにします。この設定をオフにすると、一方のメッシュは重複内すべてのボリュームを取得し、他方のメッシュは他から削除されます。" @@ -3714,8 +4006,7 @@ msgstr "各レイヤーの印刷を開始する基準地点のX座標。" msgctxt "z_seam_x description" msgid "The X coordinate of the position near where to start printing each part in a layer." -msgstr "レイヤー内の各印刷を開始するX座" -"標の位置。" +msgstr "レイヤー内の各印刷を開始するX座標の位置。" msgctxt "extruder_prime_pos_x description" msgid "The X coordinate of the position where the nozzle primes at the start of printing." @@ -3841,13 +4132,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "移動中の加速度。" -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "通常のスキンラインに対してアイロン時にノズルから吐出するフィラメントの量。ノズルが常に材料で満たされた状態を保つことで、表面の溝を埋めるのに役立ちます。ただし多過ぎると側面が粗くなります。" +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "ラフト土台のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フロー量を増やすことで、接着力やラフト構造の強度を向上させることができます。" -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルのライン幅に対する割合で示される、インフィルとウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "ラフト境界面のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで、接着力やラフト構造の強度を向上させることができます。" + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "ラフトのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで、接着力やラフト構造の強度を向上させることができます。" + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "ラフト表面のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フロー量を増やすことで、接着力やラフト構造の強度を向上させることができます。" + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "通常のスキンラインに対してアイロン時にノズルから吐出するフィラメントの量。ノズルが常に材料で満たされた状態を保つことで、表面の溝を埋めるのに役立ちます。ただし多過ぎると側面が粗くなります。" + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルのライン幅に対する割合で示される、インフィルとウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルとラフト土台のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルとラフト土台のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルとラフト境界面のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルとラフト境界面のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルとラフト表面のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "インフィルとラフト表面のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3953,6 +4284,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "アイロンライン同士の距離。" +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "Z軸シームにおける、モデルとそのサポート構造との間の距離。" + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "ノズルが既に印刷された部分を移動する際の間隔。" @@ -4121,6 +4456,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "型を印刷するためのモデルの水平部分上の高さ。" +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "通常速度でファンが回転するときの高さ。ここより下層レイヤーでは初期ファンのスピードから通常の速度まで徐々に増加します。" + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "通常速度でファンが回転するときの高さ。ここより下層レイヤーでは初期ファンのスピードから通常の速度まで徐々に増加します。" @@ -4129,10 +4468,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "ノズルの先端とガントリーシステムの高さの差（X軸とY軸）。" -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "ノズル先端とプリントヘッドの最下部との高さの差。" - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "エクストルーダースイッチ後のZホップを実行するときの高さの違い。" @@ -4182,7 +4517,9 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "最初のブリムラインとプリントの最初のレイヤーの輪郭との間の水平距離。小さなギャップがあると、ブリムの取り外しが容易になり、断熱性の面でもメリットがあります。" msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." msgstr "" "スカートと印刷の最初の層の間の水平距離。\n" "これは最小距離です。複数のスカートラインがこの距離から外側に拡張されます。" @@ -4231,6 +4568,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "削除するスキンエリアの最大幅。この値より小さいすべてのスキンエリアが削除されます。これにより、モデルの傾斜表面の上部/下部スキンに費やす時間や材料の量を制限できます。" +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "ビルドファンが最大速度で回転するレイヤー。この値は計算され整数に丸められます。" + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "ファンが通常の速度で回転する時のレイヤー。通常速度のファンの高さが設定されている場合、この値が計算され、整数に変換されます。" @@ -4443,6 +4784,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "ステアステップ効果を発揮するための、エリアの最小スロープです。小さい値を指定すると勾配が緩くなりサポートを取り除きやすくなりますが、値が非常に小さいと、モデルの他の部品に直感的に非常にわかりにくい結果が表れる場合があります。" +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "プライムタワーシェルの最小の厚さ。厚くすることでプライムタワーの強度を上げることができます。" + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "1つのレイヤーに最低限費やす時間。1つの層に必ず設定された時間を費やすため、場合によってはプリントに遅れが生じます。これにより、次の層をプリントする前に造形物を適切に冷却できます。ヘッド持ち上げが無効になっていて、最小速度を下回った場合、最小レイヤー時間よりも短くなる場合があります。" @@ -4511,6 +4856,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "サポートブリムに使用される線の数。ブリムの線数を増やすと、追加材料の費用でビルドプレートへの接着性が強化されます。" +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "ビルドボリュームを冷却するファンの数。これが0に設定されている場合、ビルドボリュームファンがないことを意味します。" + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "第2ラフト層の上の最上層の数。これらは、モデルが置かれる完全に塗りつぶされた積層です。 2つの層は、1よりも滑らかな上面をもたらす。" @@ -4603,6 +4952,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "初期レイヤーの最大瞬時速度の変更。" +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "スカーフシーム開始時の、選択したレイヤーの高さの比率。数値が低いほどシームは高くなります。効果を得るには値を100未満にする必要があります。" + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "造形不可領域を考慮しないビルドプレートの形状。" @@ -4931,6 +5284,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "この設定は、ブリッジ壁が始まる直前に、エクストルーダーを動かす距離を制御します。ブリッジが始まる前にコースティングすることにより、ノズル内が減圧され、ブリッジがより平らになります。" +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "外側ウォールをプリントする際における最高速度に達するまでの加速度です。" + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "外側ウォールのプリントを終了する際の減速度です。" + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "外側ウォールの加減速を適用するために長いパスを分割する際の造形パスの最大長です。距離が短いほど精度が上がりますが、Gコードが冗長になります。" + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "外側ウォールをプリントする際における終了時の最高速度の比率です。" + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "外側ウォールをプリントする際における開始時の最高速度の比率です。" + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "この設定は、ラフト土台のアウトラインの内側の角をどの程度丸くするかを制御します。内側の角はここで指定した値と等しい半径の半円に丸められます。この設定では、ラフトの輪郭にある円より小さい穴も削除されます。" @@ -4971,6 +5344,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "材料の冷却時の収縮を補正するために、モデルはこのスケールファクタでスケールされます。" +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "上部レイヤー" @@ -5175,10 +5560,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "本体直径" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "ウォールのシームがこの角度以上にオーバーハングしないよう試みます。値が90の場合、どのウォールもオーバーハングとして扱われません。" + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "変更なし" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "重複部分を統合" @@ -5303,9 +5696,17 @@ msgctxt "shell label" msgid "Walls" msgstr "ウォール" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "ウォールのみ" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "ウォールとライン" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "この角度以上に張り出した壁は、オーバーハング壁設定を使用してプリントされます。値が90の場合は、オーバーハング壁として処理されません。サポートによってサポートされているオーバーハングも、オーバーハングとして処理されません。" +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "この角度を超えるオーバーハングとなるウォールは、オーバーハングの設定を用いてプリントされます。値が90の場合、どのウォールもオーバーハングとして扱われません。サポートにより支えられているオーバーハングについてもオーバーハングとして扱われません。さらに、半分未満がオーバーハングとなっているラインもまたオーバーハングとして扱われません。" msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5343,6 +5744,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "ブリッジ壁を印刷するときは、材料の吐出量をこの値で乗算します。" +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "ラフト境界面の第1層をプリントする際に、土台と境界面との接着を調整するためこのオフセット値だけ平行移動します。オフセット値をマイナスにすると接着力が向上します。" + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "ラフト表面の第1層をプリントする際、境界面と表面との接着を調整するためこのオフセット値だけ移動します。オフセット値をマイナスにすると接着力が向上します。" + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "セカンドブリッジスキンレイヤーを印刷するときは、材料の吐出量をこの値で乗算します。" @@ -5639,6 +6048,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Zシーム合わせ" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Zシームを頂点に配置" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Zシーム位置" @@ -5699,318 +6112,14 @@ msgctxt "travel description" msgid "travel" msgstr "移動経路" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "ノズル切り替え中に冷却ファンを作動させるかどうか。これによりノズルの冷却スピードを上げてにじみを減らすのに役立ちます：
    • 変更なし：ファンを以前の状態に維持します
    • 最後のエクストルーダーのみ：最後に使用したエクストルーダーのファンをオンにしますが、もし他のエクストルーダーがあればファンをオフにします。これは、完全に別個のエクストルーダーがある場合に有用です。
    • すべてのファン：ノズル切り替え中にすべてのファンをオンにします。これは、冷却ファンが1つのみの場合、または複数のファンが互いに接近している場合に有用です。
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "すべてのファン" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "エクストルーダー切替中に冷却" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "サポート構造のZシームと実際の3Dモデルとの間の空間的な関係を管理します。この制御は、プリントした造形物に損傷を与えたり跡を残したりすることなくサポート構造をシームレスに取り外せるようにするために非常に重要です。" - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "モデルからの最小Zシーム距離" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "サポート材の初期層におけるインフィル密度の倍率です。この値を増やすことで、ベッドとの接着力を高めることができます。" - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "最後のエクストルーダーのみ" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Zシームをポリゴンの頂点に配置します。これをオフに切り替えることで、頂点と頂点の間にもシームを配置できます。（サポートのないオーバーハングへのシーム配置制限は上書きされないことに留意してください。）" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "プライムタワーにおけるシェル厚さの最小値" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "ラフト土台フロー量" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "ラフト土台でのインフィルの重なり" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "ラフト土台でのインフィルの重なり (%)" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "ラフトフロー" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "ラフト境界面フロー量" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "ラフト境界面でのインフィルの重なり" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "ラフト境界面でのインフィルの重なり (%)" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "ラフト境界面のZオフセット" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "ラフト表層フロー量" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "ラフト表面でのインフィルの重なり" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "ラフト表面でのインフィルの重なり (%)" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "ラフト表層のZオフセット" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "シームオーバーハンギング ウォール角度" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "サポートインフィル密度を初期層の倍数にする" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "サポートZシームをモデルから離す" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフト土台のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フロー量を増やすことで、接着力やラフト構造の強度を向上させることができます。" - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフト境界面のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで、接着力やラフト構造の強度を向上させることができます。" - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフトのプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フローを増やすことで、接着力やラフト構造の強度を向上させることができます。" - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "ラフト表面のプリント中に押出す材料の量（通常の押出ラインに対する相対的な量）。フロー量を増やすことで、接着力やラフト構造の強度を向上させることができます。" - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト土台のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト土台のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト境界面のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト境界面のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト表面のウォールが重なる量（インフィルラインの幅に対する割合）。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "インフィルとラフト表面のウォールが重なる量。わずかな重なりにより、ウォールがインフィルにしっかりと接続されます。" - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "Z軸シームにおける、モデルとそのサポート構造との間の距離。" - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "プライムタワーシェルの最小の厚さ。厚くすることでプライムタワーの強度を上げることができます。" - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "ウォールのシームがこの角度以上にオーバーハングしないよう試みます。値が90の場合、どのウォールもオーバーハングとして扱われません。" - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "変更なし" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "ラフト境界面の第1層をプリントする際に、土台と境界面との接着を調整するためこのオフセット値だけ平行移動します。オフセット値をマイナスにすると接着力が向上します。" - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "ラフト表面の第1層をプリントする際、境界面と表面との接着を調整するためこのオフセット値だけ移動します。オフセット値をマイナスにすると接着力が向上します。" - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Zシームを頂点に配置" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "インフィルパターンにラインを追加して、上にあるスキンをサポートします。このオプションは、下のインフィルが上にプリントされるスキンレイヤーを正しくサポートしていないことにより複雑な形状のスキンに時々現れる、穴やプラスチックの塊を防ぎます。「ウォール」はスキンのアウトラインのみをサポートするのに対して、「ウォールとライン」はスキンを構成するラインの端もサポートします。" - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "高さでのビルドファン速度" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "ノズルの長さ" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "レイヤーでのビルドファン速度" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "ノズル先端とプリントヘッドの最下部との高さの差。" -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "ビルドボリュームファンの数" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "スカーフシームに沿って押し出す際のフロー変更における各ステップの長さを決定します。距離が短いほどより精密になりますが、Gコードはより複雑になります。" - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Zシームをより目立たなくする、スカーフシームの長さを決定します。効果を得るには、0より大きい値にする必要があります。" - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "段階的なフローの変化におけるステップごとの継続時間" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "段階的なフローの変化を有効にします。有効にすると、フロー量は目標フローまで段階的に増加/減少します。これは、エクストルーダーモーターの始動/停止時にフローがすぐに変化しないボーデンチューブを備えたプリンターに便利です。" - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "スキンをサポートするための追加のインフィルライン" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "この値より長い移動の場合、材料フローはパスの目標フローにリセットされます。" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "段階的なフローの離散化ステップのサイズ" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "段階的なフローが有効" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "段階的なフローの最大加速度" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "初期層の最大フロー加速度" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "フローを段階的に変化させるための最大加速度" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "第1層のフローを段階的に変化させるための最低速度" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "なし" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "外側ウォールにおける加速度" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "外側ウォールにおける減速" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "外側ウォールにおける終了速度の比率" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "外側ウォールでの速度スプリットの距離" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "外側ウォールにおける開始速度の比率" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "フローの継続時間をリセット" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "スカーフシームの長さ" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "スカーフシームを開始する高さ" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "スカーフシームのステップ長" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "通常速度でファンが回転するときの高さ。ここより下層レイヤーでは初期ファンのスピードから通常の速度まで徐々に増加します。" - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "ビルドファンが最大速度で回転するレイヤー。この値は計算され整数に丸められます。" - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "ビルドボリュームを冷却するファンの数。これが0に設定されている場合、ビルドボリュームファンがないことを意味します。" - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "スカーフシーム開始時の、選択したレイヤーの高さの比率。数値が低いほどシームは高くなります。効果を得るには値を100未満にする必要があります。" - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "外側ウォールをプリントする際における最高速度に達するまでの加速度です。" - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "外側ウォールのプリントを終了する際の減速度です。" - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "外側ウォールの加減速を適用するために長いパスを分割する際の造形パスの最大長です。距離が短いほど精度が上がりますが、Gコードが冗長になります。" - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "外側ウォールをプリントする際における終了時の最高速度の比率です。" - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "外側ウォールをプリントする際における開始時の最高速度の比率です。" - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "ウォールのみ" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "ウォールとライン" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "この角度を超えるオーバーハングとなるウォールは、オーバーハングの設定を用いてプリントされます。値が90の場合、どのウォールもオーバーハングとして扱われません。サポートにより支えられているオーバーハングについてもオーバーハングとして扱われません。さらに、半分未満がオーバーハングとなっているラインもまたオーバーハングとして扱われません。" +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "この角度以上に張り出した壁は、オーバーハング壁設定を使用してプリントされます。値が90の場合は、オーバーハング壁として処理されません。サポートによってサポートされているオーバーハングも、オーバーハングとして処理されません。" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index cfea04a6ef1..db2488cfdce 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "프라임 타워 생성 방법:
    • 일반: 보조 재료가 프라이밍되는 버킷을 생성합니다.
    • 중간 삽입: 프라임 타워를 최대한 희박하게 생성합니다. 시간과 필라멘트를 절약하지만, 사용된 재료가 서로 밀착되는 경우에만 가능합니다.
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "노즐 전환 중 냉각 팬의 활성화 여부를 선택합니다. 노즐을 더 빨리 냉각시켜 흘러내림을 줄일 수 있습니다:
    • 변경 없음: 팬을 이전 상태와 같이 유지합니다
    • 마지막 압출기만: 마지막으로 사용한 압출기의 팬을 켜고, 나머지 팬이 있을 경우 모두 끕니다. 완전한 별도의 압출기가 있는 경우 유용합니다.
    • 모든 팬: 노즐 전환 중 모든 팬을 켭니다. 냉각팬이 1개만 있거나, 여러 개의 팬이 서로 가까이 있는 경우 유용합니다.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "모델 주위의 브림은 원하지 않는 다른 모델에 닿을 수 있습니다. 이 설정은 브림이 없는 모델에서 이 거리 내의 모든 브림을 제거합니다." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "어댑티브 레이어는 모델의 모양에 따라 레이어의 높이를 계산합니다." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "위 스킨을 지지하기 위해 내부채움 패턴에 선을 추가로 더합니다. 이 옵션은 아래의 내부채움이 위에 출력되는 스킨 레이어를 제대로 지지하지 못해 복잡한 모양의 스킨에 구멍이나 플라스틱 방울이 생기는 것을 방지합니다. '벽'은 스킨의 윤곽선만 지지하는 반면 '벽 및 선'은 스킨을 이루는 선의 끝부분도 지지합니다." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "내부채움 영역 주변에 여분의 벽을 추가합니다. 이러한 벽은 상단/하단 스킨 라인이 늘어지는 것을 줄여줄 수 있습니다. 일부 여분 재료를 사용해도 같은 품질을 유지하는 데 필요한 필요한 상단/하단 스킨 층이 감소한다는 의미입니다." -"이 기능을 올바르게 구성하는 경우 내부채움 다각형 연결과 함께 사용해 이동 또는 리트랙션없이 모든 내부채움을 단일 돌출 경로에 연결할 수 있습니다." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "내부채움 영역 주변에 여분의 벽을 추가합니다. 이러한 벽은 상단/하단 스킨 라인이 늘어지는 것을 줄여줄 수 있습니다. 일부 여분 재료를 사용해도 같은 품질을 유지하는 데 필요한 필요한 상단/하단 스킨 층이 감소한다는 의미입니다.이 기능을 올바르게 구성하는 경우 내부채움 다각형 연결과 함께 사용해 이동 또는 리트랙션없이 모든 내부채움을 단일 돌출 경로에 연결할 수 있습니다." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "모두 한꺼번에" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "모든 팬" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "출력물의 해상도에 영향을 미치는 모든 설정. 이러한 설정은 품질 (및 프린팅 시간)에 큰 영향을 미칩니다." @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "브림 너비" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "높이에서 팬 속도 설정" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "레이어에서 팬 속도 설정" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "빌드 플레이트 부착" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "빌드 볼륨 온도 경고" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "빌드 볼륨 팬 번호" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "이 설정을 활성화하면 모델에 브림이 없더라도 프라임 타워에는 브림이 생성됩니다. 높은 타워의 튼튼한 베이스가 필요하다면 베이스 높이를 늘릴 수 있습니다." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "냉각" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "압출기 전환 중 냉각" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "십자형" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "브릿지가 출력되는 중에 브리지를 감지하고 인쇄 속도, 흐름 및 팬 설정을 수정합니다." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "스카프 솔기를 따라 압출할 때 흐름 변화에서 각 단계의 길이를 결정합니다. 거리가 짧을수록 더 정밀하지만 G코드도 복잡해집니다." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Z 솔기를 덜 보이게 하는 솔기 유형인 스카프 솔기의 길이를 결정합니다. 0보다 커야 효과적입니다." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "벽이 프린팅되는 순서를 정의합니다. 외벽을 먼저 프린팅하면 내벽의 오류가 외부로 전파될 수 없으므로 치수 정확도가 향상됩니다. 그러나 나중에 프린팅하면 오버행(경사면)이 프린트팅 될 때 더 잘 쌓일 수 있습니다. 전체 내벽의 총량이 불균일할 경우, '가운데 마지막 선'이 항상 마지막에 인쇄됩니다." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "이중 압출" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "점진적 흐름 변경에서 각 단계의 지속 시간" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "타원" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Ooze 쉴드를 활성화. 이렇게하면 첫 번째 노즐과 동일한 높이에 두 번째 노즐을 닦을 가능성이 있는 모델 주위에 쉘이 생깁니다." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "점진적 흐름 변경을 활성화합니다. 활성화하면 흐름이 목표 흐름까지 점진적으로 증가/감소합니다. 이는 압출기 모터가 시작/정지될 때 흐름이 즉시 변경되지 않는 보우덴 튜브가 있는 프린터에 유용합니다." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "발생할 수 있는 오류를 감지하도록 임곗값 설정을 위한 출력 과정 보고를 활성화합니다." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "광범위한 스티칭은 다각형을 만지면서 구멍을 닫음으로써 메쉬의 열린 구멍을 꿰매려합니다. 이 옵션은 많은 처리 시간을 초래할 수 있습니다." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "스킨을 지지하는 추가 내부채움 선" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "여분의 내부채움 벽 수" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "노즐 스위치 후 프라이밍하는 추가 소재의 양입니다." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "익스트루더 프라임 X 위치" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "익스트루더 프라임 Z 포지션" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "압출기의 히터 공유" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "수평 퍼지 속도" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "이 값보다 긴 이동에 대해서는 재료 흐름이 경로 목표 흐름으로 재설정됩니다" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "노즐 크기의 1~2배 정도의 얇은 구조물의 경우 모델의 두께에 맞게 선 너비를 변경해야 합니다. 이 설정은 벽에 허용되는 최소 선 너비를 제어합니다. N개의 벽이 넓고 N+1개의 벽이 좁은 일부 형상 두께에서는 N개의 벽에서 N+1개의 벽으로 전환하기 때문에, 최소 선 너비가 내재적으로 최대 선 너비를 결정합니다. 가장 넓을 가능성이 있는 벽 선은 최소 벽 선 너비의 두 배입니다." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Gcode 유형" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "맨 마지막에 실행될 G 코드 명령 " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "맨 마지막에 실행될 G 코드 명령 ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "시작과 동시에형실행될 G 코드 명령어 " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "시작과 동시에형실행될 G 코드 명령어 ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "점진적 서포트 내부채움 단계" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "점진적 흐름 이산화 단계 크기" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "점진적 흐름 활성화됨" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "점진적 흐름 최대 가속" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "최소 레이어 시간 때문에 늦춰진 속도로 프린트하는 경우 점차 이 온도로 낮춥니다." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "히팅 빌드 플레이트가 있음" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "가열 속도" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "수평 확장 배율 수축 보정" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "가열 시 파단되기 전까지 필라멘트가 늘어날 수 있는 거리입니다." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "초기 프린팅 온도" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "초기 레이어 최대 흐름 가속" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "내벽 가속도" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "부품의 윤곽만 지터하고 부품의 구멍은 지터하지 않습니다." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "끊긴 면 유지" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "익스투루더의 위치를 헤드의 마지막으로 알려진 위치에 상대위치가 아닌 절대 위치로 만듭니다." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "모델의 첫 번째 및 두 번째 레이어를 Z 방향으로 겹쳐서 에어 갭에서 손실된 필라멘트를 보완합니다. 첫 번째 모델 레이어 위의 모든 모델은 이 값만큼 아래로 이동합니다." -"이 설정으로 인해 두 번째 레이어가 초기 레이어 아래에 출력되는 경우가 있습니다. 이는 의도된 동작입니다." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "모델의 첫 번째 및 두 번째 레이어를 Z 방향으로 겹쳐서 에어 갭에서 손실된 필라멘트를 보완합니다. 첫 번째 모델 레이어 위의 모든 모델은 이 값만큼 아래로 이동합니다.이 설정으로 인해 두 번째 레이어가 초기 레이어 아래에 출력되는 경우가 있습니다. 이는 의도된 동작입니다." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "서포트 구조물의 Z 심과 실제 3D 모델 간의 공간 관계를 관리합니다. 이 컨트롤은 인쇄 결과 모델에 손상이나 자국을 남기지 않고 인쇄 후 서포트 구조물을 원활히 제거할 수 있도록 해주므로 매우 중요합니다." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "최대 이동 해상도" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "점진적 흐름 변경에 대한 최대 가속" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "X 방향 모터의 최대 가속도" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "중간" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "모델과의 최소 Z 심 거리" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "최소 몰드 너비" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "서포트 지붕에 대한 최소 면적 크기입니다. 이 값보다 작은 영역을 갖는 다각형은 정상적인 지원으로 인쇄됩니다." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "첫 번째 레이어의 점진적 흐름 변경에 대한 최소 속도" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "얇은 피처의 최소 두께 이 값보다 더 얇은 모델 피처는 프린트되지 않으며, 최소 피처 크기보다 더 두꺼운 피처는 최소 벽 선 너비로 넓어집니다." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "여러 개의 스커트 라인을 사용하여 작은 모델에 더 잘 압출 성형 할 수 있습니다. 이것을 0으로 설정하면 스커트가 비활성화됩니다." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "서포트의 초기 레이어에서 인필을 위한 압출 배율입니다. 이 값을 높이면 베드 밀착에 도움이 될 수 있습니다." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "첫 번째 레이어의 라인 폭 승수입니다. 이것을 늘리면 베드 접착력을 향상시킬 수 있습니다." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "None" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "없음" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "없음" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "외부 표면에 없음" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "노즐 각도" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "노즐 지름" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "노즐이 위치할 수 없는 구역" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "노즐 ID" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "노즐 길이" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "노즐 크기" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "노즐 스위치 리트렉션 속도" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "익스트루더의 수" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "한번에 하나씩" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "마지막 압출기만" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "이동 시, 수평 이동으로 피할 수없는 출력물 위로 이동할 때만 Z 홉을 수행하십시오." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "외벽 가속도" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "외벽 가속" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "외벽 감속" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "외벽 종료 속도 비율" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "외벽 익스트루더" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "외벽 속도" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "외벽 속도 분할 거리" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "외벽 시작 속도 비율" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "외벽 이동 거리" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "세번째 브리지 벽과 스킨을 인쇄 할 때 사용하는 팬 속도 백분율." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "다각형 꼭지점에 Z 심을 배치합니다. 이 기능을 끄면 정점 사이에도 심을 배치할 수 있습니다. (단, 이 경우 지원되지 않는 오버행에 심을 배치하는 데 대한 제약을 무시하지는 않는다는 점에 유의하세요)" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "레이어가 슬라이스 된, 이 값보다 둘레가 작은 다각형은 필터링됩니다. 값을 낮을수록 슬라이스가 느려지지만, 해상도 메쉬가 높아집니다. 주로 고해상도 SLA 프린터 및 세부 사항이 많은 매우 작은 3D 모델에 적합합니다." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "프라임 타워 최대 브리징 거리" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "프라임 타워 최소 셸 두께" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "프라임 타워 최소 볼륨" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "프린팅 가속도" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk 프린팅" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "각 노즐을 교체 한 후에 재료를 프라이밍(Priming)하는 프린팅 옆에 타워를 프린팅하십시오." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "모델 상단이 지지가 되어야 하는 경우에만 충진물 구조를 인쇄합니다. 이 기능을 사용하면 인쇄 시간 및 재료 사용이 감소하지만, 개체 강도가 균일하지 않습니다." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "한 방향으로 주변 라인들과 항상 겹치게 하기 위해 상단/하단 라인들을 배치하여 프린트하십시오. 이는 프린트하는 데 더 많은 시간이 소모되지만 평평한 면이 보다 일관적으로 보이게 합니다." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "프린팅 온도" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "래프트 기본 팬 속도" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "래프트 기본 흐름" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "래프트 베이스 인필 오버랩" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "래프트 베이스 인필 오버랩 백분율" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "래프트 기준 선 간격" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "래프트 팬 속도" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "래프트 흐름" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "래프트 인터페이스 흐름" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "래프트 인터페이스 인필 오버랩" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "래프트 인터페이스 인필 오버랩 백분율" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "래프트 인터페이스 Z 오프셋" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "래프트 중간 추가 여백" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "래프트 부드럽게하기" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "래프트 서피스 흐름" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "래프트 서피스 인필 오버랩" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "래프트 서피스 인필 오버랩 백분율" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "래프트 서피스 Z 오프셋" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "래프트 상단 추가 여백" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "설정된 임곗값을 벗어난 이벤트 보고" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "흐름 지속 시간 재설정" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "배치 기본 설정" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "확장 배율 수축 보상" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "스카프 솔기 길이" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "스카프 솔기 시작 높이" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "스카프 솔기 단계 길이" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "장면에 서포트 메쉬가 있습니다" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "솔기 코너 환경 설정" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "심 오버행잉 월 각도" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "수동으로 인쇄 순서 설정" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "서포트 내부채움 가속도" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "서포트 인필 밀도 압출 배율 초기 레이어" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "서포트 내부채움 익스트루더" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "서포트 Z 거리" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "모델과 떨어진 서포트 Z 심" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "서포트 라인 우선" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "가장 안쪽의 브림 라인과 그다음으로 안쪽에 있는 브림 라인의 프린트 순서를 바꿉니다. 이렇게 하면 브림이 잘 제거됩니다." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "교차하는 메쉬로 교차하는 볼륨으로 전환하면 겹치는 메쉬가 서로 얽히게됩니다. 이 설정을 해제하면 메시 중 하나가 다른 메시에서 제거되는 동안 오버랩의 모든 볼륨을 가져옵니다." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "헤드가 움직일때의 가속도." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "다림질하는 동안 기본 스킨 라인을 기준으로 한 재료의 압출량. 노즐을 가득 채우면 윗면의 틈새를 채울 수 있지만 표면에 과도한 압출과 필라멘트 덩어리가 생길 수 있습니다." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "래프트 베이스 인쇄 시 일반 압출 라인 대비 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "내부채움 라인 폭의 비율로 나타낸 내부채움재와 벽 사이의 오버랩 양. 약간의 오버랩으로 벽이 내부채움과 확실하게 연결됩니다." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "래프트 인터페이스 인쇄 시 일반 압출 라인 대비 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "일반 압출 라인 대비 래프트 인쇄 중 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "래프트 표면 인쇄 시 일반 압출 라인 대비 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "다림질하는 동안 기본 스킨 라인을 기준으로 한 재료의 압출량. 노즐을 가득 채우면 윗면의 틈새를 채울 수 있지만 표면에 과도한 압출과 필라멘트 덩어리가 생길 수 있습니다." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "내부채움 라인 폭의 비율로 나타낸 내부채움재와 벽 사이의 오버랩 양. 약간의 오버랩으로 벽이 내부채움과 확실하게 연결됩니다." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "래프트 베이스의 인필과 월 사이의 겹침 정도(인필 라인 너비의 백분율)입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "래프트 베이스의 인필과 월 사이의 겹침 정도입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "래프트 인터페이스의 인필과 월 사이의 겹침 정도(인필 라인 너비의 백분율)입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "래프트 인터페이스의 인필과 월 사이의 겹침 정도입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "래프트 표면의 인필과 월 사이의 겹침 정도(인필 라인 너비의 백분율)입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "래프트 표면의 인필과 월 사이의 겹침 정도입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "다림질 라인 사이의 거리." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "Z축 심에서 모델과 서포트 구조물 사이의 거리입니다." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "이동 중 출력물을 피할 때 노즐과 이미 프린팅 된 부분 사이의 거리." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "모델의 수평 부분 위의 높이로 몰드를 프린팅합니다." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "일반 팬 속도에서 팬이 회전하는 높이입니다. 아래 레이어에서는 팬 속도가 초기 팬 속도에서 일반 팬 속도로 점차 증가합니다." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "표준 팬 속도로 팬이 회전하는 높이입니다. 이 높이의 아래 레이어에서 팬 속도는 초기 팬 속도에서 표준 팬 속도로 점차 증가합니다." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "노즐 끝과 갠트리 시스템 사이의 높이 차이 (X 및 Y 축)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "노즐의 끝과 프린트 헤드의 가장 낮은 부분 사이의 높이 차이입니다." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "익스트루더 스위치 후 Z 홉을 수행할 때의 높이 차이." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "첫 번째 브림 선과 첫 번째 레이어 프린팅의 윤곽 사이의 수평 거리입니다. 작은 간격은 브림을 제거하기 쉽도록 하면서 내열성의 이점을 제공할 수 있습니다." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "프린트의 스커트와 첫 번째 레이어 사이의 수평 거리입니다." -"이것은 최소 거리입니다. 여러 개의 스커트 선이 이 거리에서 바깥쪽으로 연장됩니다." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "프린트의 스커트와 첫 번째 레이어 사이의 수평 거리입니다.이것은 최소 거리입니다. 여러 개의 스커트 선이 이 거리에서 바깥쪽으로 연장됩니다." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "제거 할 상단 스킨 영역의 가장 큰 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게 하면 모델의 경사면에서 상단 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이됩니다." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "빌드 팬이 최대 팬 속도로 회전하는 레이어입니다. 이 값은 계산되어 정수로 반올림됩니다." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "팬이 표준 팬 속도로 회전하는 레이어입니다. 표준 팬 속도시의 높이가 설정이 되어있으면, 이 값이 계산되고 정수로 반올림됩니다." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "계단 스텝이 적용되는 영역의 최소 경사입니다. 값이 낮을수록 낮은 각도 서포트 제거가 쉬워지지만 값을 너무 낮게 지정하면 모델의 다른 부분에서 적절하지 않은 결과가 발생할 수 있습니다." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "프라임 타워 셸의 최소 두께입니다. 이 값을 늘림으로써 프라임 타워의 강도를 높일 수 있습니다." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "레이어에 소요 된 최소 시간입니다. 이렇게 하면 프린터가 한 레이어에서 여기에 설정된 시간을 소비하게됩니다. 이렇게하면 다음 레이어를 프린팅하기 전에 출력물을 적절히 냉각시킬 수 있습니다. 리프트 헤드가 비활성화되고 최소 속도가 위반되는 경우 레이어가 최소 레이어 시간보다 짧게 걸릴 수 있습니다." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "서포트 브림에 사용되는 라인의 수. 브림 라인이 많아질수록 추가 재료가 소요되지만 빌드 플레이트에 대한 접착력이 향상됩니다." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "빌드 볼륨을 냉각하는 팬의 수입니다. 0으로 설정하면 빌드 볼륨 팬이 없는 것을 나타냅니다." + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "두 번째 래프트 레이어 맨 위에있는 최상위 레이어의 수입니다. 이것들은 모델이 위치하는 완전히 채워진 레이어입니다. 2층은 1보다 부드러운 표면을 만듭니다." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "초기 레이어의 프린팅 최대 순간 속도 변화." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "스카프 솔기가 시작되는 선택한 레이어 높이의 비율입니다. 숫자가 낮을수록 솔기 높이가 커집니다. 100보다 낮아야 효과적입니다." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "프린팅 할 수 없는 영역을 고려하지 않은 빌드 플레이트의 모양." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "이것은 브릿지 벽이 시작되기 직전에 익스트루더가 있어야하는 거리를 제어합니다. 브릿지가 시작되기 전에 코스팅(coasting)을 하면 노즐의 압력을 낮추고 보다 평평한 브릿지를 만들 수 있습니다." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "외벽을 출력할 때 최고 속도에 도달하는 가속도입니다." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "외벽 출력을 종료할 때의 감속도입니다." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "외벽 가속/감속을 적용하기 위해 긴 경로를 분할 때 압출 경로의 최대 길이입니다. 거리가 짧을수록 더 정밀해지지만 G코드도 복잡해집니다." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "외벽을 출력할 때 종료되는 최고 속도의 비율입니다." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "외벽을 출력할 때 시작되는 최고 속도의 비율입니다." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "이 설정은 래프트 베이스의 내부 모서리를 얼마나 둥글게 할지 제어합니다. 내부 모서리는 여기에 지정된 값과 동일한 반경을 가진 반원 모양으로 둥글게 다듬어집니다. 이 설정은 래프트 윤곽선에 있는 이러한 원보다 작은 구멍도 제거합니다." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "냉각됨에 따라 재료 수축을 보상하기 위해 모델이 이 배율로 확장됩니다." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "상단 레이어" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "트렁크 직경" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "이 각도보다 오버행이 더 큰 월에는 이음새가 생기지 않도록 해야 합니다. 값이 90이면 어떠한 월도 오버행잉으로 처리되지 않습니다." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "변경 없음" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "유니언 오버랩 볼륨" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "벽" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "벽만" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "벽 및 선" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "이 각도보다 놓은 오버행(경사면)의 벽은 오버행 벽 설정을 사용해 인쇄됩니다. 값이 90이면 오버행(경사면)으로 처리되는 벽이 없습니다. 서포트로 지지되는 오버행(경사면)도 오버행(경사면)으로 처리되지 않습니다." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "이 각도보다 더 돌출된 벽은 돌출 벽 설정을 사용하여 출력됩니다. 값이 90인 경우 벽은 돌출부로 간주하지 않습니다. 지지대가 지지하는 돌출부도 돌출부로 간주하지 않습니다. 또한 돌출부의 절반보다 짧은 선도 돌출부로 간주하지 않습니다." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "브릿지 스킨 벽 영역을 프린팅할 때 압출 된 재료의 양에 이 값을 곱합니다." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "래프트 인터페이스의 첫 번째 레이어 인쇄 시, 해당 오프셋으로 변환하여 베이스와 인터페이스 사이의 접착력을 지정할 수 있습니다. 오프셋이 음수일 경우 접착력 향상을 기대할 수 있습니다." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "래프트 서피스의 첫 번째 레이어를 인쇄 시, 해당 오프셋으로 변환하여 인터페이스와 표면 사이의 접착력을 지정할 수 있습니다. 오프셋이 음수일 경우 접착력 향상을 기대할 수 있습니다." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "두번째 브릿지 스킨 영역을 프린팅할 때 압출 된 재료의 양에 이 값을 곱합니다." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Z 솔기 정렬" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "버텍스 상의 Z 심" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Z 경계 위치" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "이동" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "노즐 전환 중 냉각 팬의 활성화 여부를 선택합니다. 노즐을 더 빨리 냉각시켜 흘러내림을 줄일 수 있습니다:
    • 변경 없음: 팬을 이전 상태와 같이 유지합니다
    • 마지막 압출기만: 마지막으로 사용한 압출기의 팬을 켜고, 나머지 팬이 있을 경우 모두 끕니다. 완전한 별도의 압출기가 있는 경우 유용합니다.
    • 모든 팬: 노즐 전환 중 모든 팬을 켭니다. 냉각팬이 1개만 있거나, 여러 개의 팬이 서로 가까이 있는 경우 유용합니다.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "모든 팬" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "압출기 전환 중 냉각" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "서포트 구조물의 Z 심과 실제 3D 모델 간의 공간 관계를 관리합니다. 이 컨트롤은 인쇄 결과 모델에 손상이나 자국을 남기지 않고 인쇄 후 서포트 구조물을 원활히 제거할 수 있도록 해주므로 매우 중요합니다." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "모델과의 최소 Z 심 거리" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "서포트의 초기 레이어에서 인필을 위한 압출 배율입니다. 이 값을 높이면 베드 밀착에 도움이 될 수 있습니다." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "마지막 압출기만" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "다각형 꼭지점에 Z 심을 배치합니다. 이 기능을 끄면 정점 사이에도 심을 배치할 수 있습니다. (단, 이 경우 지원되지 않는 오버행에 심을 배치하는 데 대한 제약을 무시하지는 않는다는 점에 유의하세요)" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "프라임 타워 최소 셸 두께" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "래프트 기본 흐름" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "래프트 베이스 인필 오버랩" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "래프트 베이스 인필 오버랩 백분율" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "래프트 흐름" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "래프트 인터페이스 흐름" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "래프트 인터페이스 인필 오버랩" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "래프트 인터페이스 인필 오버랩 백분율" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "래프트 인터페이스 Z 오프셋" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "래프트 서피스 흐름" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "래프트 서피스 인필 오버랩" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "래프트 서피스 인필 오버랩 백분율" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "래프트 서피스 Z 오프셋" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "심 오버행잉 월 각도" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "서포트 인필 밀도 압출 배율 초기 레이어" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "모델과 떨어진 서포트 Z 심" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "래프트 베이스 인쇄 시 일반 압출 라인 대비 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "래프트 인터페이스 인쇄 시 일반 압출 라인 대비 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "일반 압출 라인 대비 래프트 인쇄 중 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "래프트 표면 인쇄 시 일반 압출 라인 대비 압출할 재료의 양입니다. 유동이 증가하면 접착력 및 래프트 구조 강도가 향상될 수 있습니다." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "래프트 베이스의 인필과 월 사이의 겹침 정도(인필 라인 너비의 백분율)입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "래프트 베이스의 인필과 월 사이의 겹침 정도입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "래프트 인터페이스의 인필과 월 사이의 겹침 정도(인필 라인 너비의 백분율)입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "래프트 인터페이스의 인필과 월 사이의 겹침 정도입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "래프트 표면의 인필과 월 사이의 겹침 정도(인필 라인 너비의 백분율)입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "래프트 표면의 인필과 월 사이의 겹침 정도입니다. 약간의 겹침이 있을 경우 월이 인필에 보다 단단히 연결될 수 있습니다." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "Z축 심에서 모델과 서포트 구조물 사이의 거리입니다." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "프라임 타워 셸의 최소 두께입니다. 이 값을 늘림으로써 프라임 타워의 강도를 높일 수 있습니다." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "이 각도보다 오버행이 더 큰 월에는 이음새가 생기지 않도록 해야 합니다. 값이 90이면 어떠한 월도 오버행잉으로 처리되지 않습니다." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "변경 없음" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "래프트 인터페이스의 첫 번째 레이어 인쇄 시, 해당 오프셋으로 변환하여 베이스와 인터페이스 사이의 접착력을 지정할 수 있습니다. 오프셋이 음수일 경우 접착력 향상을 기대할 수 있습니다." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "래프트 서피스의 첫 번째 레이어를 인쇄 시, 해당 오프셋으로 변환하여 인터페이스와 표면 사이의 접착력을 지정할 수 있습니다. 오프셋이 음수일 경우 접착력 향상을 기대할 수 있습니다." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "버텍스 상의 Z 심" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "위 스킨을 지지하기 위해 내부채움 패턴에 선을 추가로 더합니다. 이 옵션은 아래의 내부채움이 위에 출력되는 스킨 레이어를 제대로 지지하지 못해 복잡한 모양의 스킨에 구멍이나 플라스틱 방울이 생기는 것을 방지합니다. '벽'은 스킨의 윤곽선만 지지하는 반면 '벽 및 선'은 스킨을 이루는 선의 끝부분도 지지합니다." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "높이에서 팬 속도 설정" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "노즐 길이" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "레이어에서 팬 속도 설정" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "노즐의 끝과 프린트 헤드의 가장 낮은 부분 사이의 높이 차이입니다." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "빌드 볼륨 팬 번호" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "스카프 솔기를 따라 압출할 때 흐름 변화에서 각 단계의 길이를 결정합니다. 거리가 짧을수록 더 정밀하지만 G코드도 복잡해집니다." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Z 솔기를 덜 보이게 하는 솔기 유형인 스카프 솔기의 길이를 결정합니다. 0보다 커야 효과적입니다." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "점진적 흐름 변경에서 각 단계의 지속 시간" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "점진적 흐름 변경을 활성화합니다. 활성화하면 흐름이 목표 흐름까지 점진적으로 증가/감소합니다. 이는 압출기 모터가 시작/정지될 때 흐름이 즉시 변경되지 않는 보우덴 튜브가 있는 프린터에 유용합니다." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "스킨을 지지하는 추가 내부채움 선" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "이 값보다 긴 이동에 대해서는 재료 흐름이 경로 목표 흐름으로 재설정됩니다" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "점진적 흐름 이산화 단계 크기" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "점진적 흐름 활성화됨" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "점진적 흐름 최대 가속" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "초기 레이어 최대 흐름 가속" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "점진적 흐름 변경에 대한 최대 가속" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "첫 번째 레이어의 점진적 흐름 변경에 대한 최소 속도" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "없음" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "외벽 가속" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "외벽 감속" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "외벽 종료 속도 비율" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "외벽 속도 분할 거리" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "외벽 시작 속도 비율" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "흐름 지속 시간 재설정" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "스카프 솔기 길이" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "스카프 솔기 시작 높이" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "스카프 솔기 단계 길이" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "일반 팬 속도에서 팬이 회전하는 높이입니다. 아래 레이어에서는 팬 속도가 초기 팬 속도에서 일반 팬 속도로 점차 증가합니다." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "빌드 팬이 최대 팬 속도로 회전하는 레이어입니다. 이 값은 계산되어 정수로 반올림됩니다." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "빌드 볼륨을 냉각하는 팬의 수입니다. 0으로 설정하면 빌드 볼륨 팬이 없는 것을 나타냅니다." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "스카프 솔기가 시작되는 선택한 레이어 높이의 비율입니다. 숫자가 낮을수록 솔기 높이가 커집니다. 100보다 낮아야 효과적입니다." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "외벽을 출력할 때 최고 속도에 도달하는 가속도입니다." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "외벽 출력을 종료할 때의 감속도입니다." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "외벽 가속/감속을 적용하기 위해 긴 경로를 분할 때 압출 경로의 최대 길이입니다. 거리가 짧을수록 더 정밀해지지만 G코드도 복잡해집니다." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "외벽을 출력할 때 종료되는 최고 속도의 비율입니다." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "외벽을 출력할 때 시작되는 최고 속도의 비율입니다." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "벽만" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "벽 및 선" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "이 각도보다 더 돌출된 벽은 돌출 벽 설정을 사용하여 출력됩니다. 값이 90인 경우 벽은 돌출부로 간주하지 않습니다. 지지대가 지지하는 돌출부도 돌출부로 간주하지 않습니다. 또한 돌출부의 절반보다 짧은 선도 돌출부로 간주하지 않습니다." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "이 각도보다 놓은 오버행(경사면)의 벽은 오버행 벽 설정을 사용해 인쇄됩니다. 값이 90이면 오버행(경사면)으로 처리되는 벽이 없습니다. 서포트로 지지되는 오버행(경사면)도 오버행(경사면)으로 처리되지 않습니다." diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 63e8b5e618d..614a3332d5d 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Zo genereer je de voorbereidingstoren:
    • Normaal: creëer een emmer waarin secundaire materialen worden voorbereid
    • Interleaved: creëer een zo minimaal mogelijke voorbereidingstoren. Dit bespaart tijd en filament, maar is alleen mogelijk als de gebruikte materialen aan elkaar hechten
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Of de koelventilatoren moeten worden geactiveerd bij een spuitkopwissel. Dit kan helpen om doorsijpelen te verminderen omdat de sproeier sneller afkoelt:
    • Ongewijzigd: houd de ventilatoren zoals ze waren
    • Alleen laatste extruder:schakel de ventilator van de laatstgebruikte extruder in, maar schakel de andere uit (als die er zijn). Dit is nuttig indien u volledig aparte extruders heeft.
    • Alle ventilatoren: schakel alle ventilatoren in bij een spuitkopwissel. Dit is nuttig indien u een enkele koelventilator heeft, of meerdere ventilatoren die dicht bij elkaar zitten.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Een rand rond een model kan een ander model raken op een plek waarvan u dat niet wilt. Dit verwijdert alle rand binnen deze afstand van modellen zonder rand." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Met adaptieve lagen berekent u de laaghoogte afhankelijk van de vorm van het model." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Voeg extra lijnen toe aan het invulpatroon om de skins erboven te ondersteunen. Deze optie voorkomt gaten of plastic klodders die soms te zien zijn in complex gevormde skins doordat de invulling eronder de skinlaag die erboven wordt geprint niet correct ondersteunt. 'Wanden' ondersteunt alleen de contouren van de skin, terwijl 'Wanden en lijnen' ook de uiteinden van de lijnen ondersteunt die de skin vormen." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Voeg extra wanden toe rondom de vulling. Deze wanden kunnen ervoor zorgen dat de skin aan de boven-/onderkant minder doorzakt. Dit betekent dat u met alleen wat extra materiaal voor dezelfde kwaliteit minder skinlagen aan de boven-/onderkant nodig hebt." -"Deze optie kan in combinatie met de optie 'Polygonen voor de vulling verbinden' worden gebruikt om alle vulling in één doorvoerpad te verbinden zonder extra bewegingen of intrekkingen, mits correct ingesteld." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Voeg extra wanden toe rondom de vulling. Deze wanden kunnen ervoor zorgen dat de skin aan de boven-/onderkant minder doorzakt. Dit betekent dat u met alleen wat extra materiaal voor dezelfde kwaliteit minder skinlagen aan de boven-/onderkant nodig hebt.Deze optie kan in combinatie met de optie 'Polygonen voor de vulling verbinden' worden gebruikt om alle vulling in één doorvoerpad te verbinden zonder extra bewegingen of intrekkingen, mits correct ingesteld." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Alles Tegelijk" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Alle ventilatoren" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Alle instellingen die invloed hebben op de resolutie van de print. Deze instellingen hebben een grote invloed op de kwaliteit (en printtijd)." @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Breedte Brim" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Constructieventilatorsnelheid op hoogte" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Constructieventilatorsnelheid op laag" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Hechting aan Platform" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Waarschuwing temperatuur bouwvolume" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Ventilatornummer constructievolume " + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Door deze instelling in te schakelen, krijgt uw prime toren een brim, zelfs als het model dat niet heeft. Als u een stevigere basis wilt voor een hoge toren, kunt u de basis hoogte verhogen." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Koelen" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Koeling tijdens extruderwissel" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Kruis" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Hiermee detecteert u bruggen en past u de instellingen voor de printsnelheid, doorvoer en ventilator aan tijdens het printen van bruggen." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Bepaalt de lengte van elke stap in de stroomverandering bij het extruderen langs de schuine naad. Een kleinere afstand resulteert in een nauwkeurigere maar ook complexere G-code." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Bepaalt de lengte van de schuine naad, een naadtype dat de Z-naad minder zichtbaar moet maken. Moet hoger zijn dan 0 om effectief te zijn." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Bepaalt de volgorde waarin de wanden worden geprint. Wanneer u de buitenwanden het eerst print, bevordert u de nauwkeurigheid van de afmetingen, omdat fouten in de binnenwanden niet worden overgedragen op de buitenzijde. Door ze later te printen kunt u echter beter stapelen wanneer de overhangs worden geprint. Bij een oneven aantal binnenwanden wordt de 'middelste laatste lijn' altijd als laatste afgedrukt." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Dubbele Doorvoer" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Duur van elke stap in de geleidelijke stroomverandering" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Ovaal" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Hiermee wordt het uitloopscherm aan de buitenkant ingeschakeld, waardoor een shell rond het model wordt gemaakt waarop een tweede nozzle kan worden afgeveegd als deze zich op dezelfde hoogte bevindt als de eerste nozzle." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Geleidelijke stroomwijzigingen inschakelen. Als deze optie is ingeschakeld, wordt de stroom geleidelijk verhoogd/verlaagd tot de doelstroom. Dit is handig voor printers met een bowdenbuis waarbij de stroom niet onmiddellijk verandert wanneer de extrudermotor start/stopt." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Rapportage van printproces inschakelen voor het instellen van drempelwaarden voor mogelijke foutdetectie." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Met uitgebreid hechten worden zo veel mogelijk open gaten in het raster gehecht doordat het gat wordt gedicht met polygonen die elkaar raken. Deze optie kan de verwerkingstijd aanzienlijk verlengen." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Extra invullijnen ter ondersteuning van skins" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Aantal Extra Wanden Rond vulling" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Extra primemateriaal na het wisselen van de nozzle." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "X-positie voor Primen Extruder" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Z-positie voor Primen Extruder" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extruders delen verwarming" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Afvoersnelheid flush" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Voor elke af te leggen afstand die langer is dan deze waarde, wordt de materiaalstroom opnieuw ingesteld op de doelstroom van de paden." + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Bij dunne structuren die ongeveer één of tweemaal zo groot als de nozzle zijn, moeten de lijnbreedtes worden aangepast aan de dikte van het model. Met deze instelling beheert u de minimum lijnbreedte die voor wanden is toegestaan. De minimum lijnbreedte bepaalt automatisch ook de maximale lijnbreedte, omdat we bij een bepaalde geometriedikte overgaan van wanden van N naar wanden van N+1, waarbij de N-wanden breed zijn en de N+1-wanden smal. De breedst mogelijke wandlijn is tweemaal de minimumbreedte van de wandlijn." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Versie G-code" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "G-code-opdrachten die aan het eind worden uitgevoerd, gescheiden door " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "G-code-opdrachten die aan het eind worden uitgevoerd, gescheiden door ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "G-code-opdrachten die aan het begin worden uitgevoerd, gescheiden door " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "G-code-opdrachten die aan het begin worden uitgevoerd, gescheiden door ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Geleidelijke supportvulling traptreden" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Stapgrootte geleidelijke stroomdiscretisatie" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Geleidelijke stroom ingeschakeld" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Maximale versnelling voor geleidelijke stroom" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Verlaag geleidelijk naar deze temperatuur bij het printen met lagere snelheden vanwege de minimale laagtijd." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Heeft verwarmd platform" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Verwarmingssnelheid" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Horizontale schaalfactor krimpcompensatie" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Hoe ver het filament kan worden uitgerekt voordat het afbreekt, wanneer het wordt verwarmd." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Starttemperatuur voor printen" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Maximale stroomversnelling eerste laag" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Binnenwandacceleratie" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Trillen alleen voor de contouren van de onderdelen en niet voor de gaten van de onderdelen." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Onderbroken Oppervlakken Behouden" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Maak van de primepositie van de extruder de absolute positie, in plaats van de relatieve positie ten opzichte van de laatst bekende locatie van de printkop." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Laat de eerste en tweede laag van het model overlappen in de Z-richting om te compenseren voor het filament dat verloren gaat in de luchtspleet. Alle modellen boven de eerste modellaag zullen met deze hoeveelheid naar beneden worden verschoven." -"Het kan voorkomen dat de tweede laag onder de eerste laag wordt afgedrukt door deze instelling. Dit gedrag is zo bedoeld." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Laat de eerste en tweede laag van het model overlappen in de Z-richting om te compenseren voor het filament dat verloren gaat in de luchtspleet. Alle modellen boven de eerste modellaag zullen met deze hoeveelheid naar beneden worden verschoven.Het kan voorkomen dat de tweede laag onder de eerste laag wordt afgedrukt door deze instelling. Dit gedrag is zo bedoeld." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Beheer de ruimtelijke relatie tussen de z-naad van de ondersteunende structuur en het eigenlijke 3D-model. Controle hierover is cruciaal omdat het gebruikers in staat stelt om de ondersteunende structuren na het printen naadloos te verwijderen, zonder schade of sporen op het geprinte model." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Maximale bewegingsresolutie" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Maximale versnelling voor geleidelijke stroomveranderingen" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "De maximale acceleratie van de motor in de X-richting" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Midden" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Min. Z-naadafstand van model" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Minimale matrijsbreedte" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Minimumgebied voor de supportdaken. Polygonen met een gebied dat kleiner is dan deze waarde worden geprint als normale ondersteuning." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Minimumsnelheid voor geleidelijke stroomveranderingen voor de eerste laag" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Minimumdikte van dunne elementen. Modelelementen die dunner zijn dan deze waarde worden niet geprint, terwijl elementen die dikker zijn dan de minimale elementgrootte worden verbreed tot de minimale wandlijnbreedte." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Met meerdere skirtlijnen kunt u de doorvoer beter voorbereiden voor kleine modellen. Met de waarde 0 wordt de skirt uitgeschakeld." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Vermenigvuldiging voor de infill op de eerste lagen van de drager. Dit verhogen kan helpen voor de bedhechting." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Vermenigvuldiging van de lijnbreedte van de eerste laag. Door deze te verhogen kan de hechting aan het bed worden verbeterd." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Geen" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Geen" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Geen" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Niet op buitenzijde" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Nozzlehoek" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Nozzlediameter" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Verboden gebieden voor de nozzle" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Nozzle-ID" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Nozzlelengte" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Maat nozzle" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Intreksnelheid bij Wisselen Nozzles" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Aantal extruders" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "Eén voor Eén" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Alleen laatste extruder" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Voer alleen een Z-sprong uit bij bewegingen over geprinte delen die niet kunnen worden vermeden met Geprinte Delen Mijden Tijdens Bewegingen." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Buitenwandacceleratie" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Buitenwandversnelling" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Buitenwandvertraging" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Snelheidsverhouding buitenwand" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Extruder buitenwand" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Snelheid Buitenwand" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Snelheid splitafstand buitenwand" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Startsnelheidsverhouding buitenwand" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Veegafstand buitenwand" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Percentage ventilatorsnelheid tijdens het printen van de derde brugskinlaag." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Plaats de z-naad op een polygoonvertex. Door dit uit te schakelen kan de naad ook tussen vertexen geplaatst worden. (Denk eraan dat dit niet de beperkingen opheft om de naad op een niet-ondersteunde overhang te plaatsen)." + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Polygonen in geslicete lagen, die een kleinere omtrek hebben dan deze waarde, worden eruit gefilterd. Bij lagere waarden krijgt het raster een hogere resolutie, waardoor het slicen langer duurt. Dit is voornamelijk bedoeld voor SLA-printers met een hoge resolutie en zeer kleine 3D-modellen die veel details bevatten." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Maximale overbruggingsafstand voorbereidingstoren" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Minimale wanddikte primaire toren" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Minimumvolume primepijler" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Printacceleratie" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Printschok" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Print een pijler naast de print, waarop het materiaal na iedere nozzlewisseling wordt ingespoeld." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Print alleen vulstructuren waarvan de bovenkant van het model moet worden ondersteund. Hiermee reduceert u de printtijd en het materiaalgebruik. Dit kan echter leiden tot een niet gelijkmatige objectsterkte." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Print boven- en onderlijnen in een volgorde die ervoor zorgt dat ze altijd in één richting overlappen met aangrenzende lijnen. Hierdoor duurt het iets langer om te printen, maar platte oppervlakken zien er dan consistenter uit." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Printtemperatuur" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Ventilatorsnelheid Grondlaag Raft" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Flow" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Infilloverlap raftbasis" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Infilloverlappercentage raftbasis" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Tussenruimte Lijnen Grondvlak Raft" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Ventilatorsnelheid Raft" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Flow raft" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Flow raftinterface" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Infilloverlap raftinterface" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Infilloverlappercentage raftinterface" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Z-offset raftinterface" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Extra marge voor vlot in het midden" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Raft effenen" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Flow raftoppervlak" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Infilloverlap raftoppervlak" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Infilloverlappercentage raftoppervlak" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Z-offset raftoppervlak" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Extra marge voor vlot aan bovenkant" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Rapportagegebeurtenissen die ingestelde drempels overschrijden" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Stroomduur opnieuw instellen" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Plaatsings voorkeur" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Schaalfactor krimpcompensatie" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Lengte schuine naad" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Starthoogte schuine naad" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Staplengte schuine naad" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "Scène heeft supportrasters" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Voorkeur van naad en hoek" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Naad boven wandhoek" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Handmatig afdrukvolgorde instellen" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Acceleratie Supportvulling" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Ondersteuning vermenigvuldigen infilldichtheid eerste laag" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Extruder Supportvulling" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Z-afstand Supportstructuur" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Ondersteuning Z-naad weg van model" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Geprefereerde ondersteuningslijnen" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Verwissel de printvolgorde van de binnenste en de op een na binnenste randlijn. Dit verbetert het verwijderen van de rand." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Schakel naar de rastersnijpuntvolumes die bij elke laag horen, zodat de overlappende rasters worden verweven. Als u deze instelling uitschakelt, krijgt een van de rasters al het volume in de overlap, terwijl dit uit de andere rasters wordt verwijderd." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "De acceleratie tijdens het uitvoeren van bewegingen." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "De hoeveelheid materiaal, in verhouding tot een normale skinlijn, die tijdens het strijken moet worden doorgevoerd. Als de nozzle gevuld blijft, kunnen scheuren in de bovenlaag worden gevuld. Te hoge doorvoer leidt echter tot uitstulpingen aan de zijkant van het oppervlak." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het printen van de raftbasis. Een verhoogde flow kan de hechting en de structurele sterkte van de raft verbeteren." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De mate van overlap tussen de vulling en de wanden als percentage van de lijnbreedte van de vulling. Met een lichte overlap kunnen de wanden goed hechten aan de vulling." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het printen van de raftinterface. Een verhoogde flow kan de hechting en de structurele sterkte van het vlot verbeteren." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het printen van de raft. Een verhoogde flow kan de hechting en de structurele sterkte van het vlot verbeteren." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het bedrukken van het raftoppervlak. Een verhoogde flow kan de hechting en de structurele sterkte van de raft verbeteren." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "De hoeveelheid materiaal, in verhouding tot een normale skinlijn, die tijdens het strijken moet worden doorgevoerd. Als de nozzle gevuld blijft, kunnen scheuren in de bovenlaag worden gevuld. Te hoge doorvoer leidt echter tot uitstulpingen aan de zijkant van het oppervlak." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De mate van overlap tussen de vulling en de wanden als percentage van de lijnbreedte van de vulling. Met een lichte overlap kunnen de wanden goed hechten aan de vulling." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftbasis, als percentage van de breedte van de infill-lijn. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftbasis. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftinterface, als percentage van de breedte van de infill-lijn. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftinterface. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De hoeveelheid overlap tussen de infill en de wanden van het raftoppervlak, als percentage van de breedte van de infill-lijn. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "De hoeveelheid overlap tussen de infill en de wanden van het raftoppervlak. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "De afstand tussen de strijklijnen." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "De afstand tussen het model en de ondersteuningsstructuur op de naad van de z-as." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "De afstand tussen de nozzle en geprinte delen wanneer deze tijdens bewegingen worden gemeden." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "De hoogte die in de matrijs moet worden geprint boven de horizontale delen in het model." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "De hoogte waarop de ventilatoren op normale ventilatorsnelheid draaien. Op de lagen hieronder neemt de ventilatorsnelheid geleidelijk toe van de initiële ventilatorsnelheid naar de normale ventilatorsnelheid." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "De hoogte waarop de ventilatoren op normale snelheid draaien. Tijdens het printen van de onderliggende lagen wordt de ventilatorsnelheid geleidelijk verhoogd van de startsnelheid ventilator naar de normale ventilatorsnelheid." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "Het hoogteverschil tussen de punt van de nozzle en het rijbrugsysteem (X- en Y-as)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "Het hoogteverschil tussen de punt van de nozzle en het laagste deel van de printkop." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "Het hoogteverschil dat wordt aangehouden tijdens een Z-sprong na wisselen extruder." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "De horizontale afstand tussen de eerste brimlijn en de contour van de eerste laag van de print. Door een kleine tussenruimte is de brim gemakkelijker te verwijderen terwijl de thermische voordelen behouden blijven." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "De horizontale afstand tussen de skirt en de eerste laag van de print." -"Dit is de minimumafstand. Als u meerdere skirtlijnen print, worden deze vanaf deze afstand naar buiten geprint." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "De horizontale afstand tussen de skirt en de eerste laag van de print.Dit is de minimumafstand. Als u meerdere skirtlijnen print, worden deze vanaf deze afstand naar buiten geprint." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "De grootste breedte van delen van bovenste skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde, zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de bovenste/onderste skinlaag op schuine vlakken in het model." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "De laag waarbij de bouwventilatoren op volle ventilatorsnelheid draaien. Deze waarde wordt berekend en afgerond op een heel getal." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "De laag waarop de ventilatoren op normale snelheid draaien. Als de normale ventilatorsnelheid op hoogte ingeschakeld is, wordt deze waarde berekend en op een geheel getal afgerond." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "De minimale helling van het gebied voordat traptreden van kracht worden. Lage waarden zouden het gemakkelijker moeten maken om support op ondieperere hellingen te verwijderen. Zeer lage waarden kunnen echter resulteren in een aantal zeer contra-intuïtieve resultaten op andere delen van het model." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "De minimale dikte van de wand van de primaire toren. U kunt deze dikte verhogen om de primaire toren sterker te maken." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "De tijd die minimaal aan het printen van een laag wordt besteed. Hierdoor wordt de printer gedwongen langzamer te printen zodat deze ten minste de ingestelde tijd gebruikt voor het printen van een laag. Hierdoor kan het geprinte materiaal voldoende afkoelen voordat de volgende laag wordt geprint. Het printen van lagen kan nog steeds minder lang duren dan de minimale laagtijd als Printkop optillen is uitgeschakeld en als anders niet zou worden voldaan aan de Minimumsnelheid." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Het aantal lijnen dat voor de supportbrim wordt gebruikt. Meer brimlijnen zorgen voor betere hechting aan het platform, maar kosten wat extra materiaal." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "Het nummer van de ventilator die het constructievolume koelt. Als dit is ingesteld op 0, betekent dit dat er geen constructievolumeventilator is." + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "Het aantal bovenlagen op de tweede raftlaag. Dit zijn volledig gevulde lagen waarop het model rust. Met twee lagen krijgt u een gladder oppervlak dan met één laag." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "De maximale onmiddellijke snelheidsverandering in de eerste laag." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "De verhouding van de geselecteerde laaghoogte waarop de schuine naad zal beginnen. Een lager getal resulteert in een grotere naadhoogte. Moet lager zijn dan 100 om effectief te zijn." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "De vorm van het platform zonder rekening te houden met niet-printbare gebieden." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Met deze optie controleert u de afstand die de extruder moet coasten voordat een brugwand begint. Met coasting voordat de brug begint, vermindert u de druk in de nozzle en krijgt u mogelijk een vlakkere brug." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Dit is de versnelling waarmee men de topsnelheid bereikt als men een buitenwand afdrukt." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Dit is de vertraging waarmee men het afdrukken van een buitenwand beëindigt." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Dit is de maximale lengte van een extrusiepad bij het splitsen van een langer pad om de versnelling/vertraging van de buitenwand toe te passen. Een kleinere afstand zorgt voor een preciezere maar ook uitgebreide G-code." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Dit is de verhouding van de topsnelheid om mee te eindigen bij het printen van een buitenwand." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Dit is de verhouding van de topsnelheid om mee te beginnen bij het printen van een buitenwand." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Deze instelling bepaalt hoeveel binnenhoeken in de omtrek van het basisvlot worden afgerond. Binnenhoeken worden afgerond tot een halve cirkel met een straal gelijk aan de hier opgegeven waarde. Deze instelling verwijdert ook gaten in de omtrek van het vlot die kleiner zijn dan zo'n cirkel." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Het model wordt met deze factor geschaald ter compensatie van het krimpen van het materiaal tijdens het afkoelen." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Bovenlagen" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Stamdiameter" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Probeer naden te voorkomen bij muren die verder overhangen dan deze hoek. Als de waarde 90 is, worden geen muren als overhangend behandeld." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Ongewijzigd" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Overlappende Volumes Samenvoegen" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Wanden" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Alleen wanden" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Wanden en lijnen" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Wanden die overhangen in een hoek groter dan deze waarde, worden geprint met instellingen voor overhangende wanden. Wanneer de waarde 90 is, wordt een wand niet als een overhangende wand gezien. Een overhang die wordt ondersteund door ondersteuning wordt ook niet als overhang gezien." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Wanden die meer oversteken dan deze hoek worden afgedrukt met behulp van de instellingen voor overhangende wanden. Als de waarde 90 is, worden er geen wanden behandeld als overhangend. Overhangen die ondersteund worden door ondersteuning worden ook niet behandeld als overhang. Daarnaast wordt elke lijn die voor minder dan de helft overhangt ook niet behandeld als overhang." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Tijdens het printen van brugwanden wordt de hoeveelheid materiaal die wordt doorgevoerd, met deze waarde vermenigvuldigd." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Bij het printen van de eerste laag van de raftinterface: gebruik deze offset om de hechting tussen de basis en de interface aan te passen. Een negatieve offset zou de hechting moeten verbeteren." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Bij het printen van de eerste laag van het raftoppervlak: gebruik deze offset om de hechting tussen de interface en het oppervlak aan te passen. Een negatieve offset zou de hechting moeten verbeteren." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Tijdens het printen van de tweede brugskinlaag wordt de hoeveelheid materiaal die wordt doorgevoerd, met deze waarde vermenigvuldigd." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Uitlijning Z-naad" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Z-naad op vertex" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Z-naadpositie" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "beweging" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Of de koelventilatoren moeten worden geactiveerd bij een spuitkopwissel. Dit kan helpen om doorsijpelen te verminderen omdat de sproeier sneller afkoelt:
    • Ongewijzigd: houd de ventilatoren zoals ze waren
    • Alleen laatste extruder:schakel de ventilator van de laatstgebruikte extruder in, maar schakel de andere uit (als die er zijn). Dit is nuttig indien u volledig aparte extruders heeft.
    • Alle ventilatoren: schakel alle ventilatoren in bij een spuitkopwissel. Dit is nuttig indien u een enkele koelventilator heeft, of meerdere ventilatoren die dicht bij elkaar zitten.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Alle ventilatoren" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Koeling tijdens extruderwissel" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Beheer de ruimtelijke relatie tussen de z-naad van de ondersteunende structuur en het eigenlijke 3D-model. Controle hierover is cruciaal omdat het gebruikers in staat stelt om de ondersteunende structuren na het printen naadloos te verwijderen, zonder schade of sporen op het geprinte model." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Min. Z-naadafstand van model" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Vermenigvuldiging voor de infill op de eerste lagen van de drager. Dit verhogen kan helpen voor de bedhechting." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Alleen laatste extruder" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Plaats de z-naad op een polygoonvertex. Door dit uit te schakelen kan de naad ook tussen vertexen geplaatst worden. (Denk eraan dat dit niet de beperkingen opheft om de naad op een niet-ondersteunde overhang te plaatsen)." - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Minimale wanddikte primaire toren" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Flow" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Infilloverlap raftbasis" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Infilloverlappercentage raftbasis" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Flow raft" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Flow raftinterface" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Infilloverlap raftinterface" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Infilloverlappercentage raftinterface" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Z-offset raftinterface" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Flow raftoppervlak" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Infilloverlap raftoppervlak" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Infilloverlappercentage raftoppervlak" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Z-offset raftoppervlak" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Naad boven wandhoek" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Ondersteuning vermenigvuldigen infilldichtheid eerste laag" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Ondersteuning Z-naad weg van model" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het printen van de raftbasis. Een verhoogde flow kan de hechting en de structurele sterkte van de raft verbeteren." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het printen van de raftinterface. Een verhoogde flow kan de hechting en de structurele sterkte van het vlot verbeteren." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het printen van de raft. Een verhoogde flow kan de hechting en de structurele sterkte van het vlot verbeteren." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "De hoeveelheid materiaal, ten opzichte van een normale extrusielijn, die uitsteekt bij het bedrukken van het raftoppervlak. Een verhoogde flow kan de hechting en de structurele sterkte van de raft verbeteren." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftbasis, als percentage van de breedte van de infill-lijn. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftbasis. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftinterface, als percentage van de breedte van de infill-lijn. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De hoeveelheid overlap tussen de infill en de wanden van de raftinterface. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De hoeveelheid overlap tussen de infill en de wanden van het raftoppervlak, als percentage van de breedte van de infill-lijn. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "De hoeveelheid overlap tussen de infill en de wanden van het raftoppervlak. Een kleine overlap zorgt ervoor dat de wanden stevig op de infill aansluiten." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "De afstand tussen het model en de ondersteuningsstructuur op de naad van de z-as." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "De minimale dikte van de wand van de primaire toren. U kunt deze dikte verhogen om de primaire toren sterker te maken." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Probeer naden te voorkomen bij muren die verder overhangen dan deze hoek. Als de waarde 90 is, worden geen muren als overhangend behandeld." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Ongewijzigd" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Bij het printen van de eerste laag van de raftinterface: gebruik deze offset om de hechting tussen de basis en de interface aan te passen. Een negatieve offset zou de hechting moeten verbeteren." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Bij het printen van de eerste laag van het raftoppervlak: gebruik deze offset om de hechting tussen de interface en het oppervlak aan te passen. Een negatieve offset zou de hechting moeten verbeteren." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Z-naad op vertex" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Voeg extra lijnen toe aan het invulpatroon om de skins erboven te ondersteunen. Deze optie voorkomt gaten of plastic klodders die soms te zien zijn in complex gevormde skins doordat de invulling eronder de skinlaag die erboven wordt geprint niet correct ondersteunt. 'Wanden' ondersteunt alleen de contouren van de skin, terwijl 'Wanden en lijnen' ook de uiteinden van de lijnen ondersteunt die de skin vormen." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Constructieventilatorsnelheid op hoogte" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Nozzlelengte" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Constructieventilatorsnelheid op laag" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "Het hoogteverschil tussen de punt van de nozzle en het laagste deel van de printkop." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Ventilatornummer constructievolume " - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Bepaalt de lengte van elke stap in de stroomverandering bij het extruderen langs de schuine naad. Een kleinere afstand resulteert in een nauwkeurigere maar ook complexere G-code." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Bepaalt de lengte van de schuine naad, een naadtype dat de Z-naad minder zichtbaar moet maken. Moet hoger zijn dan 0 om effectief te zijn." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Duur van elke stap in de geleidelijke stroomverandering" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Geleidelijke stroomwijzigingen inschakelen. Als deze optie is ingeschakeld, wordt de stroom geleidelijk verhoogd/verlaagd tot de doelstroom. Dit is handig voor printers met een bowdenbuis waarbij de stroom niet onmiddellijk verandert wanneer de extrudermotor start/stopt." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Extra invullijnen ter ondersteuning van skins" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Voor elke af te leggen afstand die langer is dan deze waarde, wordt de materiaalstroom opnieuw ingesteld op de doelstroom van de paden." - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Stapgrootte geleidelijke stroomdiscretisatie" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Geleidelijke stroom ingeschakeld" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Maximale versnelling voor geleidelijke stroom" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Maximale stroomversnelling eerste laag" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Maximale versnelling voor geleidelijke stroomveranderingen" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Minimumsnelheid voor geleidelijke stroomveranderingen voor de eerste laag" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Geen" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Buitenwandversnelling" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Buitenwandvertraging" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Snelheidsverhouding buitenwand" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Snelheid splitafstand buitenwand" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Startsnelheidsverhouding buitenwand" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Stroomduur opnieuw instellen" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Lengte schuine naad" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Starthoogte schuine naad" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Staplengte schuine naad" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "De hoogte waarop de ventilatoren op normale ventilatorsnelheid draaien. Op de lagen hieronder neemt de ventilatorsnelheid geleidelijk toe van de initiële ventilatorsnelheid naar de normale ventilatorsnelheid." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "De laag waarbij de bouwventilatoren op volle ventilatorsnelheid draaien. Deze waarde wordt berekend en afgerond op een heel getal." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Het nummer van de ventilator die het constructievolume koelt. Als dit is ingesteld op 0, betekent dit dat er geen constructievolumeventilator is." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "De verhouding van de geselecteerde laaghoogte waarop de schuine naad zal beginnen. Een lager getal resulteert in een grotere naadhoogte. Moet lager zijn dan 100 om effectief te zijn." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Dit is de versnelling waarmee men de topsnelheid bereikt als men een buitenwand afdrukt." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Dit is de vertraging waarmee men het afdrukken van een buitenwand beëindigt." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Dit is de maximale lengte van een extrusiepad bij het splitsen van een langer pad om de versnelling/vertraging van de buitenwand toe te passen. Een kleinere afstand zorgt voor een preciezere maar ook uitgebreide G-code." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Dit is de verhouding van de topsnelheid om mee te eindigen bij het printen van een buitenwand." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Dit is de verhouding van de topsnelheid om mee te beginnen bij het printen van een buitenwand." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Alleen wanden" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Wanden en lijnen" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Wanden die meer oversteken dan deze hoek worden afgedrukt met behulp van de instellingen voor overhangende wanden. Als de waarde 90 is, worden er geen wanden behandeld als overhangend. Overhangen die ondersteund worden door ondersteuning worden ook niet behandeld als overhang. Daarnaast wordt elke lijn die voor minder dan de helft overhangt ook niet behandeld als overhang." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Wanden die overhangen in een hoek groter dan deze waarde, worden geprint met instellingen voor overhangende wanden. Wanneer de waarde 90 is, wordt een wand niet als een overhangende wand gezien. Een overhang die wordt ondersteund door ondersteuning wordt ook niet als overhang gezien." diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index 34411eb80cd..fb74d0a8635 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2019-11-15 15:34+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -1048,6 +1048,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Ilość dodatkowego materiału do podania po zmianie dyszy." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Pozycja X Czyszczenia Dyszy" @@ -1060,6 +1064,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Pozycja Z Czyszczenia Dyszy" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "" @@ -1416,6 +1424,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Posiada Podgrzewany Stół" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Prędkość nagrzewania" @@ -1456,6 +1468,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Jak bardzo filament może być rozciągnięty, zanim pęknie, podczas ogrzewania." @@ -1884,6 +1904,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "" +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Zachowaj Rozłączone Powierzchnie" @@ -2478,14 +2518,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Kąt dyszy" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Średnica dyszy" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Niedozwolone Obszary Dyszy" @@ -2494,6 +2546,10 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ID Dyszy" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Rozmiar dyszy" + msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" msgstr "Dodatkowa ekstruzja po zmianie dyszy" @@ -2514,6 +2570,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Prędk. Retrakcji przy Zmianie Dyszy" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Liczba Ekstruderów" @@ -2802,6 +2866,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Przyspieszenie Druku" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Zryw Druku" @@ -2830,6 +2902,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Wydrukuj wieżę obok wydruku, która służy do zmiany materiału po każdym przełączeniu dyszy." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Drukuj wypełnienie tylko w miejscach, w których górna część modelu powinna być podparta strukturą wewnętrzną. Załączenie tej funkcji skutkuje redukcją czasu druku, ale prowadzi do niejednolitej wytrzymałości obiektu." @@ -2878,6 +2954,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "" +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura Druku" @@ -3910,6 +3990,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Przełącz się, to której przecinającej się siatki będą należały z każdą warstwą, tak że nakładające się siatki przeplatają się. Wyłączenie tej opcji spowoduje, że jedna siatka uzyska całą objętość podczas nakładania się, kiedy jest usunięta z pozostałych siatek." @@ -5262,6 +5350,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "" +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Górne warstwy" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 11d6d8ffb6e..f52216283da 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.7\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2024-10-29 03:52+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" @@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Material extra a avançar depois da troca de bico." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Posição X da Purga do Extrusor" @@ -1061,6 +1065,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posição Z de Purga do Extrusor" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extrusores Compartilham Aquecedor" @@ -1417,6 +1425,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Tem Mesa Aquecida" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocidade de Aquecimento" @@ -1457,6 +1469,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Compensação de Fator de Encolhimento Horizontal" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Quanto o filamento pode ser esticado antes que quebre, quando aquecido." @@ -1885,6 +1905,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Flutuar movimento apenas nos contornos e não nos furos das peças." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Manter Faces Desconectadas" @@ -2481,14 +2521,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Não na Superfície Externa" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Ângulo do Bico" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diâmetro do bico" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Áreas Proibidas para o Bico" @@ -2497,6 +2549,10 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ID do Bico" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Tamanho do bico" + msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" msgstr "Quantidade de Avanço Extra da Troca de Bico" @@ -2517,6 +2573,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocidade de Retração da Troca do Bico" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Número de extrusores" @@ -2805,6 +2869,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Aceleração da Impressão" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk da Impressão" @@ -2833,6 +2905,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimir uma torre próxima à impressão que serve para purgar o material a cada troca de bico." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprime estruturas de preenchimento somente onde os tetos do modelo devam ser suportados. Habilitar este ajuste reduz tempo de impressão e uso de material, mas leva a resistências não-uniformes no objeto." @@ -2881,6 +2957,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprime filetes superiores e inferiores em uma ordem que os faz sempre se sobreporem a filetes adjacentes em uma única direção. Faz levar um pouco mais de tempo na impressão, mas torna superfícies planas mais consistentes." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura de Impressão" @@ -3913,6 +3993,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Troca a ordem de impressão do filete de brim mais interno e o segundo mais interno. Isto melhora a remoção do brim." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Troca quais volumes sobrepondo malhas vão pertencer a cada camada, de modo que as malhas sobrepostas se tornem entrelaçadas. Desligar esta opção vai fazer com que uma das malhas obtenha todo o volume da sobreposiçào, removendo este volume das outras malhas." @@ -5265,6 +5353,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Para compensar o encolhimento do material enquanto esfria, o modelo será redimensionado por este fator." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Camadas Superiores" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index d46ee53e189..3f813441ce8 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Como gerar a torre principal:
    • Normal: criar um balde no qual os materiais secundários são preparados
    • Intercalado: criar uma torre de preparação o mais esparsa possível. Assim, irá poupar-se tempo e filamento, mas tal apenas será possível se os materiais aderirem uns aos outros
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Se as ventoinhas de arrefecimento serão ativadas durante uma mudança de bocal. Isto pode ajudar a reduzir o escorrimento, ao arrefecer o bocal mais rapidamente:
    • Sem alterações: manter as ventoinhas como estavam anteriormente
    • Apenas a última extrusora: liga a ventoinha da última extrusora utilizada, desliga as outras (se existirem). É útil se houverem extrusoras completamente separadas.
    • Todas as ventoinhas: liga todas as ventoinhas durante a mudança de bocal. É útil se houver uma única ventoinha de arrefecimento, ou várias ventoinhas próximas umas das outras.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Uma borda ao redor de um modelo poderá tocar noutro modelo num ponto onde o utilizador não quer que tal aconteça. Esta ação remove toda a borda neste espaço entre modelos sem borda. " @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Camadas Adaptáveis calcula as espessuras das camadas conforme a forma do modelo." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Adicione linhas extra ao padrão de preenchimento para suportar as películas superiores. Esta opção previne o surgimento de buracos ou bolhas de plástico que por vezes surgem em películas de forma complexa devido ao facto de o preenchimento inferior não suportar corretamente a camada da película a ser impressa acima. A opção \"Paredes\" suporta apenas os contornos da película, ao passo que a opção \"Paredes e Linhas\" também suporta as extremidades das linhas que compôem a película." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Adicionar paredes adicionais em torno da área de enchimento. Essas paredes podem fazer com que as linhas de revestimento superiores/inferiores desçam menos, o que significa que são necessárias menos camadas de revestimento superior/inferior para a mesma qualidade à custa de algum material adicional." -"Esta funcionalidade pode ser combinada com a opção Ligar polígonos de enchimento para unir todo o enchimento num único caminho de extrusão sem necessidade de deslocações ou retrações, se configurado corretamente." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Adicionar paredes adicionais em torno da área de enchimento. Essas paredes podem fazer com que as linhas de revestimento superiores/inferiores desçam menos, o que significa que são necessárias menos camadas de revestimento superior/inferior para a mesma qualidade à custa de algum material adicional.Esta funcionalidade pode ser combinada com a opção Ligar polígonos de enchimento para unir todo o enchimento num único caminho de extrusão sem necessidade de deslocações ou retrações, se configurado corretamente." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Simultaneamente" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Todas as ventoinhas" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Todas as definições que influenciam a resolução da impressão. Estas definições têm um grande impacto na qualidade. (e no tempo de impressão)." @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Largura da Aba" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Velocidade da ventoinha de montagem em altura" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Velocidade da ventoinha de montagem em camada" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Aderência" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Aviso de temperatura do volume de construção" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Número da ventoinha de volume de montagem" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Ao ativar esta configuração, sua torre de primagem terá uma aba, mesmo que o modelo não tenha. Se você deseja uma base mais robusta para uma torre alta, pode aumentar a altura da base." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Arrefecimento" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Arrefecimento durante a troca de extrusora" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Cruz" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Detetar vãos (bridges) e modificar as definições da velocidade de impressão, do fluxo e da ventoinha durante a impressão de vãos ou saliências." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Determina o comprimento de cada etapa na variação de fluxo ao expelir ao longo da costura do encaixe. Uma menor distância irá resultar num código G mais preciso mas também mais complexo." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Determina o comprimento da costura do encaixe, um tipo de costura que deverá tornar a costura Z menos visível. Deve ser superior a 0 de modo a ser eficaz." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Determina a ordem pela qual as paredes são impressas. Imprimir paredes externas antecipadamente ajuda em termos de precisão dimensional, uma vez que as falhas de paredes internas não se podem propagar para o exterior. No entanto, imprimi-las mais tarde permite empilhá-las melhor quando são impressas saliências. Quando há uma quantidade desigual de paredes internas totais, a \"última linha central\" é sempre impressa em último lugar." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Dupla Extrusão" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Duração de cada etapa da mudança gradual de fluxo" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Elíptica" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Ativa a proteção exterior contra escorrimentos. Isto irá criar um invólucro em torno do modelo que deverá limpar um segundo nozzle, caso este se encontre à mesma altura que o primeiro nozzle." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Ativar alterações graduais de fluxo. Quando ativado, o fluxo é gradualmente aumentado/diminuído para o fluxo alvo. Isto é útil para impressoras com um tubo bowden em que o fluxo não é imediatamente alterado quando o motor da extrusora arranca/para." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Permitir comunicação do processo de impressão para definir valores limite para possível deteção de falhas." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "A costura extensiva tenta coser buracos abertos na malha, ao fechá-los com os polígonos adjacentes. Esta opção pode acrescentar bastante tempo de processamento." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Linhas de preenchimento extra para suportar as películas" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Contagem de paredes de enchimento adicionais" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Material extra a preparar após a substituição do nozzle." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Posição X Preparação Extrusor" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posição Z para Preparação Extrusor" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extrusoras Partilham Aquecedor" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Velocidade da purga da descarga" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Para qualquer deslocação superior a este valor, o fluxo de material é reposto no fluxo teórico das vias" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Para estruturas finas de cerca de uma ou duas vezes o tamanho do bocal, os diâmetros da linha têm de ser alterados para aderir à espessura do modelo. Esta definição controla o diâmetro mínimo da linha permitido para as paredes. Os diâmetros mínimos de linha determinam também os diâmetros máximos de linha, uma vez que fazemos a transição de paredes N para N+1 com uma determinada espessura da geometria em que as paredes N são largas e as paredes N+1 são estreitas. A linha de parede mais larga possível é o dobro do diâmetro mínimo de linha da parede." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Variante do G-code" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "Comandos G-code a serem executados no fim – separados por " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "Comandos G-code a serem executados no fim – separados por ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "Comandos G-code a serem executados no início – separados por " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "Comandos G-code a serem executados no início – separados por ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Enchimento Gradual Suporte" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Tamanho do passo de discretização do fluxo gradual" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Fluxo gradual ativado" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Aceleração máxima do fluxo gradual" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Reduz gradualmente para esta temperatura ao imprimir a velocidades reduzidas devido ao tempo mínimo da camada." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Tem Base de Construção Aquecida" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocidade de aquecimento" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Compensação de contração do fator de dimensionamento horizontal" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "A distância a que o filamento pode ser esticado antes de se separar, enquanto é aquecido." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Temperatura de impressão inicial" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Aceleração do fluxo máximo da camada inicial" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Aceleração da parede interior" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Vibrar apenas os contornos das peças e não os buracos das peças." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Manter Faces Soltas" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Definir como absoluta, a posição para a preparação do extrusor, em vez de relativa à última posição conhecida da cabeça." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Faça com que a primeira e segunda camadas do modelo se sobreponham na direção Z para compensar a perda de filamento na caixa de ar. Todos os modelos acima da primeira camada do modelo serão deslocadas para baixo segundo este valor." -"Note-se que, por vezes, a segunda camada é imprimida por baixo da camada inicial por causa desta configuração. Este comportamento é intencional." +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Faça com que a primeira e segunda camadas do modelo se sobreponham na direção Z para compensar a perda de filamento na caixa de ar. Todos os modelos acima da primeira camada do modelo serão deslocadas para baixo segundo este valor.Note-se que, por vezes, a segunda camada é imprimida por baixo da camada inicial por causa desta configuração. Este comportamento é intencional." msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Gere a relação espacial entre a junta z da estrutura de suporte e o modelo 3D real. Este controlo é crucial, uma vez que assegura aos utilizadores a remoção sem problemas das estruturas de suporte após a impressão, sem causar danos ou deixar marcas no modelo impresso." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Resolução Máxima Deslocação" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Aceleração máxima para mudanças graduais de fluxo" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "A aceleração máxima do motor da direção X" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Centro" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Distância mínima entre a junta Z e o modelo" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Largura mínima do molde" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Tamanho mínimo da área para os tetos do suporte. Os polígonos com uma área inferior a este valor serão impressos como suporte normal." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Velocidade mínima para mudanças graduais de fluxo para a primeira camada" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Espessura mínima dos elementos finos. Os elementos do modelo mais finos do que este valor não serão impressos, enquanto que os elementos mais espessos do que o Tamanho mínimo do elemento serão alargados para o Diâmetro mínimo de linha da parede." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Varias linhas de contorno ajudam a preparar melhor a extrusão para modelos pequenos. Definir este valor como 0 desactiva o contorno." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Multiplicador para o enchimento nas camadas iniciais do suporte. Aumentá-lo pode ajudar a adesão ao leito." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Multiplicador do diâmetro da linha da camada inicial. Aumentar o diâmetro poderá melhorar a aderência à base de construção." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Nenhum" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Nenhuma" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Nenhum" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Não na Superfície Exterior" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Ângulo do nozzle" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diâmetro do Nozzle" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Áreas não permitidas ao nozzle" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "ID do Nozzle" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Comprimento do nozzle" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Tamanho do nozzle" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocidade de retração de substituição do nozzle" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Número de Extrusores" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "Individualmente" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Apenas a última extrusora" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Efetua um salto Z apenas ao deslocar-se sobre as peças impressas que não podem ser evitadas pelo movimento horizontal através da opção Evitar Peças impressas durante a deslocação." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Aceleração da parede exterior" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Aceleração da parede externa" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Desaceleração da parede externa" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Taxa de velocidade da extremidade da parede externa" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Extrusor Parede Exterior" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Velocidade Parede Exterior" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Distância de separação de velocidade da parede externa" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Taxa de velocidade de início da parede externa" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Distância Limpeza Parede Exterior" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Percentagem da velocidade da ventoinha a ser utilizada ao imprimir a terceira camada do revestimento de Bridge." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Posicione a junta z no vértice de um polígono. Desativar esta opção também pode posicionar a junta entre vértices. (Tenha em mente que isto não anula as restrições sobre o posicionamento da junta numa saliência não suportada)." + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Os polígonos em camadas seccionadas que apresentem uma circunferência mais pequena do que este valor serão filtrados. Valores mais reduzidos originam malhas de resolução superior à custa do tempo de seccionamento. Destina-se principalmente a impressoras SLA de alta resolução e a modelos 3D muito pequenos com muitos detalhes." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Distância transitória máxima da torre de preparação" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Espessura mínima da carcaça da torre principal" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Volume mínimo da torre de preparação" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Aceleração de impressão" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk da Impressão" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprime uma torre próxima da impressão que prepara o material depois de cada substituição do nozzle." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprimir as estruturas de enchimento só onde os revestimentos superiores necessitam de suporte. Activar esta definição reduz o tempo de impressão e material usado, mas faz com que a peça não tenha uma resistência uniforme." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprimir as linhas superiores/inferiores numa ordem que faz com que ocorra sempre uma sobreposição com as linhas adjacentes numa única direção. Este processo demora ligeiramente mais tempo a imprimir, mas torna o aspeto das superfícies planas mais consistente." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura de Impressão" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Velocidade do ventilador inferior do raft" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Fluxo de base da jangada" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Sobreposição de enchimento na base de jangada " + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Percentagem de sobreposição do enchimento na base da jangada" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Espaçamento da Linha Base do Raft" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Velocidade do ventilador do raft" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Fluxo da jangada" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Fluxo da interface da jangada" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Sobreposição do enchimento na interface da jangada " + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Percentagem de sobreposição do enchimento na interface da jangada " + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Desvio Z da interface da jangada" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Margem extra do centro da plataforma" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Suavização Raft" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Fluxo de superfície da jangada" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Sobreposição do enchimento na superfície da jangada " + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Percentagem de sobreposição do enchimento da superfície da jangada" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Desvio Z da superfície da jangada" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Margem extra do topo da plataforma" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Eventos de comunicação que ultrapassam os limites definidos" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Redefinir a duração do fluxo" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Preferência de Apoio" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Compensação de redução do fator de escala" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Comprimento da costura do encaixe" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Altura de início da costura do encaixe" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Comprimento da etapa de costura do encaixe" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "O cenário tem malhas de suporte" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Preferência Canto Junta" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Ângulo da parede saliente da junta" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Definir sequência de impressão manualmente" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Aceleração de enchimento do suporte" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Camada inicial do multiplicador de densidade do enchimento de suporte" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Extrusor de enchimento do suporte" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Distância Z de suporte" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Apoiar a junta Z longe do modelo" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Tipo de linhas de suporte preferidas" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Trocar a ordem de impressão da linha mais interior e da segunda linha mais interior da aba. Isto permite facilitar a remoção da aba." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Altera para os volumes de interceção de malha que pertencerão a cada camada, para que as malhas sobrepostas fiquem entrelaçadas. Desativar esta definição poderá fazer com que uma das malhas obtenha todo o volume na sobreposição, sendo removido das outras malhas." @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "A aceleração com que os movimentos de deslocação são efetuados." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "A quantidade de material, em relação a uma linha de revestimento normal, a ser extrudido durante o processo de engomar. Manter o nozzle cheio ajuda a preencher algumas das fissuras da superfície superior, mas cheio de mais, provoca sobre-extrusão e pequenos pontos ou \"bolhas\" na parte lateral da superfície." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da base da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A percentagem de sobreposição entre o enchimento e as paredes. Uma ligeira sobreposição permite que as paredes sejam ligadas firmemente ao enchimento." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da interface da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da superfície da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "A quantidade de material, em relação a uma linha de revestimento normal, a ser extrudido durante o processo de engomar. Manter o nozzle cheio ajuda a preencher algumas das fissuras da superfície superior, mas cheio de mais, provoca sobre-extrusão e pequenos pontos ou \"bolhas\" na parte lateral da superfície." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A percentagem de sobreposição entre o enchimento e as paredes. Uma ligeira sobreposição permite que as paredes sejam ligadas firmemente ao enchimento." + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A quantidade de sobreposição entre o enchimento e as paredes da base da jangada, como percentagem da largura da linha de enchimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A quantidade de sobreposição entre o enchimento e as paredes da base da jangada. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A quantidade de sobreposição entre o enchimento e as paredes da interface da jangada, em percentagem da largura da linha de enchimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A quantidade de sobreposição entre o enchimento e as paredes da interface da jangada. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A quantidade de sobreposição entre o enchimento e as paredes da superfície da jangada, como percentagem da largura da linha de enchimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "A quantidade de sobreposição entre o enchimento e as paredes da superfície da jangada. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "A distância entre as linhas de engomar." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "A distância entre o modelo e a sua estrutura de suporte na junta do eixo z." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "A distância entre o nozzle e as peças já impressas ao evitá-las durante os movimentos de deslocação." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "A altura acima das partes horizontais do modelo em que deve imprimir o molde." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "A altura a que as ventoinhas giram a uma velocidade normal. Nas camadas inferiores, a velocidade da ventoinha aumenta gradualmente, desde a Velocidade de Ventoinha Inicial a Velocidade de Ventoinha Normal." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "A altura em que os ventiladores giram à velocidade normal. Nas camadas anteriores, a velocidade do ventilador aumenta gradualmente da Velocidade Inicial até à Velocidade Normal do ventilador." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "A diferença de altura entre a ponta do nozzle e o sistema de pórtico (eixos X e Y)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "A diferença de altura entre a ponta do nozzle e o extremo inferior da cabeça de impressão." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "A diferença de altura ao efetuar um salto Z após uma mudança do extrusor." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "A distância horizontal entre a primeira linha da aba e o contorno da primeira camada da impressão. Uma pequena folga pode tornar a aba mais fácil de remover, e, ao mesmo tempo, proporcionar as vantagens térmicas." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "A distância horizontal entre o contorno e o perímetro exterior da primeira camada da impressão." -"Esta é a distância mínima. Linhas múltiplas de contorno serão impressas para o exterior." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "A distância horizontal entre o contorno e o perímetro exterior da primeira camada da impressão.Esta é a distância mínima. Linhas múltiplas de contorno serão impressas para o exterior." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "A largura máxima das áreas do revestimento superior a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento superior nas superfícies inclinadas do modelo." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "A camada em que as ventoinhas de montagem giram a uma velocidade de ventoinha total. Este valor é calculado e arredondado para um número inteiro." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "A camada na qual os ventiladores giram à velocidade normal do ventilador. Se a Altura para Velocidade Normal do ventilador estiver definida , este valor é calculado e arredondado para um número inteiro." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "O declive mínimo da área para o efeito de degrau de escada. Valores baixos fazem com que seja mais fácil remover o suporte em declives com pouca profundidade, mas valores muito baixos podem proporcionar resultados verdadeiramente contraintuitivos noutras partes do modelo." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "A espessura mínima da carcaça da torre principal. Pode aumentá-la para tornar a torre principal mais forte." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "O tempo mínimo gasto numa camada. Isto força a impressora a abrandar para que, no mínimo, o tempo aqui definido seja gasto numa camada. Isto permite que o material impresso arrefeça devidamente antes de imprimir a camada seguinte. Ainda assim, as camadas podem demorar menos do que o tempo mínimo por camada se a opção Elevar Cabeça estiver desativada e se a Velocidade Mínima for desrespeitada." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "O número de linhas utilizado para a aba do suporte. Uma aba com mais linhas melhora a aderência à base de construção à custa de algum material adicional." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "O número da ventoinha que arrefece o volume de montagem. Se este número estiver programado para 0, tal significa que não existe ventoinha de volume de montagem." + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "O número de camadas superiores impressas em cima da camada do meio do raft. Estas são as camadas, totalmente preenchidas, onde o modelo assenta. Duas camadas resultam numa superfície superior mais uniforme do que só uma camada." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "A mudança de velocidade instantânea máxima de impressão para a camada inicial." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "A taxa de altura da camada selecionada a que terá início a costura do enciaxe. Um número mais baixo irá resultar numa maior altura de costura. Deve ser inferior a 100 para ser eficaz. " + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "A forma da base de construção sem ter em consideração as áreas onde não é possível imprimir." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Isto controla a distância que o extrusor deve desacelerar imediatamente antes do início de uma parede de Bridge. Desacelerar antes do início de Bridge pode reduzir a pressão no nozzle e poderá produzir um vão mais liso." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Trata-se da aceleração com que se poderá alcançar a velocidade máxima ao imprimir uma parede externa." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Trata-se da desaceleração com que se poderá concluir a impressão da parede externa." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Trata-se do comprimento máximo de uma direção de extrusão ao dividir uma trajetória mais longa para aplicar a aceleração/desaceleração da parede externa. Uma distância menor irá criar um código G mais preciso, mas também mais verboso." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Trata-se da taxa de velocidade máxima de conclusão de impressão de uma parede externa." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Trata-se da taxa de velocidade máxima de início de impressão de uma parede externa." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Esta configuração controla o quanto os ângulos internos no contorno da base da plataforma são arredondados. Os ângulos internos são arredondados até formar um semi-círculo com um raio igual ao valor apresentado aqui. Esta configuração também remove buracos no contorno da plataforma mais pequenos do que tal círculo." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Para compensar a redução do material quando arrefece, o modelo vai ser dimensionado com este fator." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Camadas Superiores" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Diâmetro do Tronco" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Tente evitar juntas em paredes que estejam mais salientes do que este ângulo. Quando o valor é 90, nenhuma parede será tratada como saliente." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Sem alterações" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Unir Volumes Sobrepostos" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Paredes" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Apenas paredes" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Paredes e linhas" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "As paredes com saliências que ultrapassem este ângulo serão impressas utilizando definições de parede de saliências. Quando o valor é 90, nenhuma parede é considerada como sendo uma saliência. As saliências suportadas por suporte também não serão consideradas como saliências." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "As paredes com um excedente que ultrapassa este ângulo serão impressas utilizando as definições de parede excendente. Quando o valor é igual a 90, nenhuma parede será tratada como excedente. O excedente suportado pelo suporte também não será tratado como excedente. Adicionalmente, qualquer linha que seja inferior à metade excedente também não será tratada como excedente." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Ao imprimir as paredes de Bridge, a quantidade de material extrudido é multiplicada por este valor." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Ao imprimir a primeira camada da interface da jangada, traduza por este desvio para personalizar a adesão entre a base e a interface. Um desvio negativo deve melhorar a aderência." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Ao imprimir a primeira camada da superfície da jangada, traduza por este desvio para personalizar a aderência entre a interface e a superfície. Um desvio negativo deverá melhorar a aderência." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Ao imprimir a segunda camada do revestimento de Bridge, a quantidade de material extrudido é multiplicada por este valor." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Alinhamento da Junta-Z" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Junta Z no vértice" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Posição da Junta-Z" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "deslocação" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Se as ventoinhas de arrefecimento serão ativadas durante uma mudança de bocal. Isto pode ajudar a reduzir o escorrimento, ao arrefecer o bocal mais rapidamente:
    • Sem alterações: manter as ventoinhas como estavam anteriormente
    • Apenas a última extrusora: liga a ventoinha da última extrusora utilizada, desliga as outras (se existirem). É útil se houverem extrusoras completamente separadas.
    • Todas as ventoinhas: liga todas as ventoinhas durante a mudança de bocal. É útil se houver uma única ventoinha de arrefecimento, ou várias ventoinhas próximas umas das outras.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Todas as ventoinhas" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Arrefecimento durante a troca de extrusora" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Gere a relação espacial entre a junta z da estrutura de suporte e o modelo 3D real. Este controlo é crucial, uma vez que assegura aos utilizadores a remoção sem problemas das estruturas de suporte após a impressão, sem causar danos ou deixar marcas no modelo impresso." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Distância mínima entre a junta Z e o modelo" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Multiplicador para o enchimento nas camadas iniciais do suporte. Aumentá-lo pode ajudar a adesão ao leito." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Apenas a última extrusora" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Posicione a junta z no vértice de um polígono. Desativar esta opção também pode posicionar a junta entre vértices. (Tenha em mente que isto não anula as restrições sobre o posicionamento da junta numa saliência não suportada)." - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Espessura mínima da carcaça da torre principal" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Fluxo de base da jangada" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Sobreposição de enchimento na base de jangada " - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Percentagem de sobreposição do enchimento na base da jangada" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Fluxo da jangada" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Fluxo da interface da jangada" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Sobreposição do enchimento na interface da jangada " - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Percentagem de sobreposição do enchimento na interface da jangada " - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Desvio Z da interface da jangada" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Fluxo de superfície da jangada" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Sobreposição do enchimento na superfície da jangada " - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Percentagem de sobreposição do enchimento da superfície da jangada" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Desvio Z da superfície da jangada" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Ângulo da parede saliente da junta" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Camada inicial do multiplicador de densidade do enchimento de suporte" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Apoiar a junta Z longe do modelo" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da base da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da interface da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "A quantidade de material, relativamente a uma linha de extrusão normal, a extrudir durante a impressão da superfície da jangada. O aumento do fluxo pode melhorar a aderência e a resistência estrutural da jangada." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A quantidade de sobreposição entre o enchimento e as paredes da base da jangada, como percentagem da largura da linha de enchimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A quantidade de sobreposição entre o enchimento e as paredes da base da jangada. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A quantidade de sobreposição entre o enchimento e as paredes da interface da jangada, em percentagem da largura da linha de enchimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A quantidade de sobreposição entre o enchimento e as paredes da interface da jangada. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A quantidade de sobreposição entre o enchimento e as paredes da superfície da jangada, como percentagem da largura da linha de enchimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "A quantidade de sobreposição entre o enchimento e as paredes da superfície da jangada. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao enchimento." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "A distância entre o modelo e a sua estrutura de suporte na junta do eixo z." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "A espessura mínima da carcaça da torre principal. Pode aumentá-la para tornar a torre principal mais forte." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Tente evitar juntas em paredes que estejam mais salientes do que este ângulo. Quando o valor é 90, nenhuma parede será tratada como saliente." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Sem alterações" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Ao imprimir a primeira camada da interface da jangada, traduza por este desvio para personalizar a adesão entre a base e a interface. Um desvio negativo deve melhorar a aderência." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Ao imprimir a primeira camada da superfície da jangada, traduza por este desvio para personalizar a aderência entre a interface e a superfície. Um desvio negativo deverá melhorar a aderência." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Junta Z no vértice" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Adicione linhas extra ao padrão de preenchimento para suportar as películas superiores. Esta opção previne o surgimento de buracos ou bolhas de plástico que por vezes surgem em películas de forma complexa devido ao facto de o preenchimento inferior não suportar corretamente a camada da película a ser impressa acima. A opção \"Paredes\" suporta apenas os contornos da película, ao passo que a opção \"Paredes e Linhas\" também suporta as extremidades das linhas que compôem a película." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Velocidade da ventoinha de montagem em altura" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Comprimento do nozzle" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Velocidade da ventoinha de montagem em camada" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "A diferença de altura entre a ponta do nozzle e o extremo inferior da cabeça de impressão." -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Número da ventoinha de volume de montagem" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Determina o comprimento de cada etapa na variação de fluxo ao expelir ao longo da costura do encaixe. Uma menor distância irá resultar num código G mais preciso mas também mais complexo." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Determina o comprimento da costura do encaixe, um tipo de costura que deverá tornar a costura Z menos visível. Deve ser superior a 0 de modo a ser eficaz." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Duração de cada etapa da mudança gradual de fluxo" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Ativar alterações graduais de fluxo. Quando ativado, o fluxo é gradualmente aumentado/diminuído para o fluxo alvo. Isto é útil para impressoras com um tubo bowden em que o fluxo não é imediatamente alterado quando o motor da extrusora arranca/para." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Linhas de preenchimento extra para suportar as películas" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Para qualquer deslocação superior a este valor, o fluxo de material é reposto no fluxo teórico das vias" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Tamanho do passo de discretização do fluxo gradual" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Fluxo gradual ativado" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Aceleração máxima do fluxo gradual" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Aceleração do fluxo máximo da camada inicial" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Aceleração máxima para mudanças graduais de fluxo" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Velocidade mínima para mudanças graduais de fluxo para a primeira camada" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Nenhuma" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Aceleração da parede externa" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Desaceleração da parede externa" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Taxa de velocidade da extremidade da parede externa" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Distância de separação de velocidade da parede externa" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Taxa de velocidade de início da parede externa" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Redefinir a duração do fluxo" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Comprimento da costura do encaixe" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Altura de início da costura do encaixe" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Comprimento da etapa de costura do encaixe" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "A altura a que as ventoinhas giram a uma velocidade normal. Nas camadas inferiores, a velocidade da ventoinha aumenta gradualmente, desde a Velocidade de Ventoinha Inicial a Velocidade de Ventoinha Normal." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "A camada em que as ventoinhas de montagem giram a uma velocidade de ventoinha total. Este valor é calculado e arredondado para um número inteiro." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "O número da ventoinha que arrefece o volume de montagem. Se este número estiver programado para 0, tal significa que não existe ventoinha de volume de montagem." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "A taxa de altura da camada selecionada a que terá início a costura do enciaxe. Um número mais baixo irá resultar numa maior altura de costura. Deve ser inferior a 100 para ser eficaz. " - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Trata-se da aceleração com que se poderá alcançar a velocidade máxima ao imprimir uma parede externa." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Trata-se da desaceleração com que se poderá concluir a impressão da parede externa." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Trata-se do comprimento máximo de uma direção de extrusão ao dividir uma trajetória mais longa para aplicar a aceleração/desaceleração da parede externa. Uma distância menor irá criar um código G mais preciso, mas também mais verboso." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Trata-se da taxa de velocidade máxima de conclusão de impressão de uma parede externa." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Trata-se da taxa de velocidade máxima de início de impressão de uma parede externa." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Apenas paredes" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Paredes e linhas" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "As paredes com um excedente que ultrapassa este ângulo serão impressas utilizando as definições de parede excendente. Quando o valor é igual a 90, nenhuma parede será tratada como excedente. O excedente suportado pelo suporte também não será tratado como excedente. Adicionalmente, qualquer linha que seja inferior à metade excedente também não será tratada como excedente." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "As paredes com saliências que ultrapassem este ângulo serão impressas utilizando definições de parede de saliências. Quando o valor é 90, nenhuma parede é considerada como sendo uma saliência. As saliências suportadas por suporte também não serão consideradas como saliências." diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index d748d9401ba..88f3ebae8d4 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Как создать основную башню:
    • Нормально: создайте корзину, в которую будут загружены вторичные материалы
    • С чередованием: создайте как можно более редкую основную башню. Это сэкономит время и нить, но это возможно только в том случае, если используемые материалы прилипают друг к другу
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Следует ли включать охлаждающие вентиляторы при переключении сопел. Это может помочь уменьшить просачивание за счет более быстрого охлаждения сопла:
    • Без изменений: оставить вентиляторы в прежнем режиме
    • Только последний экструдер: включить вентилятор последнего использованного экструдера, но выключить остальные (если они есть). Это полезно, если у вас полностью раздельные экструдеры.
    • Все вентиляторы: включить все вентиляторы во время переключения сопел. Это полезно, если у вас один охлаждающий вентилятор или несколько вентиляторов, расположенных близко друг к другу.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Кромка вокруг модели может касаться другой модели там, где это нежелательно. При этом у моделей без кромок удаляются все кромки на этом расстоянии." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "В случае адаптивных слоев расчет высоты слоя осуществляется в зависимости от формы модели." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Добавьте дополнительные линии в шаблон заполнения для поддержки оболочек выше. Эта опция предотвращает появление отверстий или капель пластика, которые иногда появляются в оболочках сложной формы из-за того, что заполнение внизу не поддерживает правильно слой оболочки, печатаемый выше. \"Стены\" поддерживают только контуры оболочки, тогда как \"стены и линии\" поддерживают также концы линий, которые образуют оболочку." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Добавление дополнительных стенок вокруг области заполнения. Эти стенки могут уменьшить провисание верхних/нижних линий оболочки, что уменьшает необходимое количество верхних/нижних слоев оболочки без ухудшения качества за счет небольшого увеличения количества материала." -"Эта функция может сочетаться с соединением полигонов заполнения для соединения всего участка заполнения в один путь экструзии без необходимости в движениях или откатах в случае правильной настройки." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Добавление дополнительных стенок вокруг области заполнения. Эти стенки могут уменьшить провисание верхних/нижних линий оболочки, что уменьшает необходимое количество верхних/нижних слоев оболочки без ухудшения качества за счет небольшого увеличения количества материала.Эта функция может сочетаться с соединением полигонов заполнения для соединения всего участка заполнения в один путь экструзии без необходимости в движениях или откатах в случае правильной настройки." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Все за раз" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Все вентиляторы" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Все параметры, которые влияют на разрешение печати. Эти параметры сильно влияют на качество (и время печати)" @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Ширина каймы" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Скорость вентилятора построения в высоту" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Скорость вентилятора построения на уровне" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Тип прилипания к столу" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Предупреждение о температуре объема сборки " +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Номер вентилятора объема построения" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Активируя эту настройку, ваша башня подготовки получит бортик, даже если модель его не требует. Если вам нужна более устойчивая основа для высокой башни, вы можете увеличить высоту основания." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Охлаждение" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Охлаждение при переключении экструдеров" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Крестовое" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Обнаружение мостиков и изменение скорости печати, настроек потока и вентилятора во время печати мостиков." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Определяет длину каждого шага изменения потока при экструзии вдоль косого шва. Меньшее расстояние приведет к более точному, но и более сложному G-коду." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Определяет длину косого шва, типа шва, который должен сделать шов Z менее заметным. Для эффективности должно быть больше 0." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Определяет порядок печати стенок. Если сначала печатать наружные стенки, это поможет более точно определять размеры стенок, поскольку дефекты внутренних стенок не смогут распространяться наружу. Если печатать внешние стенки позже, это позволит лучше укладывать их друг на друга при печати выступов. При неравномерном количестве общих внутренних стен «центральная последняя линия» всегда печатается последней." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "Два экструдера" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Продолжительность каждого шага изменения плавного потока" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Эллиптическая" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Разрешает печать внешней защиты от вытекших капель. Создаёт ограду вокруг модели, о которую вытирается материал, вытекший из второго сопла, если оно находится на той же высоте, что и первое сопло." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Включите изменения плавного потока. Если эта функция включена, поток постепенно увеличивается/уменьшается до целевого значения. Это полезно для принтеров с трубкой Боудена, где поток не меняется сразу при запуске/остановке двигателя экструдера." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Включите отчеты о процессе печати для установки пороговых значений для возможного обнаружения дефектов." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Обширное сшивание пытается сшить открытые отверстия в объекте, закрывая их полигонами. Эта опция может добавить дополнительное время во время обработки." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Дополнительные линии заполнения для поддержки оболочек" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Количество дополнительных стенок заполнения" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Дополнительный объем материала для заполнения после смены экструдера." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Начальная X позиция экструдера" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Z координата начала печати" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Общий нагреватель экструдеров" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Скорость выдавливания заподлицо" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Для любого перемещения, превышающего это значение, поток материала сбрасывается до целевого потока пути." + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Для тонких структур, шириной не более одного или двух размеров сопла, ширину линии необходимо изменить таким образом, чтобы она соответствовала толщине модели. Этот параметр задает минимальную допустимую ширину линии стенки. Минимальная ширина линии одновременно определяет максимальную ширину линии, поскольку выполняется переход от N к N+1 стенкам при некоторой геометрической толщине, где N стенок —— широкие, а N+1 стенок — узкие. Самая широкая возможная линия стенки в два раза превышает минимальную ширину линии стенки." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "Вариант G-кода" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "Команды в G-коде, которые будут выполнены в самом конце, разделенные с помощью " +msgid "" +"G-code commands to be executed at the very end - separated by \n" "." +msgstr "Команды в G-коде, которые будут выполнены в самом конце, разделенные с помощью ." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "Команды в G-коде, которые будут выполнены в самом начале, разделенные с помощью " +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "Команды в G-коде, которые будут выполнены в самом начале, разделенные с помощью ." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Степень заполнения поддержек" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Размер шага дискретизации плавного потока" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Плавный поток включен" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Максимальное ускорение плавного потока" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Постепенно снижать температуру до этой температуры при печати на пониженных скоростях из-за минимального времени нанесения слоя." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Имеет подогреваемый стол" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Скорость нагрева" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Горизонтальный коэффициент масштабирования для компенсации усадки" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Насколько сильно можно растянуть материал при нагревании, до тех пор пока он не отломится." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "Начальная температура печати" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "Максимальное ускорение потока начального слоя" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "Ускорение внутренней стенки" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Дрожание только контуров деталей, но не отверстий." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Сохранить отсоединённые поверхности" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Сделать стартовую позицию экструдера абсолютной, а не относительной от последней известной позиции головы." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Сделайте так, чтобы первый и второй слои модели перекрывались в направлении Z, чтобы компенсировать потерю нити в воздушном зазоре. Все модели выше первого слоя модели будут сдвинуты вниз на эту величину." -"Можно отметить, что иногда из-за этой настройки второй слой печатается ниже начального слоя. Это предполагаемое поведение" +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Сделайте так, чтобы первый и второй слои модели перекрывались в направлении Z, чтобы компенсировать потерю нити в воздушном зазоре. Все модели выше первого слоя модели будут сдвинуты вниз на эту величину.Можно отметить, что иногда из-за этой настройки второй слой печатается ниже начального слоя. Это предполагаемое поведение" msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Управляйте пространственным соотношением между Z-швом опорной конструкции и фактической 3D-моделью. Это управление крайне важно, поскольку позволяет пользователям обеспечить плавное удаление опорных конструкций после печати, не нанося повреждений и не оставляя следов на напечатанной модели." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Максимальное разрешение перемещения" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Максимальное ускорение для изменения плавного потока" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "Максимальное ускорение для мотора оси X" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Середина" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Минимальное расстояние Z-шва от модели" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Минимальная ширина формы" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Минимальная площадь зоны для верхних частей поддержек. Полигоны с площадью меньше данного значения будут печататься как поддержки нормали." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "Минимальная скорость изменения плавного потока для первого слоя" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "Минимальная толщина тонких элементов. Элементы модели, которые тоньше этого значения, не будут напечатаны, в то время как элементы с толщиной, превышающей минимальный размер элемента, будут расширены до минимальной ширины линии стенки." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Несколько линий юбки помогают лучше начать укладывание материала при печати небольших моделей. Установка этого параметра в 0 отключает печать юбки." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Коэффициент заполнения начальных слоев опоры. Увеличение этого показателя может способствовать повышению адгезии платформы." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "Множитель для ширины линии первого слоя. Увеличение значения улучшает прилипание к столу." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Нет" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Нет" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Нет" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Не на внешней поверхности" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Угол сопла" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Диаметр сопла" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Запрещённые зоны для сопла" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Идентификатор сопла" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Длина сопла" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Диаметр сопла" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Скорость отката при смене экструдера" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Количество экструдеров" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "По отдельности" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Только последний экструдер" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Выполнять поднятие оси Z только в случае движения над напечатанными частями, которые нельзя обогнуть горизонтальным движением, используя «Обход напечатанных деталей» при перемещении." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Ускорение внешней стенки" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Ускорение на внешних стенках" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Замедление на внешних станках" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Коэффициент скорости в конце внешней стенки" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Экструдер внешних стенок" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Скорость печати внешней стенки" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Интервал скорости на внешней стенке" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Коэффициент начальной скорости на внешней стенке" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Расстояние очистки внешней стенки" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Скорость вентилятора в процентах, с которой печатается слой третьей оболочки мостика." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Разместить Z-шов на вершине многоугольника. При отключении этого параметра шов также может располагаться между вершинами. (Имейте в виду, что это не отменяет ограничений на размещение шва на безопорном выступе.)" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Полигоны в разделенных слоях, длина окружности которых меньше указанной величины, будут отфильтрованы. Пониженные значения приводят к увеличению разрешения объекта за счет времени разделения. Это предназначено главным образом для принтеров SLA с высоким разрешением и миниатюрных 3D-моделей с множеством деталей." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Максимальное расстояние моста основной башни" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Минимальная толщина оболочки основной башни" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "Минимальный объём черновой башни" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Ускорение печати" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Рывок печати" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Печатает башню перед печатью модели, чем помогает выдавить старый материал после смены экструдера." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Печать заполненных структур только там, где должны поддерживаться верхние части моделей. Активация этой функции сокращает время печати и расход материалов, однако приводит к неравномерной прочности." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Печатайте линии дна/крышки в таком порядке, чтобы они всегда перекрывали соседние линии в одном направлении. На печать уходит немного больше времени, но плоские поверхности выглядят более единообразными." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Температура сопла" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Скорость вентилятора для низа подложки" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Поток основания рафта" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Перекрытие заполнения основания рафта" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Процент перекрытия заполнения основания рафта" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Дистанция между линиями нижнего слоя подложки" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Скорость вентилятора для подложки" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Поток рафта" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Поток стыка рафта" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Перекрытие заполнения стыка рафта" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Процент перекрытия заполнения стыка рафта" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Z-смещение стыка рафта" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Средняя дополнительная кромка фундамента" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Сглаживание подложки" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Поток поверхности рафта" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Перекрытие заполнения поверхности рафта" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Процент перекрытия заполнения поверхности рафта" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Z-смещение поверхности рафта" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Дополнительная кромка фундамента сверху" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Отчеты о событиях, выходящих за установленные пороговые значения" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Сбросить продолжительность потока" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Предпочтение опоры" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Коэффициент масштабирования для компенсации усадки" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Длина косого шва" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Начальная высота косого шва" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Длина шага косого шва" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "На сцене есть объекты поддержки" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Настройки угла шва" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Угол нависания стенки, выше которого не следует размещать шов" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Установить последовательность печати вручную" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Ускорение заполнение поддержек" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Поддерживать коэффициент плотности заполнения начального слоя " + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Экструдер заполнения поддержек" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Зазор поддержки по оси Z" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Поддерживать Z-шов в стороне от модели" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Предпочитать линии поддержки" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Меняет местами порядок печати внутренней и следующей внутренней линий каймы. Это упрощает удаление каймы." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Чередует какой из объектов, пересекающихся в объёме, будет участвовать в печати каждого слоя таким образом, что пересекающиеся объекты становятся вплетёнными друг в друга. Выключение этого параметра приведёт к тому, что один из объектов займёт весь объём пересечения, в то время как данный объём будет исключён из других объектов." @@ -3840,14 +4128,54 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "Ускорение, с которым выполняется перемещение." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "Объём материала, относительно от обычной линии, который будет выдавлен в процессе разглаживания. Наличие в сопле наличие материала помогает заполнять щели на верхней оболочке, но слишком большое значение приводит к излишнему выдавливанию материала и ухудшает качество оболочки." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Количество материала, которое необходимо выдавить во время печати основания рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Количество материала, которое необходимо выдавить во время печати стыка рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Количество материала, которое необходимо выдавить во время печати рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Количество материала, которое необходимо выдавить во время печати поверхности рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "Объём материала, относительно от обычной линии, который будет выдавлен в процессе разглаживания. Наличие в сопле наличие материала помогает заполнять щели на верхней оболочке, но слишком большое значение приводит к излишнему выдавливанию материала и ухудшает качество оболочки." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." msgstr "Величина перекрытия между заполнением и стенками в виде процентного отношения от ширины линии заполнения. Небольшое перекрытие позволяет стенкам надежно соединяться с заполнением." +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Величина перекрытия между заполнителем и стенками основания рафта, выраженная в процентах от ширины линии заполнения. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Величина перекрытия между заполнителем и стенками основания рафта. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Величина перекрытия между заполнителем и стенками стыка рафта, выраженная в процентах от ширины линии заполнения. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Величина перекрытия между заполнителем и стенками стыка рафта. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Величина перекрытия между заполнителем и стенками поверхности рафта, выраженная в процентах от ширины линии заполнения. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Величина перекрытия между заполнителем и стенками поверхности рафта. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." + msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." msgstr "Величина перекрытия между заполнением и стенками. Небольшое перекрытие позволяет стенкам плотно соединиться с заполнением." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "Расстояние между линиями разглаживания." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "Расстояние между моделью и ее опорной конструкцией у шва по оси z." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "Дистанция между соплом и уже напечатанными частями, выдерживаемая при перемещении." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "Высота над горизонтальными частями вашей модели, по которой создаётся форма." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "Высота, на которой вентиляторы вращаются на обычной скорости. На нижних уровнях скорость вентилятора постепенно увеличивается от начальной скорости вентилятора до обычной скорости вентилятора." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "Высота, на которой вентилятор вращается с обычной скоростью. На предыдущих слоях скорость вращения вентилятора постепенно увеличивается с начальной." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "Высота между кончиком сопла и портальной системой (по осям X и Y)." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "Высота между кончиком сопла и нижней частью головы." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "Высота, на которую приподнимается ось Z после смены экструдера." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "Горизонтальное расстояние между первой линией каймы и контуром первого слоя изделия. Небольшой зазор облегчит удаление каймы и позволит сохранить термические преимущества." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Горизонтальное расстояние между юбкой и первым слоем печати." -"Минимальное расстояние. Несколько линий юбки будут расширяться от этого расстояния." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "Горизонтальное расстояние между юбкой и первым слоем печати.Минимальное расстояние. Несколько линий юбки будут расширяться от этого расстояния." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати верхних оболочек наклонных поверхностей модели." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "Слой, на котором вентиляторы построения вращаются на полной скорости. Это значение рассчитывается и округляется до целого числа." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "Слой, на котором вентилятор должен вращаться с обыкновенной скоростью. Если определена обычная скорость для вентилятора на высоте, это значение вычисляется и округляется до целого." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "Минимальный уклон области, где применяется лестничный шаг. При низких значениях удаление поддержки на более пологих уклонах должно быть проще, но слишком низкие значения могут приводить к очень неожиданным результатам на других деталях модели." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "Минимальная толщина оболочки основной башни. Вы можете увеличить ее, чтобы сделать основную башню прочнее." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "Минимальное время, затрачиваемое на печать слоя. Этот параметр заставляет принтер замедляться, как минимум, чтобы потратить на печать слоя время, указанное в этом параметре. Это позволяет напечатанному материалу достаточно охладиться перед печатью следующего слоя. Слои могут печататься быстрее, чем указано в этом параметре, если поднятие головы отключено и если будет нарушено требование по минимальной скорости печати." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Количество линий, используемых для каймы поддержки. При увеличении линий каймы улучшается адгезия к рабочему столу и увеличивается расход материала." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "Номер вентилятора, охлаждающего объем построения. Если установлено значение 0, это означает, что вентилятора объема построения нет" + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "Количество верхних слоёв над вторым слоем подложки. Это такие полностью заполненные слои, на которых размещается модель. Два слоя приводят к более гладкой поверхности чем один." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "Изменение максимальной мгновенной скорости на первом слое." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "Коэффициент выбранной высоты слоя, при котором начнется косой шов. Меньшее число приведет к большей высоте шва. Для эффективности должно быть ниже 100." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "Форма стола без учёта непечатаемых областей." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Эта настройка управляет расстоянием наката экструдера непосредственно перед началом стенки мостика. Накат перед началом мостика может уменьшить давление в сопле и создать более ровный мостик." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Это ускорение, с которым можно достичь максимальной скорости при печати наружной стенки." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Это замедление, с которым следует завершить печать внешней стенки." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Это максимальная длина пути экструзии при разделении более длинного пути для применения ускорения/замедления на внешней стенке. Меньшее расстояние создаст более точный, но и более сложный G-код." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Это коэффициент максимальной скорости для завершения печати внешней стенки." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Это коэффициент максимальной скорости, с которой следует начинать печать внешней стенки." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Этот параметр определяет, насколько закруглены внутренние углы контура основания фундамента. Внутренние углы закруглены до полукруга с радиусом, равным указанному здесь значению. Эта настройка также удаляет отверстия в контуре фундамента, которые меньше такого круга." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Для компенсации усадки материала при остывании модель будет масштабирована с этим коэффициентом." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Слои крышки" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Диаметр ствола" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Старайтесь избегать швов на стенках, которые нависают под большим углом, чем этот. Если значение равно 90, ни одна стенка не будет считаться нависающей." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Без изменений" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Объединение перекрывающихся объёмов" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Стенки" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Только стенки" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Стенки и линии" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Стенки, выступающие под углом больше указанного, будут напечатаны с использованием настроек выступающей стенки. Если значение составляет 90, стенки не считаются выступающими. Выступающие элементы, для которых имеется поддержка, также не считаются выступающими." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Стены, которые нависают больше, чем на этот угол, будут напечатаны с использованием настроек для нависающих стен. Если значение равно 90, ни одна стенка не будет считаться нависающей. Нависание, поддерживаемое опорой, также не будет считаться нависанием. Кроме того, любая линия, которая нависает меньше, чем на половину, также не будет считаться нависанием." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Во время печати стенок мостика объем выдавленного материала умножается на указанное значение." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "При печати первого слоя стыка рафта переместите с учетом этого смещения, чтобы настроить адгезию между основанием и стыком. Отрицательное смещение должно улучшить адгезию." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "При печати первого слоя поверхности рафта переместите с учетом этого смещения, чтобы настроить адгезию между стыком и поверхностью. Отрицательное смещение должно улучшить адгезию." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "Во время печати слоя второй оболочки мостика объем выдавленного материала умножается на указанное значение." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Выравнивание шва по оси Z" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Z-шов на вершине" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Позиция Z шва" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "перемещение" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Следует ли включать охлаждающие вентиляторы при переключении сопел. Это может помочь уменьшить просачивание за счет более быстрого охлаждения сопла:
    • Без изменений: оставить вентиляторы в прежнем режиме
    • Только последний экструдер: включить вентилятор последнего использованного экструдера, но выключить остальные (если они есть). Это полезно, если у вас полностью раздельные экструдеры.
    • Все вентиляторы: включить все вентиляторы во время переключения сопел. Это полезно, если у вас один охлаждающий вентилятор или несколько вентиляторов, расположенных близко друг к другу.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Все вентиляторы" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Длина сопла" -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Охлаждение при переключении экструдеров" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Управляйте пространственным соотношением между Z-швом опорной конструкции и фактической 3D-моделью. Это управление крайне важно, поскольку позволяет пользователям обеспечить плавное удаление опорных конструкций после печати, не нанося повреждений и не оставляя следов на напечатанной модели." +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "Высота между кончиком сопла и нижней частью головы." -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Минимальное расстояние Z-шва от модели" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Коэффициент заполнения начальных слоев опоры. Увеличение этого показателя может способствовать повышению адгезии платформы." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Только последний экструдер" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Разместить Z-шов на вершине многоугольника. При отключении этого параметра шов также может располагаться между вершинами. (Имейте в виду, что это не отменяет ограничений на размещение шва на безопорном выступе.)" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Минимальная толщина оболочки основной башни" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Поток основания рафта" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Перекрытие заполнения основания рафта" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Процент перекрытия заполнения основания рафта" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Поток рафта" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Поток стыка рафта" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Перекрытие заполнения стыка рафта" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Процент перекрытия заполнения стыка рафта" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Z-смещение стыка рафта" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Поток поверхности рафта" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Перекрытие заполнения поверхности рафта" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Процент перекрытия заполнения поверхности рафта" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Z-смещение поверхности рафта" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Угол нависания стенки, выше которого не следует размещать шов" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Поддерживать коэффициент плотности заполнения начального слоя " - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Поддерживать Z-шов в стороне от модели" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Количество материала, которое необходимо выдавить во время печати основания рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Количество материала, которое необходимо выдавить во время печати стыка рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Количество материала, которое необходимо выдавить во время печати рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Количество материала, которое необходимо выдавить во время печати поверхности рафта, по сравнению с обычной экструзионной линией. Увеличение потока может улучшить адгезию и прочность конструкции." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Величина перекрытия между заполнителем и стенками основания рафта, выраженная в процентах от ширины линии заполнения. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Величина перекрытия между заполнителем и стенками основания рафта. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Величина перекрытия между заполнителем и стенками стыка рафта, выраженная в процентах от ширины линии заполнения. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Величина перекрытия между заполнителем и стенками стыка рафта. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Величина перекрытия между заполнителем и стенками поверхности рафта, выраженная в процентах от ширины линии заполнения. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Величина перекрытия между заполнителем и стенками поверхности рафта. Небольшое перекрытие позволяет стенкам плотно прилегать к заполнителю." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "Расстояние между моделью и ее опорной конструкцией у шва по оси z." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "Минимальная толщина оболочки основной башни. Вы можете увеличить ее, чтобы сделать основную башню прочнее." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Старайтесь избегать швов на стенках, которые нависают под большим углом, чем этот. Если значение равно 90, ни одна стенка не будет считаться нависающей." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Без изменений" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "При печати первого слоя стыка рафта переместите с учетом этого смещения, чтобы настроить адгезию между основанием и стыком. Отрицательное смещение должно улучшить адгезию." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "При печати первого слоя поверхности рафта переместите с учетом этого смещения, чтобы настроить адгезию между стыком и поверхностью. Отрицательное смещение должно улучшить адгезию." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Z-шов на вершине" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Добавьте дополнительные линии в шаблон заполнения для поддержки оболочек выше. Эта опция предотвращает появление отверстий или капель пластика, которые иногда появляются в оболочках сложной формы из-за того, что заполнение внизу не поддерживает правильно слой оболочки, печатаемый выше. \"Стены\" поддерживают только контуры оболочки, тогда как \"стены и линии\" поддерживают также концы линий, которые образуют оболочку." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Скорость вентилятора построения в высоту" - -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Скорость вентилятора построения на уровне" - -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Номер вентилятора объема построения" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Определяет длину каждого шага изменения потока при экструзии вдоль косого шва. Меньшее расстояние приведет к более точному, но и более сложному G-коду." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Определяет длину косого шва, типа шва, который должен сделать шов Z менее заметным. Для эффективности должно быть больше 0." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Продолжительность каждого шага изменения плавного потока" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Включите изменения плавного потока. Если эта функция включена, поток постепенно увеличивается/уменьшается до целевого значения. Это полезно для принтеров с трубкой Боудена, где поток не меняется сразу при запуске/остановке двигателя экструдера." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Дополнительные линии заполнения для поддержки оболочек" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Для любого перемещения, превышающего это значение, поток материала сбрасывается до целевого потока пути." - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Размер шага дискретизации плавного потока" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Плавный поток включен" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Максимальное ускорение плавного потока" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Максимальное ускорение потока начального слоя" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Максимальное ускорение для изменения плавного потока" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Минимальная скорость изменения плавного потока для первого слоя" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Нет" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Ускорение на внешних стенках" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Замедление на внешних станках" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Коэффициент скорости в конце внешней стенки" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Интервал скорости на внешней стенке" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Коэффициент начальной скорости на внешней стенке" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Сбросить продолжительность потока" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Длина косого шва" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Начальная высота косого шва" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Длина шага косого шва" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "Высота, на которой вентиляторы вращаются на обычной скорости. На нижних уровнях скорость вентилятора постепенно увеличивается от начальной скорости вентилятора до обычной скорости вентилятора." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "Слой, на котором вентиляторы построения вращаются на полной скорости. Это значение рассчитывается и округляется до целого числа." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Номер вентилятора, охлаждающего объем построения. Если установлено значение 0, это означает, что вентилятора объема построения нет" - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Коэффициент выбранной высоты слоя, при котором начнется косой шов. Меньшее число приведет к большей высоте шва. Для эффективности должно быть ниже 100." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Это ускорение, с которым можно достичь максимальной скорости при печати наружной стенки." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Это замедление, с которым следует завершить печать внешней стенки." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Это максимальная длина пути экструзии при разделении более длинного пути для применения ускорения/замедления на внешней стенке. Меньшее расстояние создаст более точный, но и более сложный G-код." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Это коэффициент максимальной скорости для завершения печати внешней стенки." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Это коэффициент максимальной скорости, с которой следует начинать печать внешней стенки." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Только стенки" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Стенки и линии" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Стены, которые нависают больше, чем на этот угол, будут напечатаны с использованием настроек для нависающих стен. Если значение равно 90, ни одна стенка не будет считаться нависающей. Нависание, поддерживаемое опорой, также не будет считаться нависанием. Кроме того, любая линия, которая нависает меньше, чем на половину, также не будет считаться нависанием." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Стенки, выступающие под углом больше указанного, будут напечатаны с использованием настроек выступающей стенки. Если значение составляет 90, стенки не считаются выступающими. Выступающие элементы, для которых имеется поддержка, также не считаются выступающими." diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 0c30c63edc1..7e88c153631 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "Asal kule nasıl oluşturulur:
    • Normal: İkincil malzemelerin astarlandığı bir kova oluşturur.
    • Aralıklı: Olabildiğince seyrek bir asal kule oluşturur. Bu, zamandan ve filamentten tasarruf sağlayacaktır ama bu yalnızca kullanılan malzemelerin birbirine yapışması durumunda mümkündür.
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "Bir nozül değişimi sırasında soğutma fanlarının etkinleştirilip etkinleştirilmeyeceği. Bu, nozülü daha hızlı soğutarak sızıntıyı azaltmaya yardımcı olabilir:
    • Değişmemiş: Fanları daha önce olduğu gibi tutun
    • Sadece son ekstrüder: Son kullanılan ekstrüderin fanını açın ama diğerlerini (varsa) kapatın. Bu, tamamen ayrı ekstrüderleriniz varsa kullanışlıdır.
    • Tüm fanlar: Nozül değişimi sırasında tüm fanları açın. Bu, tek bir soğutma fanınız veya birbirine yakın duran birden fazla fanınız varsa kullanışlıdır.
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "Bir modelin etrafındaki brim, istemediğiniz yerden başka bir modele değebilir. Bu, brim olmayan modellerde bu mesafedeki tüm brimleri ortadan kaldırır." @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "Uyarlanabilir katmanlar modelin şekline bağlı olarak katman yüksekliğini hesaplar." +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "Yukarıdaki kaplamaları desteklemek için dolgu desenine ekstra hatlar ekleyin. Bu seçenek, karmaşık şekilli kaplamalarda alttaki dolgunun üstte basılan kaplama katmanını doğru şekilde desteklememesi nedeniyle bazen ortaya çıkan delikleri veya plastik lekeleri önler. \"Duvarlar\" sadece kaplamanın ana hatlarını desteklerken, \"Duvarlar ve Hatlar\" kaplamayı oluşturan hatların uçlarını da destekler." + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Dolgu alanının etrafına ekstra duvar ekle. Bu duvarlar üst/alt yüzey hatlarının daha az aşağı düşmesini sağlar. Yani biraz fazla materyal kullanarak, daha az üst/alt yüzey katmanı ile aynı kaliteyi yakalayabilirsiniz." -"Bu özellik, doğru konfigüre edildiğinde, harekete veya geri çekmeye gerek kalmadan Dolgu Poligonlarını Bağlama ile birlikte tüm dolguyu tek bir ekstrüzyon yoluna bağlayabilir." +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "Dolgu alanının etrafına ekstra duvar ekle. Bu duvarlar üst/alt yüzey hatlarının daha az aşağı düşmesini sağlar. Yani biraz fazla materyal kullanarak, daha az üst/alt yüzey katmanı ile aynı kaliteyi yakalayabilirsiniz.Bu özellik, doğru konfigüre edildiğinde, harekete veya geri çekmeye gerek kalmadan Dolgu Poligonlarını Bağlama ile birlikte tüm dolguyu tek bir ekstrüzyon yoluna bağlayabilir." msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "Tümünü birden" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "Tüm fanlar" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "Yazdırma çözünürlüğünü etkileyen tüm ayarlar. Bu ayarların (ve yazdırma süresinin) kalite üzerinde büyük bir etkisi vardır" @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Kenar Genişliği" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "Yükseklikteki Yapı Fan Hızı" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "Katmandaki Yapı Fan Hızı" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "Yapı Levhası Yapıştırması" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "Yapı Hacmi sıcaklığı Uyarısı" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "Yapı hacmi fan sayısı" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "Bu ayarı etkinleştirmeniz, modelinizde olmasa bile prime tower'ınıza bir brim kazandırır. Eğer yüksek bir kule için daha sağlam bir taban istiyorsanız, taban yüksekliğini artırabilirsiniz." @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "Soğuma" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "Ekstruder değişimi sırasında soğutma" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "Çapraz" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "Köprüleri tespit edin ve köprüler yazdırılırken yazdırma hızını, akışı ve fan ayarlarını değiştirin." +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "Atkı dikişi boyunca kalıptan geçirirken akış değişimindeki her adımın uzunluğunu belirler. Daha küçük bir mesafe, daha hassas ama aynı zamanda daha karmaşık bir G koduna sebep olacaktır." + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "Z dikişini daha az görünür hâle getirmesi gereken bir dikiş türü olan atkı dikişinin uzunluğunu belirler. Etkili olması için 0'dan büyük olmalıdır." + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "Duvarların basılacağı sırayı belirler. Dış duvarların önce basılması, iç duvarlardaki hataların dışarıya taşmasını önleyerek boyutların doğru olmasını sağlar. Bu duvarların daha sonra basılması ise çıkıntılar basılırken daha iyi yığınlanma sağlar. Toplam iç duvar miktarı eşit değilse ”ortadaki son hat” her zaman en son yazdırılır." @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "İkili ekstrüzyon" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "Kademeli akış değişimindeki her adımın süresi" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "Eliptik" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "Dış sızdırma kalkanını etkinleştirir. Modelin etrafında, ilk nozül ile aynı yükseklikte olması halinde ikinci bir nozülü temizleyebilecek olan bir kalkan oluşturacaktır." +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "Kademeli akış değişikliklerini etkinleştirin. Etkinleştirildiğinde akış, hedef akışa doğru kademeli olarak artırılır/azaltılır. Bu, akışın ekstrüder motoru çalıştığında/durduğunda hemen değişmediği bowden tüplü yazıcılar için kullanışlıdır." + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "Olası hata tespitine yönelik eşik değerlerini ayarlamak için yazdırma işlemi raporlamasını etkinleştirin." @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "Geniş Dikiş, bitişik poligonlarla dikişleri kapatarak ağdaki açık boşlukların dikmeye çalışır. Bu seçenek çok fazla işlem süresi ortaya çıkarabilir." +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "Kaplamaları Desteklemek İçin Ekstra Dolgu Hatları" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "Ekstra Dolgu Duvar Sayısı" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "Nozül değişiminin ardından çalışmaya hazırlanacak ek malzemedir." +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "Extruder İlk X konumu" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Ekstruder İlk Z konumu" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Ekstrüderler Isıtıcıyı Paylaşır" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "Temizleme Hızı" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "Bu değerden daha uzun herhangi bir seyahat hareketi için malzeme akışı, hedef akış yollarına sıfırlanır" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "Nozül boyutunun bir veya iki katı kadar olan ince yapılarda modelin kalınlığına bağlı olarak hat genişliklerinin değiştirilmesi gerekir. Bu ayar, duvarlar için izin verilen minimum hat genişliğini kontrol eder. Minimum hat genişlikleri, N duvarlarının geniş ve N+1 duvarlarının dar olduğu bazı geometrik kalınlıklarda N duvardan N+1 duvara geçildiği için maksimum hat genişliklerini de belirler. Mümkün olan en geniş duvar hattı Minimum Duvar Hattı Genişliğinin iki katıdır." @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "G-code türü" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "En son çalıştırılacak G-code komutları (" -" ile ayrılır)." +msgid "" +"G-code commands to be executed at the very end - separated by \n" +"." +msgstr "En son çalıştırılacak G-code komutları ( ile ayrılır)." msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "ile ayrılan, başlangıçta yürütülecek G-code komutları" +msgid "" +"G-code commands to be executed at the very start - separated by \n" "." +msgstr "ile ayrılan, başlangıçta yürütülecek G-code komutları." msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "Kademeli Destek Dolgusu Aşamaları" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "Kademeli akış ayrıklaştırma adım boyutu" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "Kademeli akış etkinleştirildi" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "Kademeli akış maksimum ivme" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "Minimum katman süresi nedeniyle düşük hızlarda yazdırırken bu sıcaklığa kademeli olarak düşürün." @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Isıtılmış Yapı Levhası İçerir" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Isınma Hızı" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Yatay Ölçekleme Faktörü Büzülme Telafisi" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Filamentin ısıtıldığında kopmadan esneyebileceği mesafedir." @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "İlk Yazdırma Sıcaklığı" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "İlk katman maksimum akış ivmesi" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "İç Duvar İvmesi" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Parçalardaki delikleri değil, yalnızca ana hatlarını titretir." +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Bağlı Olmayan Yüzleri Tut" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "Ekstruder ilk konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın." msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "Hava boşluğundaki filament kaybını telafi etmek için modelin birinci ve ikinci katmanını Z yönünde üst üste getirir. İlk model katmanının üzerindeki tüm modeller bu miktarda aşağı kaydırılacaktır." -"Bu ayar nedeniyle bazen ikinci katmanın ilk katmanın altına yazdırıldığı belirtilebilir. Bu istenilen davranıştır" +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "Hava boşluğundaki filament kaybını telafi etmek için modelin birinci ve ikinci katmanını Z yönünde üst üste getirir. İlk model katmanının üzerindeki tüm modeller bu miktarda aşağı kaydırılacaktır.Bu ayar nedeniyle bazen ikinci katmanın ilk katmanın altına yazdırıldığı belirtilebilir. Bu istenilen davranıştır" msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "Destek yapısının z dikiş izi ile gerçek 3D model arasındaki uzamsal ilişkiyi yönetin. Bu kontrol, kullanıcıların baskı sonrası destek yapılarının, basılan modelde hasara yol açmadan veya iz bırakmadan hatasız bir şekilde çıkarılmasını sağlaması nedeniyle çok önemlidir." + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "Maksimum Hareket Çözünürlüğü" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "Kademeli akış değişiklikleri için maksimum ivme" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "X yönü motoru için maksimum ivme" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Ortalayıcı" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "Modelden Min Z Dikiş İzi Mesafesi" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "Minimum Kalıp Genişliği" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "Destek çatılarının minimum alan boyutu. Alanı bu değerden küçük olan poligonlar normal destekle basılacaktır." +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "İlk katman için kademeli akış değişiklikleri için minimum hız" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "İnce yüz hatlarının minimum kalınlığıdır. Bu değerden daha ince olan model yüz hatları yazdırılmaz, Minimum Yüz Hattı Boyutundan daha kalın olan modeller ise Minimum Duvar Hattı Genişliği değerine kadar genişletilir." @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "Çoklu etek hatları küçük modeller için daha iyi ekstrüzyon işlemi hazırlanmasına yardımcı olur. Bu değeri 0’a ayarlamak eteği devre dışı bırakacaktır." +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "Desteğin ilk katmanlarındaki dolgu çarpanı. Bunu artırmak, yatak yapışmasına yardımcı olabilir." + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "İlk katman üzerinde bulunan hat genişliği çoğaltıcı. Çoğaltmayı artırmak yatak yapışmasını iyileştirebilir." @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "Hiçbiri" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "Hiçbiri" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "Hiçbiri" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Dış Yüzeyde Değil" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Nozül Açısı" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Nozül Çapı" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Nozül İzni Olmayan Alanlar" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "Nozül Kimliği" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "Nozül Uzunluğu" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "Nozzle boyutu" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Nozül Anahtarı Geri Çekme Hızı" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Ekstrüder Sayısı" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "Birer Birer" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "Sadece son ekstrüder" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "Sadece Hareket Sırasında Yazdırılan Bölümleri Atlama yoluyla yatay hareket sayesinde atlanamayan yazdırılmış parçalar üzerinde hareket ederken Z Sıçramasını gerçekleştirin." @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "Dış Duvar İvmesi" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "Dış Duvar Hızlanması" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "Dış Duvar Yavaşlaması" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "Dış Duvar Bitiş Hız Oranı" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "Dış Duvar Ekstruderi" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "Dış Duvar Hızı" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "Dış Duvar Hızı Bölünme Mesafesi" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "Dış Duvar Başlangıç Hız Oranı" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "Dış Duvar Sürme Mesafesi" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "Üçüncü köprü yüzey alanı katmanı yazdırılırken kullanılacak yüzde fan hızı." +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "Z dikiş izini bir çokgen tepe noktasına yerleştirin. Bunu kapatmak, dikiş izini köşeler arasına da yerleştirebilir. (Bunun, dikiş izinin desteklenmeyen bir çıkıntıya yerleştirilmesiyle ilgili kısıtlamaları geçersiz kılmayacağını unutmayın.)" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "Bu miktardan daha kısa çevre uzunluğuna sahip dilimlenmiş katmanlardaki poligonlar filtre ile elenecektir. Daha düşük değerler dilimleme süresini uzatacak ancak daha yüksek çözünürlükte bir ağ oluşturacaktır. Genellikle yüksek çözünürlüklü SLA yazıcılarına yöneliktir ve çok fazla detay içeren çok küçük 3D modellerinde kullanılır." @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "Asal Kule Maksimum Köprüleme Mesafesi" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "Ana Kule Minimum Kabuk Kalınlığı" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "İlk Direğin Minimum Hacmi" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "Yazdırma İvmesi" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Yazdırma İvmesi Değişimi" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Malzemenin hazırlanmasına yardımcı olan yazıcının yanındaki direği her nozül değişiminden sonra yazdırın." +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Yazdırma dolgusu, yalnızca model tepelerinin desteklenmesi gereken yerleri yapılandırır. Bu özelliğin etkinleştirilmesi yazdırma süresini ve malzeme kullanımını azaltır ancak üniform olmayan nesne kuvvetine yol açar." @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Her zaman bitişik hatlarla tek yönde çakışmaya neden olan bir düzenle üst/alt hat baskısı yapın. Bu baskı biraz daha uzun sürer, fakat düz yüzeylerin daha tutarlı görünmesini sağlar." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Yazdırma Sıcaklığı" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Radyenin Taban Fan Hızı" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "Raft Tabanı Akış" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "Raft Tabanı Dolgu Örtüşmesi" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "Raft Tabanı Dolgu Örtüşmesi Yüzdesi" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Radye Taban Hat Genişliği" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Radye Fan Hızı" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "Raft Akış" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "Raft Arayüzü Akış" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "Raft Arayüzü Dolgu Örtüşmesi" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "Raft Arayüzü Dolgu Örtüşme Yüzdesi" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "Raft Arayüzü Z Ofseti" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "Raft Ortası Ekstra Tolerans" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Radye Düzeltme" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "Raft Yüzey Akışı" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "Raft Yüzey Dolgusu Örtüşmesi" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "Raft Yüzey Dolgusu Örtüşme Yüzdesi" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "Raft Yüzeyi Z Ofseti" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "Raft Üstü Ekstra Tolerans" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "Belirlenen eşiklerin dışına çıkan etkinliklerin raporlanması" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "Akış süresini sıfırla" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "Yerleştirme Tercihi" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "Ölçekleme Faktörü Büzülme Telafisi" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "Atkı Dikişi Uzunluğu" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "Atkı Dikişi Başlangıç Yüksekliği" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "Atkı Dikişi Adım Uzunluğu" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "Sahnede Destek Örgüsü Var" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Dikiş Köşesi Tercihi" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "Dikiş İzi Çıkıntılı Duvar Açısı" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "Baskı Sırasını Manuel Olarak Ayarla" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "Destek Dolgusu İvmesi" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "Destek Dolgu Yoğunluğu Çarpanı İlk Katman" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "Destek Dolgu Ekstruderi" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "Destek Z Mesafesi" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "Destek Z Dikiş İzi Modelden Mesafe" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "Tercih edilen destek hatları" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "En içteki ve ikinci en içteki kenar çizgilerinin baskı sırasını değiştirin. Bu, kenarın çıkarılmasını kolaylaştırır." +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Çakışan bileşimlerin birbirine karışması için her bir katmanda bileşim kesişimi hacimlerine göre değişiklik yapın. Bu ayarın kapatılması, bir bileşimin diğer bileşimlerden ayrılarak çakışmadaki tüm hacmi almasına neden olur." @@ -3840,14 +4128,54 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "Hareket hamlelerinin ivmesi." -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "Ütüleme sırasında normal yüzey hattına göre ekstrude edilecek malzeme miktarı. Nozülü dolu tutmak üst yüzeyde oluşan çatlakların bir kısmının doldurulmasını sağlar fakat nozülün fazla dolu olması aşırı ekstrüzyona ve yüzey yanlarında noktalar oluşmasına neden olur." +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Raft tabanı baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Raft arayüzü baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Raft baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "Raft yüzey baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "Ütüleme sırasında normal yüzey hattına göre ekstrude edilecek malzeme miktarı. Nozülü dolu tutmak üst yüzeyde oluşan çatlakların bir kısmının doldurulmasını sağlar fakat nozülün fazla dolu olması aşırı ekstrüzyona ve yüzey yanlarında noktalar oluşmasına neden olur." + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ve duvarların arasındaki çakışma miktarı. Ufak bir çakışma duvarların dolguya sıkıca bağlanmasını sağlar." +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ile raft tabanının duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Dolgu ile raft tabanının duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ile raft arayüzünün duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Dolgu ile raft arayüzünün duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ile raft yüzeyinin duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "Dolgu ile raft yüzeyinin duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." + msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." msgstr "Dolgu ve duvarlar arasındaki çakışma miktarı. Hafif bir çakışma duvarların dolguya sıkıca bağlanmasını sağlar." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "Ütüleme hatları arasında bulunan mesafe." +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "Model ile z ekseni dikiş izindeki destek yapısı arasındaki mesafe." + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "Hareket esnasında atlama yaparken nozül ve daha önce yazdırılmış olan bölümler arasındaki mesafe." @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "Kalıp yazdıracak modelinizin yatay kısımlarının üzerindeki yükseklik." +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "Fanların normal fan hızında döndüğü yükseklik. Aşağıdaki katmanlarda fan hızı, Başlangıç Fan Hızından Normal Fan Hızına doğru kademeli olarak artar." + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "Fanların olağan fan hızında döndüğü yükseklik. Alttaki katmanlarda fan hızı, İlk Fan Hızından Olağan Fan Hızına kadar kademeli olarak artar." @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "Nozül ucu ve portal sistemi (X ve Y aksları) arasındaki yükseklik farkı." -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "Nozül ucu ve yazıcı başlığının en alt parçası arasındaki yükseklik farkı." - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "Ekstruder değişiminden sonra Z Sıçraması yapılırken oluşan yükseklik farkı." @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "Baskının ilk katmanının uçtaki ilk hattı ile ana hattı arasındaki yatay mesafe. Küçük bir boşluk baskının uç kısmının kolayca çıkarılmasını sağlamasının yanı sıra ısı bakımından da avantajlıdır." msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Baskının eteği ve ilk katmanı arasındaki yatay mesafe." -"Minimum mesafedir. Bu mesafeden çok sayıda etek hattı dışarı doğru uzanır." +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "Baskının eteği ve ilk katmanı arasındaki yatay mesafe.Minimum mesafedir. Bu mesafeden çok sayıda etek hattı dışarı doğru uzanır." msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "Kaldırılacak olan üst yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde üst yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "Yapı fanlarının tam fan hızında döndüğü katman. Bu değer hesaplanır ve bir tam sayıya yuvarlanır." + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "Fanların olağan fan hızında döndüğü katman Yüksekteki olağan fan hızı ayarlanırsa bu değer hesaplanır ve tam sayıya yuvarlanır." @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "Basamaklı alanın etkili olması için gereken minimum eğimdir. Düşük değerler, derinliği daha düşük olan eğimlerde desteğin kaldırılmasını kolaylaştırırken, gerçekten düşük değerler ise modelin diğer parçalarında tersine sonuçlar doğurabilir." +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "Ana kule kabuğunun minimum kalınlığı. Ana kuleyi güçlendirmek için artırabilirsiniz." + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "Bir katmanda harcanan minimum süre. Bu süre yazıcıyı yavaşlamaya ve burada en azından bir katmanda ayarlanan süreyi kullanmaya zorlar. Bir sonraki katman yazdırılmadan önce yazdırılan materyalin düzgün bir şekilde soğumasını sağlar. Kaldırma Başlığı devre dışı bırakılır ve Minimum Hız değeri başka bir şekilde ihlal edilmezse katmanlar yine de minimal katman süresinden daha kısa sürebilir." @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "Bir destek kenarı için kullanılan hatların sayısı. Daha fazla kenar hattı, ekstra malzeme karşılığında baskı tablasına daha fazla alanın yapışacağı anlamına gelir." +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "Yapı hacmini soğutan fan sayısı. Bu, 0 olarak ayarlanırsa hiç yapı hacmi fanı olmadığı anlamına gelir" + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "İkinci radye katmanındaki üst katmanların sayısı. Bunlar modelin üstünde durduğu tamamı dolgulu katmanlardır. İki katman bir katmandan daha pürüzsüz bir üst yüzey oluşturur." @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "İlk katman için maksimum anlık yazdırma hızı değişimi." +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "Atkı dikişinin başlatılacağı, seçilen katman yüksekliğinin oranı. Daha düşük bir sayı, daha büyük bir dikiş yüksekliği ile sonuçlanacaktır. Etkili olması için 100'den düşük olmalıdır." + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "Yazdırılamayan alanların haricinde yapı levhasının şekli." @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "Bu, ekstruderin bir köprü duvarı başlamadan hemen önce taraması gereken mesafeyi kontrol eder. Köprü başlamadan önce tarama, nozüldeki basıncı azaltabilir ve daha düz bir köprü üretebilir." +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "Bu değer, bir dış duvar yazdırılırken en yüksek hıza ulaşmak için gereken hızlanmayı ifade eder." + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "Bu değer, bir dış duvar yazdırma işleminin sonlandırılacağı yavaşlamayı ifade eder." + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "Bu değer, dış duvar hızlanmasını/yavaşlamasını uygulamak için daha uzun bir yolu bölerken bir kalıptan basma yolunun maksimum uzunluğudur. Daha küçük bir mesafe daha hassas ama aynı zamanda daha karmaşık bir G Kodu oluşturacaktır." + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "Bu değer, bir dış duvar yazdırılırken işlemin sonlandırılacağı en yüksek hızın oranını ifade eder." + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "Bu değer, bir dış duvar yazdırılırken işlemin başlayacağı en yüksek hızın oranını ifade eder." + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "Bu ayar, raft tabanı taslağındaki iç köşelerin ne kadarının yuvarlak olacağını kontrol eder. İç köşeler, yarıçapı burada verilen değere eşit olacak şekilde yarım daire şeklinde yuvarlanır. Bu ayar aynı zamanda raft dış hattındaki böyle bir daireden daha küçük olan delikleri de kaldırır." @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Malzemenin soğudukça büzülmesini telafi etmek için model bu faktöre göre ölçeklenecektir." +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "Üst Katmanlar" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "Gövde Çapı" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "Bu açıdan daha fazla çıkıntı yapan duvarlardaki dikiş izlerini önlemeye çalışın. Değer 90 olduğunda hiçbir duvar çıkıntı olarak kabul edilmeyecektir." + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "Değişmemiş" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "Bağlantı Çakışma Hacimleri" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "Duvarlar" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "Sadece Duvarlar" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "Duvarlar ve Hatlar" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "Bu açıdan daha yüksek çıkıntıya sahip duvarlar çıkıntılı duvar ayarları kullanılarak basılacaktır. Değer 90 ise hiçbir duvarda çıkıntı olmadığı varsayılacaktır. Destek ile desteklenen çıkıntılar da çıkıntı olarak değerlendirilmeyecektir." +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "Bu açıdan daha fazla çıkıntı yapan duvarlar, çıkıntılı duvar ayarları kullanılarak yazdırılacaktır. Değer 90 olduğunda, hiçbir duvar çıkıntı olarak değerlendirilmeyecektir. Dayanak tarafından desteklenen çıkıntılar da çıkıntı olarak değerlendirilmeyecektir. Ayrıca, çıkıntının yarısından az olan herhangi bir hat da çıkıntı olarak değerlendirilmeyecektir." msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "Köprü duvarları yazdırılırken, ekstrude edilen malzeme miktarı bu değerle çarpılır." +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "Raft arayüzünün ilk katmanını yazdırırken taban ile arayüz arasındaki yapışmayı özelleştirmek için bu ofset ile öteleyin. Negatif bir ofset yapışmayı iyileştirmelidir." + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "Raft yüzeyinin ilk katmanını yazdırırken arayüz ve yüzey arasındaki yapışmayı özelleştirmek için bu ofset ile öteleyin. Negatif bir ofset yapışmayı iyileştirmelidir." + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "İkinci köprü yüzey alanı katmanı yazdırılırken, ekstrude edilen malzeme miktarı bu değerle çarpılır." @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Z Dikiş Hizalama" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "Tepe Noktasında Z Dikiş İzi" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Z Dikişi Konumu" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "hareket" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "Bir nozül değişimi sırasında soğutma fanlarının etkinleştirilip etkinleştirilmeyeceği. Bu, nozülü daha hızlı soğutarak sızıntıyı azaltmaya yardımcı olabilir:
    • Değişmemiş: Fanları daha önce olduğu gibi tutun
    • Sadece son ekstrüder: Son kullanılan ekstrüderin fanını açın ama diğerlerini (varsa) kapatın. Bu, tamamen ayrı ekstrüderleriniz varsa kullanışlıdır.
    • Tüm fanlar: Nozül değişimi sırasında tüm fanları açın. Bu, tek bir soğutma fanınız veya birbirine yakın duran birden fazla fanınız varsa kullanışlıdır.
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "Tüm fanlar" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "Nozül Uzunluğu" -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Ekstruder değişimi sırasında soğutma" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Destek yapısının z dikiş izi ile gerçek 3D model arasındaki uzamsal ilişkiyi yönetin. Bu kontrol, kullanıcıların baskı sonrası destek yapılarının, basılan modelde hasara yol açmadan veya iz bırakmadan hatasız bir şekilde çıkarılmasını sağlaması nedeniyle çok önemlidir." +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "Nozül ucu ve yazıcı başlığının en alt parçası arasındaki yükseklik farkı." -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Modelden Min Z Dikiş İzi Mesafesi" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Desteğin ilk katmanlarındaki dolgu çarpanı. Bunu artırmak, yatak yapışmasına yardımcı olabilir." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Sadece son ekstrüder" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Z dikiş izini bir çokgen tepe noktasına yerleştirin. Bunu kapatmak, dikiş izini köşeler arasına da yerleştirebilir. (Bunun, dikiş izinin desteklenmeyen bir çıkıntıya yerleştirilmesiyle ilgili kısıtlamaları geçersiz kılmayacağını unutmayın.)" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Ana Kule Minimum Kabuk Kalınlığı" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Raft Tabanı Akış" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Raft Tabanı Dolgu Örtüşmesi" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Raft Tabanı Dolgu Örtüşmesi Yüzdesi" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Raft Akış" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Raft Arayüzü Akış" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Raft Arayüzü Dolgu Örtüşmesi" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Raft Arayüzü Dolgu Örtüşme Yüzdesi" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Raft Arayüzü Z Ofseti" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Raft Yüzey Akışı" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Raft Yüzey Dolgusu Örtüşmesi" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Raft Yüzey Dolgusu Örtüşme Yüzdesi" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Raft Yüzeyi Z Ofseti" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Dikiş İzi Çıkıntılı Duvar Açısı" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Destek Dolgu Yoğunluğu Çarpanı İlk Katman" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Destek Z Dikiş İzi Modelden Mesafe" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Raft tabanı baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Raft arayüzü baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Raft baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "Raft yüzey baskısı sırasında normal bir ekstrüzyon hattına göre ekstrüzyona tabi tutulacak malzeme miktarı. Artan bir akışa sahip olmak yapışmayı ve raft yapısal mukavemetini artırabilir." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ile raft tabanının duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Dolgu ile raft tabanının duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ile raft arayüzünün duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Dolgu ile raft arayüzünün duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Dolgu hattı genişliğinin yüzdesi olarak dolgu ile raft yüzeyinin duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Dolgu ile raft yüzeyinin duvarları arasındaki örtüşme miktarı. Hafif bir örtüşme, duvarların dolguya sıkıca bağlanmasını sağlar." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "Model ile z ekseni dikiş izindeki destek yapısı arasındaki mesafe." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "Ana kule kabuğunun minimum kalınlığı. Ana kuleyi güçlendirmek için artırabilirsiniz." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Bu açıdan daha fazla çıkıntı yapan duvarlardaki dikiş izlerini önlemeye çalışın. Değer 90 olduğunda hiçbir duvar çıkıntı olarak kabul edilmeyecektir." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Değişmemiş" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Raft arayüzünün ilk katmanını yazdırırken taban ile arayüz arasındaki yapışmayı özelleştirmek için bu ofset ile öteleyin. Negatif bir ofset yapışmayı iyileştirmelidir." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Raft yüzeyinin ilk katmanını yazdırırken arayüz ve yüzey arasındaki yapışmayı özelleştirmek için bu ofset ile öteleyin. Negatif bir ofset yapışmayı iyileştirmelidir." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Tepe Noktasında Z Dikiş İzi" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Yukarıdaki kaplamaları desteklemek için dolgu desenine ekstra hatlar ekleyin. Bu seçenek, karmaşık şekilli kaplamalarda alttaki dolgunun üstte basılan kaplama katmanını doğru şekilde desteklememesi nedeniyle bazen ortaya çıkan delikleri veya plastik lekeleri önler. \"Duvarlar\" sadece kaplamanın ana hatlarını desteklerken, \"Duvarlar ve Hatlar\" kaplamayı oluşturan hatların uçlarını da destekler." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Yükseklikteki Yapı Fan Hızı" - -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Katmandaki Yapı Fan Hızı" - -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Yapı hacmi fan sayısı" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Atkı dikişi boyunca kalıptan geçirirken akış değişimindeki her adımın uzunluğunu belirler. Daha küçük bir mesafe, daha hassas ama aynı zamanda daha karmaşık bir G koduna sebep olacaktır." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Z dikişini daha az görünür hâle getirmesi gereken bir dikiş türü olan atkı dikişinin uzunluğunu belirler. Etkili olması için 0'dan büyük olmalıdır." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Kademeli akış değişimindeki her adımın süresi" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Kademeli akış değişikliklerini etkinleştirin. Etkinleştirildiğinde akış, hedef akışa doğru kademeli olarak artırılır/azaltılır. Bu, akışın ekstrüder motoru çalıştığında/durduğunda hemen değişmediği bowden tüplü yazıcılar için kullanışlıdır." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Kaplamaları Desteklemek İçin Ekstra Dolgu Hatları" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Bu değerden daha uzun herhangi bir seyahat hareketi için malzeme akışı, hedef akış yollarına sıfırlanır" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Kademeli akış ayrıklaştırma adım boyutu" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Kademeli akış etkinleştirildi" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Kademeli akış maksimum ivme" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "İlk katman maksimum akış ivmesi" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Kademeli akış değişiklikleri için maksimum ivme" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "İlk katman için kademeli akış değişiklikleri için minimum hız" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Hiçbiri" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Dış Duvar Hızlanması" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Dış Duvar Yavaşlaması" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Dış Duvar Bitiş Hız Oranı" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Dış Duvar Hızı Bölünme Mesafesi" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Dış Duvar Başlangıç Hız Oranı" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Akış süresini sıfırla" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Atkı Dikişi Uzunluğu" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Atkı Dikişi Başlangıç Yüksekliği" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Atkı Dikişi Adım Uzunluğu" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "Fanların normal fan hızında döndüğü yükseklik. Aşağıdaki katmanlarda fan hızı, Başlangıç Fan Hızından Normal Fan Hızına doğru kademeli olarak artar." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "Yapı fanlarının tam fan hızında döndüğü katman. Bu değer hesaplanır ve bir tam sayıya yuvarlanır." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Yapı hacmini soğutan fan sayısı. Bu, 0 olarak ayarlanırsa hiç yapı hacmi fanı olmadığı anlamına gelir" - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Atkı dikişinin başlatılacağı, seçilen katman yüksekliğinin oranı. Daha düşük bir sayı, daha büyük bir dikiş yüksekliği ile sonuçlanacaktır. Etkili olması için 100'den düşük olmalıdır." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Bu değer, bir dış duvar yazdırılırken en yüksek hıza ulaşmak için gereken hızlanmayı ifade eder." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Bu değer, bir dış duvar yazdırma işleminin sonlandırılacağı yavaşlamayı ifade eder." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Bu değer, dış duvar hızlanmasını/yavaşlamasını uygulamak için daha uzun bir yolu bölerken bir kalıptan basma yolunun maksimum uzunluğudur. Daha küçük bir mesafe daha hassas ama aynı zamanda daha karmaşık bir G Kodu oluşturacaktır." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Bu değer, bir dış duvar yazdırılırken işlemin sonlandırılacağı en yüksek hızın oranını ifade eder." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Bu değer, bir dış duvar yazdırılırken işlemin başlayacağı en yüksek hızın oranını ifade eder." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Sadece Duvarlar" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Duvarlar ve Hatlar" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Bu açıdan daha fazla çıkıntı yapan duvarlar, çıkıntılı duvar ayarları kullanılarak yazdırılacaktır. Değer 90 olduğunda, hiçbir duvar çıkıntı olarak değerlendirilmeyecektir. Dayanak tarafından desteklenen çıkıntılar da çıkıntı olarak değerlendirilmeyecektir. Ayrıca, çıkıntının yarısından az olan herhangi bir hat da çıkıntı olarak değerlendirilmeyecektir." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Bu açıdan daha yüksek çıkıntıya sahip duvarlar çıkıntılı duvar ayarları kullanılarak basılacaktır. Değer 90 ise hiçbir duvarda çıkıntı olmadığı varsayılacaktır. Destek ile desteklenen çıkıntılar da çıkıntı olarak değerlendirilmeyecektir." diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index fe6fe9f6522..73e7730964f 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-13 09:02+0100\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,10 @@ msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
    • Normal: create a bucket in which secondary materials are primed
    • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
    " msgstr "如何空心主塔:
    • 通常的:创建一个桶状结构,在其中填充辅助材料
    • 交错的: 创建一个尽可能稀疏的主塔。这将节省时间和丝材,但只有当所用材料粘附在每个部件上时才有可能
    " +msgctxt "cool_during_extruder_switch description" +msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " +msgstr "是否在喷嘴切换期间启动冷却风扇。这可以通过更快地冷却喷嘴来帮助减少滴漏:
    • 不变:保持风扇原状
    • 仅最后一个挤出机: 启动最后一个使用的挤出机的风扇,但关闭其他风扇（如果有）。如果您有完全独立的挤出机,这非常有用。
    • 所有风扇: 在喷嘴开关期间打开所有风扇。如果您有一个单独的冷却风扇或多个彼此靠近的风扇,这非常有用。
    " + msgctxt "brim_inside_margin description" msgid "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models." msgstr "模型周围的裙边可能会触及您不希望接触到的其他模型。此操作会将与其他无裙边的模型小于特定距离的裙边打印区域删除。" @@ -88,10 +92,15 @@ msgctxt "adaptive_layer_height_enabled description" msgid "Adaptive layers computes the layer heights depending on the shape of the model." msgstr "自适应图层根据模型形状计算图层高度。" +msgctxt "extra_infill_lines_to_support_skins description" +msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." +msgstr "在填充模式中添加额外的线条以支撑上面的表皮。这一选项可以防止因下面的填充未能正确支撑上面打印的表皮层而导致的孔洞或塑料块,这在复杂形状的表皮中常见。\"墙\"仅支持表皮的轮廓,而\"墙和线\"还支持构成表皮的线条之末端。" + msgctxt "infill_wall_line_count description" -msgid "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "在填充区域周围添加额外壁。此类壁可减少顶部/底部皮肤走线，这意味着只要付出一些额外的材料就可以使用更少的顶部/底部皮肤层达到相同的质量。" -"在适当配置的情况下，此功能可结合连接填充多边形以将所有填充物连接到单一挤出路径而无需空驶或回抽。" +msgid "" +"Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" +"This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." +msgstr "在填充区域周围添加额外壁。此类壁可减少顶部/底部皮肤走线，这意味着只要付出一些额外的材料就可以使用更少的顶部/底部皮肤层达到相同的质量。在适当配置的情况下，此功能可结合连接填充多边形以将所有填充物连接到单一挤出路径而无需空驶或回抽。" msgctxt "platform_adhesion description" msgid "Adhesion" @@ -149,6 +158,10 @@ msgctxt "print_sequence option all_at_once" msgid "All at Once" msgstr "同时打印" +msgctxt "cool_during_extruder_switch option all_fans" +msgid "All fans" +msgstr "所有风扇" + msgctxt "resolution description" msgid "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)" msgstr "影响打印分辨率的所有设置。 这些设置会对质量（和打印时间）产生显著影响" @@ -429,6 +442,14 @@ msgctxt "brim_width label" msgid "Brim Width" msgstr "Brim 宽度" +msgctxt "build_fan_full_at_height label" +msgid "Build Fan Speed at Height" +msgstr "在高度处的风扇速度" + +msgctxt "build_fan_full_layer label" +msgid "Build Fan Speed at Layer" +msgstr "在层上的风扇速度" + msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" msgstr "打印平台附着" @@ -469,6 +490,10 @@ msgctxt "bv_temp_warn_limit label" msgid "Build Volume temperature Warning" msgstr "打印体积温度警告" +msgctxt "build_volume_fan_nr label" +msgid "Build volume fan number" +msgstr "构建体积风扇编号" + msgctxt "prime_tower_brim_enable description" msgid "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height." msgstr "启用此设置将为您的 prime tower 添加一个边缘，即使您的模型中原本没有。如果您希望高塔有更坚固的基座，可以增加底座高度。" @@ -613,6 +638,10 @@ msgctxt "cooling label" msgid "Cooling" msgstr "冷却" +msgctxt "cool_during_extruder_switch label" +msgid "Cooling during extruder switch" +msgstr "挤出机切换期间的冷却" + msgctxt "infill_pattern option cross" msgid "Cross" msgstr "交叉" @@ -701,6 +730,14 @@ msgctxt "bridge_settings_enabled description" msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed." msgstr "在打印连桥时，检测连桥并修改打印速度、流量和风扇设置。" +msgctxt "scarf_split_distance description" +msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." +msgstr "确定在沿着缝合接缝挤出时流量变化中每一步的长度。较小的距离会导致更精确但也更复杂的 G-code。" + +msgctxt "scarf_joint_seam_length description" +msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." +msgstr "确定缝合接缝的长度,这是一种应使 Z 接缝不那么明显的接缝类型。必须大于 0 才能有效。" + msgctxt "inset_direction description" msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." msgstr "确定打印壁的顺序。先打印外壁有助于提高尺寸精度，因为内壁的误差不会传播到外壁。不过，在打印悬垂对象时，后打印外壁可以实现更好的堆叠。当总内壁数量不均匀时，“中心最后线”总是最后打印。" @@ -825,6 +862,10 @@ msgctxt "dual label" msgid "Dual Extrusion" msgstr "双重挤出" +msgctxt "gradual_flow_discretisation_step_size description" +msgid "Duration of each step in the gradual flow change" +msgstr "渐变流量变化中每个步骤的持续时间" + msgctxt "machine_shape option elliptic" msgid "Elliptic" msgstr "类圆形" @@ -917,6 +958,10 @@ msgctxt "ooze_shield_enabled description" msgid "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle." msgstr "启用外部渗出罩。 这将在模型周围创建一个外壳，如果与第一个喷嘴处于相同的高度，则可能会擦拭第二个喷嘴。" +msgctxt "gradual_flow_enabled description" +msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." +msgstr "启用渐变流量变化。启用之后,流量将会逐渐增加/减少到目标流量。这对于带有波登管的打印机非常有用,因为当挤出机电机启动/停止时,流量并不会立即改变。" + msgctxt "ppr_enable description" msgid "Enable print process reporting for setting threshold values for possible fault detection." msgstr "启用打印过程报告以设置可能的故障检测的阈值。" @@ -981,6 +1026,10 @@ msgctxt "meshfix_extensive_stitching description" msgid "Extensive stitching tries to stitch up open holes in the mesh by closing the hole with touching polygons. This option can introduce a lot of processing time." msgstr "广泛缝合尝试通过接触多边形来闭合孔洞，以此缝合网格中的开孔。 此选项可能会产生大量的处理时间。" +msgctxt "extra_infill_lines_to_support_skins label" +msgid "Extra Infill Lines To Support Skins" +msgstr "额外填充线以支撑表皮" + msgctxt "infill_wall_line_count label" msgid "Extra Infill Wall Count" msgstr "额外填充壁计数" @@ -993,6 +1042,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "喷嘴切换后的额外装填材料。" +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "挤出机 X 轴坐标" @@ -1005,6 +1058,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "挤出机初始 Z 轴位置" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "挤出器共用加热器" @@ -1177,6 +1234,10 @@ msgctxt "material_flush_purge_speed label" msgid "Flush Purge Speed" msgstr "冲洗清除速度" +msgctxt "reset_flow_duration description" +msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" +msgstr "对于任何长于此值的移动,材料流量将被重置为路径的目标流量" + msgctxt "min_wall_line_width description" msgid "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width." msgstr "对于一倍或两倍于喷嘴孔径的薄结构，需要更改走线宽度以遵循模型的厚度。此设置控制壁允许的最小走线宽度。同样，最小走线宽度内在地决定了最大走线宽度，因为我们在某些几何厚度中从 N 壁过渡到 N+1 壁时，N 壁宽而 N+1 壁窄。允许的最大壁走线宽度是最小壁走线宽度的两倍。" @@ -1222,14 +1283,16 @@ msgid "G-code Flavor" msgstr "G-code 风格" msgctxt "machine_end_gcode description" -msgid "G-code commands to be executed at the very end - separated by \n." -msgstr "在结束前执行的 G-code 命令 - 以 " -" 分行。" +msgid "" +"G-code commands to be executed at the very end - separated by \n" +"." +msgstr "在结束前执行的 G-code 命令 - 以 分行。" msgctxt "machine_start_gcode description" -msgid "G-code commands to be executed at the very start - separated by \n." -msgstr "在开始时执行的 G-code 命令 - 以 " -" 分行。" +msgid "" +"G-code commands to be executed at the very start - separated by \n" +"." +msgstr "在开始时执行的 G-code 命令 - 以 分行。" msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." @@ -1291,6 +1354,18 @@ msgctxt "gradual_support_infill_steps label" msgid "Gradual Support Infill Steps" msgstr "渐进支撑填充步阶" +msgctxt "gradual_flow_discretisation_step_size label" +msgid "Gradual flow discretisation step size" +msgstr "渐变流量离散化步长" + +msgctxt "gradual_flow_enabled label" +msgid "Gradual flow enabled" +msgstr "启用渐变流量" + +msgctxt "max_flow_acceleration label" +msgid "Gradual flow max acceleration" +msgstr "渐变流量最大加速度" + msgctxt "cool_min_temperature description" msgid "Gradually reduce to this temperature when printing at reduced speeds because of minimum layer time." msgstr "当由于最短印层时间而导致打印速度降低时，温度将逐渐降低至该温度。" @@ -1339,6 +1414,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "有加热打印平台" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "升温速度" @@ -1379,6 +1458,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "水平缩放因子收缩补偿" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "耗材受热拉伸但不断裂的极限长度。" @@ -1683,6 +1770,10 @@ msgctxt "material_initial_print_temperature label" msgid "Initial Printing Temperature" msgstr "起始打印温度" +msgctxt "layer_0_max_flow_acceleration label" +msgid "Initial layer max flow acceleration" +msgstr "初始层最大流量加速" + msgctxt "acceleration_wall_x label" msgid "Inner Wall Acceleration" msgstr "内壁加速度" @@ -1803,6 +1894,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "仅抖动部件的轮廓，而不抖动部件的孔。" +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "保留断开连接的面" @@ -1992,9 +2103,10 @@ msgid "Make the extruder prime position absolute rather than relative to the las msgstr "使挤出机主要位置为绝对值，而不是与上一已知打印头位置的相对值。" msgctxt "layer_0_z_overlap description" -msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\nIt may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" -msgstr "使模型打印的第一层和第二层在 Z 方向上重叠,以补偿气隙中损失的丝材。模型的第一层上方的所有部分都将向下移动此量。" -"您可能会发现,进行此设置后,有时第二层会打印在初始层下方。这是正常的" +msgid "" +"Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.\n" +"It may be noted that sometimes the second layer is printed below initial layer because of this setting. This is intended behavior" +msgstr "使模型打印的第一层和第二层在 Z 方向上重叠,以补偿气隙中损失的丝材。模型的第一层上方的所有部分都将向下移动此量。您可能会发现,进行此设置后,有时第二层会打印在初始层下方。这是正常的" msgctxt "meshfix description" msgid "Make the meshes more suited for 3D printing." @@ -2004,6 +2116,10 @@ msgctxt "machine_gcode_flavor option Makerbot" msgid "Makerbot" msgstr "Makerbot" +msgctxt "support_z_seam_away_from_model description" +msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." +msgstr "管理支撑结构的 z 形接缝与实际 3D 模型之间的空间关系。这个控制非常关键,因为它允许用户在打印后确保无缝去除支撑结构,而不会对打印模型造成损坏或留下痕迹。" + msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)" msgid "Marlin" msgstr "Marlin" @@ -2120,6 +2236,10 @@ msgctxt "meshfix_maximum_travel_resolution label" msgid "Maximum Travel Resolution" msgstr "空走的最大分辨率" +msgctxt "max_flow_acceleration description" +msgid "Maximum acceleration for gradual flow changes" +msgstr "渐变流量变化的最大加速度" + msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" msgstr "X 轴方向电机的最大加速度" @@ -2180,6 +2300,10 @@ msgctxt "slicing_tolerance option middle" msgid "Middle" msgstr "Middle" +msgctxt "support_z_seam_min_distance label" +msgid "Min Z Seam Distance from Model" +msgstr "模型的最小 Z 形接缝距离" + msgctxt "mold_width label" msgid "Minimal Mold Width" msgstr "最小模具宽度" @@ -2284,6 +2408,10 @@ msgctxt "minimum_roof_area description" msgid "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support." msgstr "支撑顶板的最小面积。面积小于此值的多边形将打印为一般支撑。" +msgctxt "layer_0_max_flow_acceleration description" +msgid "Minimum speed for gradual flow changes for the first layer" +msgstr "第一层渐变流量变化的最小速度" + msgctxt "min_feature_size description" msgid "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width." msgstr "薄特征的最小厚度。将不打印比此值更薄的模型特征，而比最小特征尺寸更厚的特征将加宽到最小壁走线宽度。" @@ -2324,6 +2452,10 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "多个 Skirt 走线帮助为小型模型更好地装填您的挤出部分。 将其设为 0 将禁用 skirt。" +msgctxt "support_infill_density_multiplier_initial_layer description" +msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." +msgstr "支撑初始层填充的倍数。增加这个值可能有助于床附着力。" + msgctxt "initial_layer_line_width_factor description" msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion." msgstr "第一层走线宽度乘数。 增大此乘数可改善热床粘着。" @@ -2344,6 +2476,10 @@ msgctxt "adhesion_type option none" msgid "None" msgstr "无" +msgctxt "extra_infill_lines_to_support_skins option none" +msgid "None" +msgstr "无" + msgctxt "z_seam_corner option z_seam_corner_none" msgid "None" msgstr "无" @@ -2372,14 +2508,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "不在外表面上" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "喷嘴角度" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "喷嘴直径" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "喷嘴不允许区域" @@ -2388,9 +2536,9 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "喷嘴 ID" -msgctxt "machine_nozzle_head_distance label" -msgid "Nozzle Length" -msgstr "喷嘴长度" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "喷嘴孔径" msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" @@ -2412,6 +2560,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "喷嘴切换回抽速度" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "挤出机数目" @@ -2480,6 +2636,10 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "排队打印" +msgctxt "cool_during_extruder_switch option only_last_extruder" +msgid "Only last extruder" +msgstr "仅最后一台挤出机" + msgctxt "retraction_hop_only_when_collides description" msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling." msgstr "仅在移动到无法通过“空驶时避开已打印部分”选项的水平操作避开的已打印部分上方时执行 Z 抬升。" @@ -2516,6 +2676,18 @@ msgctxt "acceleration_wall_0 label" msgid "Outer Wall Acceleration" msgstr "外壁加速度" +msgctxt "wall_0_acceleration label" +msgid "Outer Wall Acceleration" +msgstr "外墙加速" + +msgctxt "wall_0_deceleration label" +msgid "Outer Wall Deceleration" +msgstr "外墙减速" + +msgctxt "wall_0_end_speed_ratio label" +msgid "Outer Wall End Speed Ratio" +msgstr "外墙结束速度比率" + msgctxt "wall_0_extruder_nr label" msgid "Outer Wall Extruder" msgstr "外壁挤出机" @@ -2540,6 +2712,14 @@ msgctxt "speed_wall_0 label" msgid "Outer Wall Speed" msgstr "速度（外壁）" +msgctxt "wall_0_speed_split_distance label" +msgid "Outer Wall Speed Split Distance" +msgstr "外墙速度分割距离" + +msgctxt "wall_0_start_speed_ratio label" +msgid "Outer Wall Start Speed Ratio" +msgstr "外墙起始速度比率" + msgctxt "wall_0_wipe_dist label" msgid "Outer Wall Wipe Distance" msgstr "外壁擦嘴长度" @@ -2588,6 +2768,10 @@ msgctxt "bridge_fan_speed_3 description" msgid "Percentage fan speed to use when printing the third bridge skin layer." msgstr "打印桥梁第三层表面时使用的风扇百分比速度。" +msgctxt "z_seam_on_vertex description" +msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" +msgstr "将 z 形接缝放置在多边形顶点上。关闭此功能也可以在顶点之间放置接缝。（请注意,这不会覆盖在未支撑悬垂上放置接缝的限制。）" + msgctxt "minimum_polygon_circumference description" msgid "Polygons in sliced layers that have a circumference smaller than this amount will be filtered out. Lower values lead to higher resolution mesh at the cost of slicing time. It is meant mostly for high resolution SLA printers and very tiny 3D models with a lot of details." msgstr "切片层中周长小于此数值的多边形将被滤除。以切片时间为代价，较低的值可实现较高分辨率的网格。它主要用于高分辨率 SLA 打印机和包含大量细节的极小 3D 模型。" @@ -2636,6 +2820,10 @@ msgctxt "prime_tower_max_bridging_distance label" msgid "Prime Tower Maximum Bridging Distance" msgstr "主塔最大桥接距离" +msgctxt "prime_tower_min_shell_thickness label" +msgid "Prime Tower Minimum Shell Thickness" +msgstr "引导塔最小外壳厚度" + msgctxt "prime_tower_min_volume label" msgid "Prime Tower Minimum Volume" msgstr "装填塔最小体积" @@ -2668,6 +2856,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "打印加速度" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "打印抖动速度" @@ -2696,6 +2892,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "在打印品相邻处打印一个塔，用于在每个喷嘴切换后装填材料。" +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "只在模型的顶部支持打印填充结构。这样可以减少打印时间和材料的使用，但是会导致不一致的对象强度。" @@ -2744,6 +2944,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "按照一定的顺序打印顶部/底部走线，使它们始终在一个方向上与相邻的走线重叠。这需要更长一些的打印时间，但会使平面看起来更一致。" +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "打印温度" @@ -2788,6 +2992,18 @@ msgctxt "raft_base_fan_speed label" msgid "Raft Base Fan Speed" msgstr "Raft 基础风扇速度" +msgctxt "raft_base_flow label" +msgid "Raft Base Flow" +msgstr "筏底流量" + +msgctxt "raft_base_infill_overlap_mm label" +msgid "Raft Base Infill Overlap" +msgstr "筏底填充重叠" + +msgctxt "raft_base_infill_overlap label" +msgid "Raft Base Infill Overlap Percentage" +msgstr "筏底填充重叠百分比" + msgctxt "raft_base_line_spacing label" msgid "Raft Base Line Spacing" msgstr "Raft 基础走线间距" @@ -2828,6 +3044,26 @@ msgctxt "raft_fan_speed label" msgid "Raft Fan Speed" msgstr "Raft 风扇速度" +msgctxt "raft_flow label" +msgid "Raft Flow" +msgstr "木筏流量" + +msgctxt "raft_interface_flow label" +msgid "Raft Interface Flow" +msgstr "筏板界面层流量" + +msgctxt "raft_interface_infill_overlap_mm label" +msgid "Raft Interface Infill Overlap" +msgstr "筏板界面层填充重叠" + +msgctxt "raft_interface_infill_overlap label" +msgid "Raft Interface Infill Overlap Percentage" +msgstr "筏板界面层填充重叠百分比" + +msgctxt "raft_interface_z_offset label" +msgid "Raft Interface Z Offset" +msgstr "筏板界面层 Z 偏移" + msgctxt "raft_interface_margin label" msgid "Raft Middle Extra Margin" msgstr "筏层中段额外边距" @@ -2892,6 +3128,22 @@ msgctxt "raft_smoothing label" msgid "Raft Smoothing" msgstr "Raft 平滑度" +msgctxt "raft_surface_flow label" +msgid "Raft Surface Flow" +msgstr "木筏表面流量" + +msgctxt "raft_surface_infill_overlap_mm label" +msgid "Raft Surface Infill Overlap" +msgstr "木筏表面填充重叠" + +msgctxt "raft_surface_infill_overlap label" +msgid "Raft Surface Infill Overlap Percentage" +msgstr "木筏表面填充重叠百分比" + +msgctxt "raft_surface_z_offset label" +msgid "Raft Surface Z Offset" +msgstr "木筏表面 Z 偏移" + msgctxt "raft_surface_margin label" msgid "Raft Top Extra Margin" msgstr "筏层顶段额外边距" @@ -3056,6 +3308,10 @@ msgctxt "ppr description" msgid "Reporting events that go out of set thresholds" msgstr "报告超出设定阈值的事件" +msgctxt "reset_flow_duration label" +msgid "Reset flow duration" +msgstr "重置流量持续时间" + msgctxt "support_tree_rest_preference label" msgid "Rest Preference" msgstr "停留偏好" @@ -3120,6 +3376,18 @@ msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" msgstr "缩放因子收缩补偿" +msgctxt "scarf_joint_seam_length label" +msgid "Scarf Seam Length" +msgstr "缝合接缝长度" + +msgctxt "scarf_joint_seam_start_height_ratio label" +msgid "Scarf Seam Start Height" +msgstr "缝合接缝起始高度" + +msgctxt "scarf_split_distance label" +msgid "Scarf Seam Step Length" +msgstr "缝合接缝步长" + msgctxt "support_meshes_present label" msgid "Scene Has Support Meshes" msgstr "场景具有支撑网格" @@ -3128,6 +3396,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "缝隙角偏好设置" +msgctxt "seam_overhang_angle label" +msgid "Seam Overhanging Wall Angle" +msgstr "接缝悬垂墙角度" + msgctxt "user_defined_print_order_enabled label" msgid "Set Print Sequence Manually" msgstr "手动设置打印顺序" @@ -3472,6 +3744,10 @@ msgctxt "acceleration_support_infill label" msgid "Support Infill Acceleration" msgstr "支撑填充加速度" +msgctxt "support_infill_density_multiplier_initial_layer label" +msgid "Support Infill Density Multiplier Initial Layer" +msgstr "支持填充密度乘数初始层" + msgctxt "support_infill_extruder_nr label" msgid "Support Infill Extruder" msgstr "支撑填充挤出机" @@ -3664,6 +3940,10 @@ msgctxt "support_z_distance label" msgid "Support Z Distance" msgstr "支撑 Z 距离" +msgctxt "support_z_seam_away_from_model label" +msgid "Support Z Seam Away from Model" +msgstr "支持远离模型的 Z 形接缝" + msgctxt "support_interface_priority option support_lines_overwrite_interface_area" msgid "Support lines preferred" msgstr "偏好支撑线" @@ -3700,6 +3980,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "变换最内层和第二内层侧裙走线的打印顺序。这样可改善侧裙移除。" +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "切换为与每个层相交的网格相交体积，以便重叠的网格交织在一起。 关闭此设置将使其中一个网格获得重叠中的所有体积，同时将其从其他网格中移除。" @@ -3840,13 +4128,53 @@ msgctxt "acceleration_travel description" msgid "The acceleration with which travel moves are made." msgstr "进行空驶的加速度。" -msgctxt "ironing_flow description" -msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "熨平期间相对于正常皮肤走线的挤出材料量。 保持喷嘴填充状态有助于填充顶层表面的一些缝隙，但如填充过多则会导致表面上过度挤出和光点。" +msgctxt "raft_base_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "相对于正常挤出线,在筏底打印过程中挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" -msgctxt "infill_overlap description" -msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充物和壁之间的重叠量占填充走线宽度的百分比。稍微重叠可让各个壁与填充物牢固连接。" +msgctxt "raft_interface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "相对于正常挤出线,在筏板界面打印期间挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" + +msgctxt "raft_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "相对于正常挤出线,木筏打印过程中挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" + +msgctxt "raft_surface_flow description" +msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." +msgstr "相对于正常挤出线,在木筏表面打印期间挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" + +msgctxt "ironing_flow description" +msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." +msgstr "熨平期间相对于正常皮肤走线的挤出材料量。 保持喷嘴填充状态有助于填充顶层表面的一些缝隙，但如填充过多则会导致表面上过度挤出和光点。" + +msgctxt "infill_overlap description" +msgid "The amount of overlap between the infill and the walls as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充物和壁之间的重叠量占填充走线宽度的百分比。稍微重叠可让各个壁与填充物牢固连接。" + +msgctxt "raft_base_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充物与筏底墙壁之间的重叠量,以填充线宽度的百分比表示。轻微重叠可以使墙壁牢固地连接到填充物上。" + +msgctxt "raft_base_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充物与筏底壁之间的重叠量。轻微重叠可以使墙壁牢固地连接到填充物上。" + +msgctxt "raft_interface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充与筏板界面墙壁之间的重叠量,以填充线宽度的百分比表示。轻微重叠可以使墙壁牢固地连接到填充物上。" + +msgctxt "raft_interface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充物与筏板界面的墙壁之间的重叠量。轻微重叠可以使墙壁牢固地连接到填充物上。" + +msgctxt "raft_surface_infill_overlap description" +msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充与木筏表面壁之间的重叠量,以填充线宽度的百分比表示。轻微重叠可以使墙壁牢固地连接到填充物上。" + +msgctxt "raft_surface_infill_overlap_mm description" +msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." +msgstr "填充物与木筏表面的墙壁之间的重叠量。轻微重叠可以使墙壁牢固地连接到填充物上。" msgctxt "infill_overlap_mm description" msgid "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill." @@ -3952,6 +4280,10 @@ msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." msgstr "熨平走线之间的距离。" +msgctxt "support_z_seam_min_distance description" +msgid "The distance between the model and its support structure at the z-axis seam." +msgstr "模型与其支撑结构在z 轴接缝处的距离。" + msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." msgstr "喷嘴和已打印部分之间在空驶时避让的距离。" @@ -4120,6 +4452,10 @@ msgctxt "mold_roof_height description" msgid "The height above horizontal parts in your model which to print mold." msgstr "用于打印模具的模型水平部分上方的高度。" +msgctxt "build_fan_full_at_height description" +msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." +msgstr "风扇在常规风速下旋转的高度。在下面的层中,风扇速度会逐渐从初始风速增加到常规风速。" + msgctxt "cool_fan_full_at_height description" msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." msgstr "风扇以正常速度旋转的高度。 在下方的层中，风扇速度逐渐从起始风扇速度增加到正常风扇速度。" @@ -4128,10 +4464,6 @@ msgctxt "gantry_height description" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)." msgstr "喷嘴尖端与十字轴系统（X 轴和 Y 轴）之间的高度差。" -msgctxt "machine_nozzle_head_distance description" -msgid "The height difference between the tip of the nozzle and the lowest part of the print head." -msgstr "喷嘴尖端与打印头最低部分之间的高度差。" - msgctxt "retraction_hop_after_extruder_switch_height description" msgid "The height difference when performing a Z Hop after extruder switch." msgstr "挤出机切换后执行 Z 抬升的高度差。" @@ -4181,9 +4513,10 @@ msgid "The horizontal distance between the first brim line and the outline of th msgstr "第一条边沿线与打印件第一层轮廓之间的水平距离。较小的间隙可使边沿更容易去除，同时在散热方面仍有优势。" msgctxt "skirt_gap description" -msgid "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "skirt 和打印第一层之间的水平距离。" -"这是最小距离。多个 skirt 走线将从此距离向外延伸。" +msgid "" +"The horizontal distance between the skirt and the first layer of the print.\n" +"This is the minimum distance. Multiple skirt lines will extend outwards from this distance." +msgstr "skirt 和打印第一层之间的水平距离。这是最小距离。多个 skirt 走线将从此距离向外延伸。" msgctxt "lightning_infill_straightening_angle description" msgid "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line." @@ -4229,6 +4562,10 @@ msgctxt "top_skin_preshrink description" msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." msgstr "将被移除的顶部皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印顶部皮肤时所耗用的时间和材料。" +msgctxt "build_fan_full_layer description" +msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." +msgstr "构建风扇以全速旋转的层数。此值经过计算并四舍五入为整数。" + msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." msgstr "风扇以正常风扇速度旋转的层。 如果设置了正常风扇速度（高度），则该值将被计算并舍入为整数。" @@ -4441,6 +4778,10 @@ msgctxt "support_bottom_stair_step_min_slope description" msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model." msgstr "使阶梯生效的区域最小坡度。该值较小可在较浅的坡度上更容易去除支撑，但该值过小可能会在模型的其他部分上产生某些很反常的结果。" +msgctxt "prime_tower_min_shell_thickness description" +msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." +msgstr "引导塔壳的最小厚度。您可以增加它以使引导塔更坚固。" + msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." msgstr "在层中花费的最少时间。 这会迫使打印机减速，以便至少在一层中消耗此处所规定的时间。 这会让已打印材料充分冷却后再打印下一层。 如果提升头被禁用，且如果不这么做会违反“最小速度“，则层所花时间可能仍会少于最小层时间。" @@ -4509,6 +4850,10 @@ msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." msgstr "用于支撑 Brim 的走线数量。更多 Brim 走线可增强与打印平台的附着，但也会增加一些额外材料成本。" +msgctxt "build_volume_fan_nr description" +msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" +msgstr "冷却构建体积的风扇编号。如果设置为 0,则表示没有构建体积风扇" + msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." msgstr "第 2 个 raft 层上方的顶层数量。 这些是模型所在的完全填充层。 第二层会产生比第一层更平滑的顶部表面。" @@ -4601,6 +4946,10 @@ msgctxt "jerk_layer_0 description" msgid "The print maximum instantaneous velocity change for the initial layer." msgstr "起始层的打印最大瞬时速度变化。" +msgctxt "scarf_joint_seam_start_height_ratio description" +msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." +msgstr "缝合接缝开始的层高比率。较低的数字将导致更大的缝合高度。必须低于 100 才能有效。" + msgctxt "machine_shape description" msgid "The shape of the build plate without taking unprintable areas into account." msgstr "打印平台形状（不考虑不可打印区域）。" @@ -4929,6 +5278,26 @@ msgctxt "bridge_wall_coast description" msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge." msgstr "此参数用于控制挤出机在开始打印桥壁前应该滑行的距离。在开始打印连桥之前滑行，可以降低喷嘴中的压力，并保证打印出平滑的连桥。" +msgctxt "wall_0_acceleration description" +msgid "This is the acceleration with which to reach the top speed when printing an outer wall." +msgstr "这是打印外墙时达到最高速度的加速度。" + +msgctxt "wall_0_deceleration description" +msgid "This is the deceleration with which to end printing an outer wall." +msgstr "这是结束打印外墙时的减速度。" + +msgctxt "wall_0_speed_split_distance description" +msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." +msgstr "这是在拆分更长路径以应用外墙加速/减速时挤出路径的最大长度。较小的距离将创建更精确但也更冗长的 G-Code。" + +msgctxt "wall_0_end_speed_ratio description" +msgid "This is the ratio of the top speed to end with when printing an outer wall." +msgstr "这是打印外墙时在结束时的最高速度比率。" + +msgctxt "wall_0_start_speed_ratio description" +msgid "This is the ratio of the top speed to start with when printing an outer wall." +msgstr "这是打印外墙时在开始时的最高速度比率。" + msgctxt "raft_base_smoothing description" msgid "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle." msgstr "此设置用于调整筏层基段轮廓线内角的倒圆角大小。内角被倒角为半圆,其半径等于此处给出的值。此设置还会移除筏层轮廓线中面积小于此半径值圆的孔。" @@ -4969,6 +5338,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "为了补偿材料在冷却时的收缩，将用此因子缩放模型。" +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "顶部层数" @@ -5173,10 +5554,18 @@ msgctxt "support_tree_max_diameter label" msgid "Trunk Diameter" msgstr "主干直径" +msgctxt "seam_overhang_angle description" +msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." +msgstr "应尽量避免墙壁上的接缝伸出超过此角度。当数值为 90 时,没有墙壁将被视为悬垂。" + msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" msgstr "Ultimaker 2" +msgctxt "cool_during_extruder_switch option unchanged" +msgid "Unchanged" +msgstr "不变" + msgctxt "meshfix_union_all label" msgid "Union Overlapping Volumes" msgstr "联合覆盖体积" @@ -5301,9 +5690,17 @@ msgctxt "shell label" msgid "Walls" msgstr "墙" +msgctxt "extra_infill_lines_to_support_skins option walls" +msgid "Walls Only" +msgstr "仅墙体" + +msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" +msgid "Walls and Lines" +msgstr "墙体和线条" + msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." -msgstr "悬垂超过此角度的壁将使用悬垂壁设置打印。该值为 90 时，不会将任何壁视为悬垂。受到支撑支持的悬垂也不会被视为悬垂。" +msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." +msgstr "超过此角度的悬垂墙将使用悬垂墙设置打印。当值为 90 时,没有墙会被视为悬垂。得到支撑的悬垂也不会被视为悬垂。此外,任何少于一半悬垂的线也不会被视为悬垂。" msgctxt "meshfix_fluid_motion_enabled description" msgid "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions." @@ -5341,6 +5738,14 @@ msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." msgstr "打印桥壁时，将挤出的材料量乘以此值。" +msgctxt "raft_interface_z_offset description" +msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." +msgstr "打印第一层的筏板界面时,通过这个偏移来自定义筏底和筏板界面之间的附着力。负偏移量应该可以提高附着力。" + +msgctxt "raft_surface_z_offset description" +msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." +msgstr "打印第一层木筏表面时,通过这个偏移来自定义筏底和筏板界面之间的附着力。负偏移量应该可以提高附着力。" + msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." msgstr "打印连桥第二层表面时，将挤出的材料量乘以此值。" @@ -5637,6 +6042,10 @@ msgctxt "z_seam_type label" msgid "Z Seam Alignment" msgstr "Z 缝对齐" +msgctxt "z_seam_on_vertex label" +msgid "Z Seam On Vertex" +msgstr "顶点上的 Z 形接缝" + msgctxt "z_seam_position label" msgid "Z Seam Position" msgstr "Z 缝位置" @@ -5697,318 +6106,14 @@ msgctxt "travel description" msgid "travel" msgstr "空驶" -msgctxt "cool_during_extruder_switch description" -msgid "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
    • Unchanged: keep the fans as they were previously
    • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
    • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
    " -msgstr "是否在喷嘴切换期间启动冷却风扇。这可以通过更快地冷却喷嘴来帮助减少滴漏:
    • 不变:保持风扇原状
    • 仅最后一个挤出机: 启动最后一个使用的挤出机的风扇,但关闭其他风扇（如果有）。如果您有完全独立的挤出机,这非常有用。
    • 所有风扇: 在喷嘴开关期间打开所有风扇。如果您有一个单独的冷却风扇或多个彼此靠近的风扇,这非常有用。
    " - -msgctxt "cool_during_extruder_switch option all_fans" -msgid "All fans" -msgstr "所有风扇" - -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "挤出机切换期间的冷却" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "管理支撑结构的 z 形接缝与实际 3D 模型之间的空间关系。这个控制非常关键,因为它允许用户在打印后确保无缝去除支撑结构,而不会对打印模型造成损坏或留下痕迹。" - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "模型的最小 Z 形接缝距离" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "支撑初始层填充的倍数。增加这个值可能有助于床附着力。" - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "仅最后一台挤出机" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "将 z 形接缝放置在多边形顶点上。关闭此功能也可以在顶点之间放置接缝。（请注意,这不会覆盖在未支撑悬垂上放置接缝的限制。）" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "引导塔最小外壳厚度" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "筏底流量" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "筏底填充重叠" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "筏底填充重叠百分比" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "木筏流量" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "筏板界面层流量" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "筏板界面层填充重叠" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "筏板界面层填充重叠百分比" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "筏板界面层 Z 偏移" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "木筏表面流量" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "木筏表面填充重叠" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "木筏表面填充重叠百分比" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "木筏表面 Z 偏移" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "接缝悬垂墙角度" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "支持填充密度乘数初始层" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "支持远离模型的 Z 形接缝" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "相对于正常挤出线,在筏底打印过程中挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "相对于正常挤出线,在筏板界面打印期间挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "相对于正常挤出线,木筏打印过程中挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "相对于正常挤出线,在木筏表面打印期间挤出的材料量。增加流量可能会改善附着力和木筏结构强度。" - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充物与筏底墙壁之间的重叠量,以填充线宽度的百分比表示。轻微重叠可以使墙壁牢固地连接到填充物上。" - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充物与筏底壁之间的重叠量。轻微重叠可以使墙壁牢固地连接到填充物上。" - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充与筏板界面墙壁之间的重叠量,以填充线宽度的百分比表示。轻微重叠可以使墙壁牢固地连接到填充物上。" - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充物与筏板界面的墙壁之间的重叠量。轻微重叠可以使墙壁牢固地连接到填充物上。" - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充与木筏表面壁之间的重叠量,以填充线宽度的百分比表示。轻微重叠可以使墙壁牢固地连接到填充物上。" - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "填充物与木筏表面的墙壁之间的重叠量。轻微重叠可以使墙壁牢固地连接到填充物上。" - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "模型与其支撑结构在z 轴接缝处的距离。" - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "引导塔壳的最小厚度。您可以增加它以使引导塔更坚固。" - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "应尽量避免墙壁上的接缝伸出超过此角度。当数值为 90 时,没有墙壁将被视为悬垂。" - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "不变" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "打印第一层的筏板界面时,通过这个偏移来自定义筏底和筏板界面之间的附着力。负偏移量应该可以提高附着力。" - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "打印第一层木筏表面时,通过这个偏移来自定义筏底和筏板界面之间的附着力。负偏移量应该可以提高附着力。" - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "顶点上的 Z 形接缝" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "在填充模式中添加额外的线条以支撑上面的表皮。这一选项可以防止因下面的填充未能正确支撑上面打印的表皮层而导致的孔洞或塑料块,这在复杂形状的表皮中常见。\"墙\"仅支持表皮的轮廓,而\"墙和线\"还支持构成表皮的线条之末端。" - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "在高度处的风扇速度" +#~ msgctxt "machine_nozzle_head_distance label" +#~ msgid "Nozzle Length" +#~ msgstr "喷嘴长度" -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "在层上的风扇速度" +#~ msgctxt "machine_nozzle_head_distance description" +#~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." +#~ msgstr "喷嘴尖端与打印头最低部分之间的高度差。" -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "构建体积风扇编号" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "确定在沿着缝合接缝挤出时流量变化中每一步的长度。较小的距离会导致更精确但也更复杂的 G-code。" - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "确定缝合接缝的长度,这是一种应使 Z 接缝不那么明显的接缝类型。必须大于 0 才能有效。" - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "渐变流量变化中每个步骤的持续时间" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "启用渐变流量变化。启用之后,流量将会逐渐增加/减少到目标流量。这对于带有波登管的打印机非常有用,因为当挤出机电机启动/停止时,流量并不会立即改变。" - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "额外填充线以支撑表皮" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "对于任何长于此值的移动,材料流量将被重置为路径的目标流量" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "渐变流量离散化步长" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "启用渐变流量" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "渐变流量最大加速度" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "初始层最大流量加速" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "渐变流量变化的最大加速度" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "第一层渐变流量变化的最小速度" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "无" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "外墙加速" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "外墙减速" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "外墙结束速度比率" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "外墙速度分割距离" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "外墙起始速度比率" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "重置流量持续时间" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "缝合接缝长度" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "缝合接缝起始高度" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "缝合接缝步长" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "风扇在常规风速下旋转的高度。在下面的层中,风扇速度会逐渐从初始风速增加到常规风速。" - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "构建风扇以全速旋转的层数。此值经过计算并四舍五入为整数。" - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "冷却构建体积的风扇编号。如果设置为 0,则表示没有构建体积风扇" - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "缝合接缝开始的层高比率。较低的数字将导致更大的缝合高度。必须低于 100 才能有效。" - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "这是打印外墙时达到最高速度的加速度。" - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "这是结束打印外墙时的减速度。" - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "这是在拆分更长路径以应用外墙加速/减速时挤出路径的最大长度。较小的距离将创建更精确但也更冗长的 G-Code。" - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "这是打印外墙时在结束时的最高速度比率。" - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "这是打印外墙时在开始时的最高速度比率。" - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "仅墙体" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "墙体和线条" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "超过此角度的悬垂墙将使用悬垂墙设置打印。当值为 90 时,没有墙会被视为悬垂。得到支撑的悬垂也不会被视为悬垂。此外,任何少于一半悬垂的线也不会被视为悬垂。" +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "悬垂超过此角度的壁将使用悬垂壁设置打印。该值为 90 时，不会将任何壁视为悬垂。受到支撑支持的悬垂也不会被视为悬垂。" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index 6a63e1e0710..9bf4ae20306 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-10-09 14:27+0000\n" +"POT-Creation-Date: 2024-11-04 11:49+0000\n" "PO-Revision-Date: 2022-01-02 20:24+0800\n" "Last-Translator: Valen Chang \n" "Language-Team: Valen Chang \n" @@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." msgstr "噴頭切換後額外裝填的線材量。" +msgctxt "variant_name" +msgid "Extruder" +msgstr "" + msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" msgstr "擠出機 X 軸起始位置" @@ -1061,6 +1065,10 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "擠出機初始 Z 軸位置" +msgctxt "variant_name" +msgid "Extruder:" +msgstr "" + msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "擠出機共用加熱器" @@ -1417,6 +1425,10 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "有熱床" +msgctxt "variant_name" +msgid "Head" +msgstr "" + msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "加熱速度" @@ -1457,6 +1469,14 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" +msgctxt "variant_name" +msgid "Hot end" +msgstr "" + +msgctxt "variant_name" +msgid "Hotend" +msgstr "" + msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "在加熱時，線材在脆斷前可以拉伸多長的距離。" @@ -1885,6 +1905,26 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "只在列印外側時隨機抖動，內部孔洞不抖動。" +msgctxt "variant_name" +msgid "KLEMA 180 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Pro Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 250 Twin Size" +msgstr "" + +msgctxt "variant_name" +msgid "KLEMA 500 Size" +msgstr "" + msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "保持斷開表面" @@ -2479,14 +2519,26 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "不在外表面上" +msgctxt "variant_name" +msgid "Nozzle" +msgstr "" + msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "噴頭角度" +msgctxt "variant_name" +msgid "Nozzle Diam" +msgstr "" + msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "噴頭直徑" +msgctxt "variant_name" +msgid "Nozzle Diameter" +msgstr "" + msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "噴頭禁入區域" @@ -2495,6 +2547,10 @@ msgctxt "machine_nozzle_id label" msgid "Nozzle ID" msgstr "噴頭 ID" +msgctxt "variant_name" +msgid "Nozzle Size" +msgstr "噴頭孔徑" + msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" msgstr "噴頭切換額外裝填量" @@ -2515,6 +2571,14 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "噴頭切換回抽速度" +msgctxt "variant_name" +msgid "Nozzle Type" +msgstr "" + +msgctxt "variant_name" +msgid "Nozzle diameter" +msgstr "" + msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "擠出機數目" @@ -2803,6 +2867,14 @@ msgctxt "acceleration_print label" msgid "Print Acceleration" msgstr "列印加速度" +msgctxt "variant_name" +msgid "Print Core" +msgstr "" + +msgctxt "variant_name" +msgid "Print Head" +msgstr "" + msgctxt "jerk_print label" msgid "Print Jerk" msgstr "列印加加速度" @@ -2831,6 +2903,10 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "在列印件旁邊印一個塔，用在每次切換噴頭後填充線材。" +msgctxt "variant_name" +msgid "Print core" +msgstr "" + msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "只在模型頂部需要支撐的地方才列印填充。啟用此功能可減少列印時間和線材用量，但會導致物件強度不均勻。" @@ -2879,6 +2955,10 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "再列印頂層/底層線條時，命令相鄰線條於單方向重疊. 雖然會花更多時間列印，但會使平面更平整." +msgctxt "variant_name" +msgid "PrintHead type" +msgstr "" + msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "列印溫度" @@ -3911,6 +3991,14 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" +msgctxt "variant_name" +msgid "SwiftTool" +msgstr "" + +msgctxt "variant_name" +msgid "SwiftTool24" +msgstr "" + msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "將網格重疊的部分，交互的在每一層中歸屬到不同的網格，以便重疊的網格交織在一起。關閉此設定將使其中一個網格物體獲得重疊中的所有體積，而從其他網格物體中移除。" @@ -5263,6 +5351,18 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "為了補償線材在冷卻時的收縮，模型會依此比例放大列印。" +msgctxt "variant_name" +msgid "Tool" +msgstr "" + +msgctxt "variant_name" +msgid "Tool:" +msgstr "" + +msgctxt "variant_name" +msgid "Toolhead" +msgstr "" + msgctxt "top_layers label" msgid "Top Layers" msgstr "頂部層數" diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 8b4722ce326..41bf047795a 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -18,6 +18,12 @@ Item name: "cura" } + UM.I18nCatalog + { + id: catalog_fdmprinter + name: "fdmprinter.def.json" + } + width: parent.width height: childrenRect.height @@ -281,21 +287,9 @@ Item UM.Label { - text: getDefinitionVariantLabel(Cura.MachineManager.activeDefinitionVariantsName) + text: catalog_fdmprinter.i18nc("variant_name", Cura.MachineManager.activeDefinitionVariantsName) height: parent.height width: selectors.textWidth - - function getDefinitionVariantLabel(name) { - if (name === "Nozzle Size" || name === "Nozzle size") { - return catalog.i18nc("@label", "Nozzle Size"); - } else if (name === "Print Core" || name === "Print core") { - return catalog.i18nc("@label", "Print Core"); - } else if (name === "Extruder") { - return catalog.i18nc("@label", "Extruder"); - } else { - return ""; // Or a default label if needed - } - } } Cura.PrintSetupHeaderButton From 5d79bc2be36ae7b12b68f8c47568f0d5273e3efb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 4 Nov 2024 12:45:39 +0100 Subject: [PATCH 069/276] Remove double translations (wrong last conflict resolving) CURA-12255 --- resources/i18n/fr_FR/fdmprinter.def.json.po | 312 +------------------- 1 file changed, 4 insertions(+), 308 deletions(-) diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 6878d33ef9f..c794fdbff34 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-04 12:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6114,310 +6114,6 @@ msgstr "déplacement" #~ msgid "The height difference between the tip of the nozzle and the lowest part of the print head." #~ msgstr "La différence de hauteur entre la pointe de la buse et la partie la plus basse de la tête d'impression." -msgctxt "cool_during_extruder_switch label" -msgid "Cooling during extruder switch" -msgstr "Refroidissement lors de la commutation de l'extrudeuse" - -msgctxt "support_z_seam_away_from_model description" -msgid "Manage the spatial relationship between the z seam of the support structure and the actual 3D model. This control is crucial as it allows users to ensure the seamless removal of support structures post-printing, without inflicting damage or leaving marks on the printed model." -msgstr "Gérez la relation spatiale entre le joint en Z de la structure de support et le modèle 3D réel. Ce contrôle est essentiel, car il permet aux utilisateurs d'assurer le retrait transparent des structures de support après l'impression, sans endommager le modèle imprimé ni y laisser de marques." - -msgctxt "support_z_seam_min_distance label" -msgid "Min Z Seam Distance from Model" -msgstr "Distance min. du joint Z par rapport au modèle" - -msgctxt "support_infill_density_multiplier_initial_layer description" -msgid "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion." -msgstr "Multiplicateur pour le remplissage des couches initiales du support. L'augmentation de ce facteur peut contribuer à l'adhérence du lit." - -msgctxt "cool_during_extruder_switch option only_last_extruder" -msgid "Only last extruder" -msgstr "Seulement pour la dernière extrudeuse" - -msgctxt "z_seam_on_vertex description" -msgid "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)" -msgstr "Placz la couture en Z sur un sommet du polygone. Si vous désactivez cette option, vous pouvez également placer la couture entre les sommets. (Gardez à l'esprit que cela n'annule pas les restrictions imposées au placement de la couture sur un surplomb non supporté.)" - -msgctxt "prime_tower_min_shell_thickness label" -msgid "Prime Tower Minimum Shell Thickness" -msgstr "Épaisseur minimale de l'enveloppe de la tour d'amorçage" - -msgctxt "raft_base_flow label" -msgid "Raft Base Flow" -msgstr "Débit de base du radeau" - -msgctxt "raft_base_infill_overlap_mm label" -msgid "Raft Base Infill Overlap" -msgstr "Recouvrement du remplissage de la base du radier" - -msgctxt "raft_base_infill_overlap label" -msgid "Raft Base Infill Overlap Percentage" -msgstr "Pourcentage de chevauchement du remplissage de la base du radier" - -msgctxt "raft_flow label" -msgid "Raft Flow" -msgstr "Débit du radier" - -msgctxt "raft_interface_flow label" -msgid "Raft Interface Flow" -msgstr "Débit de l'interface du radier" - -msgctxt "raft_interface_infill_overlap_mm label" -msgid "Raft Interface Infill Overlap" -msgstr "Recouvrement de l'interface du radier" - -msgctxt "raft_interface_infill_overlap label" -msgid "Raft Interface Infill Overlap Percentage" -msgstr "Pourcentage de chevauchement de l'interface du radier" - -msgctxt "raft_interface_z_offset label" -msgid "Raft Interface Z Offset" -msgstr "Décalage Z de l'interface du radeau" - -msgctxt "raft_surface_flow label" -msgid "Raft Surface Flow" -msgstr "Écoulement de la surface du radier" - -msgctxt "raft_surface_infill_overlap_mm label" -msgid "Raft Surface Infill Overlap" -msgstr "Chevauchement du remplissage de la surface du radier" - -msgctxt "raft_surface_infill_overlap label" -msgid "Raft Surface Infill Overlap Percentage" -msgstr "Pourcentage du remplissage de la surface du radier" - -msgctxt "raft_surface_z_offset label" -msgid "Raft Surface Z Offset" -msgstr "Décalage Z de la surface du radier" - -msgctxt "seam_overhang_angle label" -msgid "Seam Overhanging Wall Angle" -msgstr "Angle du mur en surplomb du joint" - -msgctxt "support_infill_density_multiplier_initial_layer label" -msgid "Support Infill Density Multiplier Initial Layer" -msgstr "Couche initiale du multiplicateur de densité du support de remplissage" - -msgctxt "support_z_seam_away_from_model label" -msgid "Support Z Seam Away from Model" -msgstr "Joint Z du support à l'opposé du modèle" - -msgctxt "raft_base_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de la base du radeau. L'augmentation du débit peut améliorer l'adhérence et la solidité structurelle de l'empilement." - -msgctxt "raft_interface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de l'interface du radeau. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du radeau." - -msgctxt "raft_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder lors de l'impression du chevron. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du chevron." - -msgctxt "raft_surface_flow description" -msgid "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength." -msgstr "La quantité de matériau, par rapport à une ligne d'extrusion normale, à extruder pendant l'impression de la surface du radeau. L'augmentation du débit peut améliorer l'adhérence et la résistance structurelle du chevron." - -msgctxt "raft_base_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les parois de la base du radeau, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux parois de se raccorder fermement au remplissage." - -msgctxt "raft_base_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill." -msgstr "Le degré de chevauchement entre le remplissage et les parois de la base du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_interface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les murs de l'interface du radier, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_interface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les murs de l'interface du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_surface_infill_overlap description" -msgid "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les parois de la surface du radier, en pourcentage de la largeur de la ligne de remplissage. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "raft_surface_infill_overlap_mm description" -msgid "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill." -msgstr "La quantité de chevauchement entre le remplissage et les murs de la surface du radier. Un léger chevauchement permet aux murs de se raccorder fermement au remplissage." - -msgctxt "support_z_seam_min_distance description" -msgid "The distance between the model and its support structure at the z-axis seam." -msgstr "La distance entre le modèle et sa structure de support au niveau de la couture de l'axe z." - -msgctxt "prime_tower_min_shell_thickness description" -msgid "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger." -msgstr "L'épaisseur minimale de la coque de l'échafaudage principal. Vous pouvez l'augmenter pour rendre l'échafaudage plus solide." - -msgctxt "seam_overhang_angle description" -msgid "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging." -msgstr "Essayez d'éviter les coutures sur les murs qui dépassent cet angle. Lorsque la valeur est de 90, aucun mur ne sera traité comme étant en surplomb." - -msgctxt "cool_during_extruder_switch option unchanged" -msgid "Unchanged" -msgstr "Inchangé" - -msgctxt "raft_interface_z_offset description" -msgid "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion." -msgstr "Lors de l'impression de la première couche de l'interface du radeau, ce décalage permet de personnaliser l'adhérence entre la base et l'interface. Un décalage négatif devrait améliorer l'adhérence." - -msgctxt "raft_surface_z_offset description" -msgid "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion." -msgstr "Lors de l'impression de la première couche de la surface du radeau, il faut tenir compte de ce décalage pour personnaliser l'adhérence entre l'interface et la surface. Un décalage négatif devrait améliorer l'adhérence." - -msgctxt "z_seam_on_vertex label" -msgid "Z Seam On Vertex" -msgstr "Joint en Z sur le sommet" - -msgctxt "extra_infill_lines_to_support_skins description" -msgid "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin." -msgstr "Ajoutez des lignes supplémentaires dans le motif de remplissage pour soutenir les peaux situées au-dessus. Cette option permet d'éviter les trous ou les bulles de plastique qui apparaissent parfois dans les peaux de forme complexe, parce que le remplissage en dessous ne soutient pas correctement la couche de peau imprimée au-dessus. L'option \"Murs\" ne prend en charge que les contours de la peau, tandis que l'option \"Murs et lignes\" prend également en charge les extrémités des lignes qui composent la peau." - -msgctxt "build_fan_full_at_height label" -msgid "Build Fan Speed at Height" -msgstr "Construire la vitesse du ventilateur en hauteur" - -msgctxt "build_fan_full_layer label" -msgid "Build Fan Speed at Layer" -msgstr "Vitesse du ventilateur de construction à la couche" - -msgctxt "build_volume_fan_nr label" -msgid "Build volume fan number" -msgstr "Numéro du ventilateur de volume de construction" - -msgctxt "scarf_split_distance description" -msgid "Determines the length of each step in the flow change when extruding along the scarf seam. A smaller distance will result in a more precise but also more complex G-code." -msgstr "Détermine la longueur de chaque étape du changement de flux lors de l'extrusion le long de la jointure biaisée. Une distance plus petite se traduira par un G-code plus précis mais aussi plus complexe." - -msgctxt "scarf_joint_seam_length description" -msgid "Determines the length of the scarf seam, a seam type that should make the Z seam less visible. Must be higher than 0 to be effective." -msgstr "Détermine la longueur de la jointure biaisée, un type de jointure qui devrait rendre la jointure en Z moins visible. La valeur doit être supérieure à 0 pour être active." - -msgctxt "gradual_flow_discretisation_step_size description" -msgid "Duration of each step in the gradual flow change" -msgstr "Durée de chaque pas dans la variation progressive du débit" - -msgctxt "gradual_flow_enabled description" -msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops." -msgstr "Activer les variations de débit progressives. Lorsque cette option est activée, le débit est augmenté ou réduit progressivement jusqu'au débit souhaité. Cette option est utile pour les imprimantes avec un tube bowden où le débit n'est pas modifié immédiatement lorsque le moteur de l'extrudeur démarre ou s'arrête." - -msgctxt "extra_infill_lines_to_support_skins label" -msgid "Extra Infill Lines To Support Skins" -msgstr "Lignes de remplissage supplémentaires pour soutenir les peaux" - -msgctxt "reset_flow_duration description" -msgid "For any travel move longer than this value, the material flow is reset to the paths target flow" -msgstr "Pour tout déplacement supérieur à cette valeur, le débit de matière est réinitialisé au débit souhaité pour les trajectoires" - -msgctxt "gradual_flow_discretisation_step_size label" -msgid "Gradual flow discretisation step size" -msgstr "Taille de pas de la discrétisation du débit progressif" - -msgctxt "gradual_flow_enabled label" -msgid "Gradual flow enabled" -msgstr "Débit progressif activé" - -msgctxt "max_flow_acceleration label" -msgid "Gradual flow max acceleration" -msgstr "Accélération progressive jusqu'au débit max" - -msgctxt "layer_0_max_flow_acceleration label" -msgid "Initial layer max flow acceleration" -msgstr "Accélération maximale du débit lors de la première couche" - -msgctxt "max_flow_acceleration description" -msgid "Maximum acceleration for gradual flow changes" -msgstr "Accélération maximale pour les variations de débit progressives" - -msgctxt "layer_0_max_flow_acceleration description" -msgid "Minimum speed for gradual flow changes for the first layer" -msgstr "Vitesse minimale pour les variations de débit progressives pour la première couche" - -msgctxt "extra_infill_lines_to_support_skins option none" -msgid "None" -msgstr "Aucune" - -msgctxt "wall_0_acceleration label" -msgid "Outer Wall Acceleration" -msgstr "Accélération du mur extérieur" - -msgctxt "wall_0_deceleration label" -msgid "Outer Wall Deceleration" -msgstr "Décélération du mur extérieur" - -msgctxt "wall_0_end_speed_ratio label" -msgid "Outer Wall End Speed Ratio" -msgstr "Rapport de vitesse de fin de mur extérieur" - -msgctxt "wall_0_speed_split_distance label" -msgid "Outer Wall Speed Split Distance" -msgstr "Distance de division de la vitesse de mur extérieur" - -msgctxt "wall_0_start_speed_ratio label" -msgid "Outer Wall Start Speed Ratio" -msgstr "Rapport de vitesse de départ du mur extérieur" - -msgctxt "reset_flow_duration label" -msgid "Reset flow duration" -msgstr "Réinitialiser la durée du débit" - -msgctxt "scarf_joint_seam_length label" -msgid "Scarf Seam Length" -msgstr "Longueur de la jointure biaisée" - -msgctxt "scarf_joint_seam_start_height_ratio label" -msgid "Scarf Seam Start Height" -msgstr "Hauteur de départ de la jointure biaisée" - -msgctxt "scarf_split_distance label" -msgid "Scarf Seam Step Length" -msgstr "Longueur du pas de la jointure biaisée" - -msgctxt "build_fan_full_at_height description" -msgid "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed." -msgstr "Hauteur à laquelle les ventilateurs tournent à la vitesse normale. Dans les couches inférieures, la vitesse du ventilateur passe progressivement de la vitesse initiale à la vitesse normale." - -msgctxt "build_fan_full_layer description" -msgid "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number." -msgstr "La couche à laquelle les ventilateurs de construction tournent à pleine vitesse. Cette valeur est calculée et arrondie à un nombre entier." - -msgctxt "build_volume_fan_nr description" -msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "Le numéro du ventilateur qui refroidit le volume de construction. S'il est fixé à 0, cela signifie qu'il n'y a pas de ventilateur de volume de construction." - -msgctxt "scarf_joint_seam_start_height_ratio description" -msgid "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective." -msgstr "Le ratio de la hauteur de couche sélectionnée à laquelle la jointure biaisée commencera. Un nombre inférieur entraînera une plus grande hauteur de biais. Il doit être inférieur à 100 pour être actif." - -msgctxt "wall_0_acceleration description" -msgid "This is the acceleration with which to reach the top speed when printing an outer wall." -msgstr "Il s'agit de l'accélération permettant d'atteindre la vitesse maximale lors de l'impression d'un mur extérieur." - -msgctxt "wall_0_deceleration description" -msgid "This is the deceleration with which to end printing an outer wall." -msgstr "Il s'agit de la décélération permettant de terminer l'impression d'un mur extérieur." - -msgctxt "wall_0_speed_split_distance description" -msgid "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code." -msgstr "Il s'agit de la longueur maximale d'un chemin d'extrusion lors de la division d'un chemin plus long pour appliquer l'accélération/décélération du mur extérieur. Une distance plus petite créera un code G plus précis mais aussi plus verbeux." - -msgctxt "wall_0_end_speed_ratio description" -msgid "This is the ratio of the top speed to end with when printing an outer wall." -msgstr "Il s'agit du ratio de la vitesse maximale à laquelle il faut terminer lors de l'impression d'un mur extérieur." - -msgctxt "wall_0_start_speed_ratio description" -msgid "This is the ratio of the top speed to start with when printing an outer wall." -msgstr "Il s'agit du rapport entre la vitesse maximale et la vitesse de départ lors de l'impression d'un mur extérieur." - -msgctxt "extra_infill_lines_to_support_skins option walls" -msgid "Walls Only" -msgstr "Murs uniquement" - -msgctxt "extra_infill_lines_to_support_skins option walls_and_lines" -msgid "Walls and Lines" -msgstr "Murs et lignes" - -msgctxt "wall_overhang_angle description" -msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang." -msgstr "Les murs qui dépassent de plus de cet angle seront imprimés en utilisant les paramètres des murs en surplomb. Lorsque la valeur est de 90, aucun mur n'est traité comme étant en surplomb. Les surplombs qui sont soutenus par un support ne seront pas non plus traités comme des surplombs. En outre, toute ligne dont le surplomb est inférieur à la moitié ne sera pas non plus traitée comme un surplomb." +#~ msgctxt "wall_overhang_angle description" +#~ msgid "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either." +#~ msgstr "Les parois ayant un angle supérieur à cette valeur seront imprimées en utilisant les paramètres de parois en porte-à-faux. Si la valeur est 90, aucune paroi ne sera considérée comme étant en porte-à-faux. La saillie soutenue par le support ne sera pas non plus considérée comme étant en porte-à-faux." From 71d4afcd5f903b2d18abc9fd2f50a555862eba42 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:09:15 +0100 Subject: [PATCH 070/276] Update for second beta Update for second beta --- resources/texts/change_log.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 589ce1f6cb3..5bae388acf7 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -29,6 +29,16 @@ - Fixed a bug that prevented changes to the initial layer diameter from being applied properly, contributed by @ThomasRahm - Fixed a rounding issue in the engine math, @0x5844 +* Bugs resolved during the first Beta +- Spiralize outer contour no longer adds unnecessary seams to the model +- When coasting is enabled the printhead no longer drops down +- Updated the strategy for sharpest corner - smart hiding seam location combination +- Fixed a bug where long scarf seams and short scarf seam steps would result in the seam being moved outward +- Fixed a bug where seam acceleration and deceleration were not working +- Triple-clicking values and searches that you entered now has you select everything so you can edit it in the field similar to other desktop applications +- Updated dependencies and improved how unwanted and unused binaries are excluded from the building process. +- Added Eazao material for the new Eazao printers + * Printer definitions, profiles, and materials: - Introduced Makerbot Sketch Sprint - Introduced Makerbot Sketch and Sketch Large @@ -46,6 +56,12 @@ - Updated Japanese translations by @h1data - Brazilian Portuguese by @Patola +* Known issues +- This second beta introduces a change that affects the UI so please use buttons, dropdowns, menus, and flows. We hope we did this correctly but it is a tricky change. If you see the crash please report it to us, and we will also see it show up in our crash tracking tool. +- There is a slight regression in terms of seam alignment in different strategies we hope to resolve before stable +- We see an increase in micro-segments in the outer wall, which we hope to resolve before stable (an increase in microsegments in the infill is expected) +- We see rare cases of Cura crashing after opening project files with custom extruders or printer settings than the printer that is already loaded + [5.8.1] * Bug fixes: From aa5a4f47c79a90b025751e2f1f6bc629136506de Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:59:31 +0100 Subject: [PATCH 071/276] Apply suggestions from code review Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com> --- resources/texts/change_log.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 5bae388acf7..aabe7687e41 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -29,12 +29,13 @@ - Fixed a bug that prevented changes to the initial layer diameter from being applied properly, contributed by @ThomasRahm - Fixed a rounding issue in the engine math, @0x5844 -* Bugs resolved during the first Beta +* Bugs resolved after the first Beta - Spiralize outer contour no longer adds unnecessary seams to the model - When coasting is enabled the printhead no longer drops down - Updated the strategy for sharpest corner - smart hiding seam location combination - Fixed a bug where long scarf seams and short scarf seam steps would result in the seam being moved outward - Fixed a bug where seam acceleration and deceleration were not working +- Fixed a bug where infill was wrongly removed from narrow spaces - Triple-clicking values and searches that you entered now has you select everything so you can edit it in the field similar to other desktop applications - Updated dependencies and improved how unwanted and unused binaries are excluded from the building process. - Added Eazao material for the new Eazao printers @@ -59,7 +60,7 @@ * Known issues - This second beta introduces a change that affects the UI so please use buttons, dropdowns, menus, and flows. We hope we did this correctly but it is a tricky change. If you see the crash please report it to us, and we will also see it show up in our crash tracking tool. - There is a slight regression in terms of seam alignment in different strategies we hope to resolve before stable -- We see an increase in micro-segments in the outer wall, which we hope to resolve before stable (an increase in microsegments in the infill is expected) +- We see an increase in micro-segments in the outer wall, which we hope to resolve before stable - We see rare cases of Cura crashing after opening project files with custom extruders or printer settings than the printer that is already loaded [5.8.1] From dcbd40ca7dcc06603f7e2ec8098d4145688afb06 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 5 Nov 2024 13:05:42 +0000 Subject: [PATCH 072/276] Set conan package version 5.9.0-beta.2 --- conandata.yml | 14 +++++++------- resources/conandata.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index 735e1ce9e08..4336dd073ce 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,16 +1,16 @@ -version: "5.9.0-beta.1" +version: "5.9.0-beta.2" requirements: - - "cura_resources/5.9.0-beta.1" - - "uranium/5.9.0-beta.1" - - "curaengine/5.9.0-beta.1" - - "cura_binary_data/5.9.0-beta.1" - - "fdm_materials/5.9.0-beta.1" + - "cura_resources/5.9.0-beta.2" + - "uranium/5.9.0-beta.2" + - "curaengine/5.9.0-beta.2" + - "cura_binary_data/5.9.0-beta.2" + - "fdm_materials/5.9.0-beta.2" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.9.0-beta.1" + - "fdm_materials/5.9.0-beta.2" - "cura_private_data/(latest)@internal/testing" urls: default: diff --git a/resources/conandata.yml b/resources/conandata.yml index 3aff2227065..0c252e8bc22 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.9.0-beta.1" +version: "5.9.0-beta.2" From c89b708525fc13e655c4dd12414a89450cb0c9f6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 5 Nov 2024 20:44:25 +0100 Subject: [PATCH 073/276] Make grid-translucency depend on if machine has texture on BP. part of CURA-12188 --- cura/BuildVolume.py | 8 ++++++-- resources/definitions/ankermake_m5.def.json | 1 + resources/definitions/ankermake_m5c.def.json | 1 + resources/definitions/dagoma_sigma_pro.def.json | 1 + resources/definitions/dagoma_sigma_pro_dual.def.json | 1 + resources/definitions/fdmprinter.def.json | 1 + resources/definitions/flyingbear_ghost_4s.def.json | 1 + resources/definitions/flyingbear_ghost_5.def.json | 1 + resources/definitions/flyingbear_ghost_6.def.json | 1 + resources/definitions/hellbot_adonis.def.json | 3 ++- resources/definitions/hellbot_hidra.def.json | 3 ++- resources/definitions/hellbot_hidra_plus.def.json | 3 ++- resources/definitions/hellbot_magna_2_230.def.json | 3 ++- resources/definitions/hellbot_magna_2_230_dual.def.json | 3 ++- resources/definitions/hellbot_magna_2_300.def.json | 3 ++- resources/definitions/hellbot_magna_2_300_dual.def.json | 3 ++- resources/definitions/hellbot_magna_2_400.def.json | 3 ++- resources/definitions/hellbot_magna_2_400_dual.def.json | 3 ++- resources/definitions/hellbot_magna_2_500.def.json | 3 ++- resources/definitions/hellbot_magna_2_500_dual.def.json | 3 ++- resources/definitions/hellbot_magna_I.def.json | 3 ++- resources/definitions/hellbot_magna_SE.def.json | 3 ++- resources/definitions/hellbot_magna_SE_300.def.json | 3 ++- resources/definitions/hellbot_magna_SE_Pro.def.json | 3 ++- resources/definitions/hellbot_magna_dual.def.json | 3 ++- resources/definitions/koonovo_base.def.json | 1 + resources/definitions/peopoly_moai.def.json | 3 ++- resources/definitions/ultimaker_sketch_sprint.def.json | 1 + resources/definitions/uni_200.def.json | 1 + resources/definitions/uni_250.def.json | 1 + resources/definitions/uni_300.def.json | 1 + resources/definitions/uni_mini.def.json | 1 + resources/shaders/grid.shader | 4 ++-- 33 files changed, 56 insertions(+), 21 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 02cc943823c..18b762bb2c5 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -252,14 +252,18 @@ def render(self, renderer): if not self.getMeshData() or not self.isVisible(): return True + theme = self._application.getTheme() if not self._shader: self._shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "default.shader")) self._grid_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "grid.shader")) - theme = self._application.getTheme() - self._grid_shader.setUniformValue("u_plateColor", Color(*theme.getColor("buildplate").getRgb())) self._grid_shader.setUniformValue("u_gridColor0", Color(*theme.getColor("buildplate_grid").getRgb())) self._grid_shader.setUniformValue("u_gridColor1", Color(*theme.getColor("buildplate_grid_minor").getRgb())) + plate_color = Color(*theme.getColor("buildplate").getRgb()) + if self._global_container_stack.getMetaDataEntry("has_textured_buildplate", False): + plate_color.setA(0.5) + self._grid_shader.setUniformValue("u_plateColor", plate_color) + renderer.queueNode(self, mode = RenderBatch.RenderMode.Lines) renderer.queueNode(self, mesh = self._origin_mesh, backface_cull = True) renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True, transparent = True, sort = -10) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index 4e4b3498b3c..c79870537ad 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -12,6 +12,7 @@ "has_machine_quality": true, "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, "platform_texture": "ankermake_m5.png", + "has_textured_buildplate": true, "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json index 2f49e0f030e..22d1e56a946 100644 --- a/resources/definitions/ankermake_m5c.def.json +++ b/resources/definitions/ankermake_m5c.def.json @@ -12,6 +12,7 @@ "has_machine_quality": true, "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" }, "platform_texture": "ankermake_m5c.png", + "has_textured_buildplate": true, "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, diff --git a/resources/definitions/dagoma_sigma_pro.def.json b/resources/definitions/dagoma_sigma_pro.def.json index 8bbac5a4837..31e477ca0ee 100644 --- a/resources/definitions/dagoma_sigma_pro.def.json +++ b/resources/definitions/dagoma_sigma_pro.def.json @@ -17,6 +17,7 @@ "preferred_quality_type": "h0.2", "preferred_variant_name": "Brass 0.4mm", "quality_definition": "dagoma_sigma_pro", + "has_textured_buildplate": true, "variants_name": "Nozzle" }, "overrides": diff --git a/resources/definitions/dagoma_sigma_pro_dual.def.json b/resources/definitions/dagoma_sigma_pro_dual.def.json index eb11b37603b..a81d1cc0287 100644 --- a/resources/definitions/dagoma_sigma_pro_dual.def.json +++ b/resources/definitions/dagoma_sigma_pro_dual.def.json @@ -18,6 +18,7 @@ "1": "dagoma_sigma_pro_dual_extruder_left" }, "platform_texture": "dagoma_sigma_pro.png", + "has_textured_buildplate": true, "preferred_quality_type": "h0.2", "preferred_variant_name": "Brass 0.4mm", "quality_definition": "dagoma_sigma_pro_dual", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 31cffc4dc36..58dacc3a176 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -15,6 +15,7 @@ "preferred_material": "generic_pla", "preferred_quality_type": "normal", "machine_extruder_trains": { "0": "fdmextruder" }, + "has_textured_buildplate": false, "supports_usb_connection": true, "supports_network_connection": false, "supports_abstract_color": false diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index fe5b82a49f8..f2839142377 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -8,6 +8,7 @@ "author": "oducceu", "platform": "flyingbear_platform.obj", "platform_texture": "flyingbear_platform.png", + "has_textured_buildplate": true, "quality_definition": "flyingbear_base" }, "overrides": diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index 26108d9eeb2..615b910ee72 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -8,6 +8,7 @@ "author": "oducceu", "platform": "flyingbear_platform.obj", "platform_texture": "flyingbear_platform.png", + "has_textured_buildplate": true, "quality_definition": "flyingbear_base" }, "overrides": diff --git a/resources/definitions/flyingbear_ghost_6.def.json b/resources/definitions/flyingbear_ghost_6.def.json index 26c067285e0..a32931748a7 100644 --- a/resources/definitions/flyingbear_ghost_6.def.json +++ b/resources/definitions/flyingbear_ghost_6.def.json @@ -8,6 +8,7 @@ "author": "barrnet", "platform": "flyingbear_platform.obj", "platform_texture": "flyingbear_platform.png", + "has_textured_buildplate": true, "quality_definition": "flyingbear_base" }, "overrides": diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json index 8f797dc6686..9daa5fc7209 100644 --- a/resources/definitions/hellbot_adonis.def.json +++ b/resources/definitions/hellbot_adonis.def.json @@ -16,7 +16,8 @@ -1, 0 ], - "platform_texture": "hellbot.png" + "platform_texture": "hellbot.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json index 810f308a19f..3ebdb7bb99c 100644 --- a/resources/definitions/hellbot_hidra.def.json +++ b/resources/definitions/hellbot_hidra.def.json @@ -20,7 +20,8 @@ 0, 5 ], - "platform_texture": "hellbot_hidra.png" + "platform_texture": "hellbot_hidra.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json index 60654b9dec8..844faa1904e 100644 --- a/resources/definitions/hellbot_hidra_plus.def.json +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -20,7 +20,8 @@ 0, 5 ], - "platform_texture": "hellbot_hidra_plus.png" + "platform_texture": "hellbot_hidra_plus.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json index 10be0b79fc7..6757599d3f8 100644 --- a/resources/definitions/hellbot_magna_2_230.def.json +++ b/resources/definitions/hellbot_magna_2_230.def.json @@ -11,7 +11,8 @@ "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" }, - "platform_texture": "Magna2_230.png" + "platform_texture": "Magna2_230.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index 31501cbea12..d913a0d89fa 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -15,7 +15,8 @@ "0": "hellbot_magna_2_230_dual_extruder_0", "1": "hellbot_magna_2_230_dual_extruder_1" }, - "platform_texture": "Magna2_230.png" + "platform_texture": "Magna2_230.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json index 3fd09e49f33..1a49f41a374 100644 --- a/resources/definitions/hellbot_magna_2_300.def.json +++ b/resources/definitions/hellbot_magna_2_300.def.json @@ -11,7 +11,8 @@ "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" }, - "platform_texture": "Magna2_300.png" + "platform_texture": "Magna2_300.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index 11d98cf1501..9db9e9774e0 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -15,7 +15,8 @@ "0": "hellbot_magna_2_300_dual_extruder_0", "1": "hellbot_magna_2_300_dual_extruder_1" }, - "platform_texture": "Magna2_300.png" + "platform_texture": "Magna2_300.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_400.def.json b/resources/definitions/hellbot_magna_2_400.def.json index c27273c67b6..797584e3412 100644 --- a/resources/definitions/hellbot_magna_2_400.def.json +++ b/resources/definitions/hellbot_magna_2_400.def.json @@ -11,7 +11,8 @@ "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" }, - "platform_texture": "Magna2_400.png" + "platform_texture": "Magna2_400.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json index 560bd800b4f..e74221bbd3c 100644 --- a/resources/definitions/hellbot_magna_2_400_dual.def.json +++ b/resources/definitions/hellbot_magna_2_400_dual.def.json @@ -15,7 +15,8 @@ "0": "hellbot_magna_2_400_dual_extruder_0", "1": "hellbot_magna_2_400_dual_extruder_1" }, - "platform_texture": "Magna2_400.png" + "platform_texture": "Magna2_400.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_500.def.json b/resources/definitions/hellbot_magna_2_500.def.json index d718fd36359..61bddc7b9af 100644 --- a/resources/definitions/hellbot_magna_2_500.def.json +++ b/resources/definitions/hellbot_magna_2_500.def.json @@ -11,7 +11,8 @@ "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" }, - "platform_texture": "Magna2_500.png" + "platform_texture": "Magna2_500.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json index cb5e8b94be6..040c2898671 100644 --- a/resources/definitions/hellbot_magna_2_500_dual.def.json +++ b/resources/definitions/hellbot_magna_2_500_dual.def.json @@ -15,7 +15,8 @@ "0": "hellbot_magna_2_500_dual_extruder_0", "1": "hellbot_magna_2_500_dual_extruder_1" }, - "platform_texture": "Magna2_500.png" + "platform_texture": "Magna2_500.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index 263a182ebc7..0adcaa38e2b 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -16,7 +16,8 @@ -1, 0 ], - "platform_texture": "hellbot.png" + "platform_texture": "hellbot.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index 0c010151e69..f568d944ec4 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -11,7 +11,8 @@ "platform": "hellbot_magna_SE.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, - "platform_texture": "hellbot_magna_SE.png" + "platform_texture": "hellbot_magna_SE.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE_300.def.json b/resources/definitions/hellbot_magna_SE_300.def.json index bc60eb3aa75..3c3aaa81955 100644 --- a/resources/definitions/hellbot_magna_SE_300.def.json +++ b/resources/definitions/hellbot_magna_SE_300.def.json @@ -11,7 +11,8 @@ "platform": "Hellbot_Magna_SE_300.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_300_extruder" }, - "platform_texture": "Hellbot_Magna_SE_300.png" + "platform_texture": "Hellbot_Magna_SE_300.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index 65f32c2aabb..bb045f4517c 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -11,7 +11,8 @@ "platform": "Hellbot_Magna_SE_Pro.obj", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" }, - "platform_texture": "Hellbot_magna_SE_Pro.png" + "platform_texture": "Hellbot_magna_SE_Pro.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index e41fcb7ccef..d403399028b 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -20,7 +20,8 @@ -1, 0 ], - "platform_texture": "hellbot.png" + "platform_texture": "hellbot.png", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index f46c39ec1ef..516e5a081cf 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -14,6 +14,7 @@ "has_materials": true, "machine_extruder_trains": { "0": "koonovo_base_extruder_0" }, "platform_texture": "koonovo.png", + "has_textured_buildplate": true, "preferred_material": "generic_pla", "preferred_quality_type": "standard" }, diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 9ce1438fe3b..a45c5cf6665 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -12,7 +12,8 @@ "has_machine_quality": true, "has_materials": false, "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" }, - "platform_texture": "moai.jpg" + "platform_texture": "moai.jpg", + "has_textured_buildplate": true }, "overrides": { diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index f8d392fe1ff..5e830f205f9 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -66,6 +66,7 @@ 0 ], "platform_texture": "MakerbotSketchSprint.png", + "has_textured_buildplate": true, "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", "preferred_variant_name": "0.4mm", diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index 9b1d498408d..17af2722a67 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -8,6 +8,7 @@ "author": "Nail` Gimadeev (C)", "platform": "uni_200_platform.stl", "platform_texture": "uni.png", + "has_textured_buildplate": true, "quality_definition": "uni_base" }, "overrides": diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index a6300a32e2e..704f861fe69 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -8,6 +8,7 @@ "author": "Nail` Gimadeev (C)", "platform": "uni_250_platform.stl", "platform_texture": "uni.png", + "has_textured_buildplate": true, "quality_definition": "uni_base" }, "overrides": diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index a5c8be60a6b..eee62529e5a 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -8,6 +8,7 @@ "author": "Nail` Gimadeev (C)", "platform": "uni_300_platform.stl", "platform_texture": "uni.png", + "has_textured_buildplate": true, "quality_definition": "uni_base" }, "overrides": diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index 5c08db9fb3a..e11d4f6679e 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -8,6 +8,7 @@ "author": "Nail` Gimadeev (C)", "platform": "uni_mini_platform.stl", "platform_texture": "uni.png", + "has_textured_buildplate": true, "quality_definition": "uni_base" }, "overrides": diff --git a/resources/shaders/grid.shader b/resources/shaders/grid.shader index 5334461015f..7386263c840 100644 --- a/resources/shaders/grid.shader +++ b/resources/shaders/grid.shader @@ -45,7 +45,7 @@ fragment = float majorLine = min(majorGrid.x, majorGrid.y); gl_FragColor = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); - gl_FragColor.a = 0.98; + gl_FragColor.a = u_plateColor.a; } vertex41core = @@ -89,7 +89,7 @@ fragment41core = float majorLine = min(majorGrid.x, majorGrid.y); frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); - frag_color.a = 0.98; + frag_color.a = u_plateColor.a; } [defaults] From 30f3d59b7af9eeb8263009bc195e2201857493eb Mon Sep 17 00:00:00 2001 From: rburema Date: Tue, 5 Nov 2024 19:45:43 +0000 Subject: [PATCH 074/276] Applied printer-linter format --- resources/definitions/ankermake_m5.def.json | 2 +- resources/definitions/ankermake_m5c.def.json | 2 +- resources/definitions/dagoma_sigma_pro.def.json | 2 +- resources/definitions/dagoma_sigma_pro_dual.def.json | 2 +- resources/definitions/flyingbear_ghost_4s.def.json | 2 +- resources/definitions/flyingbear_ghost_5.def.json | 2 +- resources/definitions/flyingbear_ghost_6.def.json | 2 +- resources/definitions/hellbot_adonis.def.json | 4 ++-- resources/definitions/hellbot_hidra.def.json | 4 ++-- resources/definitions/hellbot_hidra_plus.def.json | 4 ++-- resources/definitions/hellbot_magna_2_230.def.json | 4 ++-- resources/definitions/hellbot_magna_2_230_dual.def.json | 4 ++-- resources/definitions/hellbot_magna_2_300.def.json | 4 ++-- resources/definitions/hellbot_magna_2_300_dual.def.json | 4 ++-- resources/definitions/hellbot_magna_2_400.def.json | 4 ++-- resources/definitions/hellbot_magna_2_400_dual.def.json | 4 ++-- resources/definitions/hellbot_magna_2_500.def.json | 4 ++-- resources/definitions/hellbot_magna_2_500_dual.def.json | 4 ++-- resources/definitions/hellbot_magna_I.def.json | 4 ++-- resources/definitions/hellbot_magna_SE.def.json | 4 ++-- resources/definitions/hellbot_magna_SE_300.def.json | 4 ++-- resources/definitions/hellbot_magna_SE_Pro.def.json | 4 ++-- resources/definitions/hellbot_magna_dual.def.json | 4 ++-- resources/definitions/koonovo_base.def.json | 2 +- resources/definitions/peopoly_moai.def.json | 4 ++-- resources/definitions/ultimaker_sketch_sprint.def.json | 2 +- resources/definitions/uni_200.def.json | 2 +- resources/definitions/uni_250.def.json | 2 +- resources/definitions/uni_300.def.json | 2 +- resources/definitions/uni_mini.def.json | 2 +- 30 files changed, 47 insertions(+), 47 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index c79870537ad..4a70851e33a 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "ankermake_m5_platform.obj", "has_machine_quality": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, "platform_texture": "ankermake_m5.png", - "has_textured_buildplate": true, "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json index 22d1e56a946..131bd6bd7a8 100644 --- a/resources/definitions/ankermake_m5c.def.json +++ b/resources/definitions/ankermake_m5c.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "ankermake_m5c_platform.obj", "has_machine_quality": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" }, "platform_texture": "ankermake_m5c.png", - "has_textured_buildplate": true, "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, diff --git a/resources/definitions/dagoma_sigma_pro.def.json b/resources/definitions/dagoma_sigma_pro.def.json index 31e477ca0ee..3f39c9f713f 100644 --- a/resources/definitions/dagoma_sigma_pro.def.json +++ b/resources/definitions/dagoma_sigma_pro.def.json @@ -11,13 +11,13 @@ "platform": "dagoma_sigma_pro.obj", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { "0": "dagoma_sigma_pro_extruder" }, "platform_texture": "dagoma_sigma_pro.png", "preferred_quality_type": "h0.2", "preferred_variant_name": "Brass 0.4mm", "quality_definition": "dagoma_sigma_pro", - "has_textured_buildplate": true, "variants_name": "Nozzle" }, "overrides": diff --git a/resources/definitions/dagoma_sigma_pro_dual.def.json b/resources/definitions/dagoma_sigma_pro_dual.def.json index a81d1cc0287..cd1702228cb 100644 --- a/resources/definitions/dagoma_sigma_pro_dual.def.json +++ b/resources/definitions/dagoma_sigma_pro_dual.def.json @@ -11,6 +11,7 @@ "platform": "dagoma_sigma_pro.obj", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { @@ -18,7 +19,6 @@ "1": "dagoma_sigma_pro_dual_extruder_left" }, "platform_texture": "dagoma_sigma_pro.png", - "has_textured_buildplate": true, "preferred_quality_type": "h0.2", "preferred_variant_name": "Brass 0.4mm", "quality_definition": "dagoma_sigma_pro_dual", diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index f2839142377..807d0365237 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "oducceu", "platform": "flyingbear_platform.obj", - "platform_texture": "flyingbear_platform.png", "has_textured_buildplate": true, + "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, "overrides": diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index 615b910ee72..b72a3a18fd4 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "oducceu", "platform": "flyingbear_platform.obj", - "platform_texture": "flyingbear_platform.png", "has_textured_buildplate": true, + "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, "overrides": diff --git a/resources/definitions/flyingbear_ghost_6.def.json b/resources/definitions/flyingbear_ghost_6.def.json index a32931748a7..8c5287cb4ee 100644 --- a/resources/definitions/flyingbear_ghost_6.def.json +++ b/resources/definitions/flyingbear_ghost_6.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "barrnet", "platform": "flyingbear_platform.obj", - "platform_texture": "flyingbear_platform.png", "has_textured_buildplate": true, + "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, "overrides": diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json index 9daa5fc7209..2a7022e7c13 100644 --- a/resources/definitions/hellbot_adonis.def.json +++ b/resources/definitions/hellbot_adonis.def.json @@ -10,14 +10,14 @@ "file_formats": "text/x-gcode", "platform": "hellbot_adonis.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_adonis_extruder" }, "platform_offset": [ 0, -1, 0 ], - "platform_texture": "hellbot.png", - "has_textured_buildplate": true + "platform_texture": "hellbot.png" }, "overrides": { diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json index 3ebdb7bb99c..fe1d580354a 100644 --- a/resources/definitions/hellbot_hidra.def.json +++ b/resources/definitions/hellbot_hidra.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_hidra.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_hidra_extruder_0", @@ -20,8 +21,7 @@ 0, 5 ], - "platform_texture": "hellbot_hidra.png", - "has_textured_buildplate": true + "platform_texture": "hellbot_hidra.png" }, "overrides": { diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json index 844faa1904e..dc718dc5f26 100644 --- a/resources/definitions/hellbot_hidra_plus.def.json +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_hidra_plus.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_hidra_plus_extruder_0", @@ -20,8 +21,7 @@ 0, 5 ], - "platform_texture": "hellbot_hidra_plus.png", - "has_textured_buildplate": true + "platform_texture": "hellbot_hidra_plus.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json index 6757599d3f8..c2e200b1008 100644 --- a/resources/definitions/hellbot_magna_2_230.def.json +++ b/resources/definitions/hellbot_magna_2_230.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" }, - "platform_texture": "Magna2_230.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_230.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index d913a0d89fa..3ba073d89be 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -10,13 +10,13 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_dual_extruder_0", "1": "hellbot_magna_2_230_dual_extruder_1" }, - "platform_texture": "Magna2_230.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_230.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json index 1a49f41a374..565119e31f7 100644 --- a/resources/definitions/hellbot_magna_2_300.def.json +++ b/resources/definitions/hellbot_magna_2_300.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" }, - "platform_texture": "Magna2_300.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_300.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index 9db9e9774e0..9e0e72f1457 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -10,13 +10,13 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_dual_extruder_0", "1": "hellbot_magna_2_300_dual_extruder_1" }, - "platform_texture": "Magna2_300.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_300.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_400.def.json b/resources/definitions/hellbot_magna_2_400.def.json index 797584e3412..8bc7c21811d 100644 --- a/resources/definitions/hellbot_magna_2_400.def.json +++ b/resources/definitions/hellbot_magna_2_400.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" }, - "platform_texture": "Magna2_400.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_400.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json index e74221bbd3c..00f10c1117b 100644 --- a/resources/definitions/hellbot_magna_2_400_dual.def.json +++ b/resources/definitions/hellbot_magna_2_400_dual.def.json @@ -10,13 +10,13 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_dual_extruder_0", "1": "hellbot_magna_2_400_dual_extruder_1" }, - "platform_texture": "Magna2_400.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_400.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_500.def.json b/resources/definitions/hellbot_magna_2_500.def.json index 61bddc7b9af..fe83fab70a3 100644 --- a/resources/definitions/hellbot_magna_2_500.def.json +++ b/resources/definitions/hellbot_magna_2_500.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" }, - "platform_texture": "Magna2_500.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_500.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json index 040c2898671..a8f6fc5b374 100644 --- a/resources/definitions/hellbot_magna_2_500_dual.def.json +++ b/resources/definitions/hellbot_magna_2_500_dual.def.json @@ -10,13 +10,13 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_dual_extruder_0", "1": "hellbot_magna_2_500_dual_extruder_1" }, - "platform_texture": "Magna2_500.png", - "has_textured_buildplate": true + "platform_texture": "Magna2_500.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index 0adcaa38e2b..7425aa3db46 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -10,14 +10,14 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_i_extruder" }, "platform_offset": [ 0, -1, 0 ], - "platform_texture": "hellbot.png", - "has_textured_buildplate": true + "platform_texture": "hellbot.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index f568d944ec4..a449a60f019 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna_SE.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, - "platform_texture": "hellbot_magna_SE.png", - "has_textured_buildplate": true + "platform_texture": "hellbot_magna_SE.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE_300.def.json b/resources/definitions/hellbot_magna_SE_300.def.json index 3c3aaa81955..bb83df4a374 100644 --- a/resources/definitions/hellbot_magna_SE_300.def.json +++ b/resources/definitions/hellbot_magna_SE_300.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_SE_300.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_300_extruder" }, - "platform_texture": "Hellbot_Magna_SE_300.png", - "has_textured_buildplate": true + "platform_texture": "Hellbot_Magna_SE_300.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index bb045f4517c..aa71aab37be 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -10,9 +10,9 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_SE_Pro.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" }, - "platform_texture": "Hellbot_magna_SE_Pro.png", - "has_textured_buildplate": true + "platform_texture": "Hellbot_magna_SE_Pro.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index d403399028b..9488ec2a435 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_dual_extruder_1", @@ -20,8 +21,7 @@ -1, 0 ], - "platform_texture": "hellbot.png", - "has_textured_buildplate": true + "platform_texture": "hellbot.png" }, "overrides": { diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index 516e5a081cf..d194902e5c8 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -12,9 +12,9 @@ "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "koonovo_base_extruder_0" }, "platform_texture": "koonovo.png", - "has_textured_buildplate": true, "preferred_material": "generic_pla", "preferred_quality_type": "standard" }, diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index a45c5cf6665..20d3bafa0a7 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -11,9 +11,9 @@ "platform": "moai.obj", "has_machine_quality": true, "has_materials": false, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" }, - "platform_texture": "moai.jpg", - "has_textured_buildplate": true + "platform_texture": "moai.jpg" }, "overrides": { diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 5e830f205f9..b8690046267 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -58,6 +58,7 @@ ], "has_machine_quality": true, "has_materials": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { "0": "ultimaker_sketch_sprint_extruder" }, "platform_offset": [ @@ -66,7 +67,6 @@ 0 ], "platform_texture": "MakerbotSketchSprint.png", - "has_textured_buildplate": true, "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", "preferred_variant_name": "0.4mm", diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index 17af2722a67..c58264e1ee2 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_200_platform.stl", - "platform_texture": "uni.png", "has_textured_buildplate": true, + "platform_texture": "uni.png", "quality_definition": "uni_base" }, "overrides": diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index 704f861fe69..ae2aad97147 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_250_platform.stl", - "platform_texture": "uni.png", "has_textured_buildplate": true, + "platform_texture": "uni.png", "quality_definition": "uni_base" }, "overrides": diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index eee62529e5a..6d801b68f83 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_300_platform.stl", - "platform_texture": "uni.png", "has_textured_buildplate": true, + "platform_texture": "uni.png", "quality_definition": "uni_base" }, "overrides": diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index e11d4f6679e..be327eef4ab 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -7,8 +7,8 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_mini_platform.stl", - "platform_texture": "uni.png", "has_textured_buildplate": true, + "platform_texture": "uni.png", "quality_definition": "uni_base" }, "overrides": From 5ef569d8ce9ec8aac86134c772c872557d968430 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 6 Nov 2024 10:55:43 +0100 Subject: [PATCH 075/276] Set only UM variants name as being translated CURA-12255 Also applied some consistency between labels, so that they are more consistent and more printers get their variants name translated. --- resources/definitions/fdmprinter.def.json | 3 +- resources/definitions/inat_base.def.json | 3 +- ...tur3d_discov3ry1_complete_um2plus.def.json | 2 +- resources/definitions/ultimaker3.def.json | 3 +- .../definitions/ultimaker3_extended.def.json | 3 +- .../definitions/ultimaker_factor4.def.json | 3 +- .../definitions/ultimaker_method.def.json | 1 + .../ultimaker_method_base.def.json | 1 + .../definitions/ultimaker_methodx.def.json | 1 + .../definitions/ultimaker_methodxl.def.json | 1 + resources/definitions/ultimaker_s3.def.json | 3 +- resources/definitions/ultimaker_s5.def.json | 3 +- resources/definitions/ultimaker_s7.def.json | 3 +- .../definitions/ultimaker_sketch.def.json | 1 + .../ultimaker_sketch_large.def.json | 1 + .../ultimaker_sketch_sprint.def.json | 1 + resources/i18n/cs_CZ/fdmprinter.def.json.po | 90 +----------------- resources/i18n/de_DE/fdmprinter.def.json.po | 90 +----------------- resources/i18n/es_ES/fdmprinter.def.json.po | 90 +----------------- resources/i18n/fdmprinter.def.json.pot | 92 +------------------ resources/i18n/fi_FI/fdmprinter.def.json.po | 90 +----------------- resources/i18n/fr_FR/fdmprinter.def.json.po | 90 +----------------- resources/i18n/hu_HU/fdmprinter.def.json.po | 90 +----------------- resources/i18n/it_IT/fdmprinter.def.json.po | 90 +----------------- resources/i18n/ja_JP/fdmprinter.def.json.po | 90 +----------------- resources/i18n/ko_KR/fdmprinter.def.json.po | 90 +----------------- resources/i18n/nl_NL/fdmprinter.def.json.po | 90 +----------------- resources/i18n/pl_PL/fdmprinter.def.json.po | 90 +----------------- resources/i18n/pt_BR/fdmprinter.def.json.po | 90 +----------------- resources/i18n/pt_PT/fdmprinter.def.json.po | 90 +----------------- resources/i18n/ru_RU/fdmprinter.def.json.po | 90 +----------------- resources/i18n/tr_TR/fdmprinter.def.json.po | 90 +----------------- resources/i18n/zh_CN/fdmprinter.def.json.po | 90 +----------------- resources/i18n/zh_TW/fdmprinter.def.json.po | 90 +----------------- 34 files changed, 43 insertions(+), 1612 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 31cffc4dc36..d02da8c0311 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -17,7 +17,8 @@ "machine_extruder_trains": { "0": "fdmextruder" }, "supports_usb_connection": true, "supports_network_connection": false, - "supports_abstract_color": false + "supports_abstract_color": false, + "variants_name_has_translation": false }, "settings": { diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 1d95bbbde44..5bd5258d5af 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -16,7 +16,8 @@ "preferred_material": "generic_pla", "preferred_quality_type": "standard", "preferred_variant_name": "0.4mm", - "variants_name": "Extruder:" + "variants_name": "Extruder", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 722f4dade54..4876738f6e5 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -25,7 +25,7 @@ "preferred_quality_type": "extra_fast", "preferred_variant_name": "0.84mm (Green)", "supported_actions": [], - "variants_name": "Print core" + "variants_name": "Print Core" }, "overrides": { diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index bd814cc79c1..fb8b876fb5c 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -51,7 +51,8 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print core" + "variants_name": "Print Core", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 5afbbce1da7..bdfd5f93a56 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -36,7 +36,8 @@ "preferred_variant_name": "AA 0.4", "quality_definition": "ultimaker3", "supported_actions": [ "DiscoverUM3Action" ], - "variants_name": "Print core" + "variants_name": "Print Core", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 909f180b09a..710ee29a409 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -43,7 +43,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print core", + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 53f7ba8be39..5e78c3f6308 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -83,6 +83,7 @@ "supports_usb_connection": false, "variant_definition": "ultimaker_method", "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index c4cbce4f3ad..ff2f9fc2218 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -26,6 +26,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 607af6c626a..37b11ad4eff 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -69,6 +69,7 @@ "supports_usb_connection": false, "variant_definition": "ultimaker_methodx", "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index f942d1618bc..d12fa8ac59d 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -67,6 +67,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 76534f16097..27957af727d 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -50,7 +50,8 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_material_export": true, "supports_usb_connection": false, - "variants_name": "Print core", + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 76a3e017736..46d46d33eb4 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -54,7 +54,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print core", + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -2 }, "overrides": diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 12cd714dd9f..14d9b211686 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -40,7 +40,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print core", + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -2 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index a5483f8f64a..2f96b52397f 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -72,6 +72,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch_large.def.json b/resources/definitions/ultimaker_sketch_large.def.json index a0ed0c9365e..49ae05a6140 100644 --- a/resources/definitions/ultimaker_sketch_large.def.json +++ b/resources/definitions/ultimaker_sketch_large.def.json @@ -20,6 +20,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index f8d392fe1ff..61cef0f2867 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -73,6 +73,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index a49f6f3616d..7cadd3bf6f8 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2023-02-16 20:35+0100\n" "Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" @@ -1065,10 +1065,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "První Z pozice extruderu" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extrudery sdílí ohřívač" @@ -1423,10 +1419,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Má vyhřívanou podložku" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Rychlost zahřívání" @@ -1467,14 +1459,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Horizontální faktor zvětšení pro kompenzaci smrštění" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Jak daleko může být filament natažen, než se rozbije při zahřátí." @@ -1903,26 +1887,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Rozmazat jen okrajové části modelu a žádné díry modelu." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Ponechat odpojené plochy" @@ -2517,26 +2481,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Ne na vnějším povrchu" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Úhel trysky" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Průměr trysky" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Zakázané oblasti pro trysku" @@ -2569,14 +2521,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Retrakční rychlost přepnutí trysek" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Počet extrůderů" @@ -2869,10 +2813,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Trh při tisku" @@ -2901,10 +2841,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Vytiskněte věž vedle tisku, která slouží k naplnění materiálu po každém přepnutí trysky." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Výplňové struktury tiskněte pouze tam, kde by měly být podporovány vrcholy modelu. Pokud to povolíte, sníží se doba tisku a spotřeba materiálu, ale vede k nestejnoměrné pevnosti objektu." @@ -2953,10 +2889,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Tisknout horní / dolní linky v takovém pořadí, aby se navazující linky překrývaly ve stejném směru. Tisk zabere trochu více času, ale hladké povrchy budou vypadat více jednolité." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Teplota při tisku" @@ -3989,14 +3921,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Prohodí pořadí tisku vnitřní a druhé nejvnitřnější čáry límce. Toto usnadňuje odstraňování límce." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Přepněte do kterého protínajícího se svazku sítí bude patřit každá vrstva, takže překrývající se očka se protnou. Vypnutí tohoto nastavení způsobí, že jedna z sítí získá veškerý objem v překrytí, zatímco je odstraněna z ostatních sítí." @@ -5349,18 +5273,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Model bude zvětšen tímto faktorem, aby bylo kompenzováno smrštění materiálu po vychladnutí." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Vrchní vrstvy" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index b5ceee1416f..d68cf6a89b2 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Z-Position Extruder-Einzug" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extruder teilen sich Heizelement" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Mit beheizter Druckplatte" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Aufheizgeschwindigkeit" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Schrumpfungskompensation für horizontalen Skalierungsfaktor" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Streckmaß für das Filament im erhitzten Zustand, bevor es bricht." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Es werden nur die Umrisse der Teile gejittert und nicht die Löcher der Teile." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Unterbrochene Flächen beibehalten" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Nicht auf der Außenfläche" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Düsenwinkel" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Düsendurchmesser" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Unzulässige Bereiche für die Düse" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Düsenwechsel Rückzugsgeschwindigkeit" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Anzahl Extruder" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Ruckfunktion Drucken" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Drucken Sie einen Turm neben dem Druck, der zum Einziehen des Materials nach jeder Düsenschaltung dient." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Drucken Sie Füllstrukturen nur dort, wo das Modell gestützt werden soll. Die Aktivierung dieser Option reduziert die Druckdauer und den Materialverbrauch, führt jedoch zu einer ungleichmäßigen Objektdicke." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Obere/Untere Linien werden in einer Reihenfolge gedruckt, so dass sie sich mit benachbarten Linien immer in gleicher Richtung überschneiden. Dies erfordert etwas mehr Zeit für den Druck, lässt aber flache Oberflächen gleichmäßiger aussehen." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Drucktemperatur" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Vertauschen Sie die Druckreihenfolge der innersten und der zweitinnersten Brim-Linie, um die Entfernung des Brims zu erleichtern." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Schaltet mit jeder Schicht das Volumen zu den entsprechenden Netzüberschneidungen, sodass die überlappenden Netze miteinander verwebt werden. Durch Abschalten dieser Funktion erhält eines der Netze das gesamte Volumen der Überlappung, während es von den anderen Netzen entfernt wird." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Um die Schrumpfung des Materials beim Abkühlen zu kompensieren, wird das Modell mit diesem Faktor skaliert." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Obere Schichten" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index a001762e9d6..aad9b40a909 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posición de preparación del extrusor sobre el eje Z" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Calentador compartido de extrusores" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Tiene una placa de impresión caliente" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocidad de calentamiento" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Factor de escala horizontal para la compensación de la contracción" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Hasta dónde puede estirarse el filamento antes de que se rompa mientras se calienta." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Use solo los contornos de las piezas, no los orificios de las piezas." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Mantener caras desconectadas" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "No en la superficie exterior" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Ángulo de la tobera" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diámetro de la tobera" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Áreas no permitidas para la tobera" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocidad de retracción del cambio de tobera" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Número de extrusores" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Impulso de impresión" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimir una torre junto a la impresión que sirve para preparar el material tras cada cambio de tobera." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprimir estructuras de relleno solo cuando se deban soportar las partes superiores del modelo. Habilitar esto reduce el tiempo de impresión y el uso de material, pero ocasiona que la resistencia del objeto no sea uniforme." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprime colocando las líneas superior e inferior de modo que siempre se superpongan a las líneas adyacentes en una dirección. Esto lleva un poco más de tiempo de impresión, pero hace que las superficies planas tengan un aspecto más consistente." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura de impresión" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Intercambie el orden de impresión de las líneas más internas y del segundo borde más interno. De ese modo se mejora la eliminación del borde." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Cambiar la malla a la que pertenecerán los volúmenes que se cruzan en cada capa, de forma que las mallas superpuestas se entrelacen. Desactivar esta opción dará lugar a que una de las mallas reciba todo el volumen de la superposición y que este se elimine de las demás mallas." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Para compensar la contracción del material a medida que se enfría, el modelo se escala con este factor." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Capas superiores" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 985c987bfdc..2e2900a9a1e 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -6001,102 +6001,14 @@ msgid "Transformation matrix to be applied to the model when loading it from fil msgstr "" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "variant_name" msgid "Extruder" msgstr "" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle Size" -msgstr "" - -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - -msgctxt "variant_name" -msgid "Head" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - msgctxt "variant_name" msgid "Print Core" msgstr "" msgctxt "variant_name" -msgid "Nozzle Diameter" +msgid "Nozzle Size" msgstr "" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 6acf42833e3..38cfa3f6421 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2022-07-15 11:17+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -1062,10 +1062,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Suulakkeen esitäytön Z-sijainti" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "" @@ -1418,10 +1414,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Sisältää lämmitettävän alustan" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "" @@ -1462,14 +1454,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "" @@ -1898,26 +1882,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "" -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Pidä erilliset pinnat" @@ -2512,26 +2476,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Suuttimen läpimitta" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Suuttimen kielletyt alueet" @@ -2564,14 +2516,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Suuttimen vaihdon takaisinvetonopeus" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Suulakkeiden määrä" @@ -2864,10 +2808,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Tulostuksen nykäisy" @@ -2896,10 +2836,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Tulosta tulosteen viereen torni, jolla materiaali esitäytetään aina suuttimen vaihdon jälkeen." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "" @@ -2948,10 +2884,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "" -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Tulostuslämpötila" @@ -3984,14 +3916,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Määrittää, mitkä verkon leikkaustilavuudet kuuluvat jokaiseen kerrokseen, jotta limittäiset verkot yhdistetään. Jos tämä asetus poistetaan käytöstä, yksi verkoista saa kaiken tilavuuden limityksessä, ja verkko poistetaan muista verkoista." @@ -5342,18 +5266,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "" -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Yläkerrokset" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index c794fdbff34..703d55a11b9 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 12:44+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Extrudeuse Position d'amorçage Z" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Les extrudeurs partagent le chauffage" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "A un plateau chauffé" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Vitesse de chauffage" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Compensation du rétrécissement du facteur d'échelle horizontale" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Jusqu'où le filament peut être étiré avant qu'il ne se casse, pendant qu'il est chauffé." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "N'agitez que les contours des pièces et non les trous des pièces." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Conserver les faces disjointes" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Pas sur la surface extérieure" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Angle de la buse" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diamètre de la buse" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Zones interdites au bec d'impression" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Vitesse de rétraction de changement de buse" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Nombre d'extrudeuses" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Imprimer en saccade" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimer une tour à côté de l'impression qui sert à amorcer le matériau après chaque changement de buse." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprimer les structures de remplissage uniquement là où le haut du modèle doit être supporté, ce qui permet de réduire le temps d'impression et l'utilisation de matériau, mais conduit à une résistance uniforme de l'objet." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprimez les lignes supérieures et inférieures dans un ordre tel qu'elles se chevauchent toujours avec les lignes adjacentes dans une seule direction. Cela prend un peu plus de temps à imprimer, mais les surfaces planes ont l'air plus cohérentes." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Température d’impression" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Ce paramètre inverse l'ordre d'impression de la ligne de bordure la plus intérieure et de la deuxième ligne de bordure la plus intérieure. La bordure est ainsi plus facile à retirer." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Passe aux volumes d'intersection de maille qui appartiennent à chaque couche, de manière à ce que les mailles qui se chevauchent soient entrelacées. Si vous désactivez ce paramètre, l'une des mailles obtiendra tout le volume dans le chevauchement tandis qu'il est retiré des autres mailles." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Pour compenser la contraction du matériau lors de son refroidissement, le modèle est mis à l'échelle avec ce facteur." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Couches supérieures" diff --git a/resources/i18n/hu_HU/fdmprinter.def.json.po b/resources/i18n/hu_HU/fdmprinter.def.json.po index ee2103453e3..85a1b50c17e 100644 --- a/resources/i18n/hu_HU/fdmprinter.def.json.po +++ b/resources/i18n/hu_HU/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2020-03-24 09:43+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: AT-VLOG\n" @@ -1065,10 +1065,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Kezdő Z pozíció" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "" @@ -1425,10 +1421,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Van tárgyasztal fűtés" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Felfűtési sebesség" @@ -1469,14 +1461,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Mennyire húzható ki a szál melegítés közben, szakadás nélkül." @@ -1905,26 +1889,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "" -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Nyílt poligonok megtartása" @@ -2519,26 +2483,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Csúcsszög" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Fúvóka átmérő" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Fúvóka tiltott területek" @@ -2571,14 +2523,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Fúvókaváltás visszahúzási sebesség" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Extruderek száma" @@ -2871,10 +2815,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Nyomtatás löket" @@ -2903,10 +2843,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Nyomtasson egy tornyot a nyomtatandó tárgy mellett, amely abban segít, hogy a fejben lévő anyagváltást végre tudja hajtani. Kinyomtatja az előtoronyba a fejben marad előző alapanyag maradványokat, így már kitisztult fúvókával tudja a nyomtatást folytatni a nyomtatandó testen." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Csak ott nyomtasson kitöltő szerkezeteket, ahol a felső modellrésznek szüksége van alátámasztásra. Ennek az engedélyezése csökkenti a nyomtatási időt, illetve az anyagszükségletet, azonban a tárgyak belső szilárdsága egyenetlen lehet." @@ -2955,10 +2891,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "" -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Nyomtatási hőmérséklet" @@ -3991,14 +3923,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Bekapcsolja, hogy minden egyes rétegnél, ahol kereszteződő hálók találhatóak, azok fonódjanak össze. Ha kikapcsoljuk ezt az opciót, akkor a kereszteződő hálók közül az egyik megkapja az átfedésben lévő háló teljes térfogatát, míg a többi hálót eltávolítja." @@ -5351,18 +5275,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "" -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Felső rétegek" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 1cdf8249be1..fdf1dd72cd0 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posizione Z innesco estrusore" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Condivisione del riscaldatore da parte degli estrusori" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Piano di stampa riscaldato" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocità di riscaldamento" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Fattore di scala orizzontale per la compensazione della contrazione" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "La lunghezza massima di estensione del filamento prima che si rompa durante il riscaldamento." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Distorce solo i profili delle parti, non i fori di queste." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Mantenimento delle superfici scollegate" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Non su superficie esterna" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Angolo ugello" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diametro ugello" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Aree ugello non consentite" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocità di retrazione cambio ugello" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Numero di estrusori" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk stampa" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Stampa una torre accanto alla stampa che serve per innescare il materiale dopo ogni cambio ugello." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Stampare le strutture di riempimento solo laddove è necessario supportare le sommità del modello. L'abilitazione di questa funzione riduce il tempo di stampa e l'utilizzo del materiale, ma comporta una disuniforme resistenza dell'oggetto." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Stampa linee superiori/inferiori in un ordine che ne causa sempre la sovrapposizione con le linee adiacenti in un singola direzione. Questa operazione richiede un tempo di stampa leggermente superiore ma rende l'aspetto delle superfici piane più uniforme." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura di stampa" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Scambia l'ordine di stampa della prima e seconda linea più interna del brim per agevolarne la rimozione." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Selezionare quali volumi di intersezione maglie appartengono a ciascuno strato, in modo che le maglie sovrapposte diventino interconnesse. Disattivando questa funzione una delle maglie ottiene tutto il volume della sovrapposizione, che viene rimosso dalle altre maglie." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Per compensare la contrazione del materiale durante il raffreddamento, il modello sarà scalato con questo fattore." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Strati superiori" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 909fc231ba1..3300e8f66a9 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2024-10-30 02:17+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" @@ -1060,10 +1060,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "エクストルーダーのZ座標" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "エクストルーダーのヒーター共有" @@ -1416,10 +1412,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "加熱式ビルドプレートあり" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "加熱速度" @@ -1460,14 +1452,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "水平スケールファクタ収縮補正" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "加熱中にフィラメントの引き出しが生じる距離。" @@ -1896,26 +1880,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "部品の輪郭のみに振動が起こり、部品の穴には起こりません。" -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "スティッチできない部分を保持" @@ -2512,26 +2476,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "外側表面には適用しない" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "ノズル角度" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "ノズル内径" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "ノズル拒否エリア" @@ -2564,14 +2516,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "ノズルスイッチ引き戻し速度" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "エクストルーダーの数" @@ -2864,10 +2808,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "印刷ジャーク" @@ -2896,10 +2836,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "印刷物の隣に、ノズルを切り替えた後の材料でタワーを作成します。" -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "面材構造を印刷するには、モデルの上部がサポートされている必要があります。これを有効にすると、印刷時間と材料の使用量が減少しますが、オブジェクトの強度が不均一になります。" @@ -2948,10 +2884,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "上面/底面のラインを、隣接するラインと常に一方向で重なるような順序でプリントします。これにより、プリントにかかる時間は少し長くなりますが、平らな面の見た目の一貫性が高まります。" -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "印刷温度" @@ -3984,14 +3916,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "最も内側のブリムラインと2番目に内側のブリムラインのプリント順序を入れ替えます。これにより、ブリムを取り外しやすくします。" -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "重複するメッシュがどのレイヤーに属しているかを切り替えることで、重なったメッシュが絡み合うようにします。この設定をオフにすると、一方のメッシュは重複内すべてのボリュームを取得し、他方のメッシュは他から削除されます。" @@ -5344,18 +5268,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "材料の冷却時の収縮を補正するために、モデルはこのスケールファクタでスケールされます。" -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "上部レイヤー" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index db2488cfdce..8b336f642b0 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "익스트루더 프라임 Z 포지션" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "압출기의 히터 공유" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "히팅 빌드 플레이트가 있음" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "가열 속도" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "수평 확장 배율 수축 보정" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "가열 시 파단되기 전까지 필라멘트가 늘어날 수 있는 거리입니다." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "부품의 윤곽만 지터하고 부품의 구멍은 지터하지 않습니다." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "끊긴 면 유지" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "외부 표면에 없음" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "노즐 각도" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "노즐 지름" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "노즐이 위치할 수 없는 구역" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "노즐 스위치 리트렉션 속도" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "익스트루더의 수" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk 프린팅" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "각 노즐을 교체 한 후에 재료를 프라이밍(Priming)하는 프린팅 옆에 타워를 프린팅하십시오." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "모델 상단이 지지가 되어야 하는 경우에만 충진물 구조를 인쇄합니다. 이 기능을 사용하면 인쇄 시간 및 재료 사용이 감소하지만, 개체 강도가 균일하지 않습니다." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "한 방향으로 주변 라인들과 항상 겹치게 하기 위해 상단/하단 라인들을 배치하여 프린트하십시오. 이는 프린트하는 데 더 많은 시간이 소모되지만 평평한 면이 보다 일관적으로 보이게 합니다." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "프린팅 온도" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "가장 안쪽의 브림 라인과 그다음으로 안쪽에 있는 브림 라인의 프린트 순서를 바꿉니다. 이렇게 하면 브림이 잘 제거됩니다." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "교차하는 메쉬로 교차하는 볼륨으로 전환하면 겹치는 메쉬가 서로 얽히게됩니다. 이 설정을 해제하면 메시 중 하나가 다른 메시에서 제거되는 동안 오버랩의 모든 볼륨을 가져옵니다." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "냉각됨에 따라 재료 수축을 보상하기 위해 모델이 이 배율로 확장됩니다." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "상단 레이어" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 614a3332d5d..3d34a8b6635 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Z-positie voor Primen Extruder" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extruders delen verwarming" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Heeft verwarmd platform" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Verwarmingssnelheid" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Horizontale schaalfactor krimpcompensatie" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Hoe ver het filament kan worden uitgerekt voordat het afbreekt, wanneer het wordt verwarmd." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Trillen alleen voor de contouren van de onderdelen en niet voor de gaten van de onderdelen." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Onderbroken Oppervlakken Behouden" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Niet op buitenzijde" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Nozzlehoek" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Nozzlediameter" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Verboden gebieden voor de nozzle" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Intreksnelheid bij Wisselen Nozzles" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Aantal extruders" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Printschok" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Print een pijler naast de print, waarop het materiaal na iedere nozzlewisseling wordt ingespoeld." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Print alleen vulstructuren waarvan de bovenkant van het model moet worden ondersteund. Hiermee reduceert u de printtijd en het materiaalgebruik. Dit kan echter leiden tot een niet gelijkmatige objectsterkte." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Print boven- en onderlijnen in een volgorde die ervoor zorgt dat ze altijd in één richting overlappen met aangrenzende lijnen. Hierdoor duurt het iets langer om te printen, maar platte oppervlakken zien er dan consistenter uit." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Printtemperatuur" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Verwissel de printvolgorde van de binnenste en de op een na binnenste randlijn. Dit verbetert het verwijderen van de rand." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Schakel naar de rastersnijpuntvolumes die bij elke laag horen, zodat de overlappende rasters worden verweven. Als u deze instelling uitschakelt, krijgt een van de rasters al het volume in de overlap, terwijl dit uit de andere rasters wordt verwijderd." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Het model wordt met deze factor geschaald ter compensatie van het krimpen van het materiaal tijdens het afkoelen." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Bovenlagen" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index fb74d0a8635..a59ae5b25b8 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2019-11-15 15:34+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -1064,10 +1064,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Pozycja Z Czyszczenia Dyszy" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "" @@ -1424,10 +1420,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Posiada Podgrzewany Stół" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Prędkość nagrzewania" @@ -1468,14 +1460,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Jak bardzo filament może być rozciągnięty, zanim pęknie, podczas ogrzewania." @@ -1904,26 +1888,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "" -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Zachowaj Rozłączone Powierzchnie" @@ -2518,26 +2482,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Kąt dyszy" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Średnica dyszy" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Niedozwolone Obszary Dyszy" @@ -2570,14 +2522,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Prędk. Retrakcji przy Zmianie Dyszy" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Liczba Ekstruderów" @@ -2870,10 +2814,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Zryw Druku" @@ -2902,10 +2842,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Wydrukuj wieżę obok wydruku, która służy do zmiany materiału po każdym przełączeniu dyszy." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Drukuj wypełnienie tylko w miejscach, w których górna część modelu powinna być podparta strukturą wewnętrzną. Załączenie tej funkcji skutkuje redukcją czasu druku, ale prowadzi do niejednolitej wytrzymałości obiektu." @@ -2954,10 +2890,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "" -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura Druku" @@ -3990,14 +3922,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Przełącz się, to której przecinającej się siatki będą należały z każdą warstwą, tak że nakładające się siatki przeplatają się. Wyłączenie tej opcji spowoduje, że jedna siatka uzyska całą objętość podczas nakładania się, kiedy jest usunięta z pozostałych siatek." @@ -5350,18 +5274,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "" -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Górne warstwy" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index f52216283da..182dfbc4c2c 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.7\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2024-10-29 03:52+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" @@ -1065,10 +1065,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posição Z de Purga do Extrusor" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extrusores Compartilham Aquecedor" @@ -1425,10 +1421,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Tem Mesa Aquecida" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocidade de Aquecimento" @@ -1469,14 +1461,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Compensação de Fator de Encolhimento Horizontal" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Quanto o filamento pode ser esticado antes que quebre, quando aquecido." @@ -1905,26 +1889,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Flutuar movimento apenas nos contornos e não nos furos das peças." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Manter Faces Desconectadas" @@ -2521,26 +2485,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Não na Superfície Externa" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Ângulo do Bico" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diâmetro do bico" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Áreas Proibidas para o Bico" @@ -2573,14 +2525,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocidade de Retração da Troca do Bico" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Número de extrusores" @@ -2873,10 +2817,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk da Impressão" @@ -2905,10 +2845,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimir uma torre próxima à impressão que serve para purgar o material a cada troca de bico." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprime estruturas de preenchimento somente onde os tetos do modelo devam ser suportados. Habilitar este ajuste reduz tempo de impressão e uso de material, mas leva a resistências não-uniformes no objeto." @@ -2957,10 +2893,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprime filetes superiores e inferiores em uma ordem que os faz sempre se sobreporem a filetes adjacentes em uma única direção. Faz levar um pouco mais de tempo na impressão, mas torna superfícies planas mais consistentes." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura de Impressão" @@ -3993,14 +3925,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Troca a ordem de impressão do filete de brim mais interno e o segundo mais interno. Isto melhora a remoção do brim." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Troca quais volumes sobrepondo malhas vão pertencer a cada camada, de modo que as malhas sobrepostas se tornem entrelaçadas. Desligar esta opção vai fazer com que uma das malhas obtenha todo o volume da sobreposiçào, removendo este volume das outras malhas." @@ -5353,18 +5277,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Para compensar o encolhimento do material enquanto esfria, o modelo será redimensionado por este fator." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Camadas Superiores" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index 3f813441ce8..4267c2f5fa8 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Posição Z para Preparação Extrusor" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Extrusoras Partilham Aquecedor" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Tem Base de Construção Aquecida" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Velocidade de aquecimento" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Compensação de contração do fator de dimensionamento horizontal" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "A distância a que o filamento pode ser esticado antes de se separar, enquanto é aquecido." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Vibrar apenas os contornos das peças e não os buracos das peças." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Manter Faces Soltas" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Não na Superfície Exterior" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Ângulo do nozzle" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Diâmetro do Nozzle" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Áreas não permitidas ao nozzle" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Velocidade de retração de substituição do nozzle" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Número de Extrusores" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Jerk da Impressão" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprime uma torre próxima da impressão que prepara o material depois de cada substituição do nozzle." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Imprimir as estruturas de enchimento só onde os revestimentos superiores necessitam de suporte. Activar esta definição reduz o tempo de impressão e material usado, mas faz com que a peça não tenha uma resistência uniforme." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Imprimir as linhas superiores/inferiores numa ordem que faz com que ocorra sempre uma sobreposição com as linhas adjacentes numa única direção. Este processo demora ligeiramente mais tempo a imprimir, mas torna o aspeto das superfícies planas mais consistente." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Temperatura de Impressão" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Trocar a ordem de impressão da linha mais interior e da segunda linha mais interior da aba. Isto permite facilitar a remoção da aba." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Altera para os volumes de interceção de malha que pertencerão a cada camada, para que as malhas sobrepostas fiquem entrelaçadas. Desativar esta definição poderá fazer com que uma das malhas obtenha todo o volume na sobreposição, sendo removido das outras malhas." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Para compensar a redução do material quando arrefece, o modelo vai ser dimensionado com este fator." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Camadas Superiores" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 88f3ebae8d4..cd567b9d94f 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Z координата начала печати" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Общий нагреватель экструдеров" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Имеет подогреваемый стол" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Скорость нагрева" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Горизонтальный коэффициент масштабирования для компенсации усадки" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Насколько сильно можно растянуть материал при нагревании, до тех пор пока он не отломится." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Дрожание только контуров деталей, но не отверстий." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Сохранить отсоединённые поверхности" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Не на внешней поверхности" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Угол сопла" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Диаметр сопла" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Запрещённые зоны для сопла" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Скорость отката при смене экструдера" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Количество экструдеров" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Рывок печати" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Печатает башню перед печатью модели, чем помогает выдавить старый материал после смены экструдера." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Печать заполненных структур только там, где должны поддерживаться верхние части моделей. Активация этой функции сокращает время печати и расход материалов, однако приводит к неравномерной прочности." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Печатайте линии дна/крышки в таком порядке, чтобы они всегда перекрывали соседние линии в одном направлении. На печать уходит немного больше времени, но плоские поверхности выглядят более единообразными." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Температура сопла" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "Меняет местами порядок печати внутренней и следующей внутренней линий каймы. Это упрощает удаление каймы." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Чередует какой из объектов, пересекающихся в объёме, будет участвовать в печати каждого слоя таким образом, что пересекающиеся объекты становятся вплетёнными друг в друга. Выключение этого параметра приведёт к тому, что один из объектов займёт весь объём пересечения, в то время как данный объём будет исключён из других объектов." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Для компенсации усадки материала при остывании модель будет масштабирована с этим коэффициентом." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Слои крышки" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 7e88c153631..9d47d98d828 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "Ekstruder İlk Z konumu" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "Ekstrüderler Isıtıcıyı Paylaşır" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "Isıtılmış Yapı Levhası İçerir" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "Isınma Hızı" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "Yatay Ölçekleme Faktörü Büzülme Telafisi" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "Filamentin ısıtıldığında kopmadan esneyebileceği mesafedir." @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "Parçalardaki delikleri değil, yalnızca ana hatlarını titretir." -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "Bağlı Olmayan Yüzleri Tut" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "Dış Yüzeyde Değil" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "Nozül Açısı" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "Nozül Çapı" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "Nozül İzni Olmayan Alanlar" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "Nozül Anahtarı Geri Çekme Hızı" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "Ekstrüder Sayısı" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "Yazdırma İvmesi Değişimi" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Malzemenin hazırlanmasına yardımcı olan yazıcının yanındaki direği her nozül değişiminden sonra yazdırın." -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "Yazdırma dolgusu, yalnızca model tepelerinin desteklenmesi gereken yerleri yapılandırır. Bu özelliğin etkinleştirilmesi yazdırma süresini ve malzeme kullanımını azaltır ancak üniform olmayan nesne kuvvetine yol açar." @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "Her zaman bitişik hatlarla tek yönde çakışmaya neden olan bir düzenle üst/alt hat baskısı yapın. Bu baskı biraz daha uzun sürer, fakat düz yüzeylerin daha tutarlı görünmesini sağlar." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "Yazdırma Sıcaklığı" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "En içteki ve ikinci en içteki kenar çizgilerinin baskı sırasını değiştirin. Bu, kenarın çıkarılmasını kolaylaştırır." -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "Çakışan bileşimlerin birbirine karışması için her bir katmanda bileşim kesişimi hacimlerine göre değişiklik yapın. Bu ayarın kapatılması, bir bileşimin diğer bileşimlerden ayrılarak çakışmadaki tüm hacmi almasına neden olur." @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "Malzemenin soğudukça büzülmesini telafi etmek için model bu faktöre göre ölçeklenecektir." -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "Üst Katmanlar" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 73e7730964f..e58312edff5 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1058,10 +1058,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "挤出机初始 Z 轴位置" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "挤出器共用加热器" @@ -1414,10 +1410,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "有加热打印平台" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "升温速度" @@ -1458,14 +1450,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "水平缩放因子收缩补偿" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "耗材受热拉伸但不断裂的极限长度。" @@ -1894,26 +1878,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "仅抖动部件的轮廓，而不抖动部件的孔。" -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "保留断开连接的面" @@ -2508,26 +2472,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "不在外表面上" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "喷嘴角度" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "喷嘴直径" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "喷嘴不允许区域" @@ -2560,14 +2512,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "喷嘴切换回抽速度" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "挤出机数目" @@ -2860,10 +2804,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "打印抖动速度" @@ -2892,10 +2832,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "在打印品相邻处打印一个塔，用于在每个喷嘴切换后装填材料。" -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "只在模型的顶部支持打印填充结构。这样可以减少打印时间和材料的使用，但是会导致不一致的对象强度。" @@ -2944,10 +2880,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "按照一定的顺序打印顶部/底部走线，使它们始终在一个方向上与相邻的走线重叠。这需要更长一些的打印时间，但会使平面看起来更一致。" -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "打印温度" @@ -3980,14 +3912,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "变换最内层和第二内层侧裙走线的打印顺序。这样可改善侧裙移除。" -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "切换为与每个层相交的网格相交体积，以便重叠的网格交织在一起。 关闭此设置将使其中一个网格获得重叠中的所有体积，同时将其从其他网格中移除。" @@ -5338,18 +5262,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "为了补偿材料在冷却时的收缩，将用此因子缩放模型。" -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "顶部层数" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index 9bf4ae20306..05fdf171ef0 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2024-11-04 11:49+0000\n" +"POT-Creation-Date: 2024-11-06 10:43+0000\n" "PO-Revision-Date: 2022-01-02 20:24+0800\n" "Last-Translator: Valen Chang \n" "Language-Team: Valen Chang \n" @@ -1065,10 +1065,6 @@ msgctxt "extruder_prime_pos_z label" msgid "Extruder Prime Z Position" msgstr "擠出機初始 Z 軸位置" -msgctxt "variant_name" -msgid "Extruder:" -msgstr "" - msgctxt "machine_extruders_share_heater label" msgid "Extruders Share Heater" msgstr "擠出機共用加熱器" @@ -1425,10 +1421,6 @@ msgctxt "machine_heated_bed label" msgid "Has Heated Build Plate" msgstr "有熱床" -msgctxt "variant_name" -msgid "Head" -msgstr "" - msgctxt "machine_nozzle_heat_up_speed label" msgid "Heat Up Speed" msgstr "加熱速度" @@ -1469,14 +1461,6 @@ msgctxt "material_shrinkage_percentage_xy label" msgid "Horizontal Scaling Factor Shrinkage Compensation" msgstr "" -msgctxt "variant_name" -msgid "Hot end" -msgstr "" - -msgctxt "variant_name" -msgid "Hotend" -msgstr "" - msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." msgstr "在加熱時，線材在脆斷前可以拉伸多長的距離。" @@ -1905,26 +1889,6 @@ msgctxt "magic_fuzzy_skin_outside_only description" msgid "Jitter only the parts' outlines and not the parts' holes." msgstr "只在列印外側時隨機抖動，內部孔洞不抖動。" -msgctxt "variant_name" -msgid "KLEMA 180 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Pro Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 250 Twin Size" -msgstr "" - -msgctxt "variant_name" -msgid "KLEMA 500 Size" -msgstr "" - msgctxt "meshfix_keep_open_polygons label" msgid "Keep Disconnected Faces" msgstr "保持斷開表面" @@ -2519,26 +2483,14 @@ msgctxt "retraction_combing option no_outer_surfaces" msgid "Not on Outer Surface" msgstr "不在外表面上" -msgctxt "variant_name" -msgid "Nozzle" -msgstr "" - msgctxt "machine_nozzle_expansion_angle label" msgid "Nozzle Angle" msgstr "噴頭角度" -msgctxt "variant_name" -msgid "Nozzle Diam" -msgstr "" - msgctxt "machine_nozzle_size label" msgid "Nozzle Diameter" msgstr "噴頭直徑" -msgctxt "variant_name" -msgid "Nozzle Diameter" -msgstr "" - msgctxt "nozzle_disallowed_areas label" msgid "Nozzle Disallowed Areas" msgstr "噴頭禁入區域" @@ -2571,14 +2523,6 @@ msgctxt "switch_extruder_retraction_speeds label" msgid "Nozzle Switch Retraction Speed" msgstr "噴頭切換回抽速度" -msgctxt "variant_name" -msgid "Nozzle Type" -msgstr "" - -msgctxt "variant_name" -msgid "Nozzle diameter" -msgstr "" - msgctxt "machine_extruder_count label" msgid "Number of Extruders" msgstr "擠出機數目" @@ -2871,10 +2815,6 @@ msgctxt "variant_name" msgid "Print Core" msgstr "" -msgctxt "variant_name" -msgid "Print Head" -msgstr "" - msgctxt "jerk_print label" msgid "Print Jerk" msgstr "列印加加速度" @@ -2903,10 +2843,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "在列印件旁邊印一個塔，用在每次切換噴頭後填充線材。" -msgctxt "variant_name" -msgid "Print core" -msgstr "" - msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." msgstr "只在模型頂部需要支撐的地方才列印填充。啟用此功能可減少列印時間和線材用量，但會導致物件強度不均勻。" @@ -2955,10 +2891,6 @@ msgctxt "skin_monotonic description" msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." msgstr "再列印頂層/底層線條時，命令相鄰線條於單方向重疊. 雖然會花更多時間列印，但會使平面更平整." -msgctxt "variant_name" -msgid "PrintHead type" -msgstr "" - msgctxt "material_print_temperature label" msgid "Printing Temperature" msgstr "列印溫度" @@ -3991,14 +3923,6 @@ msgctxt "brim_smart_ordering description" msgid "Swap print order of the innermost and second innermost brim lines. This improves brim removal." msgstr "" -msgctxt "variant_name" -msgid "SwiftTool" -msgstr "" - -msgctxt "variant_name" -msgid "SwiftTool24" -msgstr "" - msgctxt "alternate_carve_order description" msgid "Switch to which mesh intersecting volumes will belong with every layer, so that the overlapping meshes become interwoven. Turning this setting off will cause one of the meshes to obtain all of the volume in the overlap, while it is removed from the other meshes." msgstr "將網格重疊的部分，交互的在每一層中歸屬到不同的網格，以便重疊的網格交織在一起。關閉此設定將使其中一個網格物體獲得重疊中的所有體積，而從其他網格物體中移除。" @@ -5351,18 +5275,6 @@ msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." msgstr "為了補償線材在冷卻時的收縮，模型會依此比例放大列印。" -msgctxt "variant_name" -msgid "Tool" -msgstr "" - -msgctxt "variant_name" -msgid "Tool:" -msgstr "" - -msgctxt "variant_name" -msgid "Toolhead" -msgstr "" - msgctxt "top_layers label" msgid "Top Layers" msgstr "頂部層數" From 8632f7917b18e9546339fd10ed52543ae19f93c2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 6 Nov 2024 11:48:24 +0100 Subject: [PATCH 076/276] Adjust Sketch Sprint mesh and image CURA-12188 Now we have a different rendering for textured build plates, we can really make something nice. --- resources/images/MakerbotSketchSprint.png | Bin 35904 -> 36118 bytes .../ultimaker_sketch_sprint_platform.obj | 8568 ++++++++++------- 2 files changed, 5097 insertions(+), 3471 deletions(-) diff --git a/resources/images/MakerbotSketchSprint.png b/resources/images/MakerbotSketchSprint.png index d2b967acab3e7198cf8b0a032d9cf46b3853d99c..a9a21d9131e0e1a3fd143637f40da589dc6ace81 100644 GIT binary patch literal 36118 zcmeEv2T+vRx^1hY&X_YQQN&2jNnlhIQ8A$8G-OHLl4H|4Gb)O}sDmg9j3O!`w1`bh zXkb)8ML|J8$r6s$N#R-Zp|NN4ea z^$REz%3|Gp+WHjATz~vm`29TmM#zAXh#!Rk$Bn)8t$jsKde9u4T48*!wv- zP$+&?Zb!_P%-Qh$`0y%?+0w!Sh4f9Foe@^64*J|U)Obq%!ag;v9&ygR?>FhDB%j#! z)3VhGRNXl`aTi6dYP(oK6?0df6LvaOaPX$d-N$OFr^j!U?HZfi7HImrQ{}H66w0h$op$d&qPu(d-yR7M za+7{ZW8d>11@f)TSo-2i)+|5z@<>eQZP9Snf<5<_IiE2UJSa7>ELuTqn^gGEE`RsaCn0?ePlbEBHM;9&O$J;~bkGqvqFA(V%gS9! zY|-zm-v1)?tIW@{&R-vUxb<#>YEJj(rVfjXj{b2x&%y2fS7vFRRw?#+E^4_Yw(f~n zG4I84!^^80JsaJBk=i%@()&}3a`B#X6FcN>>`FafEVsG!vA}~r?eeV^hnMTDHi!>m zRM?*xSmVetw|^Vh&v$m9s((eL(~^zn=SuAQm9oyj^^ZjhWla_J58iRo`uthgV_Y=D z&cp50C0n7@_kR=68WA4vu8=r*=&A1K@7|5tR13%dc#`kL2Ui~NV>WLB{Y-r(%S!FMF8VbKQZV^;4Wj-0{R$u@uTuO(&R`vED&7Tbi4cwH?jI zUdqqyBy5jD*`eik(%RO=-b=*B-qDGwA=;CbD=Ok-ry**js3)U$a<}~nr+on)_QwJa z9k&f|u~oGb)zVzB!%qztaI^Qa7V&d)rFyFQX^2i=R}FtAzm^sinSP0vi-xGN-Vu@A zG!J_b1t|q78Oc31*%(>k{~zhUf_|uaj!h(!RdFQoiz1G!I8< zSyfe4X&E_bIXOwZLekTp>SgUGN%h=FE-`ZrZF^5!52uq}PBf|rxu&%Z&D%>uR22U% z^0)hQJE^Dl_sdf~|5^pChqRydNoiRr8EH2+>3@EQr`H}IT;#7C`VZgXc^sZ9t#9v1 z^Y*Z{-{WIX_1gH)m$0+_`}+Nj-9Qvy{o+&Uh0WYmHn5G)X~*D^7nU;C2(|d zJ30L>EcU;=(#y%=AB*)b_eTC@`f>jGM)3B(U-w^L{kLbIelcF9r>CY(v-Kvor>m_Y zNK@^&(~guINTwW__mq=SQvouajpjIFJ_^*>$W zu!j?@(%SW(?}}W?4wtgEm$P<|QIx|4926xL

    Zqt!0#yC2f=xY~}21WR&exl%_9b zXREfC=HX_I?R0XpcC?p1Np+n52eRO5JCEpUh{{RH{Np!AT&=wv@CFUhgHBX$zkmG0 zaVIzXV_w!|HD#6MWmHsD7Ra`!;bE|_*2GS6 zf$4YPS=4rW*jsziJdV?7t{S4`mPE)q|NhTHqpibdZs?w~<$nm6TVJ!6T~3C`wu@SSv`{ z*{R6M+Nmfg+bPW0$KMz5|MU^%VHs+&O8@U3QB_q@PDxc&Nzy?czO0~Pqa{r8mi zmswy-{wx3Ymtp@`euRj~w-5QZ*7w_TeOs=7YX$zT7k{&^Z_D*>t-!za;&0aVe{H!I z{G%wgrvl6RqU1fYVv#(`<#{#-bhM`nXUgdAEC&Ac!^wRno)n7IM)Kb*zXUBG{BpjR zuHK&cUlz_=Ao|@a8B;e3MTDZOz4N$VRcGzjV`h%gy`OpeI+G}K=3VT|5j*6%opIOhBJEXn6Vs2#cK>yUc_wQvl1@Fj= z>nveRdMZxe%|87g7W6hu>r_@sXb*)}qqn=a0{{Ey>SQzn;$~KPf+~^q)n3 zuGri^oBR|z*gTi~+;{E&*#(k37f?WR^sLb%s$0U zjki50qfmkt{PN2$?nCY6HSbJ|Iy+s*N17s1Gcq!IcrI>kVf@Ne?E?pjVrgmV>1(tm z29LdY`_}&%7RUD0eoIQjl`oy07sZWIv~L{=*`KiD*s)`&j~@Lt^>ads)EJK!pOK-O znU&SlUY_L6<96LQ9G+yi@4B_DGR2~LN%p|NfULay75>nLXLkL*KjBMz`-QV-&p!3( zG7aK&u~XC2ThGs-P{IYVJ0o8nON6F5mh4S6zWDa-+mWyL;%ou}0xGL7hKCmzSK zEAz1o>PnV#D4LlzscRGTw~2~w-m;~h-*2Pn_Q?G;S-#TvVP~>t%b}Ye2PW)I*5E@f z*_-@c)Z#bN`#F|6JovTjT3j4HMnCZhGj#(Z!NWBr@y|d192p-dxuR0hbT=(cUdk#*0A@2kbE37?fjq)MtKLC9z5M3p zJ69G^dY6a5)C)iK_MSA)^m01vo{^L!9=pTeqalQoU@Wm$N2f40ck7r ztPX=%vf6KeY+HGfQ9P3=O|8vb?c(B6I40ogw%|JZvcHW@V|?<#?yq0Z=j3SeZK4GI zgf+#A+c-IGYi(`Stjb!X_3Ir`TH^5wSd%Z^-Q1%2lpt;RL*MwQr}ze~+Y&{$b8>=9 ztm@yrTP7$dD66g>c%RqR)uk9X;v2wWJ$VxJsHeWHY^4=_$Y6Y;hoLnnEUNjWxVTu5 zU)?aN9839DN8{|o_@((2mG$D{;gww8N45(1*`}Hf__3AB#(opm zP|dN-30h}sYum%|sj8~FeSG^KD=VuH&2phu?(42#ifkRNoC_dtQZk%FD~kYHA8uF(z2_Wx?l^l$CAW-Q5ps zZHd)l2o3ktN4Qj`bglJY)>q`*_xbbZYuB%*M*H#=6&0Nm;>@OGTfqSp6cn`aByTG- zV9kB!w8l3GX$Gx59J@m`C!$3~=mVCe=|keNjJWELA480omib9WOdDtC*X7?+#=Bv> z#>U1Um-{2)3=R$o_+814jg1vd`X#B{*<;}4$dii7$|l4`$ML=h#v4Jl;r7UIyDNG1 zkE5im3W}nnW4@=1gaiZz5<48W(9O4zC2p0Rob29K9AoQ0Ug*4S?^S#Et}0edURG-A z^7#1pzNp;sP1O1v$==zNTo-@w4QUdg-QC@D-hN0{d~nM&IiNN_$6$M;-}s1ow{z`u z9D1cYn-U(Gn3(vK&hr^>k!GBK|NecA*1kA3@9ilTSw0fOk5mlB{Sowq=ggU-uBi!g zV^eD{cw}^5m_r#E?ug%?@YwcAd4+i$VkMoPi(P=<)%NwlO0aeB-@Q9|r?4JIiI_*6 zHZ|3qcgBNd8s?E9aNxiJP?y86=6J$i@J2ylreP8cI_qBfeMw145@g{S?`vwZCk*r0 z!X2HRowwRP_;`DFjryCKnS~;8EDh+sd+(kn^Lf0?u1)qHQ9+nF=~E!rH}U8?+6&&ijcz%x``#t z8EFi~gH{c=t(l3)>b;xkyo^J>fhogC11g@a2Nx|~jAtE4X?x6OD;M8XUD@KHYMJe~ zJVHpLYG^DuDJfJsXT;`k+THo{=i8n<*?T4C0HvX6J8ocNxW2HZD5?qm*b_vxvlDA= zYiokh7q}e*C3p?%cb5~SS^67k_LdkPKl6c(4+S*#DS#s3^^1SptbqGL+@4iAk zN8K`gTV6-5UBA9+xWH{_Xvn?&Ln2lxG>$Pj8lT)r?gZJrS%`)hljYk}u_%?e-6zMm zu4~t`qYBk_>=1wr%Brbl-V4)MzkYpVk#z1G3%BeW5vgBIZXHqSy-+K;<#6o915r|4 zygu9%_1tGzv)|a@*ZF}rm42IZsy;n%xO)#SFYj2KJ)qXs-%>;ZCw;7TLiQYRWR+FgWqMYeMsD%I`+*Z+Ul=Wh_xpX~htH{`@&_NjA*| z3xOpR9q#HEewJ_`%A?RoTYCp%GQ0Ib*s*(u@|Ej@(t7fE>6w|CPlHB1%yWY$IBgGe zbEjVFI0-~z&ug0Mt5kaFDdrg~2wL%NpqtU@bn^@k`@?N3D1Tg?zf|Z2{--YN;_Q53 zA)l1M4cqZ%rdPj%nWU7|`u7w{uMjd!25k?`#ihD(!E0oTnj=r2Jn_1}{0Eb(`Hpe) zbldPxJ6DJ1KMfdiemfFy9KPZ)d_E+EKnmV)Pg^k6&+ln#d;Kp$g+O6GwI7=viQ8-a zE>UFj(@!G9AB~KRZ0+ssE31S1^7&+U>hdI@=^`8*_4rqOy3?$2`Q;>HBb1nN}y@Tzum2;lpnu+3-sToI%*wh~h`O6;DxFSqJ%K(UK*tDQ8KZ z_iQW9Pc~y~zN~KM=jU%KO*oKo%LgvmU6XMo@DOlYV`F}(Vtg}l5qCku=;&w{uf3-y z;>wo8-F{2zCv&2tEUJcQ15ZBgkf>TZVakKCzb`Ah!plHVw20{H{FLV2-~7rVg6`v^ zMDC&RvX_^aHjaS?x!jzAto&*MI$=m8EO)uwGfghQ;;NVUrW(JYPbw=bd&ULkvMG5z zZLHx5-f&Yv7=JZ$b$fd|B8gac9f$WSqUXxqIs{`5htm_}N~KCUI67LWQYbw~;Y?I2 zRY&B_W7m>P>?2z{uXXVE9T<;}jn(W;wKp;J+~j~j3it6ZG^-O8H8eD|2@2X#P*~VR zJR|G{z+?zO4Z^TafF^PQytOT*;A54&zxcbHfuG0fn^rp~ub^`~O=>uSzB<24!RMP_ zUGeL0)&}*HaCW z4V!@Zlu$-}jK^N7(8mVDBhMiwUdV3@v~pEaQff`PW&wCm+3J>SD6z&REKy z<#=}(K4G(UP-=wtaN;6g2P&$ltcAyA#NCLEP08@D1orh6Xu8_h*B9L+SjUA08CzI{ zbyPBYzUQ3TwL!}K=`v)GKuePtdlNeoA2DW z&&$b$CN4Gk@j4MUFrCV#k3b96Y+503dH3sfiK51u3{OR)m9!YPX~c5M2))`ls^vw%+i%r9ZsLwwto}ha zZ28MDXH+}qOvB!h-#unwSqIumhF1xTNA7>~=1u4K_f4(}I@_l0K*DyP93QRujs5s> zf3ewkJr>FK#EGrLJ_N5e{P~N9@bj7)bL^tB=G6FrV2Lg^0?sPz>^-y-L2-|fQRS^1 z9fZ?!ONGg2xCHAVk?SY^&dVSm1`o^)VxUYy{kV4H#*ONlm8GRC5W@R9KgnzTNI6Bn zasB#v-~ilzHB&DzAVAZWh?ArAmy&XTA zBpcfL_;8OT{fMWMkd(}CY;07YdRtObi2TVNryCj>c}6sCRTikO66x;py~deP>8{N( z@>I}fFc{rkFpkDLP9RV7+?6X=GUAJTs$X_K#U5Vh$(_=K1NqXI%$q;oCEQQtWrl#D zU|35_OAW8Rqa#g@kD}7sQDY^2=OsUbn@TT@%r?sp?1(yl=FHsq^%M%%31Q+;?2gex zPhLNk*q>0ELi;4WYQg)ux>(*bZ)fNBBZW^MJzB=#Ro5?>_!u70O^pTkj21VD)1;dY zn7f`C%r;h$mtP5F&(pk`%%)6^3DTBNF}~Ar=BLB93i3nwnm#{22hT7XFs*T0O-o+B zH0x7M&BgQQ&)2N3LdHC5WyScTXCY-g$4&7KTUk0d%RP8|oI?L(KwI@M*~{ipMmR9@ zaO}PyGa13(oR3@&lH7 zeoj5H4EU|Dxeg%h{sjH(fT7n*mr;JI53ZGAOsI_?8@Z#?%dPHwQ2qdn$4LsJx~!I# zFg!xt(v>?n_ySSPlV;?yx*hkXHS&EjLMK6qA3m%iegIPo3kw76T!umsOJU_Xhxt64 z8&v;&sANY+N8dn+R!@M?V~L~;XMi0UY?Xh5?b{nyZrYo`IfDjYW~HYa4lJFUn?6)i z9&nI^IA_*+QqKgXptKz}HMg>gKt$Uu$b0>IKlLKb&28xU9E!?sz`H0`tC?2e9>0Iw zS?+I2p_CfVMDW53ACj+U`CnpJR5vA+x6l7nla!n+NjQtFEOmh5@Er|83HTHsvH+U7 ztBXs~;wxrt6Zh>+xVpvFC@LC3!~{-`A+M_ha$VnQi4xug^=94mO)=~X%8gO(g6Bqm z*$qzwUKJ#@p5Tquvnh8THmssh;!2O^2u=+@tnfQUfPp6-ATBG@-Oa6QpV0*$AD;r? zla*6_!c)tU!9w*Dy&lf#x!RPu?qu@Xu?=0mzdS}lei5NHxpt}0j+dOxNZ2>E7?UyO zuMr7{gAsvlaXazkt=%X(7J}94eQ%Id-o;k#a#XZHdV-yWe5|iYk|;{w-4^`I`-%zR z5PD%sgpw92guesj(nfNiAp2F;o3>|+ip1m&!r=w4w*L=st9 z*-N|({lvjyZuH!ukQXBE)u<@&8@aiRlBAX5k*~RCUl3M2jBdAn z1<(Xc4+$|gH?J`o^oKDMdI6Xd{%0F_2${OxpU1l@QRLC~uGLM+a3;X)yKRhUZl3KY z>zm$51xmM_sq`C>97*kN*LDJ60~y#hK3!XP&5^oe&BAXo}Tig9EDGWV>^k*G$PUU#LP8Ac0(3=UtP_QNb8QO zA7zMjwqKv<)S2Sk=RhTn8;c$rqX+`x?d&kVclWLh))Q4x6K>$Bkr7{nu$Jak+N`*k zm@rTgf}Z{d67=m%(gojN0OIoT>3&Lwxgc-u7S;iu1{l?~-Y+UD$`)A#FrPdomMi`F zR5ffbivP}18*od(BcIO+#;*lXz0BW>a-nH-pp9^Fya{Kwz3DkQLL{L_biF(mk!UW} zMh&`Z|A{MXDH{A~hs@#KyPx0MNK0P*DX{k75{k%NSjtH;)VCm+#MIQ)T?#nh^bqx@ z5eOiO7ZMC&^%EA0z)Y9m9ykbWr4PxN6tFw|`^88x1D_`~Fqpimzz7=Fv%5Z57^IAp zMdqrBi3x;-;{zQ}IJA3CYVHA|fE*Nlw<;Lak%f>2k0qSEPZLyBp_+6dcuvVRE}{Bjh4xXbvc zrNo*h++yGJrCQA?a*`k~P^C5nFkxtLtvgA-9RqN2Ddk7ajpYy>3KXq@~i{B!-U;&B@6b!Qa<{PF*0kG@eAqCPw>&G_((MZ z4{w^B;Gqm$kDNdf>(tLJ^`D=B9wbN{@jZe(FEB=0S9Ob9%@ddlUDTJ+2@}=Dt}pPdr?cscSgqf)S*$%Y8g12rGfz)`-u0%W zq^_&!pIAgp?xSBt{Tn2RGtd<#%ctv@$Ihh?{V9^cP}ZWNP=}NzIh&nbUqRw%G{vJYHw6~9D9}lI8mSE3M>--2VUWYi>{EE6dAuKCAz&0pooO2qP zlwF_|Jgx$41M;uaIK!w24nPnv=y_N|bl>K~i0QSp9Km>D&7i0Esx|0i3W%2*8>9AR zR&Tw)ep_5z08U4Hd_{D>;X1}vJZwhEZUhWG`w3+B+K_gHGo3XY=eI+(J)2GM9g3++ zeazh*ee>qS(KV9@)isf=AYd~#%HbFS)m7){Se=>{pS0y04IN;io{6Ss?w+7lY8H2; zPijo58EXY{C5EeBJ(iHN%)X{>=F9f z`5Ykh0uuMBUxw4cc9E#&s}aRYIZ8Qod|f4W@Z(OMWkIjmx{QaZKg5*|4tm{G^KOq3 zxo&S#lkK0@I^h1hEu}8oemCL3);bF;+L0WV*!Na8?J8zE{F#Yr`!rcx=?ts z_Z&*&5EPn%x5&$h^MX}UZ0hgt_rQ5mH%|bO9nModP*`s$6=mz;(eK-rHkYE3gLA`E z_1CbZZF?(BLH;?18>@sQhXjID6O2m&GlHs`9Q}Y+cV#|E!7so~3MNUTULvPKYh@8S zb2Kz>ArLh;H(%1On*pE~2uVGhQN7ufaO8MPjf%}PqPn0^f zK?XV4H!KA?PgX`|8I}yJlmMX68+zcx(d2iv5vbS%lf2okZqK+b#1Wbzw7S)z0$dbN z5c+7*B5f3}DW`o2U;rk#6R)625I7(%Imhc7^9~K2&f(d^{xpzo`iZMx%7F{A$*JVq z>qQhwA~~lGwoP~F?6$YJPS95^J-XNohT6#Os-ADTAzSh1&q%^?c5Ax8X~4yrgHtLt zyMlVn;dN(4$8Y6=P}?*K>YvmzjFpujs7z}zy~U9%h6jhpr-OZ^(SrQen$^2Vr)Hyy zfA;KWVNuGD9@9Jj2hJP1oV>fiB&8%BUW#H^DQ9YuN7qS1LCvPshlAE5rFmh5Fk?`) zm@EMZnwle)E-TYRtPJZXaq>#eNuw`~(1&@5kt1$)2h1j`cy~BYpFE%HZ{GU3*19xPwu5mw=?SbWg~Q z77zc!Z8YFx@JI2<$!?WQ0OYD;Kh~mL1vU`mcjidjNl8e&sGsDrN%+87>X$EHUe>Nk zg5|*AP#bQ?g4Fw8L}?J7J2lbc-umV`IecDS^=!MzMY$or_nKRdJ z-n@v4QTU7FTfCE;EE9qS=WZxOr|Jg4W+dX6Kku~LTu`e%zp`ty1+)4McX#_RX!UKD z_9p2aon@SlB~8_tB@#tT1fHNMY2x+dYW4Qvbch^8hj(VwU0}^0A|SZ0agX-6TxB{+ zNf^OxtQa_uz@|pz?^xlI4<9~Ux_A)8E3tf`_CT_faHyf8g*};>NJOD`@7{g+SOOMn zyO$2n-Qa0c3hy5uR`k?ZMUI8Z8`YFZHL0 zteXZM$X3La0Zkc@$?d#XCdpw4ka5O}-`R=*HQpMNO1Z>*!AflW^!fFsDR7P*^wuoe<<$*e3N_ z*78cGB%BVcd3J&Tg)-8BfYR^|HEdJvWJj)zpPyf#AvG2Nj6{PSfL=#7E<(0yIwu?) zG6U~FS_xGXMWOb-vxff8H?BM@k4H~9WZRd-TRs4A}m#XuJyxqZ>ruU1wGfnZbGZ;%|^Gr{Cf!K7< zeBQO0miV<-W?JTLFHg7B|Mcz6r@k#1<(rXEzBvZvTQHz}3kH;L!GQ8D7*M_i0}!y^ zkioZL@GTgi)cA%Bz6ArA!M8Hu8#4G0gTZ=A8qR@cbO8u8@r`_-d?Q>aly4*x~bsTS&``yvmjQzVBgI2V~tA6TMxpFA;N_Xt_8`p1)TJi$l4t27)RiCcJ zc8duXo^q3ElV3Y$_Ho{`jbXC0n?5>az3E{aRxB98(3aVm)48z$Xs}$ga)yw$yY}0R zY|HasXE^6|n`b!amogh>bX?Bc#6Ri+R|%big2@%6Qs zR_MvoA%ZtKqpddpHStn3qal9}6szCt7PXaBLLH#R0FAN`-u7P^k^HwuLsiS}!BZa$ow zeeT>jG9Xyk+Ishuf5h?r936DQ^|eGA6Tat9cf!azdo52R73p=K_O|lhd_^R;LL)TEU%dhY za0&XazRQ`jp-1|6FTx$6Y6fr97fmNtF)a=&{3qiD?RFXR#;2Ns-p7AdJ$ zQc^;OpfIAx?-XshernU|ylka&cN?O=mqDQ)ts?eT|hScSKa>{`i8k1BGG??D3qr)lw zbq8Pa7A{)4RL9ZLu{IUmsF*rWrdwc$6y4q1BVV_?Drx!0_Fczvpd(ougLMh13VLL4 z@6e$`&ecnnE=6y7LU&GdbTot$p52+8U7FAKvS3_t{(~0~corkVm_Waum5Y!l&PRjn z71}dRF#H3Rnh%2Nh@hC{vaHg?z!=6NyyN6CCkHi_&0NVJ{Oe26WUZjATq$UVfq2~E zfocR&4D_pLXmAwnt`Z~{lfYaDMz_4(4wMD>vZIPxFt&6*E8GBMhF`xrbr^HHGGyi| zV;0=Qjd2NMS>ka#G{hQPTBfL1V7dsy=bP7(>%3Wu$!pwXrmdNoSt?YMT0Hsq_?j9T z{^&NwWFRKdZ#1w)nmM;%)BypR)O@$-yJYMO^FWzC!f4(z(j+ax7{NHGfa_6&IcS2# zFjJzLdth*|5O%>^+&c;D8X55lcPuY&E11Oo=`Qs?rgAZy+Yyeri}Eh%{!DBt(L|^X zWy39?gYf%pvS_{U$rv>ne=}_{%#aE_j{>@@n_E66Bx+O9TDVq7Na?+@STpC9n8m=? zovhrKSf?;9D?2-=WltR>o?zF%&RobD{n+Sz&$PvS0OmlcPvY9u42L{e@K20az(0R_ zM*Hz);2exAlJ;6(S6^Rc*d;BSiJ3{=8a{$9-&e0* zg$)m*4;V(7s9u2qd^qdoiFtR<(~fLi1^c*7pGwzl!z#+dGi49y}| zn|JO*Wu-Rh zXUy97v@$M389CwsPtnt}s4jg{SKC3;$1IDr^)2cKdsqe3<6sqEYp(sAgeekp69dfb zuE+k-Eb`4rtNV;;V89y_sOCPWcQONkNCP`NDu>M zF{fO<_h-Vh>00UMvEqzw*T6|qYzHR#F-)cHWy9vd@KdJL4tn9<3IW{ z7uZY&h9BIC5!r1RQJuDg{IYw8H^!9|Vp`fWvE2uTMZf|i>9QZui7Eyr`YWomZX&s$ zySd#m8{_BhNDc{K$o&SLgjH9jE7aE4N05eaGGK|RKUOMs7(L^Cqiu0kTkpPU@#q_> zv?|2Rs#`V82x1@=^f1g5trZaP5={|lPFCKQVGf@+ueNIL?3BQh5N#dO<_-(w)?lg+ z9p^dkr0-zX1_7Fgcwkb&jR93FqpP=vx!mnDR`QE8jg~9-6Q)x!PQ#~r`2}?AZl|RU z>`JMqs#*_;J~AzVUT#*Kftd_ixGOwZ2ryKtRB=g(H0Ka@7SVAusP2cv-7n1wNh)Bo zD+Q}-Yr`;q{<6h`C^zA%&>(Z0l@1TaP{)0i*L}mUh)rbL7>hw1%8h|;TJ)WFC?(`b zxst4L%E}BEmzVdnKTw8g0~J-(^Oze$oVf&RmXs`ioPtjOm&lx6UaK$+%%U%WxY1>? z)U>o?MdhNROO`Cbm~uil8hW2VFz44R`sW6F717U&T-KhhdwQK7h{ePs&p zAQx*Y(q~B2!lbUw&JR*GXi2X+1M3U0&aJMl#+vzhd6|#=PP~*dX^Eg9{lvfU)mD!28`-ZNZ!S-Rv@PMu~TBT4KWZ1BDL`@^kSWH*Hx($Dnws=~u zKUn#^zTI;Ro+Q|Gx>Gs#YWvTQLl-tAN$Mqy8leMUJ9|-Zk~LLv<$*ECxWcnD*Ti)1 zI0dw9{{@OzxsO+IGBQR>8>wU&dR;Oh)<(u_1gq=n!ZAH@pc*q}l2iLH-&s>&8F{{( z>;zGx!f?2EA!Ib-)6&X*2srcGa4sh?_a#Qspr}!vE+{0lH~Q`+G2LWUFYOnfKAGU| zFD7xkkWb*|`!0)NP%mZ2S>$Fbzc8b)ixk=}V!epM24E_d4euw;j9bQ34C@HDv-2T$u?*5fzD;VkCJ~(}F0P0+v{EtI|9%?f ztu`==&dC%qFo?bj@qlHxL+?T%tzdz+wl-)&nPd%2^!CaSkJ7!2;mG?frqCHA>3@S! zQd>hq!)xz{Fb#ribQf-*VXT&j2i7k9nwd8=)Q9PHGISFXl|ba6E=@zwyFPs>$;tWc z?amluDyYr!W$w6(b^2IS^H9B_yxhBG%X9_UD+M*l6j!G)WSj$%dR7=*7e?U3CIo3( zB^78O7U8DIh*wC|t=<{zxfP+pSyHI|`i&b&{1RJqSHKI6)*P$b%+_p<`5QVwdP>d8 z3hWwSv)Q&TF5<|9m?6`-EC!!P6;iI5abM}T6si^=F_5V^FFJedX#igjrig3jHj-^^ zh?+rE2JE$uO%nqRWbMi^zYcs&6j~4vL;OCywsv=yEma5uiZG2liQ#WxxC+x9<_2#A zYt;-<7Xh~1%&H!5Wp+q=;HI4-^8y}dXyYA7M^(3-k=~I#+?}k`QLSKQE}{y78l+M8 zFueG$eapIz-AGm+$^?QG#}*=}R94AD2CL%dYRnd4v*;xy>&y?|S;^gG6 zUBb2aw2%;S9>qu_czoowE$orge`5(*mpUTRirdaCe*)VfVo?P)FCV~A5!_)S&euP} zobcg0P>sQBs%&A5cEl?IFAe*~3 z_vcD~blyaJQ6!R4mv6B6>cHqYi?7~0;S0$sTei@K^2r!T9&b8n(W)`_^s%}+t1st4 z*ILWB1((GV-59Jd{pDTEHM$jPm{vqu@GgYx4WtL_s|I|0wlOU)kX6!$Ot@(?T~X z)MG9)cqcnlOgBaHEL04#-4B$7gkXZtv;=9q)>H%ee z^{XMU7&-XIFdC2J;ndw0|`+I_jTXPt%Nx0GxoT%R_n@ z0OlT8EtD;QJ-A_(@V1U;`BM*IS8jtyO?5ewd{W`+_ z19hTmmz9-8V-X2V7$6L;v9GC+weZ2%R~_$`ymoGT6Lcdznq*W_Dk5G~?;-*2=FM!@ z%$kkMVPgOW+Slx!ynOX8)4>LT!`;ts?egU)L=h|g3bb9}!*~@EWOzgb(Q;4@j_IgK zb#`^Vh+8r9l^OuRpX%7n89`P*v(OP^#&{uvRp|oZNel&7F4l&kO_MZZ^uW#7*qn0B zr2tJNDY4lueAFQhl5;);GrN9HqH3WQM1E%n#Gq(Jq3#{nYp4|ir|M&_B>tx?r>M9Z zdS2dzs2mzmZqqm=cp0%W0@h|XB4_7s98kD3}ndC&vxD>Vj6 zB3O5UbUho7hQcXlSvV?q#yihXC(Wd)jLf!v7(ijC%;o#q-u{5)aQ|Lb7OylNl2@4# zbk3Gua!tu~4@eS04uW84kdrF}2q4(PV1*Lm_S9h=$XyWBAgHdT6#+>W7e2ECm&GtH z%FMRS$-Gw8fx5nf%3wW`)hjbLHGNQh`4-8=h_mBdb}r}m`I{we(7@X~3B{A#@}J#J zd|YN^VSMJCFqb^r>IG%?mhiJ!5KOK0^y0 zp8ELl3anXF0fG_)3&;2R_BvX0A7lK2GzH&j4}Jg{QDRQl4-8-en(5kgWP4ouqV zQ1ZHz2)waK3<-fG#tYPB^24#Dgh=;+N8sHECc*t}Lsyv1G1sprX1%s7$4IW+Xikdh zk5bd_Ml9Ow=mnBM^4>NNj1mugoDYN-Ld0;c2hoPMU)g9WC8G=iO$)MjTj*4+ufL)4 zzeR0oF*-bH;3n|+A&aGmV*-9Y4-!)vxEL0G4?3g858BFNNtQew@2_G>>ysx>m+i9e za`S70*;?N0Av$@(5i4*u$wBq-6(hs3;O&}UeWUI=A^(~A_XWR>JBXK1dbw1WLr{F! zs8@D)Oe45-Lk~hZW~u8k7Y={ zIC#=<=q`aR!oeduH%$}Qe25_vo(hDzF#M^fC67K9xYhEUjFqx5l|yoblPr(*uyrQ2ufj}1K_cic`t0?>sN4|sJ( zWF)n&1hf^utuN;gHpLr>u&S z);W}eA(*d~vUGiacTbNF^g6pb5Ry@81-zb}r~U;J-gp7Qib0yRU6c?+#zNF}@URz< z=+GKnT`;SmQgOBME(&FRDfy0o%SA1>;((W_Oj)f^fZ7gq@V1|ZDJbW&p=*dw-PdQch`_m2h{H6)eUn-B6WyiK>+apVM;KSIf$!Rc8rG0N zOkg;QNDyO0+aLK0p2RAI(2iek!%l!5$RKWBOi6i%VgsTCq2}F;^&1Jr^6c5O!oK0p zSc<8!-{zn6@mYfkkdL}@`V+jDm^B0h_dA^DM!k!R@; zje8n6oFe``rJb;pr%#_=SdCJ!No#6AE8bk{h6p7E9K@=6`mhDEY(+ZRHwc_qW<6g) z84>pFsSCpu7FHuO6B)~R)q)7oX3#Nxy`P^S5YIYv@ZbxG#aif6dM_X$UW<;-eAmfv zbCZO`N8pt?d10O1-35$^N`}Sv0SMN%&>U~3@?j0iBE&_>Ae`(yE9lCD7Mo<}GJPD_*Fr?89j@_vK`RaIhTG%0f% zVkYMWLNE@BlvTT2i4q88`x0Y>C_%4*KZv3jex!6B&3*cGE!17gbo|GK?Tselg2%QY z{59cxgoSs`QdW3@>`Jt>qwl&01qpzu1sP@$MhWUCr3S|jyhTfkz1w<<-xkDw(7{C0 zVtHTxq1W|Olf%I|IQ_wq&ryjr(7gHjEP4x**uPGM5K%7G;aO@{B^(30Z3|{Mc;H6; zhu}|s7MH~UWds0|Q}$D+1cLz=Y@U6}S089QFffbjYlK(S*1FkHL@d*zCZG?}i268Q zv-oVpXafRbpaNiOHkK5{%l$y=R$wY_(3t04` zPs#4HNF`K3U~S|`%Fj<_f5PQ<3ksFf)MU#p4Hh9N6?(uw{qzS{T^Ecy;g-$KiJ*&k z9He=Pt}1em(6s5t#8?Ep0iB6zrx0KFfk0%rz6bK`@N}Z0Bq1$b2(OqdSo*w7Az82* zHXjc{lZee6VAeyN3&pf6HY-%DOczipj&yUbJoI?gI zW1M#-uZacoPeAaF;PI#3s>wpn&sbIQuW!6T%Q=q-O_Uh#IGF|>VnwtkwT*$S0NW)s z*qKsX)Dgi1REtU>tR?vd2e`sWU!gD#kfvVyladJ!j?|Mlw1kP&nU%$lWXKnuFczGm zeid2zb3F6f=0v#x|xO0M-nu`FqCxl$A_4V zLX4EC;Skls&*y}l+mh6z5th8CChiYwqB=m<-Ut9fRPwNo9YR)EKvEE3N!HGACd)w) z0!__)sZ8cciSl7jSU*UuC`)y{W5PCc3a-a;>1}R)v8$3&b0Ln7&n0CYibYm^;^VDp zuV4{Q03IXxb55BN0cKL*?xOVHBG%IwDt#MAuu$hQT=?Yy*|#KS&IOPj$eTHXf&0OL z;ND5!1F4*#yaPYj3&O>!vGh+_c0TqaHuAg-jp zsSjTOLq3>>F-|mc_^g7KgFGM-3x{xUPof1&3+jI0!fWIORe##&L6C6Ecqr29CcUr zZ}F_C1H!RZ5d3=jPKO+ofMF*`tdMq$8haf9jJdl`AX_$ETat)@`8wPp=du~;&4P6w`*#dd&@A@L2gEg-H(&CWtD zAYVBFp8zqD(Py(72$aMyCm~eYDU0l`h$Rjw1zVuu;!OKH1T4G@GW=3c^zJ(%6ca=Q zQZlCX38(?&5S*FGL-lVNI49PHj{%`woX`MI84z4R(Wz{<@7J5?s;Ed-!1tdpC2txb z_rtw_DqMI3^%AZc2V*hSD47t?kg%nm{OVWx=bt-k*9f24b&L8(u)%?46iPd3LaRA) zSuFSI_QwG?cu*q)*$%=A09=TGABaX~E_^h>Ic~NR;Mk(N0}PX?R(SyXBOZSQXNyfF zW)Q_rc71SQe5EkJ)A9E~*wrZ>AhFAw_v*OJi78}uoUIU6C^h$l_wq-C$hzDd6JTXD zrxvX*q-Fx;H}aMiypqJe%*^%pE*$^1;Crwlun}i6$T?O?8@#r%D-qjZmgE{-4%#fa z_9Ze4q{IjrESZe}6ozLfMDDVF!(8d$SLWW3p@wg}JMoCghGx&AoV-qq7+)iDh8=u} zwY?t@m2bN)K}e7kha6*_|EzT1qo|KXrE1Pvq2GoUGzEA>Zi;-15joY>=^&>wF01bt zAOcq!o`oYGjniTTI|ag}+}@{!M13Aao3|z+X#E?E*k>h+oF{;84wQWLHQ~ZB+)nyt|uPn;)7~>42C3wgA<1F3>#G z@<@{gG-DIm2imhaT{nSzUm%Vrv~lVR*HTV(kj6o(2uN>4f|;|@r~T_DJ;UpCo6^$yg7#(A#Yux8cF>Lz^4h6*? zN`jS@>FM{Y>gs}R`OgF}(^xD6_PLYjhyqNi$VtJsa{$pID^|v4g+xUrEO+1L6>L_{ z6~emxg>`{&@Wn10@Qnmb9n4(B#&D8rNZ{Jj*})07qURd9fy+uVXu$WRj1)4)3t`$J zU{#cxHQ;{`{WACOEGI`gFNnxk1^q2tkeoijk^!Xwp;I_M;J@$<2@1e^Qa963)K(4u zfUm*m<=xvxIpz9j_Qbi!yH0MG9(Jrb&;e7#!N>F$uT7bp>>3~60Y(H3Is?xbnYN z17Q^GG>u_q`Wnwm!_2+E_;%`?-K+D$170-CeT|4Mn~Eh zlWhyxd5D2Hy<}N(nDYXWVvxzfAF)${p{=ctuP8V(a*i=_ZrXvREwe*#2MZ&dfXqOC z;BCt7o3e1YhXlc@W0qUy2t$5vKS}6lwjp$ag+LE_6@c3G+4L9H0bqGa*ah}Mo~Yc_ z`k;N7#wzszuM5Zt-vO-3I=)Q<-9y-P6xjSpmPYu765t!$47!}^@7wP+V6k4}t6v&P z*(@E?hHePoT%N@Ymbw5_Cxrz<1vzvB@IH{dhLj|b?FTk+`RoIJ@qwR~C^Ox5G=Y9~ z)~Tht(R;h@XxDPnv*$hUS8fJk(FiQ+iwVI*H1OUskfX*fHMl+T_eTFNj0Qg5N@1;7QYMhGCn zbY}5HZFkl^`%uimcB8Q3Y{O2Ja67*M#46!+-e`ZOS0@hIsrAk7D1+mWxt!n=&v|9Nkqe}q}M7m<|DSTWONYSr- zm4YRxvPq2#30ShbL_QzHI>I1&63r&EkiKz*PQDfoRTaTeX!9eC5CAp7;3rQ$;*Q{f zK^bNZ?$j9y|23(5zn{jk*2?nQTKeZPBn<8bQHtHZe(9-x>0pmJKh7f+1Nr8Jg}Xrk zjc}`JK>a1nK_aA5Lx~5A%rH+G>ZI4VaX_KMEP=xSMJBT(-ViNpkZ8;M9uMX59Q}O z4*Hd`YP0S%<%nloF0C~<+F>;nkjQ}$YM=ge$ODt%=y-2Uf2&6Zz8GvpfAEjEDs53m zU7>${P0e^#E*l{Ku+&F-`Am&8UTaB1K-6beb&RhUUK{kVCvqthgvu^^9)fLH)noLA zMchQb=!ETaj<~7F$Q((!Hs_QTX{6%|a72J~nfo1O-Nxp*rxy87j{Cdqj1P$lW!7>6 zhdEsJxeZ(pkq;%8t?TRWKAr!+cGUH61*1YTaLxY&MPTqx$kOr1XGNIdGux`5~>Zz>*JWu-=+9eunEOpMU;%H9X!G*lftX z4fM?);LzkMpz+Nh;~hbxT&<$7KLdwof#m}*C1n;d><9x657c}IfF0Mu#NWWC zDzNrG$inF0rV30d{~yK4Fq~KcOyS`A0My~wVC#Ds)FuUvhXRLzc3(Iw-f(*# zdsRTAAi#nESi8QmTLzg-1CFTNXkm1?R{xE=lJUW11E8BhIVQ}Ly`c&iu#b<+*Y`9x zGf!q@nBTw#?5@pk14b*TYy}RSfC}L@Hv4CcJ2HTk4Cw4p;OK%H@JdxhEudM!e;DVh zfQmU_B?}zB5Ce^30NYDD=a_~w=5+%H1%M6%RyA?JswfXMAOd9j@G#UgP5A*_Hmw0H z>wq(Hz%dn|%?uwpgU^BHX=uE0VRS3W=(ZaAZZQI-Y2ad1j{ovYf4lt)49lMa;(NOK KxvXH}97)Hk&P)QDA7!i<+L`P9XMT~&NfhI_7a;96yQBed8gD5DB0hK{$ zL7_pQVI;JQh)Pb~NDzrl&fz{A=KId~)jd_WPMv%1f2yujSqOB$z2Cjpde*bn-s^cU z9XYJMc;Whm6bfar&VH?96v|v*{NpT`hu?^tWW?cHzTXK$k7E|z8(iFIHg=BI8$5hn ztT$Nu*x67hKGjY~jxNdFuwY_nmFn!-_k}pAQdNt+#_xT2=rp*(_jSpZ>jgu7hne5M zyOUPBdE4xH`uZI=3ofWDsp;#mn=1x>qGwgi+nzIu~xtS`0CX{klV zqPOoWMfQEwdj8nJ$sJm?Ah~= z8^Uee3B0DhKX;c4elPZ!tnvcFC)`%ZJ$9pO8xOdsY=Z92b3Mnq_+u`Y{Kr@Eo?$&RA7%X1=~qgt(Y zzx$$}A8qj4hCh}*SY~Cj&i(rDzw(D)YM)_x%S1Obx{5zCzevvePOCv#?ogD^IUk!6 zMP>d5|@eLAP~^S8504Th5mdes|!}J~dsTlL~ix z&z%Z8`QG?W%7KuSt~cgu-?vK?nmpe5tN5Cv@4gpXReEIKTt&+lZ4V9im(X8vG&@E& zx&73%?c6o$tdpm&nraS)qzB^^>(a?zQQx&9fsEZt>SBx14&(Wk!8|4xNqt zvtA!Dh!d=@U$$2I*x<|J41ZPsv7tlp*`hL9ZdV%4=3b*vmKfW?z6^B_sZeQ7QWjP; zOKT|~Cl?qVg`%eE<6=Q|u=dzsX>DugtS-jS$QIjRXQeJ?prE@$*JY3OX}kS?Zq~>B z4xgatp97E2gnBB7Y{p{^9FKF3rm`(hq{;; z{=VTK<8yM+)&1w?o!$SQ1HEHAc}sc8or+5Gk_z(5@^VTx%CfSGmj7}o z9cOnB3ume|xfCugWryp??og1Iv7stU+Q?I_aS4T;l9p5jc}ZDW89AGsHdeA!s~!Jx z2|YJESfz#IzmAGr$_kgFTFYA4>`;)EwAg8*ASo{^Zz*Z9Ls3c6Qc<2NYh}4Z$x2yq z`chU@m3=ffCkrg6os)&FwX}<~?erhWgsc2~L`PjrR%+%`r+;(A(Za(9Z%`LIWasSZ z^B*rgVdrFh+{1#*ri_xT(oO|A1tr}7jvcb{|M4PyYd3dTBDto_4k@{rA&_NJ!OdV| zEr^}s0@Lrny{PPQv$pV{xt*ZV9M#3h05*_!{`1eea3?DZ4+|{|4{KZ$pQR$RLuH5D z2^l$+9f~S4iV{0yRd)Q#>uFYYHopH)uO`m3L2YKq_uIMS^L?j(HRDmotzBn+n)%Vu zZrYVLY?yWm6$|RjEx22FSzAqy6W5yg6ZN!(v#mAI<8O2Q$M5a_6H`#IRNg5gyHi1u zs;DF@DX(NBBe`>@jHRTtwUV;DjN(o?3xLhPeXu*t#>3mf&H86s%p>Ls<~coA8@5g_ z)KCBZYVXt5WEC)Bk}^9a$%M(M$SbSJ%KklJ(*N_fXtP7c+EPwlMp90B2X0Y$hk~Sq zyoJ1^m6furjFqyyl9l|7ef)C*|GT&N?>6!GEviWqSp3JLs!9LfmVM?0|AM2Knwj4L zp8@yM|HS*h=M3ZhpZxlJ)&D0yV#9`SAM#(C-*40PZMyzTGw@$}@i*)GHeLUv8Tc=~ z_?vb8zcyV9|083xb_UV&Mm|_yv~3o0$$6FswY4bu6gp+`@abkb{N{U?{iob16se8m z-z=Y4O)va%zK4$P-uYh_&RH~X*-!M^ITXqUijLOLCw!_q>ROK*+eUVO9^2m$Pnk3C zN)KE7u;Z52#AxY~DL(_fqC;CsS|65pWm;YlaC~R;Jb164=EKh^xyx;y7u_&1IQi$X zGao*Fl-WdAdl}PF%$V%+Cc~oay1wx6%zs{LnUPN5_?df`VFR zRc-B+=H_Of$#Gw`z|npeX?j~*Lr2x~j};XHy1KeYw|0z2d8ZhKl$Dj;ijEFVN=n)q zQ5e0ILaDEOJ2~E>$!L+MP-0%y*Z*RY<)@(ZqFh#0RZw$snCj^4+%-07WNh465F+^T z)2HN?nx_c~`FffYtK8k)qj%s6hRN3jD8u3^s;Z4|!zGSxU3LFhTwZDEiS66BH)a14 z7au%1IeFUIIkc;*E6s1fzLp)R`e#{NG@p57YhH>&Md}>>_;|p(ckh}C8g}1X7JKZc zmoH!5zjyD)MAM8lJo=auKF_xSt3%bsDrmgiUPx~2==L>KcXv7ZXzOF#5O+ZF!Gi}q zWd`PZ4GawWhlV)A!#+h@@7SI`y|ucgW}{d`)pJ|dmiKpuxHeW+;!Vom@)Xn@$E4K^=Fizbh zA7XWCO|#oh5siSf$2IDKqw-%`S~iN^Ke4UT;pul2N)D$%X*H$(L1FUt%lVck;>!XP z3QSL(x|EWV@;Z5YWK`6UCj%o`zC0-{ZLOf7p#MwL*khOS^Yep(PCGhY*weZE*?Z&b88ph?<{-gb^YuBx-3N1~k&1Ps8a5!O28cfXBoH=v+ zN2|}DKR?`+!N)oXMLF2Jxa`oF8t)Si9Y|}1y%a`BYunnkoORAlPhW>y;AZ-+JbwH* z3M#D+XHx>cgGuMeD5$9kMM#-eA2;c0YrDKfFIq_1lJ?V@;Ex|aCbcj%J0=1bl-Vm_ z8AJQLgu(`t?XbRrO3qq)_T=76jJbL9=4m^-OJ~oXH8eF1fwB1vcHCb11EqV`CPCl! z_Vx$y@e(kp2lwv%bw!Obd}hs>HCmBjPYt&heE9Go+F+@-hlf^@VQt^m%SQMbR9JY9 z7kcmBy*+ceYM3gpto`NmPZza&^i-?}w?TH=PkpWl5Zvv}|K z6j4LWDQ4Wz$mnu~?)`g_HoCvRf04-KT{D`bq@-xa*ie6eo`HGbYR1$UZ|TIvprr}V zpSyDkLNOnh%D$sv7McuLRA|B5w+C>6g1kJfO!|aM992)OcMz5dOMH-(RaZ8Ta&=>2 z^4HEz^%G4+$=eUaUVqlFdUE?3&96f=8ZE3?V{H560FyCtZaKweyMmGu=fj61KP+CH z|LWE5DA#FPfs-omRHW@ikQQYEn37G^$Bxof~|X)q`6pBtezWwVAI=XH@K(p7%OnruD2RrYJRV(tFAU0 z=S@wR2lN#weJn2@eBXjax}TIJqpz>Oq(2MGW#e0-E`Y;2x>smt%}?Y*bXq)_q-aaL=R!vqTVPIfjxJ7en9b>#v)SZ(Mejs*Z zm3TL+qq#7mr?>gwme~}I`&=#;c32o_a4gAi+N~TM9BR|uTMR{}l8i22vp!{#;U%fm z?d<57_x0=P@n&hpr5YA(Q6?paZ^S+DdVAshjEu2ea-I$$_D}TV&AgLnm{Ac;`kf3T z)-(>eT?gt}+uLt*=COqtBZcOc9v<>TOFun6eD|_LMWS$_`u5PW1KhrrVopv@PH0#$ z%q_u~b>BoP1AsX>G5X|KT*q3c6om+HfVDY~iB*8#c?Sf*O0abD^72BhJwro7+Q2;G zw2qFo^m`@=`VUN`IG;WpdskEx*qdXrEgZ||%HhP9*~6f_>=f(|9y|z;)rM!tD=E>k zS9f=E0RR49ccz${n)=hD%gf6x5jf68XSBAq);h?G-Dk5Wck!NQWvTo5`@{UzBO@cZ zJ0s%b-008?u4IQi0;C5a5cDPZEdrJ@>F zU<_e?p&1z&jbDnQ()+3~b>p2hM$Nz=S&8G14>yNye==Zb&JI`?CZc{BkfSbYiz$_6 z4~yYO2Lq!1M&u=#Iy`z}NnLb%7Q(>$J3CkI*|P`tn%SP-(b*XyXZv0&-6T{%+AQyZ zc9>Tdy&X|JSeji~^0f7@zy4Y)Bs6Z-vVt<4h5-ajO$@n?^foIa+^fb2u3L9$WMsq# zMxV5kOI_}Z+imD=E>tx$2?+@i&e*nu;v#fnTezX2VdZk)Mdx>u`!&C&1ORGldwZAT ze0|W1@IyhU(BTOL0j+jD$fVVJm~eK0JMMb5Vmtld6*R?8R96qC{F?myxt!7}DM?9Td#&9!t$V6$ zV>)k9y^i1x63w!V05s}37(V;&$u3%xNN`uNB2db8C zDokFxcI|8RL2x?5Q>Us1Qq2Q;_WrPRsc6-s%~(L!zAr_4!a^w&dN$Te0E6KNJk8E# zRJa}!E!iSku>&^l={YsEV_WzEkO+oelp%#O9_<9Qg6n&Dd9nL?ER)vO)z$ShnLHO2LK?jVJcyjLCx%7Ao_)jCy(6zlh zVQH`82xw}WN9!@?C#G;oRqw8*=o`_|(P=(CmPK3B5sR{B`_Sq1G4|-#SYy+h8>-Q{ ztZaVl!HB^u3V2M1O7P&G>~a{3M}L2R6W!U~-oApW>ObgsN6pu*f*N!8E*VN^lDM$2 zFaSb0D=UjX?%b0~NGA*l1F;>ej?<4%0ua6LGu^(%J!T5St!?4*B`MuwzMX+nlM`u} z-$94-;GaN}OBvpLdT-;{!)pYLX*9m7XjD{Ga8=bQgC&$4e>l^vsHmFd3!ZPUac`1b zwNUlT=)Un4*^eGSUK-$d>SmeArBey|jc^}s&rMcPP(F&!>8MDVnhZ(kBY5&8J2yyxCvC`&H@Mm^v9n z#WhqamEMi`RoT(ui0F{j$LT;6^y#ku>zb2(z>ygF-kS$vy=@#%#+MP!SA=wF@H7J0 z;TVl9YO@6}(K2b6D-Z?$PnWQ%06j?YtzoVX&X0^gzGcgnp;dp->Rzq}t0AdIqd(s^ zw%2U&k|q1h&CR=7FtrZOTu*RcVNRNLKtSdfpNp(4pB^!N1B1rVfp*p1w0lQ_770k@ z)z;QV8|d4fT65~A@SFBFgf?%*^>LnzgoK2T#B}$$z;rqQ@^9od8yUb-rhrl4(DLd;7?ujXy=@qL=-^6Ne(fpA@`RSCQVUSyTCUw9L!RX$^dz#1&M+k@)y@$q~58>fHg zn4lluGd|L%p3gysAtxuNI@|uH^~LJS?Rp5C zRiEx(ia9%!lmxJfA;p?g0UY;FU~F*Ki$%JBhvgh0{Mw; z&GarpVsOLiJRZ^{c}2y7*RNlP7N@*;kp~D@^B;V-bQ$Fr9!M9Mg!b{{C4&wn@Krso zyk={GLpI%^p4`G0_AJUc7y03r#5C~N!*`UE+MQShD&s0g^yABJ-My<`y6pq*3S0q` zIsBf{*VosB_^Hl_0bd_b(IM%{>bCS_-DX4(r{nw;?GS@ zR$X6{>l9^GyRe20WBhF5K&CP05Dg1CQu+*cTfj5QGS_$;=NmiZrKX*#GC3FJAN? zZD=zqt$x?B0XgKf&1-PW%EAThdC1~GRi2JaEIhxvt1`$wWjzdUzFFoDRn@Wg#uOH~ zo|c0{J6nIZr~q&UY2U$A=PA9iEF2y68z1j0&WOIaz0f|f z8f51RmP%yUu0kxEi)3}MJ>r4TCa)u&(Q7DYUYwjk@FX!$hcC`%O$h^o z!}ckoKPwK|J2;S<#n-N`P*~l@rD@u6_!KZQuAl&dxLa;hxv!@Eshfe<`v#Fzq`9}e zkIrTzuD_2~H|`5tU|Sp=f_&54MyDmAA!OLvgkv#Te+0Rir>Cbjay>_m&3QnCgz{WU z&SQ_?X`Ctbcm>ZkDgckkXM{3MSt&SB&sv4Hmqx94Our#a6v zk+?wLKUVig2Lf_WW0+>ax%o@om~RlUkwGzRQ{3(yd7TyGmLBj#9o3dU(=!0tzoL2- z;8AApIo7E=c1qVEL7$XR#0HgywiPCKen{v2^1_pmZ|TZQYNr~RnY|YdEc^87x_{_& z%EoW6V6sH}EbeLqs<21CL`6nL3L7BIAf3Gt^pR5qBsp~GP!m1z#I`JV)ACVj@zL?9 z=SgyuZvPE16;V?lE-F+(L0|cNUSC_@f!O4UHKTx)+VCg7aNhf|v75xi)(8j;tqvq5 z31nz(ZEco5KEsvKC5Y7C+(|YlPwmbZzEL3vF9cw&Z!Iq=SqZxQ?yh7;6j=J-nZD0R zuQkctt9BZJY*bZM2~Rce?R@m;5y1Qo)C4-W#pM-tQk#yh4`9v2s9Xl53QUyx{0T2_|d$O#K;HqHScP+eSHI3`^9 z+NqmP+ApwxSanrrbC`?0ecJ~P>S+yNFB$W=m_5+T0yKUUw}m$pN@rgo)f;Cpna0LO{$gcR41q)@crkl&wB4uw>rui- zi{tGgA|e{GDh9w%PRwNgW0Jrsbc0520~Kr3V~ie0>2R2%Ihpi$@f)}U3R}{X__?69 zCC)&^W10#ur52hpN9N8`TU`CpLs2oEX`5J+c7c46FZL}S@V=S82c$y(@$%Bg>TE3 zFKR!NI}S(T;@%yNKtF%$c7XLEUEOA9%9@^o%AF|2A>%_f5(FDfV@%PJ2JXX2B@$S( ze;M&scA6>w4g=q(?-v}yam>qCP>GmjloHL7PS?N`kN1QzYR&#q(bN=$MWi2GjzP(mmhG$_e`SAu! zuPdvboY>Zb_yu~W$~H$)3?5r1wCBjdo7OVQ%C`hJ3kV2=nQmajSSA_v`Js?rV-ZND zZX^XI$4@MU43_?Hyu$Q%8FW;<>?iNcrtH5){K*g@wdAp$_D$=fQW1@!Q^TCWg3~FO zssho;?u(>g`uX!`f-89R5oq%7 zs(N$%qpn@MMhu&9x!ZEK4M?Pul9N{;&E*YvffSOwaqF63*DvpGld6`lc+~Aqa<2{G zg{rUgL835CB!~X}6|C%9NW_!X))L`w+3)v&P$Pv3bK@dQMAWivsQXD6qzQ&Tf*Dqg&TKqNQTxU~QEN%EUJOGIkgH|6h+?>!8CaM_f-2Dy5s!eLuk2wY^Lu_rRfyOXYFLAA3E0I&pRLmMsqK^9)pt zy<2gFt6R7VRIX9m9WEzU2u`2`EE zDx#fYr2a|wmA%vb6oo{pG~AvPCqxHofpExliiAHOH86+}{Dq}YX{mdJ()&Pr#n380 zR>7~O3vWxCv#+?N-^nXJpRl++(LCF%Zz;iORU3OIlUZ?v37DP6eZkSJgp?Eof@-G4 z)(H-)C>u@|C}1zo>%;QzVtSoEi8?sGdMvN5E{sIgZ_9q0Q)`rH+@~V}Ld|Q>;D33T z^w4F9L?-M2Uw<|2Xz;Bxm(RP4iaw`$czEQ6OBkfal)y!?kDz{?8gu8)yE;cFhn1<9 zE?x50(2$c`iJ%*VtpQTLjek-2`hGyZ{CHqL6eDj-HE}<3A!bwhRae(0)Q*4(CNx z$)zYQGc!{N`%PmS^MUNz+ML1h9#(i^^Q}8~#!bf^QTvz1{$Rb*7ffmTwUnDE{zYzF zv&2%OAzH=Lp3~BX$_TP*vh{mvYs{0NBI%#2g03z6{ulP0A z3<14QiqwH!so&S2Mo!A8N{81hJl{E-_Uzd*QcHz9V1wi%m&8|+L&9n`sB3V_*G8b=D|PZJXh;1_T^B<|JR6G=Bo zEqtUU#(mG287R+}&`SsuVFpYy?3U(ivBnlv4(;8SFJIUNwn%)MLj{$uAO@R0a6rua z;fEjcFlDGpaX^LKd1j0g5*|ay*nBzmb&|$W&nBwj2;;+zVHxjZxkihtQ9eR-1IcTO zLwy|x11d#Aty@F%2m=SjCHr_8^ty(I=@`xrP5$PK0`#$i0cOY+B&h;8}wOw2)sAgg64y@)=&90t!@XSk85qVTtO26ZmveeXS7`6)7kmsy?`#iMrCWXZ05s zP_7D1ul!f+H~1Uf%|Iooy{#k{Ts4HBJw@kze2T()XAO&#^+;;o)5sAG4DBOWKp$6D z`n{t1H_3*GG8Wl+#Xf0h5M^&7Zw((HrS+_a7#vv z!H-ctI_=<4Gtdr#Jhu+JV=_Jkzh!xDR`Dk>^&O8I}D*oNC( zhTM=$h_^^1I9ns1G39?}r~78I`6RR__Ly&r42ff(K79&Zkiq+^A|tbW%i%k(?`qdn zR<1>^tU#^D&KOb#E!1|fueBFxV$r%cD6x@imz0$Bpb8i`w=>0Ud+nBgoCQcp+35S! zn03m?NTt*>BPnS)JSPdxh?mPCdVFOp0^yR;&=5fh(zUng&1o8qCnG)5*-p2x_z@u9 zh>UUm=&9#;C)rsh1(pM`$B>9-4`t4x1lVKm)8!ZAS;#YlKRYSWIEk5MS2OB(HACr0 zbvjkXJfsKvhEu!1OXke)1V#)`j`5cUWFn%Gjp&X3i7d;`pGif^EYoNC^6YmhPDmwT z1n^^01L3AABYwAVd55Q#v_gbG|2WtmR%W%UbKqp>X+(!Jgu#*%|Cmh zGWchiJtjw+cvpi3c4f-SRxi)KvPZd1x9AuvIk`8(WFjposV8dfUoJvqAMn(Nxs+ka z9XA9h%Fj^n>a2PoJr|8^-}I8vBYh z!;k_Y!tvaHMnRAo7^sekKu)8D8bhKv2^B9re!`+@X<@69(eIm#eR6&<;ihMuvSLSo zt4C3u$KLg2aH2?w4uI_g%%&K9oi>uUbAe1ZY?#=Q7>y0!2Oz|geVS9xZMMEo-j1y? zmbNN#7)zeSPo&%mpOi9vxeAaf$iHZ~E%LL~qa^`P>V_ob8T^w$G z9MeGdrz$JcCV0*y{R2Vr7vXoOChUwO6qbDI!t<{Nw_Y&9%wp4dJV#EO!{J~-^2oNZ z;r1`ic>@k`I#kUiX+O=UP&AYQD9SI8!wxg2Mwx3xM7Yu6QMSn2fd<0hH|nJe&Jj!e zd{GqJiG<##8q9Aw1yn%Ms-U5v;hsn%wn^b=1c(t-OKXQgo+Uv;R^PaBL+S^d;CQgi zch;GWM^UZ@NE5#c^NImgns2l?;K>@}`QRO6g*BaRjB0m|)(DQ6T!LMe@95pH=s@uXZ$KzBDg`#|OCKG3`^lNEp z(QK6|3w*0ORk~D!{P7n}ASx;zLh)2tKoGwE4;;|?W)A-ibNJtL&hFbXep^NW$p3;9 zpWiI;+bVps#Q!blumAt!jonj~Npn^Z7WMO#IcwvGb+2yCoPu9_W9F1R7015u^~)h7 zK=`_%GjoVu=FRjO`5l{Q&d?W#Pal!b`SxbYw+Z`ZBoxXw$Dn)z1Ijlr_!cn`G{1qt zH!y%1d}9XRn87zNfFpck2H(KoTP}$i_{I$WGcfo%$o=?_vjE?U58nzd-{|wVhzYFx zMxXze(`S4B`(@JeoKb4I@cm3#TJ{i5N8#(+B`B2t(YY`z;RN*H z2>IyLW4rY@>x5&EcUF^`ufOqoaSJ)adR;t@rmCzw{DjkgbPqQhItc?)dL{Dgv963t z9?v_LyqFU65N#;KgEchi^O;k9jLG6Kze6#HGA_vLnxfqjTwx3Uc%kgTx7Ge%Yx#WI z!|7(gj7wy_>dPG2ErJel9wZu&@cTII)id zo&#rwhKH5uBh3+&T(06y(W?izOP~CG`267NOdQg~5zv(o>yi7Jd_e7boC0^{bF=U_ zG*0x4@uqOr^ZNIrXMW2R-G5zN26`1vRU>Fy^YHY%jgx#hYv+%45;PcX)VVG}9SP7N zZS(1OPWSGSxgokAZ6G+MYN{Gt+(LDBPW*g+F?mbO4IE=U?c|i@mHFVoM(FV9md+Pz znpk$@R$+ceM~9$hAbK~@G;;bCdG)X(PIP9;n?8U)9O8xWS#dT`4{FR7Q#&9JLSVQPY(N6Ttiyn0a1%-Tch#0dhzJC1* zts5!I(1Eq&qrp$2rnNwf-x5*^e zy+en+laz3^x(x3G>HyoFwve6`H5z;;CWeDU;JHcUWAENoIE%MX0u*uR@jea)ey;55 zauyO6RuFowG~vnc(_FVCOVtYcZbF%KUd#;M1)Szm4&{YYmZvPd(4l|dgtJNdLjKT={XY;a#Z$mb6Y{WH((7u6I5HS`3=*aM*nFDqQi*ySA@i(-i-Zj3^}MkC#ikKZoQ< znfr5tO*$*k+On7**;4ddX7(#6xuC;DNvMX$3&X+q(F!ywLZ|_KsAhM^O{8Ex;WI`5)2m03%-Znp15jJRIqBRaoNq>pP-}Q6CdSpzuey6D%p5X1HkQ0=SBHe* z1$&`FlbeL00X(yl)pbj5;j}&`T7r7uBRReK8cp2-Xy#B#m3Q*+_Q#=jv=UxuH(b5& zJXSg-v@9cf(eds&UIYa$(E{p z8oFd9@ui$CL=X(^OzZV)^{16eP8-GoWMXXSsQmX{psK-mh1OB+(#6q``8NAYEfynd=h-zFv1{$@(V3ilBIGHP>pkV!p_p5x*VjOiulbwR&gCmO^X>HP< zUSmofot)rx#57!$$XyQK!inF+td$eP!@~(ik!)w2+CHqOCm0$M7N%`%9Ce8?=SRLE zK!sOn-c(;-e|PAV#9mFDLYKV>tijby>ZgHBJ*xM^04wy%q5%(BKvjdDa?Rn8Wwo0}}U1=fdlc6AlN zZ<*Yoe;Nl)g5yrM)X&?^b;yj%evLoexpOD8!eP6Vlvzd?M2cd+lB)!)fOZ-VF3UfC zf@YQMKVw_t(ZroHH(crDvOZCFtA*<&&=|+#@mxBZn#7?bvmT($o*1l=ILX?$abr&> zi-#`6q1aBes}cNXb0Ap3`F`qdaI&|*426$vGg$i|>h9gFq}bNapDobhQeZyW z8v$vj_%Jv>j?)K8XOH(Dld*;w(%2)L(Y@AI1GJ&~`)7Q1fF21>RzF+my7))h1D!X` zMEIy+QVczUL@)zA@gywa+d#`uLU{*!~+M6w zAJD?5w@D|EF@tS_im~jU9La+z&hU(IarBrv9V`KAD66UlGMR0 zy}fSf1MIIrTg^aVC?eZ+@gx?@ptwv-441cba!UA|^dcn%@$2^+pU(7mE0Cc3=+XLA zohNgX?IQPKk};(HCGzDJ73~(zkPHcmSQL*CUM5{jc;tD1=)~A%Lyf88=6!EZPt(!g z2^>)-&CuE)onr1&*3;vP);f7HGcJ@>S{ld4)gbC2Ce}7`N-GZtkhNPWrWh@c+7Ip4 zquI*9=(ZF@AE4`!TX6?cHs$5|TfQjl=2pNo_jlen58%d>;RZXpy2?dM&~JgMgA`SJ zjG?&BFzHstb;4wAYKBL=WRt;`?j4i?Um zD-jM5v)YTn1JDi-Zj$h5MsF+E^C^B#;dsOshyOIJhZE2cqWa|00lAG&3mMG8snexf z9v+J`nU3Z1x=d5+ZZx!D8d#~RW~XYW9hrWRbWy`hE>JN==m_(*_D?ZNXffBhUYc9k zE}OJ3-AIcl{Gk0H^K&KX3Gnt-{h7I}ck&{F5NRAhTfk^4z#VG;oaI}u@XTUx+LEIJkd0I#y;QGF}~kQ~N>??gwJj|FG? z-NQWWh1to=pWw04;RYMQ;!QLpghwN#fR+VtGPlC__)nvVug5%yEzmLB?gMLnV4}Y% zyOjQ8gY{;8sG1?-LSATNgEd{>ArRvDN0y??^*{%ouZ_#^*x};D#Yk7Hs;VyL%mkSa zmqwTF=BDkOU?MyRu0M)s1c;UdnLvNNUw9|rLP$h}m@Jy8M)#uAXFZx$2K0VT?1M(7 zvWkkmvZAuGPn`W)GAfN1Fl>0Qv$DQa1Qq={ZwEo9Dyyn4iR)Opxg|$Ght`W0T4S(! zqZ*hdba3oLdndFg9E^9vTH%+Aja9^Th*Hd-zEkH;1qGo2YxDqviTo)DA^!puVH#b- zq-6zeDu89e`w<+qA|K%falg`1Qf)j678kwqf?dziRfn$rEW3f&8?mc|F~&2zBMHFS z_M>I^JV>`-vCCaL(5D7yL4QdGy=4sUh0ZRxH6qo?VuDDP?(TiZ63bts?JuR>5OX-~ z+-r7oNzXAMASA;E6^k5ZTQC5HVax zB)U9({J5oB56{K{8xADwyXI3rdTk95=i0ivcOdMvpG+MIV4H>b!zM|4G;nXZ^q$W| z2@vc6@(yLjYVyg?o_*M12v|fnXQJezOkL-|*H~mhG(|4v5Oo$%=7JVJ0u|7q$t@jy zoL9tk#B@s_xA27FcGO{mX$>%kG?i5hD)qL!175;j2wF8`4mA8eUm%AStCWf zQu8J_``c}2LrVRE@D4!hz}~XZurMmLTi(8MgmqzNfbAOl_U%io;{$wV=w`P!n#xX^ zd$)O_kFFwBKJa9^Ng~S@VjIl)EHohpyQK%%S)>LR(?61p&l~Ohj%H z0t)m_*kvtUvRrJ?iKjXH*A_fk1kXWqA5P^|` zG)*KS*pMGFZg%R)jra*-Ac7)$oP^`sx1FV(GZrNBnH4o#GrLH%hZ2SJ$`Mfk$As%j z4c1p{zc&0iw{Rq2vLKlM=vY5w9g!ihMjObv(fV8{b!DWoI?-n-BqWqMz_#yPYgSZ1 z3J;8wuf1iR%r!cS$^USDG?$^ho?G4LEwP7d^pf}WRos9;I*4%l!~hgOkPP4sz$XV5 zz0i+CFfv*uz`4PU=LA@JIrAU#7dCV;c%HTo}1q|A+f_Ai;d zE`A9dezdQ5BmiAma8M$%HcE9*H$m^OwpM0O;%K#)bNGSgw}wthETy^mG4aMDi7){4 zcRu)B2>?pTauL+IE)FKqcF(EP63muqu(0Al=|(Xkt_rD$Px4uVH!d20gu;?fSC;-w zLitE=1%rQt_yq4|teut?urjNqYjTpVe)TR)KR`p&F0x>7&}*Ux<_nx?1g$eu^Sy!3 zb$Ffuec^rf;d2~n9Ksmr7d5{42Dgru$=o$75amJb5+r9< zui_18lbl@1v$eeyFXRIiRuVN6z$o;3A>1IZOLT}JSJdX6$$Ieu*ofS0J-j>+9pHAt z@g$3e33|53YAPrUXlj%PL#os4r3>j1#D^&PXCX2W;f&l}{h%w8oxDlO_r=9LyBN4$ z5)2cFIIxH{Xa@U&!fP!3ud-B8QBe-AtD1EfG!g%~pzh-ka~Lv`BNg9cF3+%_B0%IN z7jv*;4Idw9^D~Q)So-ud>?KrfP6J|(p|No=lJkR|2WPZU3W!xX95ZbJx+1T*pPoMQ z))0UK)2dh`t@#3r0@|6iDimRaUg}=uVJuZ`V7yhn7tu~>PynD9$Fe#7ki{B$n~I{t zg|NV^E#2grlI!e=E({3()zyC1jsXE`s1Puo2a|H`nPP238bb7i;-_1ST^cPNF#V`) zqIeXfM$+gDk?HZx9MZU2aFwNhnU3m^ga8eE1!_&CdvjcZz(r1qeQ*M@ z;R}smhpsLz-35WrswGXZ^EKJX+K^HdTm|Nobt7B^-eVbn=KyEJFuBIAhiQ9XkKIE7 zo;QUM)gmbB5Xqp1yR7Di(3o}MASm$qGd_x->kcQbqLvK#myj5At559VBBd7nJZje zqs^Zv9ioh3&X^bo=e|k_9)fgQw!%zWm6>I_Luk|j%si$lP%co1*y zTz_3W-77q&xXvk%hu2f&%S%f=BzTa_?Mn$~#{?IT)*-uUb{o+*%Z%yUGM(UNX4FL9 zK-}M7(*K+u7UTKa-_?~gqqDkRsRLW?-W8s5BNK9j#bODd>dop36n<9WS-2j0}M29L>VWh&&=m+LeQJ`eNrMR^5=pXg2~Va`F+o6c|Rl?p>)6TQ_me= zH9A2rJ;23sjXne$g}%-;@i(^F)xwnVETRjHoDE1ZS|>-TT>?A>vqx1ZA6HIj%U(dq z4mXf{7l}8A(M?1Zn$*?QP%Gk&RzO7QT48hl?{m)#eSi!EvJgTRk;eW;SvJJyh2eH9 ztE(>qw;6*HSLS@)e-W&DeFJ$$Kn`tFL?ID@h;>3>7M)1buz#KL{P{{;W1uMmr6UN8 zfuxqKo*i_#HmF)w1k9KWDucx$jNd96qQO@>irsN1V^^FXVwlfj9`EM)p^Y;RD zIY`m5R-B%mr0?gXS!-@2J?qmoUItQnv-LE{3usQX>h+*+o-;c7^7}bwlrZj$Qa?p8 zLdtKPRkL2Fmyr&`MQXj&oVf4b#B)g8nGt0@SuEO9n&N zp!tSsm)@VBkAcD>i~!{JB9@zIe0cPT2%kW~B@g(4l+p0k;xoqNkqk)KC)$CLqGx7z zn=#I*LuUb&75HN+o)~}$&;E3HDMiB;WC1xpsnAypJ~2mK0!q{)H`FHelH(^Kc`5{0 zb;Wj%A8hhWR3w2t%=zVr{wV*#PZ>(1|lHXEAeTBWz^Kv7!&~Fh@(eCMG2(@;uP$j+-`Z@c8(VWlD}e? z4iY(CZ`-}Syb7?hf?{d8|20z+lRQ*(iHaSmhN(>w2|RgSL8;ldP=8y>7~X?&@^BAF zRC9k=G3X5ePcOPX=LJk3Igr77DE*iq=Q7*rO;S~eo$SpkJWxQy0^?5jHTFDZGR=MO zMj9pU1|3#cQ$>V@y2$jtkh_uUg@f5Iloaw=Jh~u8-_!j$cYn!?$vZ}(Wd_9qh>F`K zB~9C^Ors(yM9s-|g2_rOGZfb}wSXuw^wFPCi(}rsi0}lC9t=SC<9DM#g=--ixU?GD z^IINKN66?$F5fPGGdan=DsaY_k0g|UBQ)sU9b)9ITYrI$e)~!jJpSbI<1Hkr9NB78 zvuqtjLx6}cRa6*E%^8PA>BE5U;GI3t^pio9CPMqr(wl)uV^VsC$kBZ;FT!mkehh%a zp@>cb>?1qu63Tb9Ly~g^tS4ekmH$bUYQexzWEpT`UU-bll4K19l88UE95|#>3G^{| zbqBI5ehVPBeqw1qDpZ!g{IUVwHr`*N2Qh3j#$k<^FkA&SPJr6PaJ%`GUu)nNofXK@ zMf<%|kabN7Kf6{fgZjS7PH)C&Nesr<_$l21c@N_DFx1tdz?4r!b4LTRRG0`4@Sz6i z$sSwgS9ehoDM$}_FbmQ|jF6;*sP_6P*Wf-hr^ekM+EsVoVbePapp3Gmp;H4nHqd=n zB-RWQaC6u{Q5FG=a z5D*XZhW*{WU?h+lJ;*ucuZgWk#FWHLugFIld7}%Usn%9eUsZMceB!LM)tX}@45GjR z2yf3mZhh3|#zzn*@Q&W#`4kp}lJ}DbW&B2Iq9P%jzAu<0cD0_0d?+J|Wkkx42%>{s zNMt_--6dlObNO4|54uvm%(ilrLYHoGU}Nr(PK6+B{0LGi6=G@-TLD8i^4dMIk zz)-$`d7glIz;b}yVu|fzpfPwH2252W-5s076SYJ@ajE9GOKWY}t1)EHB(o*YN`S_f zbSKruW-|yhDK&=hWl(Md1J}|T$5TbJN;NYOy2zt{IJhSw>j}!pbC*4t*WZh>s=C$X(B)dP9`ynmRGo|ozQAT3@j7mh{n0h+ta%S;|GGz zfdL?HBwU=xJ`et&j4CVcQ=;rIn!hP7tOYy8h8&(kW3+1Fd6F6TrXj+^`apq7pPhUI z*CwS>_$iWL3C?|Wq$6YGtWsvI(XN!_WH+Zx17E(_Ae;Jn?BKbeh_gHZH^2bQ$_RQ& zr0T7xIQWrgfGc1|2)RkxJpi6c$_r%MrMN{p1n7V#qqx1m{u`K!X1aR?lv$TAhssw) zG)VCC%G%neG4VquQ2@sVD;^XQoU$B{DEz1sM^<@0fKwvTuOF9nPUJ1QT>7SG#z^Qv0f za``f3Bm?eI;yPq%0ZXwrmoZgQ)30p6M9TkA%5?aCHf0wTXVA{DeiwhkOuYQG?h6}x z0NA0Jq4_A39ftOulF6A)er$PUJ@!ls%!=(I%g5prU*@yH6tJ_nf-#&cN+dgpx@lHf zyB^3>+-VJD4TK>Kg`E9LG(PR8(oLi=Mx4yZPRc&*wEP(czyEqumY;dW>^eyQlY9li zYq*Y2CmAQOoyf%b^68J^9x&F}bh3?wBUdI;N*!_4Jf1nzkzR&GII9lw@B0af$LgwQ zlIJs!ML>*R)mzS%rWcubVj}U#BTwrwD4(YULn_TB90%>{g<q0BVK-_Y+#SKh)W3!S<^XoWX>GM5(1}V4 z-UGSB%P`YnK9 zDy#3?AXN`>TD6{(0uSekydpct8X9I(FJUG499VX(PnVdP{>^=P;U7j!%c}i}TjDP> zTlGW`n(UyE4QdkQfxcvaWOWjANQFKyVa9?)?E|y3#$X6BldUlTPzkbcc9k5ef|(BblG-%${IfVD1F%Am?vT*~BvdkiLaf;EoJX2;%@VV%>qk`coRSDD~>}DfzjS ztBdvjm`eL3pCEnRv&7O4MPRb|4P;v06SF80O6z2o3vA@zRN1d}27BHZowP{^dDU*8 z@SVnqwE@^$!L*aWk2fl@u{V^813H;KDag5?=S1+6JdC5?fwg8q#g~znjdqx7p!gG1 zxlp1sV^(pwB2)c(Q>&1gl!Y&BC8&pdEGQzJ#fe2pmPAm!p*}=kP_tj=s z8(Cp9{_TKK`wbK0GYNn^>`lO+NBh>V0{~$(!0}0$S(M?$PnzbQx$@-vuI19_Zne+e zMOOtiCOWd9Hm*KCKGtVbKxs&>6BNN}eQalB{?O6EL1Jt<(X zWC+6f{Ri0VJDU4O$VR@rE-!s_Km~;#1eONT$9dGz zMJb!%5S|LGgIkgs0(48m546H=;hkVRJi~#P5RW9T0k1;(n_y&9T51$bMl#uKKH2=% z7dvP~e40EU4`hls7qTP508sZOhmAhj-vjkU1(4M1b2}sDbx-!tcbhqJdL72L&!LE3 z1ZK$IFW>k=|F*&QH9UWdt=u9ci^zp{5S8OJ{~>3D2^6($0CISyfH$C18_o{9!D*W8 z6RWG9B<#v7eESY59pH({o6SJI60wJ*iBrR2Q-({0q0dh;K@ggN~ZQO?G(o_?J>8HDnLF|#LC z$Z0_2qS$^jr8VxrCxRf8tyW0K2Jrdu$QO~ykc6oKPc;)J!jxETKrbGtfz*a6;)#LIwx_?fggn}jXo2G8ZKAtS0ws%sb3ND{iO_g@*{7=DGtm^! zrB+o}k3Lznf~$y`jM$b66&+Ao|Ie2b4sYo zMjqAln~O3BJ^|oDz?Se7ij2~m*ane@h<@d>ZT&AR{D^Wr(rrYo`A$_w+Rgn-Gz3Fn z2KnB+K!NPBIzDV#30w5iML5YdT}-KVX?HRkI*HmQ7(ccGOm7!sPKhd_R8~3E_OaZ`QK2pM^&5bZBxI4rh3IOdAT!v=0aieJI!V-Lu`fWT5DNt8Cpj{L z3)y2v#a>2D&4e+IRRutqjQsJyOZ%0l_ohsd1${Mbot;@8fe09*%a&7Q#Ydps+A>uv zkB2=-gM%YaH8x-SCs3W-40PT%w`{a?atZ|dYBVO*q84VaFwhEOr*qA7=2JBeE zyb{_CwOsOx4g}RIEeT))` zy?Rp-_8w$qak4dt>~O9v4-D#KXJt)zGiWf`7}IBCf6in{qZwIT#O83b6r~YKjUB@$ zcoL%K2M-p;z8!>ju^*M-)mjlszYorF;h8&9YoVp_4L^N!#75jEwlz%P3Y? z2vjtIRSe7x5i^rwd!f*?w3@%_Oby6e278xPUSY<3>>v#^0-2Zh&fawacSx#eCyL0v zkKNB(C_aLust3tWoJSh?zm^MXeC*$!U&Nr04BQ$p!4Q~ZriZQc2QIAwwwW_cs~L89 z0;>jl;5~xCf|+BDl6|}M=rv#)064nuZ6D3h@aBZSukT;}%M1)RgMdTu`T6?5BKmdrQ()~1j8$N= zef;8u#;K>9I+-3!0*w~8*Z*h-p1`|%%U{R{bV3t@!eWps1A(JTz`+S%X&oCSx)(Uw z1k7KHfkmtm=zQ6S*PA=&TLm6mU z2I$^OV564zII!>lc5Q$|p@oHoiH8{S4$D`03IT^jKsO!$+qN}6z?M1CJHR0p;J|ak zn*VRaKQSG6o(LQn0=A#mhh#7wcnx&e(@G#W0P5A*_#7 n-CNT@&wWOq={DdRSf2m(>-RX#%MiL158`{e`njxgN@xNAQV~$D diff --git a/resources/meshes/ultimaker_sketch_sprint_platform.obj b/resources/meshes/ultimaker_sketch_sprint_platform.obj index 5fb441a89af..75fd7924a80 100644 --- a/resources/meshes/ultimaker_sketch_sprint_platform.obj +++ b/resources/meshes/ultimaker_sketch_sprint_platform.obj @@ -1,1137 +1,2951 @@ -# Blender 4.2.2 LTS +# Blender 4.2.3 LTS # www.blender.org +mtllib ultimaker_sketch_sprint_platform.mtl o UMS5_Sketch_Sprint_Print_Bed -v 118.354355 -110.073631 -15.743723 -v 114.068901 -119.722466 -20.180752 -v 114.739487 -119.531227 -20.297832 -v 118.222610 111.787270 -1.131916 -v 118.105339 112.000687 -0.992550 -v 114.372559 -120.408913 -1.567927 -v 115.075256 -120.310265 -1.497774 -v 114.623497 -120.192039 -1.310158 -v 114.343330 -120.358589 -1.426195 -v 115.554459 -120.107918 -1.370563 -v 116.561562 -119.835945 -1.523540 -v 116.733383 -119.639137 -1.368384 -v 116.043571 -119.849419 -1.310039 -v 117.248619 -119.459877 -1.522878 -v 118.072464 -118.823708 -1.548119 -v 117.566948 -119.092918 -1.349142 -v 118.491196 -118.370094 -1.471268 -v 118.148705 -118.456383 -1.307186 -v 119.063904 -117.618919 -1.496015 -v 118.898308 -117.518639 -1.309204 -v 119.545059 -116.684624 -1.501333 -v 119.368965 -116.693657 -1.327548 -v 119.979317 -114.791542 -1.546383 -v 119.872765 -114.779594 -1.359550 -v 119.666153 -115.628761 -1.308561 -v 114.330254 -119.769600 -20.014763 -v 114.783730 -119.664619 -20.188385 -v 115.452164 -119.587349 -20.015186 -v 115.687637 -119.464653 -20.162823 -v 116.668396 -119.071022 -20.032841 -v 116.353371 -119.145027 -20.220768 -v 117.369240 -118.588310 -20.017700 -v 117.326752 -118.499260 -20.236143 -v 118.061874 -117.663261 -20.275997 -v 118.048515 -117.928963 -20.015171 -v 118.031891 -117.887001 -20.156723 -v 118.578491 -117.092583 -20.185804 -v 118.996643 -116.220100 -20.174244 -v 118.741119 -116.933876 -20.016710 -v 119.189331 -115.750694 -20.018013 -v 119.139214 -115.462776 -20.248945 -v 119.320786 -114.889366 -20.096825 -v 119.135612 -114.846748 -20.292850 -v -118.105087 112.111557 -0.909167 -v -119.795189 112.455376 -0.397305 -v -118.101974 112.512970 -0.341256 -v -114.381645 -120.408150 -1.560503 -v -114.337540 -120.353432 -1.417629 -v -115.075378 -120.307335 -1.484245 -v -114.369156 -120.190910 -1.306561 -v -115.421761 -120.125435 -1.356490 -v -115.842773 -120.127281 -1.528017 -v -116.801514 -119.722115 -1.529080 -v -116.721581 -119.672783 -1.389816 -v -116.096489 -119.869316 -1.328052 -v -117.660309 -119.174797 -1.581673 -v -117.731583 -119.034370 -1.396146 -v -118.395699 -118.498619 -1.537017 -v -118.816689 -117.842995 -1.374323 -v -119.059280 -117.637291 -1.538954 -v -119.347755 -117.138710 -1.600169 -v -119.466316 -116.738152 -1.418668 -v -119.614754 -116.515724 -1.573597 -v -119.790253 -115.740837 -1.411599 -v -119.446068 -116.415977 -1.311712 -v -119.851295 -115.738640 -1.607210 -v -119.984589 -114.772270 -1.549996 -v -119.760483 -114.956902 -1.308025 -v -114.288513 -119.768730 -20.062492 -v -114.807518 -119.655586 -20.193531 -v -114.054405 -119.653221 -20.249153 -v -114.479156 -119.513466 -20.300648 -v -115.314285 -119.617699 -20.019558 -v -115.577896 -119.446388 -20.233921 -v -116.598450 -119.075127 -20.136566 -v -115.648697 -119.281960 -20.300369 -v -117.359421 -118.595436 -20.016453 -v -116.676758 -118.845695 -20.293957 -v -117.344505 -118.538933 -20.178831 -v -117.667435 -118.141136 -20.254490 -v -118.071205 -117.812065 -20.193687 -v -118.174393 -117.411293 -20.300415 -v -118.596100 -117.170021 -20.014229 -v -118.457596 -117.328346 -20.146744 -v -118.785400 -116.747444 -20.154697 -v -119.074623 -116.153236 -20.014324 -v -119.129585 -115.797600 -20.177170 -v -118.782196 -116.350227 -20.297047 -v -119.229736 -114.967064 -20.227985 -v -117.562439 -119.004112 -1.307592 -v -118.768143 -117.685417 -1.307635 -v -118.202690 -114.999275 -1.308108 -v 118.175125 -114.557808 -1.315975 -v -102.527359 117.855774 -0.138946 -v -102.927872 117.810875 0.040637 -v -100.471260 117.820648 -1.295707 -v -100.992523 117.774666 -1.188597 -v -101.818733 117.807976 -0.728868 -v 102.324310 117.848808 -0.270049 -v 111.261032 117.771225 0.172250 -v -114.251167 -118.497536 -1.384607 -v -114.607948 -118.624672 -1.307536 -v -115.169846 -118.403404 -1.343528 -v -115.564735 -118.176643 -1.402450 -v -114.882591 -118.327950 -1.505968 -v -116.304878 -117.701027 -1.532479 -v -116.415077 -117.902229 -1.307010 -v -116.187958 -117.852654 -1.399496 -v -116.757812 -117.427696 -1.390290 -v -116.949265 -117.129433 -1.518570 -v -117.307846 -117.091057 -1.305937 -v -117.345657 -116.773384 -1.381246 -v -117.830345 -116.205086 -1.307549 -v -117.762093 -116.003441 -1.388687 -v -117.908432 -115.308769 -1.486655 -v 114.410706 -118.572090 -1.331387 -v 114.401733 -118.467690 -1.417562 -v 114.372513 -118.411201 -1.544248 -v 114.761902 -118.637306 -1.305193 -v 115.234459 -118.232216 -1.501876 -v 115.472389 -118.235603 -1.388150 -v 115.867188 -117.962715 -1.521942 -v 116.139709 -118.068581 -1.307957 -v 116.223412 -117.772270 -1.448457 -v 116.695084 -117.382805 -1.517065 -v 116.893127 -117.280663 -1.406013 -v 117.270126 -116.842323 -1.395114 -v 117.167587 -116.863258 -1.548399 -v 117.143982 -117.279213 -1.306540 -v 117.758835 -116.284264 -1.313323 -v 117.546371 -116.291313 -1.483035 -v 117.753342 -115.811241 -1.484184 -v 117.992233 -115.474098 -1.349338 -v 117.893784 -115.324654 -1.532196 -v -118.435722 -114.474144 -20.263554 -v -119.107986 -114.652489 -20.292091 -v -119.174210 -113.204521 -19.937145 -v -119.171562 -110.927956 -18.133074 -v -119.226143 -110.495995 -17.358353 -v -118.358910 -110.157631 -16.292042 -v -118.367775 -110.068810 -15.701704 -v 116.520187 -118.885094 -20.302149 -v -117.216118 -117.523552 -20.299286 -v 118.461922 -116.962868 -20.301010 -v 119.134209 -113.038582 -19.875046 -v 118.441986 -112.293785 -19.469849 -v 119.199783 -111.768379 -19.063721 -v 119.220894 -110.489204 -17.346588 -v 119.298531 -110.073555 -15.688443 -v 119.774773 111.181702 -1.307418 -v 119.901337 111.240204 -1.382926 -v 119.768761 111.412079 -1.271702 -v 119.909409 111.583611 -1.303199 -v 119.752731 111.747925 -1.147991 -v 119.761627 112.046616 -0.944462 -v 119.950867 111.999252 -1.151342 -v 119.872047 111.945747 -1.088641 -v 119.812729 112.230949 -0.769009 -v 119.807709 112.379074 -0.552409 -v 119.996223 111.991684 -1.300517 -v 119.792519 112.509766 -0.255070 -v 120.016357 112.556053 -0.746094 -v 119.969116 112.416672 -0.729568 -v 119.933853 112.561646 -0.318709 -v 115.859978 -120.120552 -1.519124 -v 119.850487 -115.699898 -1.498012 -v 119.334488 -114.421516 -20.080494 -v 119.118271 -114.445030 -20.263668 -v 119.260567 -114.185707 -20.150454 -v 119.151794 -113.650291 -20.097752 -v 119.317360 -113.145576 -19.784416 -v 119.184242 -112.493034 -19.588074 -v 119.362602 -112.287315 -19.258556 -v 119.383240 -111.707222 -18.742699 -v 119.177887 -111.304573 -18.606194 -v 119.423111 -110.913338 -17.714638 -v 119.324661 -111.208443 -18.370628 -v 119.356911 -110.794914 -17.743835 -v 119.168114 -110.893318 -18.084221 -v 119.396790 -110.438011 -16.939049 -v 119.482597 -110.337410 -16.039661 -v 119.239334 -110.201347 -16.518208 -v 119.426453 -110.188942 -15.950785 -v 119.720940 -110.140907 -9.095851 -v 100.478218 119.323578 -1.298494 -v 100.982079 119.310349 -1.184925 -v 101.352829 119.356827 -1.035607 -v 100.915642 119.437042 -1.252488 -v 101.744217 119.373672 -0.792277 -v 101.453491 119.486572 -1.074362 -v 100.470589 119.464737 -1.367908 -v 100.855423 119.531769 -1.387284 -v 101.885551 119.515541 -0.794309 -v 100.646645 119.560753 -1.522308 -v 101.673973 119.571487 -1.117961 -v 102.845520 119.395126 0.015541 -v 102.163635 119.375435 -0.398611 -v 102.472847 119.423157 -0.187944 -v 103.097450 119.568367 -0.033295 -v 102.213242 119.545952 -0.507428 -v 102.731453 119.601128 -0.234933 -v 103.488472 119.419319 0.177415 -v 103.541191 119.602989 0.006516 -v 111.997025 119.590935 0.055396 -v 111.999817 119.378288 0.193342 -v 112.029739 119.696396 2.196742 -v 114.688354 112.618401 2.196835 -v 120.092644 114.405334 2.196840 -v 112.301201 114.327972 2.196850 -v 112.050560 115.165657 2.196846 -v -112.038719 115.298553 2.196821 -v -112.000046 117.673386 0.196847 -v -112.029953 119.696396 2.196742 -v -112.000137 119.382225 0.192862 -v -111.998138 119.596565 0.039043 -v -102.519218 119.370659 -0.145335 -v -103.496948 119.392380 0.183690 -v -102.903625 119.382584 0.036514 -v -103.364662 119.518753 0.100306 -v -102.225067 119.534798 -0.480723 -v -102.628830 119.543793 -0.196373 -v -101.341583 119.313904 -1.041625 -v -101.815208 119.348564 -0.728368 -v -100.774269 119.339378 -1.247840 -v -102.167564 119.381317 -0.397538 -v -100.411278 119.427612 -1.343687 -v -101.098648 119.449120 -1.209586 -v -101.748756 119.478783 -0.866033 -v -100.674942 119.531944 -1.442206 -v -102.003891 119.584351 -0.855435 -v -101.438965 119.542778 -1.164819 -v -100.891144 119.563461 -1.508193 -v -100.345688 119.312752 -1.302954 -v -120.077667 114.552368 2.196845 -v -118.765244 117.459824 2.196823 -v -112.891495 113.458054 2.196839 -v -119.739502 111.199829 -1.301922 -v -119.869804 111.209549 -1.354849 -v -119.947899 111.338959 -1.424778 -v -119.775185 111.496338 -1.250343 -v -119.882454 111.734093 -1.215482 -v -119.732979 111.828209 -1.100300 -v -119.990753 111.619453 -1.504891 -v -119.948074 111.869217 -1.227029 -v -119.792702 111.970375 -1.015708 -v -119.784363 112.205727 -0.789988 -v -119.916168 112.246925 -0.854147 -v -119.810181 112.345894 -0.606545 -v -119.993370 112.217445 -1.075817 -v -119.939140 112.402214 -0.675772 -v -119.940781 112.562508 -0.345459 -v -120.015823 112.558044 -0.692129 -v -119.902252 -114.754082 -1.392995 -v -116.286118 -119.274895 -20.014675 -v -118.021980 -117.960091 -20.015705 -v -119.340454 -114.783348 -20.052229 -v -119.274757 -114.534630 -20.181122 -v -119.161011 -113.723274 -20.117863 -v -119.340775 -113.526985 -19.884106 -v -119.338287 -112.604042 -19.494438 -v -119.152519 -112.475212 -19.585819 -v -119.239815 -111.889656 -19.145163 -v -119.394661 -111.493965 -18.532047 -v -119.156212 -111.468712 -18.791908 -v -119.321434 -111.065666 -18.214077 -v -119.432602 -110.601891 -17.191814 -v -119.410721 -110.281731 -16.412001 -v -119.256668 -110.210915 -16.549660 -v -119.715919 -110.121147 -9.112874 -v -119.493843 -110.264641 -15.542349 -v -119.408600 -110.151344 -15.743717 -v -119.278488 -110.070000 -15.690532 -v -114.543411 112.614906 1.349953 -v -114.569489 112.626572 2.196847 -v -113.733543 112.884850 2.196838 -v -113.587433 112.932289 1.244109 -v -112.872269 113.469612 1.065033 -v -112.329155 114.199677 0.821682 -v -112.262863 114.402695 2.196827 -v -120.122360 112.609085 2.196848 -v -118.093246 112.594391 1.356766 -v -119.828186 112.563057 -0.067145 -v -118.076958 -114.826668 -1.373410 -v 117.984924 -114.751640 -1.532428 -v 118.021835 -114.473595 -1.456665 -v -111.256271 117.643867 0.041915 -v -102.529915 117.607796 -0.400170 -v -103.459129 117.631706 0.001673 -v -102.225235 117.660789 -0.480160 -v -102.700783 117.677444 -0.145190 -v -103.480064 117.730530 0.126026 -v -102.186890 117.827904 -0.378828 -v -103.497665 117.837036 0.183593 -v -100.942566 117.572754 -1.483343 -v -100.806305 117.616570 -1.366738 -v -101.309052 117.657494 -1.141263 -v -101.793945 117.616234 -0.944767 -v -101.892303 117.666786 -0.778254 -v -101.453026 117.826424 -0.978206 -v -100.472275 117.660339 -1.365890 -v 100.882896 117.577080 -1.446531 -v 100.498810 117.597534 -1.449834 -v 101.071053 117.676590 -1.224912 -v 100.471420 117.683937 -1.349202 -v 100.547012 117.824173 -1.290285 -v 101.593864 117.805428 -0.892159 -v 101.209450 117.828842 -1.102154 -v 102.499138 117.609131 -0.410048 -v 101.835945 117.594933 -0.977214 -v 102.186714 117.697548 -0.460242 -v 102.625229 117.695549 -0.169644 -v 103.693855 117.700951 0.114221 -v 102.824951 117.820709 0.006576 -v 101.728447 117.682243 -0.897449 -v 103.347092 117.783714 0.135642 -v 101.882988 117.826164 -0.665322 -v 103.286613 117.627090 -0.033287 -v 111.255653 117.641045 0.026235 -v 103.505989 117.879341 0.190411 -v 120.122147 112.609085 2.196848 -v 119.808662 112.570107 0.025552 -v 118.100433 112.559685 -0.076114 -v 118.093033 112.594391 1.356766 -v 113.833527 112.833344 2.196856 -v 112.876434 113.473206 2.196854 -v 112.466660 113.969559 0.898365 -v -114.220016 -118.415413 -1.547977 -v -115.551888 -118.108620 -1.539505 -v -116.838486 -116.964348 -7.303140 -v -117.462646 -116.437065 -1.539392 -v -117.799347 -115.665260 -1.538208 -v 117.314270 -116.331474 -7.303148 -v -118.021492 -110.084679 -9.303223 -v -118.248695 -114.779701 -20.143921 -v -118.341934 -114.082909 -20.156818 -v -118.343941 -113.331734 -19.948383 -v -118.228622 -113.755836 -19.923151 -v -118.491402 -113.690300 -20.118561 -v -118.281517 -112.643852 -19.587807 -v -118.479012 -112.848610 -19.797264 -v -118.212761 -112.312386 -19.234253 -v -118.274643 -111.907295 -19.075558 -v -118.455978 -112.123207 -19.357275 -v -118.390884 -111.464455 -18.778084 -v -118.200592 -111.281166 -18.305042 -v -118.386139 -111.056160 -18.293694 -v -118.267181 -110.736427 -17.689960 -v -118.428482 -110.690086 -17.755833 -v -118.173897 -110.573433 -17.063393 -v -118.338127 -110.325630 -16.908865 -v -118.152855 -110.318230 -16.209049 -v -118.189339 -110.177757 -15.727283 -v -118.410713 -115.219551 -20.302952 -v -118.226944 -115.403053 -20.232327 -v -118.219284 -114.775841 -20.057152 -v -114.604118 -118.850975 -20.296379 -v -114.230171 -118.712608 -20.195004 -v -114.980797 -118.633812 -20.225323 -v -114.237946 -118.650871 -20.060497 -v -114.956863 -118.546791 -20.066837 -v -115.717819 -118.408028 -20.240318 -v -115.509010 -118.375328 -20.088526 -v -116.214821 -118.281883 -20.294716 -v -116.010811 -118.144814 -20.050991 -v -116.361855 -117.990349 -20.172852 -v -116.965950 -117.539345 -20.208710 -v -116.630165 -117.735298 -20.024979 -v -117.168457 -117.223122 -20.032042 -v -117.447517 -116.952980 -20.175629 -v -117.608551 -116.630058 -20.013947 -v -117.832123 -116.307945 -20.169655 -v -117.909012 -116.562126 -20.297523 -v -118.081764 -115.600945 -20.114307 -v -118.009041 -115.791924 -20.013166 -v 114.271744 -118.705406 -20.190266 -v 114.526398 -118.850563 -20.295614 -v 115.021896 -118.660896 -20.255703 -v 114.974297 -118.539452 -20.071819 -v 115.735191 -118.383827 -20.227646 -v 116.189018 -118.264778 -20.286884 -v 116.995476 -117.707527 -20.293533 -v 116.921356 -117.479561 -20.022989 -v 116.834862 -117.645073 -20.182430 -v 117.519600 -116.977455 -20.251139 -v 117.444305 -116.916878 -20.123848 -v 117.935783 -116.140450 -20.192577 -v 118.064545 -116.262779 -20.296566 -v 118.265579 -115.387825 -20.260635 -v 118.433533 -114.635353 -20.284817 -v 118.174767 -115.215004 -20.125328 -v 118.149712 -115.242363 -20.009632 -v 118.228859 -114.644630 -20.073273 -v 118.301346 -114.051491 -20.114054 -v 118.232056 -113.448189 -19.854517 -v 118.443710 -113.676445 -20.109741 -v 118.412544 -112.917137 -19.818989 -v 118.295586 -112.562767 -19.546116 -v 118.216263 -112.365685 -19.277149 -v 118.473877 -111.751152 -19.065567 -v 118.298096 -111.838142 -19.049175 -v 118.195251 -111.426582 -18.428768 -v 118.276863 -111.240913 -18.415600 -v 118.415070 -111.165672 -18.449110 -v 118.379578 -110.677071 -17.717506 -v 118.190681 -110.821678 -17.642542 -v 118.388199 -110.328514 -16.943991 -v 118.333221 -110.165306 -16.307453 -v 118.217369 -110.375160 -16.767643 -v 118.220291 -110.135368 -15.607149 -v 118.006775 -110.143120 -9.303148 -v 118.142166 -110.323936 -15.964083 -v 118.153137 -109.950203 -9.303262 -v 119.986130 111.431015 -1.503579 -v 119.465630 115.315529 -9.028265 -v 119.471832 116.382378 2.196841 -v 118.360519 117.892685 2.196843 -v 116.898895 118.999329 2.196837 -v 114.897308 119.658577 2.196846 -v -114.310127 119.295677 -9.074251 -v -103.318733 119.609589 -0.043122 -v -119.723175 113.894119 -9.058847 -v -119.617691 116.017387 2.196841 -v -118.951599 116.432686 -9.115363 -v -117.866882 117.796654 -9.103250 -v -117.375725 118.697189 2.196835 -v -116.220100 119.283691 2.196840 -v -116.204552 118.856842 -9.108430 -v -114.791077 119.664810 2.196843 -v -118.085884 114.103027 0.853909 -v -112.051407 115.021782 0.546198 -v -117.688515 115.388397 0.423667 -v -111.996468 116.239250 0.213361 -v -116.938034 116.475845 0.201359 -v -115.611305 117.363991 0.196848 -v -111.261223 117.779091 0.175505 -v -118.007248 111.205269 -1.476730 -v -118.181023 111.212807 -1.309203 -v -118.204781 111.546188 -1.238338 -v -118.049149 111.539536 -1.355915 -v -118.016716 111.782684 -1.317988 -v -117.989693 -114.646675 -1.547508 -v -117.790543 111.574188 -7.303152 -v -117.770966 -114.941475 -7.303138 -v 117.790359 111.574188 -7.303152 -v 118.007660 111.359886 -1.467657 -v 118.132286 111.265457 -1.334937 -v 118.254005 111.239197 -1.298580 -v 118.232063 111.581589 -1.221109 -v 118.005493 111.781433 -1.364465 -v 118.103584 111.786919 -1.196506 -v -111.000137 117.364594 -7.303152 -v 114.463310 112.623199 1.347155 -v 113.255150 113.120026 1.181562 -v 111.999832 117.673386 0.196847 -v 116.048340 117.139496 0.195217 -v 112.058876 114.923340 0.576346 -v 117.780670 115.214111 0.480134 -v 111.997513 116.287979 0.213857 -v 117.019211 116.373627 0.214768 -v -114.575195 111.587540 -7.303152 -v -117.460663 -115.993248 -7.303137 -v -115.758873 -117.806511 -7.303141 -v -113.249184 111.944473 -7.303152 -v -114.517075 -118.196587 -7.303135 -v 114.858284 -118.155693 -7.303150 -v 116.282097 -117.474159 -7.303140 -v 117.766136 -114.965294 -7.303137 -v -111.015915 115.157600 -7.303152 -v 112.592667 112.356422 -7.303152 -v -114.694916 -118.398705 -9.303130 -v -115.851013 -117.975945 -9.303134 -v -116.843689 -117.281914 -9.303128 -v -117.710106 -115.971046 -9.303130 -v -117.987144 -114.826180 -9.303135 -v 114.251518 -118.645699 -20.031158 -v 115.756523 -118.271217 -20.049349 -v 116.342628 -117.943626 -20.019886 -v 116.575775 -117.499138 -9.303133 -v 117.525543 -116.771294 -20.015816 -v 117.941772 -115.949471 -20.020895 -v 117.971428 -115.014107 -9.303133 -v 119.724571 113.897469 -9.037800 -v 119.662277 113.886078 -9.194232 -v 119.511459 114.710922 -9.239280 -v 119.644234 114.548500 -9.063739 -v 119.414192 115.280792 -9.192760 -v 119.486115 114.208084 -9.299525 -v 119.197311 115.983597 -9.052945 -v 119.015770 116.188271 -9.214231 -v 118.532333 116.957756 -9.220325 -v 118.856323 116.623253 -9.047137 -v 118.794510 116.322868 -9.302412 -v 118.195679 117.463333 -9.121444 -v 117.678635 117.949295 -9.119531 -v 117.737122 117.715118 -9.270576 -v 116.968620 118.229507 -9.299239 -v 117.066910 118.400398 -9.133297 -v 116.097443 118.764076 -9.259552 -v 115.271828 119.074493 -9.228440 -v 116.195343 118.859680 -9.115139 -v 115.194016 118.961502 -9.302776 -v 115.201538 119.175812 -9.086905 -v 114.349159 119.179108 -9.248654 -v 114.290710 119.295265 -9.081699 -v -114.294373 119.220024 -9.209818 -v -119.466911 114.472115 -9.296109 -v -119.636940 113.925682 -9.223064 -v -119.577560 114.824707 -9.135602 -v -119.210777 115.722191 -9.231278 -v -119.294563 115.760719 -9.090490 -v -118.910774 116.103325 -9.299093 -v -118.567177 116.849304 -9.251998 -v -118.550682 117.050499 -9.098422 -v -117.764481 117.662971 -9.291227 -v -117.008949 118.288445 -9.260771 -v -117.070122 118.399796 -9.128285 -v -116.066216 118.735298 -9.291529 -v -114.900818 119.057205 -9.293808 -v -115.217964 119.163567 -9.123396 -v -119.559166 -109.946861 -9.286360 -v -118.149033 111.504288 -9.303151 -v -118.145325 111.787430 -1.157948 -v -118.146606 113.956833 -9.303151 -v -117.741333 115.440353 -9.303147 -v -114.458145 117.655617 0.196847 -v -114.559723 117.701035 -9.303152 -v -110.930252 117.723083 -9.303152 -v 118.103348 112.366615 -0.619465 -v 114.719315 117.636887 0.196848 -v 118.089966 113.938210 0.908866 -v 114.463875 117.705055 -9.303152 -v -114.583672 111.589951 -9.303151 -v 114.551651 -118.405678 -9.303135 -v -113.507935 111.842911 -9.303152 -v 115.694908 -118.059959 -9.303133 -v 117.487122 -116.446327 -9.303127 -v -112.188461 112.687088 -9.303152 -v -110.965225 117.364594 -9.303050 -v -117.790550 111.550911 -9.303093 -v -118.222229 -109.931847 -9.303203 -v 119.569618 -109.949059 -9.283147 -v 118.148880 111.504288 -9.303151 -v 111.483582 113.605560 -9.303152 -v 118.145561 113.947037 -9.303149 -v 111.027687 114.999153 -9.303152 -v 117.836464 115.200005 -9.303152 -v -116.775146 116.683022 -9.303147 -v 116.974548 116.507736 -9.303149 -v 110.930069 117.723083 -9.303152 -v 110.976608 117.364594 -9.302747 -v -115.703613 117.368263 -9.303152 -v 115.630531 117.410057 -9.303151 -v 110.999832 117.364594 -7.303152 -v 114.575012 111.587540 -9.303151 -v 113.586540 111.821754 -9.303152 -v 114.090614 111.640953 -7.303152 -v 112.513763 112.416969 -9.303152 -v 111.637863 113.373016 -7.303152 -v 111.041344 114.815544 -7.303152 -v 117.790367 111.539261 -9.303115 -v -111.307175 113.989441 -9.303152 -v -112.004547 112.895470 -7.303152 -v -111.013504 115.149124 -9.303152 -v -111.269112 114.081352 -7.303152 -v -19.787857 -128.898560 -0.003129 -v 3.791261 -129.875824 -0.003129 -v 24.018154 -130.925842 -0.003129 -v 37.218113 -129.875824 -0.003129 -v 51.827042 -130.344208 -0.003129 -v -52.515575 -129.622467 -0.003129 -v -46.827885 -128.586487 -0.003129 -v -0.865442 -128.717773 -0.003129 -v -1.687130 -128.287933 -0.003129 -v 1.172104 -128.586487 -0.003129 -v 2.048102 -128.011169 -0.003129 -v 47.134560 -128.717773 -0.003129 -v 46.008858 -128.065826 -0.003129 -v -50.091888 -127.982689 -0.003129 -v -50.710430 -126.978249 -0.003129 -v 50.693977 -127.037041 -0.003129 -v 52.580395 -129.496490 -0.003129 -v -45.077415 -125.886391 -0.003130 -v 45.305794 -124.814720 -0.003130 -v 2.563610 -124.499855 -0.003130 -v 50.563610 -124.499855 -0.003130 -v 45.867809 -123.939171 -0.003130 -v 0.495702 -123.054695 -0.003119 -v -19.825306 -117.420433 -0.003128 -v 56.905453 -119.375435 -0.003130 -v -57.001270 -119.208733 -0.003130 -v -58.083355 -118.235634 -0.003130 -v -59.166183 -117.938484 -0.003096 -v 58.770206 -117.975914 -0.003121 -v -113.385384 -117.880409 -0.003130 -v -115.146996 -117.195107 -0.003130 -v 117.065689 -114.993492 -0.003130 -v 117.465057 -113.645073 -0.003130 -v -117.448318 -113.873650 -0.003130 -v 15.711704 -114.453835 -0.003130 -v -117.465271 112.793373 -0.003146 -v 116.702469 114.825691 -0.003147 -v 115.335022 116.237984 -0.003147 -v -115.054428 116.386589 -0.003147 -v 113.426025 117.018105 -0.003147 -v -47.701908 -128.824799 -0.003129 -v -48.865448 -128.717773 -0.003129 -v -46.888092 -128.612213 -0.803129 -v -45.951878 -128.011139 -0.003129 -v -45.335190 -127.105263 -0.803129 -v -45.306046 -127.037086 -0.003129 -v -50.922802 -125.965294 -0.003130 -v -45.077415 -125.965340 -0.803129 -v -50.694225 -124.814751 -0.003130 -v -45.436405 -124.499840 -0.003130 -v -50.563824 -124.499855 -0.803129 -v -50.132195 -123.939171 -0.003130 -v -45.868023 -123.939171 -0.803129 -v -49.407265 -123.381599 -0.003130 -v -46.422649 -123.465111 -0.003130 -v -46.815056 -123.253899 -0.803129 -v -47.504299 -123.054695 -0.003119 -v -48.532536 -123.058678 -0.003117 -v 0.298098 -128.824799 -0.003129 -v -2.425719 -127.575844 -0.003129 -v -2.694181 -127.037056 -0.803129 -v 2.693967 -127.037056 -0.003129 -v -2.928645 -126.098259 -0.003130 -v 2.928431 -126.098259 -0.803129 -v 2.922588 -125.886406 -0.003130 -v -2.694218 -124.814735 -0.003130 -v 2.694004 -124.814735 -0.803129 -v -2.132176 -123.939156 -0.003130 -v -1.407283 -123.381615 -0.003130 -v 1.407069 -123.381615 -0.803129 -v 1.577361 -123.465111 -0.003130 -v -0.532529 -123.058678 -0.003118 -v -0.447260 -123.043343 -0.803127 -v 48.298092 -128.824799 -0.003129 -v 46.827671 -128.586487 -0.803129 -v 49.172123 -128.586487 -0.003129 -v 45.951664 -128.011139 -0.803129 -v 50.048126 -128.011139 -0.003129 -v 45.334976 -127.105263 -0.003129 -v 45.305832 -127.037086 -0.803129 -v 50.710217 -126.978249 -0.803129 -v 45.077202 -125.965340 -0.003130 -v 45.077202 -125.886391 -0.803129 -v 50.922588 -125.965294 -0.803129 -v 50.922588 -125.886421 -0.003130 -v 45.436192 -124.499840 -0.803129 -v 50.210964 -124.037865 -0.803129 -v 49.526669 -123.443565 -0.803129 -v 46.592731 -123.381599 -0.003130 -v 46.422436 -123.465111 -0.803129 -v 49.577354 -123.465111 -0.003130 -v 48.495705 -123.054695 -0.003119 -v 47.467472 -123.058678 -0.003118 -v 50.543003 -130.901367 -0.803129 -v 50.624214 -130.885345 -0.003129 -v 51.645302 -130.459686 -0.803129 -v 52.515362 -129.622467 -0.803129 -v 57.573318 -118.597160 -0.003130 -v 113.488632 -117.862587 -0.003130 -v 113.385170 -117.880409 -0.803130 -v 115.054192 -117.238304 -0.003130 -v 115.146767 -117.195122 -0.803130 -v 116.245628 -116.272743 -0.003130 -v 116.588020 -115.869102 -0.803130 -v 117.461884 112.972755 -0.003146 -v 116.769157 114.721024 -0.803147 -v -117.448318 113.021957 -0.803147 -v -117.065941 114.141716 -0.003147 -v -116.245857 115.421028 -0.003147 -v -115.146980 116.343414 -0.803147 -v -113.398720 117.036133 -0.003114 -v -113.385368 117.028725 -0.803148 -v -113.488846 -117.862587 -0.803130 -v -116.588234 -115.869102 -0.003130 -v -58.770420 -117.975914 -0.803130 -v -56.905666 -119.375435 -0.803130 -v -57.573532 -118.597160 -0.803130 -v -50.521194 -130.907288 -0.003129 -v -50.558754 -130.904358 -0.803129 -v -51.645515 -130.459686 -0.003129 -v -0.940402 -128.693420 -0.803129 -v -2.048316 -128.011169 -0.803129 -v 50.091675 -127.982689 -0.803129 -v 48.865234 -128.717773 -0.803129 -v 47.701694 -128.824799 -0.803129 -v -48.940411 -128.693420 -0.803129 -v -51.827255 -130.344208 -0.803129 -v -50.048340 -128.011139 -0.803129 -v -52.580608 -129.496490 -0.803129 -v -50.694191 -127.037041 -0.803129 -v -1.577575 -123.465111 -0.803129 -v -2.563823 -124.499855 -0.803129 -v -2.922801 -125.886406 -0.803129 -v -47.775795 -128.831451 -0.803129 -v 0.224211 -128.831451 -0.803129 -v 57.970268 -118.329140 -0.803130 -v 1.350205 -128.518188 -0.803129 -v -46.009071 -128.065826 -0.803129 -v 2.425506 -127.575844 -0.803129 -v -50.922802 -125.886421 -0.803129 -v 57.069794 -119.094872 -0.803130 -v -45.306007 -124.814720 -0.803129 -v 50.694012 -124.814751 -0.803129 -v 2.131962 -123.939156 -0.803129 -v -49.577568 -123.465111 -0.803129 -v 47.384830 -123.084160 -0.803130 -v 0.574773 -123.069633 -0.803130 -v -48.227192 -123.003090 -0.803135 -v 48.417694 -123.031471 -0.803128 -v -116.588211 115.017433 -0.803147 -v -117.444061 -113.851982 -0.803130 -v 58.914619 -117.961693 -0.803130 -v -115.443382 -117.013954 -0.803130 -v -116.769394 -115.572701 -0.803130 -v 117.448105 -113.873634 -0.803130 -v 117.454475 112.959404 -0.803147 -v 113.447708 117.022362 -0.803148 -v 115.443161 116.162262 -0.803147 -v -62.599171 -132.473022 -5.251470 -v -61.084202 -134.336731 -5.250704 -v -61.927765 -133.794037 -5.234065 -v -61.413071 -134.433472 -5.130083 -v -62.810913 -132.268616 -5.188111 -v -62.512043 -133.304321 -5.126971 -v -62.989403 -132.001984 -5.045174 -v -62.259815 -133.757385 -5.076136 -v -60.728928 -134.793945 -5.079785 -v -62.990475 -132.486694 -4.886776 -v -62.778763 -132.972198 -4.999070 -v -61.837406 -134.318054 -4.906031 -v -61.408154 -134.580536 -4.947596 -v -62.563820 -133.510559 -4.820692 -v -63.075256 -131.933716 -4.812207 -v -61.153618 -134.754578 -4.816858 -v -62.826405 -133.007965 -4.781913 -v -60.497292 -134.973419 -4.813125 -v -62.212803 -133.969818 -4.837237 -v 61.415157 -134.195282 -5.245730 -v 62.624371 -132.258148 -5.251293 -v 60.288685 -134.614532 -5.249719 -v 62.208233 -133.283417 -5.251501 -v 62.614449 -132.991364 -5.163921 -v 60.659607 -134.705414 -5.176629 -v 61.223797 -134.551392 -5.109446 -v 62.247849 -133.613892 -5.169331 -v 62.920506 -132.185699 -5.109763 -v 59.873363 -134.850006 -5.165756 -v 60.723160 -134.835541 -5.028454 -v 61.807644 -134.237518 -5.048467 -v 62.826767 -132.993286 -4.891047 -v 60.053406 -134.988342 -4.999704 -v 62.561386 -133.507294 -4.890453 -v 62.998104 -132.468567 -4.833063 -v 62.198444 -133.977264 -4.905097 -v 63.034019 -131.925964 -4.963964 -v 60.079563 -135.046509 -4.816742 -v 61.241802 -134.702667 -4.881860 -v 60.743134 -134.907166 -4.771103 -v 61.768909 -134.375732 -4.839029 -v 62.789181 -132.189545 -5.201136 -v 62.370220 -125.859978 -5.251946 -v 62.670925 -126.289726 -5.247623 -v 61.945690 -125.575813 -5.244761 -v 62.866707 -126.347862 -5.161260 -v 62.220135 -125.525993 -5.184912 -v 62.585991 -125.752266 -5.161261 -v 62.800095 -125.992180 -5.126022 -v 62.315517 -125.370338 -4.993575 -v 63.000904 -126.354546 -5.021907 -v 62.990021 -126.096260 -4.914006 -v -62.751270 -126.365364 -5.224683 -v -62.529827 -126.016365 -5.251668 -v -62.734982 -125.960701 -5.159594 -v -62.330677 -125.644310 -5.211176 -v -61.945305 -125.508492 -5.224631 -v -62.955479 -126.321007 -5.082900 -v -62.338913 -125.444328 -5.074628 -v -62.796169 -125.831459 -5.027400 -v -62.702877 -125.622704 -4.914423 -v -61.934273 -125.222878 -4.911747 -v -61.934303 -132.024994 -5.253129 -v -61.042862 -133.521423 -5.253125 -v 60.065979 -133.906647 -5.253129 -v 60.744240 -133.695374 -5.253128 -v -60.404114 -134.616089 -5.248155 -v -59.991501 -134.851959 -5.162792 -v -60.069202 -134.996796 -4.988307 -v -59.920784 -135.053375 -4.802408 -v 63.076515 -131.911987 -4.786819 -v 60.782104 -132.160370 -0.003115 -v 60.152294 -132.766449 -0.003119 -v 62.464901 -125.393898 -4.788422 -v 62.780857 -125.684776 -4.863102 -v 63.076771 -126.403130 -4.801388 -v -56.921116 -121.250648 -0.003126 -v 56.358704 -121.103615 -0.003130 -v 56.511997 -121.111382 -0.003134 -v 56.891109 -121.232780 -0.003126 -v 57.230110 -121.522545 -0.003125 -v 57.452896 -121.951912 -0.003107 -v -60.856499 -125.403572 -0.003130 -v -60.479137 -132.541504 -0.003128 -v -60.801395 -132.081604 -0.003122 -v -60.906845 -131.933136 -3.503132 -v -60.034172 -132.792969 -0.003126 -v -60.080845 -132.863159 -3.503125 -v 60.905151 -131.947632 -3.503133 -v 61.873306 -132.016693 -3.503129 -v 61.939976 -125.324593 -5.078502 -v 61.884880 -125.256828 -3.503125 -v 60.244820 -133.827454 -3.503121 -v 61.558098 -133.029541 -5.253113 -v 61.928558 -132.066925 -5.253129 -v -60.166397 -133.899200 -5.253126 -v -61.680592 -132.806885 -5.253125 -v -61.034702 -133.443542 -3.503128 -v -60.235451 -133.825195 -3.503124 -v -63.074604 -126.395546 -4.840712 -v -62.986717 -126.026619 -4.830535 -v -62.774971 -125.663261 -4.769271 -v -62.463909 -125.401466 -4.811271 -v 62.800034 -126.383171 1.490644 -v 62.703907 -126.072609 1.547437 -v 62.749302 -126.346748 1.645571 -v 62.298828 -125.628532 1.701200 -v 62.536472 -125.831993 1.639080 -v 62.567268 -125.968376 1.764716 -v 62.618229 -126.246452 1.804716 -v 62.286373 -125.711571 1.904059 -v 62.129612 -125.606773 1.946889 -v 62.136662 -125.773643 2.103454 -v 62.279903 -125.908043 2.043824 -v 62.794617 -131.938873 1.538564 -v 62.689457 -132.023804 1.741504 -v 60.917374 -125.250771 -3.503130 -v 60.856285 -125.403572 -0.003130 -v 61.933613 -125.199455 -4.787926 -v 62.984138 -126.015495 -4.757130 -v 61.945004 -125.501060 1.856440 -v 57.392586 -123.016838 1.685586 -v 57.193584 -122.988884 1.962851 -v 57.511974 -123.939461 2.314674 -v 57.493599 -123.607201 1.945314 -v 57.391308 -123.484612 2.067187 -v 57.259708 -123.758430 2.354782 -v 57.404518 -122.118324 1.297876 -v 57.306881 -122.966576 1.834582 -v 56.966507 -121.816643 1.548190 -v 56.957523 -121.337242 1.073774 -v 57.363857 -121.870293 1.195192 -v 56.477127 -121.158073 1.044793 -v 56.717522 -121.224510 1.107329 -v 57.168652 -121.534660 1.138083 -v 56.953354 -121.410866 1.244386 -v 56.472786 -121.261742 1.257481 -v 56.692745 -121.415352 1.368227 -v 57.250168 -121.753746 1.326669 -v 57.033508 -121.567680 1.369386 -v 57.310726 -122.016304 1.433174 -v 57.156296 -121.910179 1.528691 -v -56.659985 -121.194649 1.047971 -v -57.255051 -121.642708 1.107327 -v -56.413494 -121.159889 1.071838 -v -57.134811 -121.496941 1.137324 -v -56.862743 -121.289070 1.116894 -v -56.507332 -121.250008 1.234624 -v -57.400719 -121.999382 1.222870 -v -56.691826 -121.401741 1.362789 -v -57.229542 -121.722527 1.328488 -v -57.009281 -121.478264 1.286593 -v -57.152767 -121.922935 1.536769 -v -57.319134 -122.001945 1.417100 -v -57.399544 -122.942741 1.602983 -v -57.374317 -123.123329 1.815862 -v -57.299934 -123.022255 1.877604 -v -57.453014 -123.478798 1.942594 -v -57.565842 -123.836189 2.111749 -v -57.057690 -122.923439 2.010927 -v -57.276470 -123.585793 2.252303 -v -57.846867 -124.186501 -0.003137 -v -57.464516 -122.054543 -0.003127 -v -57.306164 -121.618111 -0.003119 -v -56.508854 -121.109398 -0.003127 -v 56.349892 -121.103584 -0.003130 -v -61.868141 -132.057434 -3.503129 -v -60.917587 -125.250771 -3.503130 -v -61.598648 -132.825684 -3.503125 -v -60.668365 -132.474945 -3.503124 -v 61.154076 -133.355255 -3.503125 -v 60.154240 -132.851044 -3.503117 -v 61.664593 -132.692596 -3.503128 -v 60.704475 -132.413055 -3.503128 -v -62.197918 -125.267876 -4.817050 -v -61.884895 -125.255394 -3.503121 -v -62.793270 -126.402412 1.554578 -v -62.693062 -126.054649 1.581854 -v -62.502602 -125.801277 1.678448 -v -62.285252 -125.627647 1.733950 -v -61.960251 -125.497597 1.817321 -v -62.477978 -125.951790 1.870732 -v -62.224606 -125.667854 1.926569 -v -61.956051 -125.570183 2.031533 -v -62.143570 -125.765892 2.094570 -v -61.258629 -134.395935 1.325644 -v -62.798374 -131.928375 1.521958 -v -62.594208 -132.859650 1.495113 -v -61.759399 -134.032104 1.440126 -v -62.129131 -133.645874 1.482792 -v -62.401806 -133.237030 1.521610 -v -62.700214 -132.549988 1.519861 -v -62.735481 -132.067444 1.667900 -v -62.189346 -133.452209 1.662257 -v -62.582253 -132.404694 1.786067 -v -61.474712 -134.129150 1.612606 -v -62.491879 -132.935883 1.677983 -v -61.841415 -133.781830 1.703676 -v -62.645245 -131.868195 1.787625 -v -62.408833 -132.779968 1.826466 -v 59.961536 -134.791626 1.116870 -v -60.000526 -134.782745 1.159636 -v -60.600849 -134.680969 1.202185 -v 60.387451 -134.725067 1.196395 -v 61.665260 -134.115875 1.392851 -v 61.213604 -134.407288 1.393788 -v 62.325844 -133.383606 1.480771 -v 60.853313 -134.575409 1.324696 -v 60.165642 -134.694550 1.325154 -v 62.019306 -133.767242 1.491730 -v 61.677105 -134.037201 1.552083 -v 62.038361 -133.672363 1.620319 -v 60.894684 -134.425354 1.536089 -v 62.562656 -132.892639 1.580469 -v 62.353493 -133.241211 1.634532 -v 62.712376 -132.435364 1.578735 -v 61.780006 -133.767822 1.741356 -v 62.226082 -133.239563 1.783108 -v 61.163151 -125.513268 2.374749 -v 61.327946 -125.610146 2.510981 -v 61.353367 -125.744011 2.631788 -v 61.068619 -125.578758 2.560845 -v 61.399044 -125.933678 2.679237 -v 61.065407 -125.724358 2.706916 -v 61.221794 -125.907356 2.749128 -v 61.008144 -125.899498 2.788625 -v 57.488174 -123.180473 -0.003113 -v 57.732376 -123.983025 -0.003139 -v 58.291897 -124.727455 -0.003138 -v 59.049015 -125.214394 -0.003135 -v 59.788223 -125.395958 -0.003126 -v 57.706276 -124.131767 2.219935 -v 57.950787 -124.501122 2.338021 -v 57.914490 -124.534752 2.487773 -v 57.693027 -124.441154 2.602659 -v 57.515778 -124.420219 2.656693 -v 58.334568 -125.148338 2.700096 -v 57.721241 -124.731911 2.741918 -v -56.918106 -121.638741 1.469390 -v 57.019352 -123.174065 2.126452 -v -59.528442 -125.386757 -0.003153 -v -58.455891 -124.867180 -0.003137 -v -57.502419 -123.306114 -0.003121 -v -57.700428 -124.110313 2.176940 -v -57.861614 -124.392738 2.344745 -v -57.569347 -124.026146 2.336455 -v -57.470795 -124.331123 2.622421 -v -57.464329 -124.115913 2.500546 -v -57.685360 -124.645195 2.718096 -v -61.055187 -125.513741 2.403316 -v -61.292290 -125.578484 2.488572 -v -61.316193 -125.723991 2.637849 -v -61.027122 -125.700935 2.695480 -v -61.111855 -125.905556 2.780598 -v -62.274925 -125.955360 2.055054 -v -62.660831 -126.278358 1.766799 -v -60.482677 -134.619476 1.401205 -v -61.051006 -134.412262 1.502295 -v -62.258228 -133.210266 1.770248 -v 61.414219 -134.140808 1.625886 -v 60.481274 -132.802246 2.697409 -v 62.529896 -132.575073 1.794130 -v 61.338074 -131.423889 2.706214 -v 59.341866 -125.412575 2.339022 -v 58.318672 -124.883781 2.398046 -v 59.836704 -125.504387 2.399870 -v 58.807377 -125.207878 2.403452 -v 58.302227 -124.968651 2.580062 -v 59.216427 -125.430504 2.518768 -v 58.777634 -125.433388 2.715315 -v 59.687065 -125.615959 2.632817 -v 59.777348 -125.755959 2.740818 -v 57.965588 -125.098686 2.791255 -v 58.595875 -125.590904 2.793981 -v -58.810997 -125.209953 2.389272 -v -59.336941 -125.410393 2.374557 -v -58.297619 -124.870171 2.405314 -v -58.371368 -125.031105 2.582873 -v -59.819504 -125.575706 2.567834 -v -58.871983 -125.325310 2.583967 -v -58.278862 -125.059746 2.673058 -v -59.288353 -125.562691 2.679748 -v -58.835030 -125.525261 2.748727 -v -57.914692 -125.049919 2.788228 -v -59.830070 -125.501411 2.377525 -v -61.069519 -125.588356 2.570231 -v -59.843292 -125.739754 2.731394 -v -61.413918 -125.913353 2.668041 -v -60.618896 -132.694733 2.695544 -v -59.090858 -133.223785 2.709266 -v -61.353123 -131.464661 2.694452 -v -60.911930 -132.203125 2.753325 -v -61.067871 -131.358948 2.789929 -v -60.085434 -132.936859 2.734118 -v -60.251774 -132.551514 2.796059 -v -59.288734 -133.380859 2.613290 -v -59.569672 -132.938263 2.786357 -v 59.147224 -133.413300 2.591535 -v 59.013474 -133.174103 2.730366 -v 59.756893 -133.124756 2.701897 -v 60.982693 -132.178040 2.731918 -v 59.679306 -132.834839 2.794274 -v 60.599369 -132.344818 2.791023 -v 61.056393 -131.270050 2.790972 -v -59.207817 -125.861320 2.793934 -v 59.561317 -125.881966 2.792308 -v 1.009265 -125.511131 -5.253131 -v 60.064846 -132.657715 -0.503127 -v 60.698875 -131.945190 -0.503130 -v 60.756817 -131.918671 -3.503130 -v -59.911755 -132.684570 -0.503130 -v -60.690269 -131.999237 -0.503129 -v -60.730717 -132.078217 -3.503122 -v -60.369400 -132.484894 -0.503126 -v 56.647533 -120.970055 -3.535604 -v 60.767353 -125.250771 -3.503131 -v 60.714985 -125.381752 -0.503132 -v -61.373013 -132.894287 -3.503126 -v -60.727161 -133.470673 -3.503126 -v -60.160641 -132.692505 -3.503115 -v -60.036026 -133.696899 -3.503130 -v 60.210030 -133.679718 -3.503123 -v 60.015305 -132.722931 -3.503128 -v 60.531811 -132.400574 -3.503127 -v -60.767567 -125.250771 -3.503131 -v -60.715199 -125.381752 -0.503132 -v -59.454121 -125.341301 -0.503151 -v -57.926945 -124.260109 -0.503134 -v -57.513344 -123.327522 -0.503150 -v -57.246933 -121.507729 -0.503129 -v 57.260761 -121.525917 -0.503130 -v 57.473972 -121.955177 -0.503124 -v 57.503975 -123.167168 -0.503137 -v 60.502861 -132.341034 -0.503130 -v 59.679684 -125.363701 -0.503135 -v 57.475719 -121.514015 -4.641313 -v 57.136456 -121.179283 -4.167931 -v 56.765976 -121.130943 -0.503099 -v 57.699539 -122.447563 -5.196062 -v -57.470043 -121.940819 -0.503123 -v -57.679825 -122.027122 -5.023061 -v -57.556648 -121.649193 -4.769513 -v -57.179962 -121.196938 -4.222813 -v -56.732906 -121.118340 -0.503103 -v -56.598572 -120.966499 -3.480700 -v 57.828594 -124.128883 -0.503142 -v 58.683777 -125.019493 -0.503152 -v 58.740093 -124.806511 -5.253150 -v 59.712776 -125.162056 -5.253135 -v 61.795921 -125.174385 -5.253131 -v 61.734814 -125.250771 -3.503131 -v 61.194118 -133.130707 -3.503115 -v 61.322250 -133.082642 -5.253106 -v 61.701687 -132.176971 -3.503125 -v -61.714481 -132.102081 -3.503127 -v -60.804138 -133.497345 -5.253124 -v -61.796135 -125.174385 -5.253131 -v -61.735027 -125.250771 -3.503131 -v -59.739876 -125.163811 -5.253134 -v -58.453651 -124.837196 -0.503138 -v -58.178078 -124.286705 -5.253152 -v 57.707520 -123.079460 -5.258518 -v -57.699478 -122.533836 -5.220407 -v 57.668495 -121.954689 -4.985293 -v -61.781857 -132.020447 -5.253130 -v -61.509552 -132.813416 -5.253121 -v -60.052338 -133.759033 -5.253130 -v -58.980675 -124.929131 -5.253136 -v -57.740059 -123.317055 -5.254315 -v 57.977913 -123.968819 -5.253142 -v 61.774746 -132.113647 -5.253125 -v 60.301826 -133.723877 -5.253124 -v 115.093307 117.036186 -0.803149 -v -115.031479 117.046875 -0.803149 -v 116.913719 115.878944 -0.803149 -v -117.021667 115.725090 -0.803149 -v 117.458076 114.730423 -0.803149 -v -115.093613 -117.887871 -0.803131 -v 114.908409 -117.909554 -0.803131 -v 115.976784 -117.562920 -0.803131 -v -117.483826 -115.334312 -0.803133 -v 117.461929 -115.519279 -0.803132 -v -116.265976 -117.378792 -0.803131 -v 116.952866 -116.691689 -0.803132 -v -117.137154 -116.402763 -0.803132 -v 116.150826 116.595711 -0.803149 -v -116.201126 116.572510 -0.803149 -v -117.462143 114.667557 -0.803149 -v 115.156166 117.032333 -2.303150 -v 117.021461 115.725075 -2.303149 -v -115.093521 117.036186 -2.303149 -v 117.461929 114.667564 -2.303149 -v -115.156464 -117.884010 -2.303131 -v 114.965919 -117.901970 -2.303131 -v 116.045540 -117.523216 -2.303131 -v 117.458076 -115.582100 -2.303132 -v -117.462143 -115.519264 -2.303132 -v 116.913742 -116.730614 -2.303132 -v -117.021667 -116.576790 -2.303132 -v -116.304993 -117.339592 -2.303131 -v 116.304688 116.487968 -2.303149 -v -116.151039 116.595711 -2.303149 -v -116.913933 115.878944 -2.303149 -v -117.458290 114.730431 -2.303149 -vt 0.647387 0.000318 -vt 0.647387 0.000318 -vt 0.647387 0.000318 -vt 0.647387 0.000318 -vt 0.647387 0.000318 +v 118.354355 -110.073631 -15.743714 +v 114.068901 -119.722466 -20.180742 +v 114.739487 -119.531227 -20.297823 +v 118.222610 111.787270 -1.131925 +v 118.105339 112.000687 -0.992558 +v 114.372559 -120.408913 -1.567918 +v 115.075256 -120.310265 -1.497765 +v 114.623497 -120.192039 -1.310149 +v 114.343330 -120.358589 -1.426186 +v 115.554459 -120.107918 -1.370554 +v 116.561562 -119.835945 -1.523531 +v 116.733383 -119.639137 -1.368375 +v 116.043571 -119.849419 -1.310030 +v 117.248619 -119.459877 -1.522869 +v 118.072464 -118.823708 -1.548110 +v 117.566948 -119.092918 -1.349133 +v 118.491196 -118.370094 -1.471259 +v 118.148705 -118.456383 -1.307177 +v 119.063904 -117.618919 -1.496006 +v 118.898308 -117.518639 -1.309195 +v 119.545059 -116.684624 -1.501324 +v 119.368965 -116.693657 -1.327539 +v 119.979317 -114.791542 -1.546374 +v 119.872765 -114.779594 -1.359541 +v 119.666153 -115.628761 -1.308552 +v 114.330254 -119.769600 -20.014753 +v 114.783730 -119.664619 -20.188375 +v 115.452164 -119.587349 -20.015177 +v 115.687637 -119.464653 -20.162813 +v 116.668396 -119.071022 -20.032831 +v 116.353371 -119.145027 -20.220758 +v 117.369240 -118.588310 -20.017691 +v 117.326752 -118.499260 -20.236134 +v 118.061874 -117.663261 -20.275988 +v 118.048515 -117.928963 -20.015162 +v 118.031891 -117.887001 -20.156713 +v 118.578491 -117.092583 -20.185795 +v 118.996643 -116.220100 -20.174234 +v 118.741119 -116.933876 -20.016701 +v 119.189331 -115.750694 -20.018003 +v 119.139214 -115.462776 -20.248936 +v 119.320786 -114.889366 -20.096815 +v 119.135612 -114.846748 -20.292841 +v -118.105087 112.111557 -0.909175 +v -119.795189 112.455376 -0.397314 +v -118.101974 112.512970 -0.341264 +v -114.381645 -120.408150 -1.560494 +v -114.337540 -120.353432 -1.417620 +v -115.075378 -120.307335 -1.484236 +v -114.369156 -120.190910 -1.306552 +v -115.421761 -120.125435 -1.356481 +v -115.842773 -120.127281 -1.528008 +v -116.801514 -119.722115 -1.529071 +v -116.721581 -119.672783 -1.389807 +v -116.096489 -119.869316 -1.328043 +v -117.660309 -119.174797 -1.581664 +v -117.731583 -119.034370 -1.396137 +v -118.395699 -118.498619 -1.537008 +v -118.816689 -117.842995 -1.374314 +v -119.059280 -117.637291 -1.538945 +v -119.347755 -117.138710 -1.600160 +v -119.466316 -116.738152 -1.418659 +v -119.614754 -116.515724 -1.573588 +v -119.790253 -115.740837 -1.411590 +v -119.446068 -116.415977 -1.311703 +v -119.851295 -115.738640 -1.607201 +v -119.984589 -114.772270 -1.549987 +v -119.760483 -114.956902 -1.308016 +v -114.288513 -119.768730 -20.062483 +v -114.807518 -119.655586 -20.193521 +v -114.054405 -119.653221 -20.249144 +v -114.479156 -119.513466 -20.300638 +v -115.314285 -119.617699 -20.019548 +v -115.577896 -119.446388 -20.233912 +v -116.598450 -119.075127 -20.136557 +v -115.648697 -119.281960 -20.300360 +v -117.359421 -118.595436 -20.016443 +v -116.676758 -118.845695 -20.293947 +v -117.344505 -118.538933 -20.178822 +v -117.667435 -118.141136 -20.254480 +v -118.071205 -117.812065 -20.193678 +v -118.174393 -117.411293 -20.300406 +v -118.596100 -117.170021 -20.014219 +v -118.457596 -117.328346 -20.146734 +v -118.785400 -116.747444 -20.154688 +v -119.074623 -116.153236 -20.014315 +v -119.129585 -115.797600 -20.177160 +v -118.782196 -116.350227 -20.297037 +v -119.229736 -114.967064 -20.227976 +v -117.562439 -119.004112 -1.307583 +v -118.768143 -117.685417 -1.307626 +v -118.202690 -114.999275 -1.308099 +v 118.175125 -114.557808 -1.315966 +v -102.527359 117.855774 -0.138955 +v -102.927872 117.810875 0.040628 +v -100.471260 117.820648 -1.295716 +v -100.992523 117.774666 -1.188606 +v -101.818733 117.807976 -0.728877 +v 102.324310 117.848808 -0.270058 +v 111.261032 117.771225 0.172241 +v -114.251167 -118.497536 -1.384598 +v -114.607948 -118.624672 -1.307527 +v -115.169846 -118.403404 -1.343519 +v -115.564735 -118.176643 -1.402441 +v -114.882591 -118.327950 -1.505959 +v -116.304878 -117.701027 -1.532470 +v -116.415077 -117.902229 -1.307001 +v -116.187958 -117.852654 -1.399487 +v -116.757812 -117.427696 -1.390281 +v -116.949265 -117.129433 -1.518561 +v -117.307846 -117.091057 -1.305928 +v -117.345657 -116.773384 -1.381237 +v -117.830345 -116.205086 -1.307540 +v -117.762093 -116.003441 -1.388678 +v -117.908432 -115.308769 -1.486646 +v 114.410706 -118.572090 -1.331378 +v 114.401733 -118.467690 -1.417553 +v 114.372513 -118.411201 -1.544239 +v 114.761902 -118.637306 -1.305184 +v 115.234459 -118.232216 -1.501867 +v 115.472389 -118.235603 -1.388141 +v 115.867188 -117.962715 -1.521933 +v 116.139709 -118.068581 -1.307948 +v 116.223412 -117.772270 -1.448448 +v 116.695084 -117.382805 -1.517056 +v 116.893127 -117.280663 -1.406004 +v 117.270126 -116.842323 -1.395105 +v 117.167587 -116.863258 -1.548390 +v 117.143982 -117.279213 -1.306531 +v 117.758835 -116.284264 -1.313314 +v 117.546371 -116.291313 -1.483026 +v 117.753342 -115.811241 -1.484175 +v 117.992233 -115.474098 -1.349329 +v 117.893784 -115.324654 -1.532187 +v -118.435722 -114.474144 -20.263544 +v -119.107986 -114.652489 -20.292082 +v -119.174210 -113.204521 -19.937138 +v -119.171562 -110.927956 -18.133066 +v -119.226143 -110.495995 -17.358345 +v -118.358910 -110.157631 -16.292034 +v -118.367775 -110.068810 -15.701695 +v 116.520187 -118.885094 -20.302139 +v -117.216118 -117.523552 -20.299276 +v 118.461922 -116.962868 -20.301001 +v 119.134209 -113.038582 -19.875038 +v 118.441986 -112.293785 -19.469841 +v 119.199783 -111.768379 -19.063713 +v 119.220894 -110.489204 -17.346581 +v 119.298531 -110.073555 -15.688435 +v 119.774773 111.181702 -1.307426 +v 119.901337 111.240204 -1.382934 +v 119.768761 111.412079 -1.271711 +v 119.909409 111.583611 -1.303208 +v 119.752731 111.747925 -1.147999 +v 119.761627 112.046616 -0.944470 +v 119.950867 111.999252 -1.151350 +v 119.872047 111.945747 -1.088650 +v 119.812729 112.230949 -0.769017 +v 119.807709 112.379074 -0.552417 +v 119.996223 111.991684 -1.300525 +v 119.792519 112.509766 -0.255078 +v 120.016357 112.556053 -0.746103 +v 119.969116 112.416672 -0.729576 +v 119.933853 112.561646 -0.318717 +v 115.859978 -120.120552 -1.519115 +v 119.850487 -115.699898 -1.498003 +v 119.334488 -114.421516 -20.080484 +v 119.118271 -114.445030 -20.263659 +v 119.260567 -114.185707 -20.150444 +v 119.151794 -113.650291 -20.097744 +v 119.317360 -113.145576 -19.784409 +v 119.184242 -112.493034 -19.588066 +v 119.362602 -112.287315 -19.258549 +v 119.383240 -111.707222 -18.742691 +v 119.177887 -111.304573 -18.606186 +v 119.423111 -110.913338 -17.714630 +v 119.324661 -111.208443 -18.370621 +v 119.356911 -110.794914 -17.743828 +v 119.168114 -110.893318 -18.084213 +v 119.396790 -110.438011 -16.939041 +v 119.482597 -110.337410 -16.039654 +v 119.239334 -110.201347 -16.518200 +v 119.426453 -110.188942 -15.950776 +v 119.720940 -110.140907 -9.095842 +v 100.478218 119.323578 -1.298503 +v 100.982079 119.310349 -1.184934 +v 101.352829 119.356827 -1.035616 +v 100.915642 119.437042 -1.252497 +v 101.744217 119.373672 -0.792286 +v 101.453491 119.486572 -1.074371 +v 100.470589 119.464737 -1.367917 +v 100.855423 119.531769 -1.387293 +v 101.885551 119.515541 -0.794318 +v 100.646645 119.560753 -1.522317 +v 101.673973 119.571487 -1.117970 +v 102.845520 119.395126 0.015532 +v 102.163635 119.375435 -0.398620 +v 102.472847 119.423157 -0.187953 +v 103.097450 119.568367 -0.033304 +v 102.213242 119.545952 -0.507437 +v 102.731453 119.601128 -0.234942 +v 103.488472 119.419319 0.177406 +v 103.541191 119.602989 0.006507 +v 111.997025 119.590935 0.055387 +v 111.999817 119.378288 0.193333 +v 112.029739 119.696396 2.196733 +v 114.688354 112.618401 2.196826 +v 120.092644 114.405334 2.196831 +v 112.301201 114.327972 2.196841 +v 112.050560 115.165657 2.196837 +v -112.038719 115.298553 2.196812 +v -112.000046 117.673386 0.196838 +v -112.029953 119.696396 2.196733 +v -112.000137 119.382225 0.192853 +v -111.998138 119.596565 0.039034 +v -102.519218 119.370659 -0.145344 +v -103.496948 119.392380 0.183681 +v -102.903625 119.382584 0.036505 +v -103.364662 119.518753 0.100297 +v -102.225067 119.534798 -0.480732 +v -102.628830 119.543793 -0.196382 +v -101.341583 119.313904 -1.041634 +v -101.815208 119.348564 -0.728377 +v -100.774269 119.339378 -1.247849 +v -102.167564 119.381317 -0.397547 +v -100.411278 119.427612 -1.343696 +v -101.098648 119.449120 -1.209595 +v -101.748756 119.478783 -0.866042 +v -100.674942 119.531944 -1.442215 +v -102.003891 119.584351 -0.855444 +v -101.438965 119.542778 -1.164828 +v -100.891144 119.563461 -1.508202 +v -100.345688 119.312752 -1.302963 +v -120.077667 114.552368 2.196836 +v -118.765244 117.459824 2.196814 +v -112.891495 113.458054 2.196831 +v -119.739502 111.199829 -1.301930 +v -119.869804 111.209549 -1.354857 +v -119.947899 111.338959 -1.424786 +v -119.775185 111.496338 -1.250351 +v -119.882454 111.734093 -1.215490 +v -119.732979 111.828209 -1.100308 +v -119.990753 111.619453 -1.504900 +v -119.948074 111.869217 -1.227037 +v -119.792702 111.970375 -1.015716 +v -119.784363 112.205727 -0.789996 +v -119.916168 112.246925 -0.854155 +v -119.810181 112.345894 -0.606553 +v -119.993370 112.217445 -1.075825 +v -119.939140 112.402214 -0.675780 +v -119.940781 112.562508 -0.345468 +v -120.015823 112.558044 -0.692138 +v -119.902252 -114.754082 -1.392986 +v -116.286118 -119.274895 -20.014666 +v -118.021980 -117.960091 -20.015696 +v -119.340454 -114.783348 -20.052219 +v -119.274757 -114.534630 -20.181112 +v -119.161011 -113.723274 -20.117853 +v -119.340775 -113.526985 -19.884098 +v -119.338287 -112.604042 -19.494431 +v -119.152519 -112.475212 -19.585812 +v -119.239815 -111.889656 -19.145155 +v -119.394661 -111.493965 -18.532040 +v -119.156212 -111.468712 -18.791901 +v -119.321434 -111.065666 -18.214069 +v -119.432602 -110.601891 -17.191807 +v -119.410721 -110.281731 -16.411993 +v -119.256668 -110.210915 -16.549652 +v -119.715919 -110.121147 -9.112865 +v -119.493843 -110.264641 -15.542340 +v -119.408600 -110.151344 -15.743709 +v -119.278488 -110.070000 -15.690523 +v -114.543411 112.614906 1.349945 +v -114.569489 112.626572 2.196838 +v -113.733543 112.884850 2.196829 +v -113.587433 112.932289 1.244100 +v -112.872269 113.469612 1.065024 +v -112.329155 114.199677 0.821673 +v -112.262863 114.402695 2.196818 +v -120.122360 112.609085 2.196839 +v -118.093246 112.594391 1.356758 +v -119.828186 112.563057 -0.067153 +v -118.076958 -114.826668 -1.373401 +v 117.984924 -114.751640 -1.532419 +v 118.021835 -114.473595 -1.456656 +v -111.256271 117.643867 0.041906 +v -102.529915 117.607796 -0.400179 +v -103.459129 117.631706 0.001664 +v -102.225235 117.660789 -0.480169 +v -102.700783 117.677444 -0.145199 +v -103.480064 117.730530 0.126017 +v -102.186890 117.827904 -0.378837 +v -103.497665 117.837036 0.183584 +v -100.942566 117.572754 -1.483352 +v -100.806305 117.616570 -1.366747 +v -101.309052 117.657494 -1.141272 +v -101.793945 117.616234 -0.944776 +v -101.892303 117.666786 -0.778263 +v -101.453026 117.826424 -0.978215 +v -100.472275 117.660339 -1.365899 +v 100.882896 117.577080 -1.446540 +v 100.498810 117.597534 -1.449843 +v 101.071053 117.676590 -1.224921 +v 100.471420 117.683937 -1.349211 +v 100.547012 117.824173 -1.290294 +v 101.593864 117.805428 -0.892168 +v 101.209450 117.828842 -1.102163 +v 102.499138 117.609131 -0.410057 +v 101.835945 117.594933 -0.977223 +v 102.186714 117.697548 -0.460251 +v 102.625229 117.695549 -0.169653 +v 103.693855 117.700951 0.114212 +v 102.824951 117.820709 0.006567 +v 101.728447 117.682243 -0.897458 +v 103.347092 117.783714 0.135633 +v 101.882988 117.826164 -0.665331 +v 103.286613 117.627090 -0.033296 +v 111.255653 117.641045 0.026226 +v 103.505989 117.879341 0.190402 +v 120.122147 112.609085 2.196839 +v 119.808662 112.570107 0.025544 +v 118.100433 112.559685 -0.076123 +v 118.093033 112.594391 1.356758 +v 113.833527 112.833344 2.196847 +v 112.876434 113.473206 2.196846 +v 112.466660 113.969559 0.898356 +v -114.220016 -118.415413 -1.547968 +v -115.551888 -118.108620 -1.539496 +v -116.838486 -116.964348 -7.303131 +v -117.462646 -116.437065 -1.539383 +v -117.799347 -115.665260 -1.538199 +v 117.314270 -116.331474 -7.303139 +v -118.021492 -110.084679 -9.303214 +v -118.248695 -114.779701 -20.143911 +v -118.341934 -114.082909 -20.156809 +v -118.343941 -113.331734 -19.948376 +v -118.228622 -113.755836 -19.923141 +v -118.491402 -113.690300 -20.118551 +v -118.281517 -112.643852 -19.587799 +v -118.479012 -112.848610 -19.797256 +v -118.212761 -112.312386 -19.234245 +v -118.274643 -111.907295 -19.075550 +v -118.455978 -112.123207 -19.357267 +v -118.390884 -111.464455 -18.778076 +v -118.200592 -111.281166 -18.305035 +v -118.386139 -111.056160 -18.293686 +v -118.267181 -110.736427 -17.689953 +v -118.428482 -110.690086 -17.755825 +v -118.173897 -110.573433 -17.063385 +v -118.338127 -110.325630 -16.908857 +v -118.152855 -110.318230 -16.209042 +v -118.189339 -110.177757 -15.727274 +v -118.410713 -115.219551 -20.302942 +v -118.226944 -115.403053 -20.232317 +v -118.219284 -114.775841 -20.057142 +v -114.604118 -118.850975 -20.296370 +v -114.230171 -118.712608 -20.194994 +v -114.980797 -118.633812 -20.225313 +v -114.237946 -118.650871 -20.060488 +v -114.956863 -118.546791 -20.066828 +v -115.717819 -118.408028 -20.240309 +v -115.509010 -118.375328 -20.088516 +v -116.214821 -118.281883 -20.294706 +v -116.010811 -118.144814 -20.050982 +v -116.361855 -117.990349 -20.172842 +v -116.965950 -117.539345 -20.208700 +v -116.630165 -117.735298 -20.024969 +v -117.168457 -117.223122 -20.032032 +v -117.447517 -116.952980 -20.175619 +v -117.608551 -116.630058 -20.013937 +v -117.832123 -116.307945 -20.169645 +v -117.909012 -116.562126 -20.297514 +v -118.081764 -115.600945 -20.114298 +v -118.009041 -115.791924 -20.013157 +v 114.271744 -118.705406 -20.190256 +v 114.526398 -118.850563 -20.295605 +v 115.021896 -118.660896 -20.255693 +v 114.974297 -118.539452 -20.071810 +v 115.735191 -118.383827 -20.227636 +v 116.189018 -118.264778 -20.286875 +v 116.995476 -117.707527 -20.293524 +v 116.921356 -117.479561 -20.022980 +v 116.834862 -117.645073 -20.182421 +v 117.519600 -116.977455 -20.251129 +v 117.444305 -116.916878 -20.123838 +v 117.935783 -116.140450 -20.192568 +v 118.064545 -116.262779 -20.296556 +v 118.265579 -115.387825 -20.260626 +v 118.433533 -114.635353 -20.284807 +v 118.174767 -115.215004 -20.125319 +v 118.149712 -115.242363 -20.009623 +v 118.228859 -114.644630 -20.073263 +v 118.301346 -114.051491 -20.114044 +v 118.232056 -113.448189 -19.854509 +v 118.443710 -113.676445 -20.109734 +v 118.412544 -112.917137 -19.818981 +v 118.295586 -112.562767 -19.546108 +v 118.216263 -112.365685 -19.277142 +v 118.473877 -111.751152 -19.065559 +v 118.298096 -111.838142 -19.049168 +v 118.195251 -111.426582 -18.428761 +v 118.276863 -111.240913 -18.415592 +v 118.415070 -111.165672 -18.449102 +v 118.379578 -110.677071 -17.717499 +v 118.190681 -110.821678 -17.642534 +v 118.388199 -110.328514 -16.943983 +v 118.333221 -110.165306 -16.307446 +v 118.217369 -110.375160 -16.767635 +v 118.220291 -110.135368 -15.607141 +v 118.006775 -110.143120 -9.303140 +v 118.142166 -110.323936 -15.964074 +v 118.153137 -109.950203 -9.303253 +v 119.986130 111.431015 -1.503587 +v 119.465630 115.315529 -9.028274 +v 119.471832 116.382378 2.196832 +v 118.360519 117.892685 2.196834 +v 116.898895 118.999329 2.196828 +v 114.897308 119.658577 2.196837 +v -114.310127 119.295677 -9.074260 +v -103.318733 119.609589 -0.043131 +v -119.723175 113.894119 -9.058856 +v -119.617691 116.017387 2.196832 +v -118.951599 116.432686 -9.115372 +v -117.866882 117.796654 -9.103258 +v -117.375725 118.697189 2.196826 +v -116.220100 119.283691 2.196831 +v -116.204552 118.856842 -9.108438 +v -114.791077 119.664810 2.196834 +v -118.085884 114.103027 0.853900 +v -112.051407 115.021782 0.546189 +v -117.688515 115.388397 0.423658 +v -111.996468 116.239250 0.213352 +v -116.938034 116.475845 0.201350 +v -115.611305 117.363991 0.196839 +v -111.261223 117.779091 0.175496 +v -118.007248 111.205269 -1.476738 +v -118.181023 111.212807 -1.309211 +v -118.204781 111.546188 -1.238346 +v -118.049149 111.539536 -1.355923 +v -118.016716 111.782684 -1.317997 +v -117.989693 -114.646675 -1.547499 +v -117.790543 111.574188 -7.303161 +v -117.770966 -114.941475 -7.303129 +v 117.790359 111.574188 -7.303161 +v 118.007660 111.359886 -1.467665 +v 118.132286 111.265457 -1.334945 +v 118.254005 111.239197 -1.298588 +v 118.232063 111.581589 -1.221117 +v 118.005493 111.781433 -1.364473 +v 118.103584 111.786919 -1.196514 +v -111.000137 117.364594 -7.303161 +v 114.463310 112.623199 1.347147 +v 113.255150 113.120026 1.181553 +v 111.999832 117.673386 0.196838 +v 116.048340 117.139496 0.195208 +v 112.058876 114.923340 0.576337 +v 117.780670 115.214111 0.480125 +v 111.997513 116.287979 0.213848 +v 117.019211 116.373627 0.214759 +v -114.575195 111.587540 -7.303161 +v -117.460663 -115.993248 -7.303128 +v -115.758873 -117.806511 -7.303132 +v -113.249184 111.944473 -7.303161 +v -114.517075 -118.196587 -7.303126 +v 114.858284 -118.155693 -7.303141 +v 116.282097 -117.474159 -7.303131 +v 117.766136 -114.965294 -7.303128 +v -111.015915 115.157600 -7.303161 +v 112.592667 112.356422 -7.303161 +v -114.694916 -118.398705 -9.303122 +v -115.851013 -117.975945 -9.303125 +v -116.843689 -117.281914 -9.303120 +v -117.710106 -115.971046 -9.303122 +v -117.987144 -114.826180 -9.303126 +v 114.251518 -118.645699 -20.031149 +v 115.756523 -118.271217 -20.049339 +v 116.342628 -117.943626 -20.019876 +v 116.575775 -117.499138 -9.303124 +v 117.525543 -116.771294 -20.015806 +v 117.941772 -115.949471 -20.020885 +v 117.971428 -115.014107 -9.303124 +v 119.724571 113.897469 -9.037808 +v 119.662277 113.886078 -9.194241 +v 119.511459 114.710922 -9.239288 +v 119.644234 114.548500 -9.063747 +v 119.414192 115.280792 -9.192769 +v 119.486115 114.208084 -9.299534 +v 119.197311 115.983597 -9.052954 +v 119.015770 116.188271 -9.214239 +v 118.532333 116.957756 -9.220334 +v 118.856323 116.623253 -9.047146 +v 118.794510 116.322868 -9.302421 +v 118.195679 117.463333 -9.121452 +v 117.678635 117.949295 -9.119539 +v 117.737122 117.715118 -9.270584 +v 116.968620 118.229507 -9.299248 +v 117.066910 118.400398 -9.133306 +v 116.097443 118.764076 -9.259561 +v 115.271828 119.074493 -9.228449 +v 116.195343 118.859680 -9.115148 +v 115.194016 118.961502 -9.302785 +v 115.201538 119.175812 -9.086913 +v 114.349159 119.179108 -9.248663 +v 114.290710 119.295265 -9.081708 +v -114.294373 119.220024 -9.209826 +v -119.466911 114.472115 -9.296118 +v -119.636940 113.925682 -9.223073 +v -119.577560 114.824707 -9.135611 +v -119.210777 115.722191 -9.231287 +v -119.294563 115.760719 -9.090499 +v -118.910774 116.103325 -9.299102 +v -118.567177 116.849304 -9.252007 +v -118.550682 117.050499 -9.098431 +v -117.764481 117.662971 -9.291236 +v -117.008949 118.288445 -9.260779 +v -117.070122 118.399796 -9.128294 +v -116.066216 118.735298 -9.291537 +v -114.900818 119.057205 -9.293817 +v -115.217964 119.163567 -9.123405 +v -119.559166 -109.946861 -9.286351 +v -118.149033 111.504288 -9.303160 +v -118.145325 111.787430 -1.157956 +v -118.146606 113.956833 -9.303160 +v -117.741333 115.440353 -9.303156 +v -114.458145 117.655617 0.196838 +v -114.559723 117.701035 -9.303161 +v -110.930252 117.723083 -9.303161 +v 118.103348 112.366615 -0.619473 +v 114.719315 117.636887 0.196839 +v 118.089966 113.938210 0.908857 +v 114.463875 117.705055 -9.303161 +v -114.583672 111.589951 -9.303160 +v 114.551651 -118.405678 -9.303126 +v -113.507935 111.842911 -9.303161 +v 115.694908 -118.059959 -9.303124 +v 117.487122 -116.446327 -9.303119 +v -112.188461 112.687088 -9.303161 +v -110.965225 117.364594 -9.303059 +v -117.790550 111.550911 -9.303102 +v -118.222229 -109.931847 -9.303194 +v 119.569618 -109.949059 -9.283138 +v 118.148880 111.504288 -9.303160 +v 111.483582 113.605560 -9.303161 +v 118.145561 113.947037 -9.303158 +v 111.027687 114.999153 -9.303161 +v 117.836464 115.200005 -9.303161 +v -116.775146 116.683022 -9.303156 +v 116.974548 116.507736 -9.303158 +v 110.930069 117.723083 -9.303161 +v 110.976608 117.364594 -9.302755 +v -115.703613 117.368263 -9.303161 +v 115.630531 117.410057 -9.303160 +v 110.999832 117.364594 -7.303161 +v 114.575012 111.587540 -9.303160 +v 113.586540 111.821754 -9.303161 +v 114.090614 111.640953 -7.303161 +v 112.513763 112.416969 -9.303161 +v 111.637863 113.373016 -7.303161 +v 111.041344 114.815544 -7.303161 +v 117.790367 111.539261 -9.303123 +v -111.307175 113.989441 -9.303161 +v -112.004547 112.895470 -7.303161 +v -111.013504 115.149124 -9.303161 +v -111.269112 114.081352 -7.303161 +v -19.787857 -128.898560 -0.003119 +v 3.791261 -129.875824 -0.003119 +v 24.018154 -130.925842 -0.003119 +v 37.218113 -129.875824 -0.003119 +v 51.827042 -130.344208 -0.003119 +v -52.515575 -129.622467 -0.003119 +v -46.827885 -128.586487 -0.003119 +v -0.865442 -128.717773 -0.003119 +v -1.687130 -128.287933 -0.003119 +v 1.172104 -128.586487 -0.003119 +v 2.048102 -128.011169 -0.003119 +v 47.134560 -128.717773 -0.003119 +v 46.008858 -128.065826 -0.003119 +v -50.091888 -127.982689 -0.003119 +v -50.710430 -126.978249 -0.003119 +v 50.693977 -127.037041 -0.003119 +v 52.580395 -129.496490 -0.003119 +v -45.077415 -125.886391 -0.003120 +v 45.305794 -124.814720 -0.003121 +v 2.563610 -124.499855 -0.003121 +v 50.563610 -124.499855 -0.003121 +v 45.867809 -123.939171 -0.003121 +v 0.495702 -123.054695 -0.003110 +v -19.825306 -117.420433 -0.003119 +v 56.905453 -119.375435 -0.003121 +v -57.001270 -119.208733 -0.003121 +v -58.083355 -118.235634 -0.003121 +v -59.166183 -117.938484 -0.003087 +v 58.770206 -117.975914 -0.003112 +v -113.385384 -117.880409 -0.003121 +v -115.146996 -117.195107 -0.003121 +v 117.065689 -114.993492 -0.003121 +v 117.465057 -113.645073 -0.003121 +v -117.448318 -113.873650 -0.003121 +v 15.711704 -114.453835 -0.003121 +v -117.465271 112.793373 -0.003155 +v 116.702469 114.825691 -0.003156 +v 115.335022 116.237984 -0.003156 +v -115.054428 116.386589 -0.003156 +v 113.426025 117.018105 -0.003156 +v -47.701908 -128.824799 -0.003119 +v -48.865448 -128.717773 -0.003119 +v -46.888092 -128.612213 -0.803119 +v -45.951878 -128.011139 -0.003119 +v -45.335190 -127.105263 -0.803119 +v -45.306046 -127.037086 -0.003119 +v -50.922802 -125.965294 -0.003120 +v -45.077415 -125.965340 -0.803119 +v -50.694225 -124.814751 -0.003121 +v -45.436405 -124.499840 -0.003121 +v -50.563824 -124.499855 -0.803120 +v -50.132195 -123.939171 -0.003121 +v -45.868023 -123.939171 -0.803120 +v -49.407265 -123.381599 -0.003121 +v -46.422649 -123.465111 -0.003121 +v -46.815056 -123.253899 -0.803120 +v -47.504299 -123.054695 -0.003110 +v -48.532536 -123.058678 -0.003108 +v 0.298098 -128.824799 -0.003119 +v -2.425719 -127.575844 -0.003119 +v -2.694181 -127.037056 -0.803119 +v 2.693967 -127.037056 -0.003119 +v -2.928645 -126.098259 -0.003120 +v 2.928431 -126.098259 -0.803119 +v 2.922588 -125.886406 -0.003120 +v -2.694218 -124.814735 -0.003121 +v 2.694004 -124.814735 -0.803120 +v -2.132176 -123.939156 -0.003121 +v -1.407283 -123.381615 -0.003121 +v 1.407069 -123.381615 -0.803120 +v 1.577361 -123.465111 -0.003121 +v -0.532529 -123.058678 -0.003109 +v -0.447260 -123.043343 -0.803118 +v 48.298092 -128.824799 -0.003119 +v 46.827671 -128.586487 -0.803119 +v 49.172123 -128.586487 -0.003119 +v 45.951664 -128.011139 -0.803119 +v 50.048126 -128.011139 -0.003119 +v 45.334976 -127.105263 -0.003119 +v 45.305832 -127.037086 -0.803119 +v 50.710217 -126.978249 -0.803119 +v 45.077202 -125.965340 -0.003120 +v 45.077202 -125.886391 -0.803120 +v 50.922588 -125.965294 -0.803119 +v 50.922588 -125.886421 -0.003120 +v 45.436192 -124.499840 -0.803120 +v 50.210964 -124.037865 -0.803120 +v 49.526669 -123.443565 -0.803120 +v 46.592731 -123.381599 -0.003121 +v 46.422436 -123.465111 -0.803120 +v 49.577354 -123.465111 -0.003121 +v 48.495705 -123.054695 -0.003110 +v 47.467472 -123.058678 -0.003109 +v 50.543003 -130.901367 -0.803119 +v 50.624214 -130.885345 -0.003119 +v 51.645302 -130.459686 -0.803119 +v 52.515362 -129.622467 -0.803119 +v 57.573318 -118.597160 -0.003121 +v 113.488632 -117.862587 -0.003121 +v 113.385170 -117.880409 -0.803121 +v 115.054192 -117.238304 -0.003121 +v 115.146767 -117.195122 -0.803121 +v 116.245628 -116.272743 -0.003121 +v 116.588020 -115.869102 -0.803121 +v 117.461884 112.972755 -0.003155 +v 116.769157 114.721024 -0.803156 +v -117.448318 113.021957 -0.803156 +v -117.065941 114.141716 -0.003156 +v -116.245857 115.421028 -0.003156 +v -115.146980 116.343414 -0.803156 +v -113.398720 117.036133 -0.003123 +v -113.385368 117.028725 -0.803157 +v -113.488846 -117.862587 -0.803121 +v -116.588234 -115.869102 -0.003121 +v -58.770420 -117.975914 -0.803121 +v -56.905666 -119.375435 -0.803121 +v -57.573532 -118.597160 -0.803121 +v -50.521194 -130.907288 -0.003119 +v -50.558754 -130.904358 -0.803119 +v -51.645515 -130.459686 -0.003119 +v -0.940402 -128.693420 -0.803119 +v -2.048316 -128.011169 -0.803119 +v 50.091675 -127.982689 -0.803119 +v 48.865234 -128.717773 -0.803119 +v 47.701694 -128.824799 -0.803119 +v -48.940411 -128.693420 -0.803119 +v -51.827255 -130.344208 -0.803119 +v -50.048340 -128.011139 -0.803119 +v -52.580608 -129.496490 -0.803119 +v -50.694191 -127.037041 -0.803119 +v -1.577575 -123.465111 -0.803120 +v -2.563823 -124.499855 -0.803120 +v -2.922801 -125.886406 -0.803120 +v -47.775795 -128.831451 -0.803119 +v 0.224211 -128.831451 -0.803119 +v 57.970268 -118.329140 -0.803121 +v 1.350205 -128.518188 -0.803119 +v -46.009071 -128.065826 -0.803119 +v 2.425506 -127.575844 -0.803119 +v -50.922802 -125.886421 -0.803120 +v 57.069794 -119.094872 -0.803121 +v -45.306007 -124.814720 -0.803120 +v 50.694012 -124.814751 -0.803120 +v 2.131962 -123.939156 -0.803120 +v -49.577568 -123.465111 -0.803120 +v 47.384830 -123.084160 -0.803121 +v 0.574773 -123.069633 -0.803121 +v -48.227192 -123.003090 -0.803126 +v 48.417694 -123.031471 -0.803119 +v -116.588211 115.017433 -0.803156 +v -117.444061 -113.851982 -0.803121 +v 58.914619 -117.961693 -0.803121 +v -115.443382 -117.013954 -0.803121 +v -116.769394 -115.572701 -0.803121 +v 117.448105 -113.873634 -0.803121 +v 117.454475 112.959404 -0.803156 +v 113.447708 117.022362 -0.803157 +v 115.443161 116.162262 -0.803156 +v -62.599171 -132.473022 -5.251460 +v -61.084202 -134.336731 -5.250694 +v -61.927765 -133.794037 -5.234055 +v -61.413071 -134.433472 -5.130073 +v -62.810913 -132.268616 -5.188101 +v -62.512043 -133.304321 -5.126961 +v -62.989403 -132.001984 -5.045164 +v -62.259815 -133.757385 -5.076126 +v -60.728928 -134.793945 -5.079775 +v -62.990475 -132.486694 -4.886766 +v -62.778763 -132.972198 -4.999060 +v -61.837406 -134.318054 -4.906021 +v -61.408154 -134.580536 -4.947586 +v -62.563820 -133.510559 -4.820682 +v -63.075256 -131.933716 -4.812197 +v -61.153618 -134.754578 -4.816848 +v -62.826405 -133.007965 -4.781903 +v -60.497292 -134.973419 -4.813115 +v -62.212803 -133.969818 -4.837227 +v 61.415157 -134.195282 -5.245720 +v 62.624371 -132.258148 -5.251283 +v 60.288685 -134.614532 -5.249709 +v 62.208233 -133.283417 -5.251491 +v 62.614449 -132.991364 -5.163911 +v 60.659607 -134.705414 -5.176619 +v 61.223797 -134.551392 -5.109436 +v 62.247849 -133.613892 -5.169321 +v 62.920506 -132.185699 -5.109753 +v 59.873363 -134.850006 -5.165746 +v 60.723160 -134.835541 -5.028444 +v 61.807644 -134.237518 -5.048457 +v 62.826767 -132.993286 -4.891037 +v 60.053406 -134.988342 -4.999694 +v 62.561386 -133.507294 -4.890443 +v 62.998104 -132.468567 -4.833053 +v 62.198444 -133.977264 -4.905087 +v 63.034019 -131.925964 -4.963954 +v 60.079563 -135.046509 -4.816732 +v 61.241802 -134.702667 -4.881850 +v 60.743134 -134.907166 -4.771093 +v 61.768909 -134.375732 -4.839019 +v 62.789181 -132.189545 -5.201126 +v 62.370220 -125.859978 -5.251936 +v 62.670925 -126.289726 -5.247613 +v 61.945690 -125.575813 -5.244751 +v 62.866707 -126.347862 -5.161251 +v 62.220135 -125.525993 -5.184903 +v 62.585991 -125.752266 -5.161252 +v 62.800095 -125.992180 -5.126012 +v 62.315517 -125.370338 -4.993566 +v 63.000904 -126.354546 -5.021897 +v 62.990021 -126.096260 -4.913997 +v -62.751270 -126.365364 -5.224673 +v -62.529827 -126.016365 -5.251658 +v -62.734982 -125.960701 -5.159585 +v -62.330677 -125.644310 -5.211166 +v -61.945305 -125.508492 -5.224621 +v -62.955479 -126.321007 -5.082891 +v -62.338913 -125.444328 -5.074618 +v -62.796169 -125.831459 -5.027390 +v -62.702877 -125.622704 -4.914413 +v -61.934273 -125.222878 -4.911737 +v -61.934303 -132.024994 -5.253119 +v -61.042862 -133.521423 -5.253115 +v 60.065979 -133.906647 -5.253119 +v 60.744240 -133.695374 -5.253118 +v -60.404114 -134.616089 -5.248145 +v -59.991501 -134.851959 -5.162782 +v -60.069202 -134.996796 -4.988297 +v -59.920784 -135.053375 -4.802398 +v 63.076515 -131.911987 -4.786809 +v 60.782104 -132.160370 -0.003105 +v 60.152294 -132.766449 -0.003109 +v 62.464901 -125.393898 -4.788413 +v 62.780857 -125.684776 -4.863092 +v 63.076771 -126.403130 -4.801378 +v -56.921116 -121.250648 -0.003117 +v 56.358704 -121.103615 -0.003121 +v 56.511997 -121.111382 -0.003125 +v 56.891109 -121.232780 -0.003117 +v 57.230110 -121.522545 -0.003116 +v 57.452896 -121.951912 -0.003098 +v -60.856499 -125.403572 -0.003121 +v -60.479137 -132.541504 -0.003118 +v -60.801395 -132.081604 -0.003112 +v -60.906845 -131.933136 -3.503122 +v -60.034172 -132.792969 -0.003116 +v -60.080845 -132.863159 -3.503115 +v 60.905151 -131.947632 -3.503123 +v 61.873306 -132.016693 -3.503119 +v 61.939976 -125.324593 -5.078493 +v 61.884880 -125.256828 -3.503115 +v 60.244820 -133.827454 -3.503111 +v 61.558098 -133.029541 -5.253103 +v 61.928558 -132.066925 -5.253119 +v -60.166397 -133.899200 -5.253116 +v -61.680592 -132.806885 -5.253115 +v -61.034702 -133.443542 -3.503118 +v -60.235451 -133.825195 -3.503114 +v -63.074604 -126.395546 -4.840703 +v -62.986717 -126.026619 -4.830525 +v -62.774971 -125.663261 -4.769261 +v -62.463909 -125.401466 -4.811262 +v 62.800034 -126.383171 1.490654 +v 62.703907 -126.072609 1.547446 +v 62.749302 -126.346748 1.645581 +v 62.298828 -125.628532 1.701210 +v 62.536472 -125.831993 1.639090 +v 62.567268 -125.968376 1.764726 +v 62.618229 -126.246452 1.804726 +v 62.286373 -125.711571 1.904069 +v 62.129612 -125.606773 1.946899 +v 62.136662 -125.773643 2.103464 +v 62.279903 -125.908043 2.043833 +v 62.794617 -131.938873 1.538574 +v 62.689457 -132.023804 1.741514 +v 60.917374 -125.250771 -3.503120 +v 60.856285 -125.403572 -0.003121 +v 61.933613 -125.199455 -4.787917 +v 62.984138 -126.015495 -4.757121 +v 61.945004 -125.501060 1.856449 +v 57.392586 -123.016838 1.685595 +v 57.193584 -122.988884 1.962860 +v 57.511974 -123.939461 2.314683 +v 57.493599 -123.607201 1.945323 +v 57.391308 -123.484612 2.067196 +v 57.259708 -123.758430 2.354791 +v 57.404518 -122.118324 1.297885 +v 57.306881 -122.966576 1.834591 +v 56.966507 -121.816643 1.548199 +v 56.957523 -121.337242 1.073783 +v 57.363857 -121.870293 1.195201 +v 56.477127 -121.158073 1.044802 +v 56.717522 -121.224510 1.107338 +v 57.168652 -121.534660 1.138092 +v 56.953354 -121.410866 1.244395 +v 56.472786 -121.261742 1.257490 +v 56.692745 -121.415352 1.368236 +v 57.250168 -121.753746 1.326678 +v 57.033508 -121.567680 1.369395 +v 57.310726 -122.016304 1.433183 +v 57.156296 -121.910179 1.528700 +v -56.659985 -121.194649 1.047980 +v -57.255051 -121.642708 1.107336 +v -56.413494 -121.159889 1.071847 +v -57.134811 -121.496941 1.137333 +v -56.862743 -121.289070 1.116903 +v -56.507332 -121.250008 1.234633 +v -57.400719 -121.999382 1.222879 +v -56.691826 -121.401741 1.362798 +v -57.229542 -121.722527 1.328497 +v -57.009281 -121.478264 1.286602 +v -57.152767 -121.922935 1.536778 +v -57.319134 -122.001945 1.417109 +v -57.399544 -122.942741 1.602992 +v -57.374317 -123.123329 1.815871 +v -57.299934 -123.022255 1.877613 +v -57.453014 -123.478798 1.942603 +v -57.565842 -123.836189 2.111758 +v -57.057690 -122.923439 2.010936 +v -57.276470 -123.585793 2.252312 +v -57.846867 -124.186501 -0.003128 +v -57.464516 -122.054543 -0.003118 +v -57.306164 -121.618111 -0.003110 +v -56.508854 -121.109398 -0.003118 +v 56.349892 -121.103584 -0.003121 +v -61.868141 -132.057434 -3.503119 +v -60.917587 -125.250771 -3.503120 +v -61.598648 -132.825684 -3.503115 +v -60.668365 -132.474945 -3.503114 +v 61.154076 -133.355255 -3.503115 +v 60.154240 -132.851044 -3.503107 +v 61.664593 -132.692596 -3.503118 +v 60.704475 -132.413055 -3.503118 +v -62.197918 -125.267876 -4.817040 +v -61.884895 -125.255394 -3.503111 +v -62.793270 -126.402412 1.554587 +v -62.693062 -126.054649 1.581864 +v -62.502602 -125.801277 1.678457 +v -62.285252 -125.627647 1.733960 +v -61.960251 -125.497597 1.817330 +v -62.477978 -125.951790 1.870741 +v -62.224606 -125.667854 1.926579 +v -61.956051 -125.570183 2.031543 +v -62.143570 -125.765892 2.094579 +v -61.258629 -134.395935 1.325654 +v -62.798374 -131.928375 1.521968 +v -62.594208 -132.859650 1.495123 +v -61.759399 -134.032104 1.440136 +v -62.129131 -133.645874 1.482802 +v -62.401806 -133.237030 1.521620 +v -62.700214 -132.549988 1.519871 +v -62.735481 -132.067444 1.667910 +v -62.189346 -133.452209 1.662267 +v -62.582253 -132.404694 1.786077 +v -61.474712 -134.129150 1.612616 +v -62.491879 -132.935883 1.677993 +v -61.841415 -133.781830 1.703686 +v -62.645245 -131.868195 1.787635 +v -62.408833 -132.779968 1.826476 +v 59.961536 -134.791626 1.116880 +v -60.000526 -134.782745 1.159646 +v -60.600849 -134.680969 1.202195 +v 60.387451 -134.725067 1.196405 +v 61.665260 -134.115875 1.392861 +v 61.213604 -134.407288 1.393798 +v 62.325844 -133.383606 1.480781 +v 60.853313 -134.575409 1.324706 +v 60.165642 -134.694550 1.325164 +v 62.019306 -133.767242 1.491740 +v 61.677105 -134.037201 1.552093 +v 62.038361 -133.672363 1.620329 +v 60.894684 -134.425354 1.536099 +v 62.562656 -132.892639 1.580479 +v 62.353493 -133.241211 1.634542 +v 62.712376 -132.435364 1.578745 +v 61.780006 -133.767822 1.741366 +v 62.226082 -133.239563 1.783118 +v 61.163151 -125.513268 2.374758 +v 61.327946 -125.610146 2.510991 +v 61.353367 -125.744011 2.631798 +v 61.068619 -125.578758 2.560854 +v 61.399044 -125.933678 2.679246 +v 61.065407 -125.724358 2.706926 +v 61.221794 -125.907356 2.749138 +v 61.008144 -125.899498 2.788635 +v 57.488174 -123.180473 -0.003104 +v 57.732376 -123.983025 -0.003130 +v 58.291897 -124.727455 -0.003129 +v 59.049015 -125.214394 -0.003126 +v 59.788223 -125.395958 -0.003117 +v 57.706276 -124.131767 2.219944 +v 57.950787 -124.501122 2.338030 +v 57.914490 -124.534752 2.487782 +v 57.693027 -124.441154 2.602668 +v 57.515778 -124.420219 2.656702 +v 58.334568 -125.148338 2.700105 +v 57.721241 -124.731911 2.741927 +v -56.918106 -121.638741 1.469399 +v 57.019352 -123.174065 2.126461 +v -59.528442 -125.386757 -0.003144 +v -58.455891 -124.867180 -0.003128 +v -57.502419 -123.306114 -0.003112 +v -57.700428 -124.110313 2.176949 +v -57.861614 -124.392738 2.344754 +v -57.569347 -124.026146 2.336464 +v -57.470795 -124.331123 2.622430 +v -57.464329 -124.115913 2.500555 +v -57.685360 -124.645195 2.718105 +v -61.055187 -125.513741 2.403326 +v -61.292290 -125.578484 2.488581 +v -61.316193 -125.723991 2.637859 +v -61.027122 -125.700935 2.695490 +v -61.111855 -125.905556 2.780607 +v -62.274925 -125.955360 2.055063 +v -62.660831 -126.278358 1.766809 +v -60.482677 -134.619476 1.401215 +v -61.051006 -134.412262 1.502305 +v -62.258228 -133.210266 1.770258 +v 61.414219 -134.140808 1.625896 +v 60.481274 -132.802246 2.697419 +v 62.529896 -132.575073 1.794140 +v 61.338074 -131.423889 2.706224 +v 59.341866 -125.412575 2.339031 +v 58.318672 -124.883781 2.398056 +v 59.836704 -125.504387 2.399879 +v 58.807377 -125.207878 2.403461 +v 58.302227 -124.968651 2.580071 +v 59.216427 -125.430504 2.518778 +v 58.777634 -125.433388 2.715325 +v 59.687065 -125.615959 2.632827 +v 59.777348 -125.755959 2.740828 +v 57.965588 -125.098686 2.791265 +v 58.595875 -125.590904 2.793991 +v -58.810997 -125.209953 2.389282 +v -59.336941 -125.410393 2.374567 +v -58.297619 -124.870171 2.405324 +v -58.371368 -125.031105 2.582883 +v -59.819504 -125.575706 2.567843 +v -58.871983 -125.325310 2.583977 +v -58.278862 -125.059746 2.673068 +v -59.288353 -125.562691 2.679758 +v -58.835030 -125.525261 2.748737 +v -57.914692 -125.049919 2.788238 +v -59.830070 -125.501411 2.377535 +v -61.069519 -125.588356 2.570240 +v -59.843292 -125.739754 2.731404 +v -61.413918 -125.913353 2.668051 +v -60.618896 -132.694733 2.695554 +v -59.090858 -133.223785 2.709276 +v -61.353123 -131.464661 2.694462 +v -60.911930 -132.203125 2.753335 +v -61.067871 -131.358948 2.789939 +v -60.085434 -132.936859 2.734128 +v -60.251774 -132.551514 2.796069 +v -59.288734 -133.380859 2.613300 +v -59.569672 -132.938263 2.786367 +v 59.147224 -133.413300 2.591545 +v 59.013474 -133.174103 2.730376 +v 59.756893 -133.124756 2.701907 +v 60.982693 -132.178040 2.731928 +v 59.679306 -132.834839 2.794284 +v 60.599369 -132.344818 2.791033 +v 61.056393 -131.270050 2.790982 +v -59.207817 -125.861320 2.793944 +v 59.561317 -125.881966 2.792318 +v 1.009265 -125.511131 -5.253121 +v 60.064846 -132.657715 -0.503117 +v 60.698875 -131.945190 -0.503120 +v 60.756817 -131.918671 -3.503120 +v -59.911755 -132.684570 -0.503120 +v -60.690269 -131.999237 -0.503119 +v -60.730717 -132.078217 -3.503112 +v -60.369400 -132.484894 -0.503116 +v 56.647533 -120.970055 -3.535595 +v 60.767353 -125.250771 -3.503121 +v 60.714985 -125.381752 -0.503123 +v -61.373013 -132.894287 -3.503116 +v -60.727161 -133.470673 -3.503116 +v -60.160641 -132.692505 -3.503105 +v -60.036026 -133.696899 -3.503120 +v 60.210030 -133.679718 -3.503113 +v 60.015305 -132.722931 -3.503118 +v 60.531811 -132.400574 -3.503117 +v -60.767567 -125.250771 -3.503121 +v -60.715199 -125.381752 -0.503123 +v -59.454121 -125.341301 -0.503142 +v -57.926945 -124.260109 -0.503125 +v -57.513344 -123.327522 -0.503141 +v -57.246933 -121.507729 -0.503120 +v 57.260761 -121.525917 -0.503121 +v 57.473972 -121.955177 -0.503115 +v 57.503975 -123.167168 -0.503128 +v 60.502861 -132.341034 -0.503120 +v 59.679684 -125.363701 -0.503126 +v 57.475719 -121.514015 -4.641304 +v 57.136456 -121.179283 -4.167922 +v 56.765976 -121.130943 -0.503090 +v 57.699539 -122.447563 -5.196053 +v -57.470043 -121.940819 -0.503114 +v -57.679825 -122.027122 -5.023052 +v -57.556648 -121.649193 -4.769504 +v -57.179962 -121.196938 -4.222804 +v -56.732906 -121.118340 -0.503094 +v -56.598572 -120.966499 -3.480691 +v 57.828594 -124.128883 -0.503133 +v 58.683777 -125.019493 -0.503143 +v 58.740093 -124.806511 -5.253140 +v 59.712776 -125.162056 -5.253126 +v 61.795921 -125.174385 -5.253121 +v 61.734814 -125.250771 -3.503121 +v 61.194118 -133.130707 -3.503105 +v 61.322250 -133.082642 -5.253096 +v 61.701687 -132.176971 -3.503115 +v -61.714481 -132.102081 -3.503117 +v -60.804138 -133.497345 -5.253114 +v -61.796135 -125.174385 -5.253121 +v -61.735027 -125.250771 -3.503121 +v -59.739876 -125.163811 -5.253124 +v -58.453651 -124.837196 -0.503129 +v -58.178078 -124.286705 -5.253142 +v 57.707520 -123.079460 -5.258509 +v -57.699478 -122.533836 -5.220398 +v 57.668495 -121.954689 -4.985284 +v -61.781857 -132.020447 -5.253120 +v -61.509552 -132.813416 -5.253111 +v -60.052338 -133.759033 -5.253120 +v -58.980675 -124.929131 -5.253127 +v -57.740059 -123.317055 -5.254305 +v 57.977913 -123.968819 -5.253132 +v 61.774746 -132.113647 -5.253115 +v 60.301826 -133.723877 -5.253114 +vn 0.0011 0.9998 -0.0195 +vn -0.0005 0.9998 -0.0192 +vn -0.0000 -0.9338 0.3577 +vn -0.0000 -0.9424 0.3346 +vn -0.0000 -0.5642 0.8256 +vn -0.0000 -0.5717 0.8205 +vn 0.0001 -0.9620 -0.2732 +vn -0.0001 -0.8503 -0.5264 +vn 0.0001 -0.5224 -0.8527 +vn -0.0000 -0.3458 -0.9383 +vn -0.0000 -0.1532 0.9882 +vn 0.0078 -0.2202 0.9754 +vn -0.0073 -0.3460 0.9382 +vn -0.0006 -0.3979 0.9174 +vn -0.3645 -0.6413 0.6752 +vn -0.0053 -0.5488 0.8359 +vn -0.0084 -0.5629 0.8265 +vn -0.0005 -0.7139 0.7002 +vn 0.0085 -0.6907 0.7231 +vn -0.0162 -0.8255 0.5642 +vn -0.0091 -0.9156 0.4019 +vn 0.0076 -0.9422 0.3349 +vn -0.0066 -0.9776 0.2106 +vn 0.0958 -0.9316 0.3506 +vn 0.1154 -0.6912 0.7134 +vn 0.2149 -0.8312 0.5127 +vn 0.1091 -0.7012 0.7045 +vn 0.2889 -0.6996 0.6535 +vn 0.0949 -0.3936 0.9144 +vn 0.3036 -0.7391 0.6013 +vn 0.2684 -0.6956 0.6664 +vn 0.4147 -0.7584 0.5028 +vn 0.1680 -0.2895 0.9423 +vn 0.4170 -0.6584 0.6266 +vn 0.1049 -0.1606 0.9814 +vn 0.5516 -0.6961 0.4596 +vn 0.5491 -0.6046 0.5770 +vn 0.4744 -0.4821 0.7366 +vn 0.5643 -0.4066 0.7185 +vn 0.4757 -0.3786 0.7939 +vn 0.6692 -0.3409 0.6603 +vn 0.6102 -0.3322 0.7192 +vn 0.6927 -0.2056 0.6913 +vn 0.6610 -0.2074 0.7211 +vn 0.1360 -0.0556 0.9891 +vn 0.8620 -0.0958 0.4977 +vn 0.6874 -0.1243 0.7155 +vn 0.0708 -0.9247 -0.3741 +vn 0.1578 -0.9717 -0.1756 +vn 0.2083 -0.8894 -0.4070 +vn 0.0423 -0.6253 -0.7792 +vn 0.1541 -0.5957 -0.7883 +vn 0.1566 -0.4824 -0.8618 +vn 0.3850 -0.9117 -0.1436 +vn 0.3892 -0.8670 -0.3111 +vn 0.1331 -0.3729 -0.9183 +vn 0.5241 -0.7481 -0.4070 +vn 0.4714 -0.7226 -0.5056 +vn 0.2835 -0.4475 -0.8482 +vn 0.6687 -0.6878 -0.2823 +vn 0.6272 -0.6710 -0.3955 +vn 0.4842 -0.4613 -0.7435 +vn 0.1742 -0.1991 -0.9644 +vn 0.0821 -0.0824 -0.9932 +vn 0.7930 -0.5524 -0.2570 +vn 0.7950 -0.5559 -0.2428 +vn 0.6001 -0.4374 -0.6697 +vn 0.4782 -0.3026 -0.8245 +vn 0.8187 -0.3868 -0.4244 +vn 0.5309 -0.2437 -0.8116 +vn 0.9315 -0.3529 -0.0883 +vn 0.4453 -0.1705 -0.8790 +vn 0.2252 -0.0680 -0.9719 +vn 0.8696 -0.2079 -0.4479 +vn 0.8947 -0.1742 -0.4113 +vn 0.7213 -0.0451 -0.6912 +vn 0.7272 0.0027 -0.6864 +vn 0.7137 0.0159 -0.7003 +vn 0.5219 0.0842 -0.8488 +vn 0.0060 -0.1707 0.9853 +vn -0.0009 -0.2080 0.9781 +vn 0.0061 -0.4126 0.9109 +vn 0.0261 -0.3218 0.9464 +vn 0.0131 -0.6098 0.7924 +vn -0.0111 -0.5147 0.8573 +vn 0.0124 -0.6924 0.7214 +vn -0.0015 -0.7947 0.6070 +vn -0.0098 -0.8165 0.5772 +vn 0.0148 -0.8864 0.4628 +vn 0.0220 -0.9498 0.3119 +vn -0.0000 -0.9994 -0.0345 +vn -0.0000 -0.9994 -0.0346 +vn -0.0919 -0.9201 0.3807 +vn -0.2204 -0.8058 0.5497 +vn -0.1075 -0.7003 0.7057 +vn -0.0743 -0.5725 0.8165 +vn -0.2528 -0.7357 0.6284 +vn -0.0624 -0.2711 0.9605 +vn -0.3415 -0.8069 0.4819 +vn -0.2942 -0.7493 0.5933 +vn -0.0245 -0.0652 0.9976 +vn -0.2059 -0.3704 0.9058 +vn -0.5128 -0.7678 0.3841 +vn -0.4591 -0.7211 0.5189 +vn -0.3263 -0.5083 0.7970 +vn -0.6371 -0.7123 0.2944 +vn -0.5559 -0.5182 0.6499 +vn -0.3806 -0.3623 0.8508 +vn -0.3135 -0.2866 0.9053 +vn -0.7343 -0.5649 0.3763 +vn -0.8139 -0.4219 0.3994 +vn -0.7226 -0.4023 0.5621 +vn -0.4807 -0.2489 0.8408 +vn -0.4394 -0.2319 0.8678 +vn -0.8771 -0.3880 0.2833 +vn -0.9206 -0.2679 0.2843 +vn -0.8623 -0.2831 0.4198 +vn -0.6281 -0.2093 0.7494 +vn -0.4530 -0.0998 0.8859 +vn -0.9446 -0.1476 0.2931 +vn -0.8752 -0.1082 0.4715 +vn -0.5968 -0.0828 0.7981 +vn -0.1512 -0.9611 -0.2311 +vn -0.0388 -0.8272 -0.5606 +vn -0.2147 -0.8745 -0.4349 +vn -0.0620 -0.5055 -0.8606 +vn -0.0821 -0.4719 -0.8778 +vn -0.0800 -0.4028 -0.9118 +vn -0.3162 -0.8917 -0.3238 +vn -0.3416 -0.8172 -0.4642 +vn -0.2913 -0.6068 -0.7396 +vn -0.1911 -0.4374 -0.8787 +vn -0.5348 -0.8449 -0.0142 +vn -0.5408 -0.7777 -0.3203 +vn -0.3976 -0.6074 -0.6877 +vn -0.3442 -0.4374 -0.8308 +vn -0.6604 -0.6883 -0.3002 +vn -0.6535 -0.6609 -0.3689 +vn -0.5529 -0.5653 -0.6122 +vn -0.1624 -0.1739 -0.9713 +vn -0.3981 -0.3304 -0.8558 +vn -0.8009 -0.5817 -0.1420 +vn -0.7642 -0.5838 -0.2742 +vn -0.5236 -0.3425 -0.7801 +vn -0.8284 -0.4716 -0.3024 +vn -0.5211 -0.2960 -0.8006 +vn -0.4938 -0.2898 -0.8199 +vn -0.9031 -0.4250 -0.0616 +vn -0.8548 -0.3194 -0.4091 +vn -0.6488 -0.2521 -0.7180 +vn -0.9773 -0.1921 -0.0897 +vn -0.8956 -0.1340 -0.4242 +vn -0.4772 -0.1109 -0.8718 +vn -0.3356 -0.0617 -0.9400 +vn -0.8616 -0.0348 -0.5064 +vn -0.5361 0.0356 -0.8434 +vn -0.0000 0.0006 1.0000 +vn -0.0000 -0.0032 1.0000 +vn 0.0007 -0.0033 1.0000 +vn -0.0001 0.0006 1.0000 +vn 0.0025 -0.0013 1.0000 +vn 0.0001 -0.0006 1.0000 +vn -0.0006 -0.0011 1.0000 +vn -0.0006 -0.0010 1.0000 +vn -0.0009 -0.0008 1.0000 +vn 0.0004 -0.0009 1.0000 +vn 0.0016 0.0008 1.0000 +vn -0.0020 0.0021 1.0000 +vn 0.0023 0.0054 1.0000 +vn -0.0026 0.0003 1.0000 +vn -0.0022 -0.0030 1.0000 +vn -0.0028 0.0008 1.0000 +vn -0.0033 0.0023 1.0000 +vn 0.0001 0.0005 1.0000 +vn 0.0001 -0.0000 1.0000 +vn 0.0047 -0.0000 1.0000 +vn -0.0050 -0.0001 1.0000 +vn 0.0058 -0.0000 1.0000 +vn 0.0285 0.0023 0.9996 +vn -0.0010 -0.0001 1.0000 +vn 0.0011 -0.0103 0.9999 +vn 0.6890 -0.0018 0.7248 +vn 0.6845 0.0003 0.7290 +vn 0.5761 0.0027 0.8174 +vn 0.5828 0.0003 0.8126 +vn 0.4090 0.0016 0.9125 +vn 0.4275 -0.0042 0.9040 +vn 0.2433 -0.0012 0.9700 +vn 0.2408 -0.0002 0.9706 +vn 0.1272 -0.0059 0.9919 +vn 0.2005 0.0091 0.9797 +vn 0.3421 -0.0121 0.9396 +vn 0.4162 0.0076 0.9092 +vn 0.5514 -0.0057 0.8343 +vn 0.5634 -0.0016 0.8262 +vn -0.0000 0.0055 1.0000 +vn -0.0000 0.0049 1.0000 +vn -0.2200 -0.0048 0.9755 +vn -0.2733 0.0118 0.9619 +vn -0.3730 -0.0054 0.9278 +vn -0.4798 -0.0099 0.8773 +vn -0.5283 0.0126 0.8489 +vn -0.6176 0.0091 0.7864 +vn -0.6844 -0.0016 0.7291 +vn -0.6669 -0.0075 0.7451 +vn -0.5641 0.0102 0.8257 +vn -0.4836 -0.0000 0.8753 +vn -0.4792 0.0013 0.8777 +vn -0.2604 -0.0021 0.9655 +vn -0.2443 0.0054 0.9697 +vn -0.0330 0.0021 0.9995 +vn 0.0021 -0.0141 0.9999 +vn -0.0018 0.0084 1.0000 +vn 0.0775 0.3487 0.9340 +vn 0.1089 0.8139 0.5707 +vn 0.1448 0.8727 0.4662 +vn 0.3698 0.9251 -0.0860 +vn 0.2511 0.6286 0.7361 +vn 0.2579 0.8556 0.4489 +vn 0.2964 0.6882 0.6622 +vn 0.2453 0.4641 0.8511 +vn 0.4169 0.7980 0.4351 +vn 0.4157 0.7594 0.5004 +vn 0.2832 0.3605 0.8887 +vn 0.5622 0.7462 0.3565 +vn 0.3839 0.4215 0.8216 +vn 0.5460 0.6014 0.5833 +vn 0.2964 0.2536 0.9208 +vn 0.6857 0.6106 0.3963 +vn 0.6468 0.4970 0.5785 +vn 0.4321 0.2564 0.8646 +vn 0.3974 0.2236 0.8900 +vn 0.8241 0.4490 0.3454 +vn 0.7604 0.3309 0.5588 +vn 0.5206 0.1612 0.8384 +vn 0.6758 0.2406 0.6967 +vn 0.9214 0.2375 0.3075 +vn 0.4942 -0.0313 0.8688 +vn 0.8120 0.1515 0.5636 +vn -0.0000 0.5184 0.8552 +vn -0.0001 0.3723 0.9281 +vn -0.0000 0.6366 0.7712 +vn -0.0001 0.8935 0.4491 +vn -0.0000 0.9133 0.4073 +vn -0.0264 0.2468 0.9687 +vn -0.2340 0.8251 0.5142 +vn -0.0995 0.6283 0.7716 +vn -0.2034 0.8760 0.4374 +vn -0.2393 0.5836 0.7760 +vn -0.2888 0.7246 0.6258 +vn -0.2200 0.4680 0.8559 +vn -0.4957 0.8347 0.2399 +vn -0.3357 0.4256 0.8404 +vn -0.4035 0.4826 0.7773 +vn -0.5721 0.7510 0.3297 +vn -0.3549 0.2831 0.8910 +vn -0.6049 0.5828 0.5426 +vn -0.7032 0.5951 0.3891 +vn -0.4868 0.3064 0.8180 +vn -0.5792 0.4034 0.7084 +vn -0.7671 0.4565 0.4508 +vn -0.7064 0.2332 0.6683 +vn -0.6074 0.2636 0.7494 +vn -0.7357 0.2735 0.6196 +vn -0.6660 0.1595 -0.7287 +vn -0.8241 0.1313 0.5510 +vn -0.8023 0.1390 0.5805 +vn -0.7018 -0.0990 0.7054 +vn -0.0016 0.9998 -0.0214 +vn -0.0115 0.9997 -0.0197 +vn 0.0281 0.0537 -0.9982 +vn -0.0064 0.1815 -0.9834 +vn -0.0101 0.1837 -0.9829 +vn -0.0185 0.3568 -0.9340 +vn 0.0213 0.3294 -0.9440 +vn -0.0415 0.4346 -0.8997 +vn 0.0188 0.5181 -0.8551 +vn -0.0389 0.5971 -0.8012 +vn 0.0103 0.6416 -0.7670 +vn -0.0063 0.6606 -0.7507 +vn 0.0074 0.7646 -0.6445 +vn -0.0036 0.7729 -0.6345 +vn 0.0202 0.8273 -0.5615 +vn -0.0312 0.8721 -0.4884 +vn 0.0252 0.9173 -0.3974 +vn -0.0124 0.9429 -0.3328 +vn 0.0180 0.9648 -0.2622 +vn -0.0159 0.9887 -0.1490 +vn -0.0033 0.9868 -0.1619 +vn -0.0000 0.0064 -1.0000 +vn -0.0000 0.0033 -1.0000 +vn 0.0011 0.0066 -1.0000 +vn 0.0012 0.0063 -1.0000 +vn -0.0032 0.0022 -1.0000 +vn -0.0050 0.0028 -1.0000 +vn -0.0029 0.0231 -0.9997 +vn 0.0022 -0.0031 -1.0000 +vn 0.0007 -0.0037 -1.0000 +vn -0.0184 0.0148 -0.9997 +vn -0.0111 0.0118 -0.9999 +vn 0.0015 0.0029 -1.0000 +vn -0.0065 0.0027 -1.0000 +vn 0.0003 0.0033 -1.0000 +vn -0.0017 -0.0047 -1.0000 +vn -0.0028 0.0048 -1.0000 +vn -0.0156 -0.0001 -0.9999 +vn -0.0087 0.0092 -0.9999 +vn 0.0105 0.0729 -0.9973 +vn -0.0269 0.2054 -0.9783 +vn 0.0100 0.1795 -0.9837 +vn 0.0033 0.3422 -0.9396 +vn -0.0124 0.3571 -0.9340 +vn 0.0095 0.4648 -0.8853 +vn -0.0077 0.4889 -0.8723 +vn 0.0282 0.5856 -0.8101 +vn 0.0162 0.5968 -0.8022 +vn 0.0185 0.7026 -0.7114 +vn -0.0100 0.7246 -0.6891 +vn 0.0156 0.7855 -0.6186 +vn -0.0309 0.8305 -0.5561 +vn 0.0165 0.8764 -0.4813 +vn -0.0226 0.9116 -0.4105 +vn 0.0233 0.9442 -0.3286 +vn -0.0196 0.9681 -0.2499 +vn 0.0038 0.9883 -0.1525 +vn 0.0093 0.9869 -0.1608 +vn 0.5474 -0.1143 0.8290 +vn 0.8924 -0.1218 0.4345 +vn 0.4523 -0.2117 0.8664 +vn 0.5162 -0.2743 0.8114 +vn 0.8617 -0.1865 0.4719 +vn 0.3411 -0.4529 0.8237 +vn 0.9344 -0.2007 0.2943 +vn 0.7107 -0.3028 0.6350 +vn 0.4783 -0.5042 0.7191 +vn 0.2336 -0.7036 0.6711 +vn 0.5331 -0.5797 0.6162 +vn 0.9026 -0.3176 0.2906 +vn 0.7204 -0.5083 0.4719 +vn 0.9272 -0.2855 0.2425 +vn 0.1411 -0.8157 0.5610 +vn 0.4638 -0.8021 0.3762 +vn 0.7008 -0.6517 0.2901 +vn 0.9372 -0.2958 0.1848 +vn 0.4061 -0.8980 0.1697 +vn 0.8687 -0.0001 0.4954 +vn 0.8182 -0.0000 0.5749 +vn 0.5123 -0.0000 0.8588 +vn 0.2401 -0.0001 0.9708 +vn 0.1423 -0.9892 -0.0346 +vn 0.2340 -0.9717 -0.0332 +vn 0.1602 -0.9865 -0.0352 +vn 0.3755 -0.9262 -0.0350 +vn 0.4799 -0.8767 -0.0335 +vn 0.3901 -0.9201 -0.0358 +vn 0.6102 -0.7915 -0.0333 +vn 0.5674 -0.8227 -0.0351 +vn 0.7372 -0.6748 -0.0337 +vn 0.6961 -0.7170 -0.0356 +vn 0.7943 -0.6067 -0.0334 +vn 0.8202 -0.5710 -0.0354 +vn 0.8885 -0.4577 -0.0324 +vn 0.9345 -0.3541 -0.0358 +vn 0.9546 -0.2960 -0.0333 +vn 0.9875 -0.1539 -0.0348 +vn 0.9892 -0.1422 -0.0344 +vn 0.9990 -0.0281 -0.0353 +vn 0.4041 0.1706 -0.8987 +vn 0.8629 0.1252 -0.4897 +vn 0.6859 0.2080 -0.6974 +vn 0.9839 0.0528 -0.1709 +vn 0.5575 0.2981 -0.7748 +vn 0.5694 0.3412 -0.7479 +vn 0.7290 0.3293 -0.6001 +vn 0.6478 0.4374 -0.6237 +vn 0.7483 0.4258 -0.5087 +vn 0.7292 0.4621 -0.5047 +vn 0.5437 0.6023 -0.5845 +vn 0.9081 0.3136 -0.2773 +vn 0.4234 0.7154 -0.5558 +vn 0.8603 0.4040 -0.3110 +vn 0.5170 0.7020 -0.4897 +vn 0.4195 0.7831 -0.4591 +vn 0.8721 0.4299 -0.2338 +vn 0.5993 0.7204 -0.3491 +vn 0.9613 0.2481 -0.1195 +vn 0.4544 0.8383 -0.3014 +vn 0.8982 0.4191 -0.1326 +vn 0.5950 0.7749 -0.2132 +vn 0.4489 0.8778 -0.1672 +vn 0.9259 0.3755 -0.0424 +vn 0.8025 0.5954 -0.0386 +vn 0.6209 0.7828 -0.0415 +vn -0.1938 0.3806 0.9042 +vn -0.3886 0.2665 0.8820 +vn -0.2027 0.4233 0.8830 +vn -0.4548 0.5598 0.6927 +vn -0.5714 0.5532 0.6062 +vn -0.3146 0.4874 0.8145 +vn -0.5685 0.5748 0.5886 +vn -0.4938 0.5022 0.7099 +vn -0.1073 0.7902 0.6033 +vn -0.2425 0.7395 0.6280 +vn -0.2343 0.8503 0.4712 +vn -0.1370 0.9037 0.4057 +vn -0.2793 0.8987 0.3380 +vn -0.4479 0.7847 0.4285 +vn -0.2045 0.8433 0.4971 +vn -0.5234 0.5614 0.6411 +vn -0.3247 0.6526 0.6846 +vn -0.3184 0.6559 0.6844 +vn -0.2232 0.5512 0.8040 +vn -0.1179 0.6944 0.7099 +vn -0.3843 0.7132 0.5863 +vn -0.2265 0.9441 0.2395 +vn -0.1034 0.9349 0.3396 +vn 0.0011 0.5442 0.8389 +vn -0.0033 0.6817 0.7316 +vn -0.9999 -0.0046 0.0157 +vn -0.9996 0.0009 0.0273 +vn -0.9867 -0.0004 -0.1625 +vn -0.9999 -0.0032 0.0154 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 0.0001 1.0000 +vn 0.9998 -0.0020 0.0204 +vn 0.9999 0.0026 0.0123 +vn 0.9999 0.0001 0.0149 +vn 0.9999 0.0013 0.0147 +vn 0.0002 0.5830 0.8125 +vn -0.0009 0.5514 0.8342 +vn 0.0038 0.8443 0.5358 +vn 0.2305 0.3562 0.9055 +vn 0.4886 0.5166 0.7031 +vn 0.3877 0.4778 0.7883 +vn 0.4890 0.5501 0.6770 +vn 0.2811 0.6013 0.7479 +vn 0.2025 0.7968 0.5694 +vn 0.1882 0.9531 0.2371 +vn 0.1344 0.9731 0.1874 +vn 0.1413 0.4016 0.9049 +vn 0.2712 0.5193 0.8104 +vn 0.4628 0.2315 0.8557 +vn 0.5051 0.4920 0.7091 +vn 0.6551 0.3649 0.6616 +vn 0.1931 0.2391 0.9516 +vn 0.5646 0.5467 0.6184 +vn 0.2909 0.8282 0.4791 +vn 0.1305 0.8348 0.5348 +vn 0.2706 0.6388 0.7202 +vn 0.3722 0.8659 0.3341 +vn 0.3442 0.7792 0.5238 +vn 0.0838 0.9777 0.1926 +vn 0.4393 0.5206 0.7321 +vn -0.0000 0.3342 0.9425 +vn -0.0000 0.4413 0.8974 +vn -0.0000 0.6865 0.7271 +vn 0.0001 0.8491 0.5282 +vn -0.0000 0.9025 0.4306 +vn -0.3814 -0.2028 0.9019 +vn -0.6957 -0.0320 0.7177 +vn -0.4960 -0.3408 0.7987 +vn -0.6627 -0.2619 0.7016 +vn -0.9708 -0.0841 0.2247 +vn -0.4422 -0.3222 0.8371 +vn -0.2456 -0.5698 0.7843 +vn -0.7019 -0.2851 0.6527 +vn -0.8767 -0.2830 0.3890 +vn -0.4871 -0.5924 0.6417 +vn -0.4947 -0.5924 0.6359 +vn -0.8981 -0.2682 0.3485 +vn 0.9837 -0.1020 0.1480 +vn -0.7889 -0.5101 0.3426 +vn -0.4691 -0.7324 0.4935 +vn -0.5581 -0.6601 0.5027 +vn -0.5429 -0.7275 0.4195 +vn -0.8679 -0.3955 0.3004 +vn -0.4530 -0.8029 0.3875 +vn -0.5279 -0.8216 0.2152 +vn -0.8876 -0.4161 0.1975 +vn -0.8819 -0.0001 0.4714 +vn -0.8856 -0.0001 0.4644 +vn -0.6671 -0.0000 0.7450 +vn -0.5142 -0.0001 0.8577 +vn -0.3763 -0.0000 0.9265 +vn -0.1475 -0.9884 -0.0349 +vn -0.1470 -0.9885 -0.0349 +vn -0.2265 -0.9734 -0.0333 +vn -0.3326 -0.9424 -0.0355 +vn -0.3890 -0.9206 -0.0331 +vn -0.5356 -0.8438 -0.0353 +vn -0.5345 -0.8444 -0.0353 +vn -0.6776 -0.7346 -0.0341 +vn -0.6917 -0.7213 -0.0350 +vn -0.7917 -0.6100 -0.0338 +vn -0.8085 -0.5874 -0.0351 +vn -0.8632 -0.5037 -0.0344 +vn -0.9042 -0.4256 -0.0362 +vn -0.9191 -0.3924 -0.0346 +vn -0.9557 -0.2924 -0.0337 +vn -0.9808 -0.1913 -0.0371 +vn -0.9903 -0.1346 -0.0344 +vn -0.9256 0.0500 -0.3753 +vn -0.7168 0.1535 -0.6802 +vn -0.4810 0.1350 -0.8663 +vn -0.6690 0.2293 -0.7070 +vn -0.7244 0.2698 -0.6344 +vn -0.6012 0.3612 -0.7128 +vn -0.9915 0.0531 -0.1192 +vn -0.8468 0.3233 -0.4225 +vn -0.6162 0.4128 -0.6707 +vn -0.7144 0.4918 -0.4978 +vn -0.5620 0.5944 -0.5752 +vn -0.3394 0.7232 -0.6015 +vn -0.9042 0.3433 -0.2540 +vn -0.6437 0.6681 -0.3731 +vn -0.4545 0.7640 -0.4580 +vn -0.6009 0.7452 -0.2891 +vn -0.6090 0.7406 -0.2841 +vn -0.9490 0.3001 -0.0966 +vn -0.8677 0.4885 -0.0925 +vn -0.4726 0.8653 -0.1673 +vn -0.5211 0.8400 -0.1510 +vn -0.8321 0.5531 -0.0411 +vn -0.7616 0.6469 -0.0382 +vn -0.5181 0.8544 -0.0391 +vn 0.3152 -0.9490 0.0011 +vn 0.2951 -0.9552 0.0222 +vn 0.5621 -0.8258 0.0451 +vn 0.6010 -0.7992 0.0020 +vn 0.8035 -0.5952 0.0076 +vn 0.8318 -0.5535 0.0416 +vn 0.9476 -0.3196 0.0015 +vn 0.9696 -0.2426 0.0332 +vn 0.9990 -0.0451 -0.0001 +vn -0.0189 -0.9997 0.0170 +vn -0.0343 -0.9993 0.0159 +vn -0.0214 -0.9986 0.0480 +vn 0.0012 -0.9998 0.0205 +vn 0.0058 -0.9999 0.0139 +vn 0.0031 -0.9997 0.0251 +vn 0.8940 -0.0001 0.4480 +vn 0.6940 0.0001 0.7199 +vn 0.4610 -0.0000 0.8874 +vn -0.8989 -0.0000 0.4381 +vn -0.7290 -0.0000 0.6845 +vn -0.6762 -0.0001 0.7367 +vn -0.2862 -0.0000 0.9582 +vn 0.0020 -0.7827 0.6224 +vn 0.0001 -0.7028 0.7114 +vn 0.0026 -0.4752 0.8799 +vn 0.2418 -0.9186 0.3126 +vn 0.1215 -0.9338 0.3364 +vn 0.4555 -0.7406 0.4940 +vn 0.2602 -0.8729 0.4127 +vn 0.1784 -0.6829 0.7084 +vn 0.2063 -0.7488 0.6298 +vn 0.5748 -0.5204 0.6315 +vn 0.4745 -0.5335 0.7002 +vn 0.5751 -0.5167 0.6343 +vn 0.4756 -0.4881 0.7318 +vn 0.4094 -0.4264 0.8066 +vn 0.1994 -0.4402 0.8755 +vn 0.1263 -0.9681 0.2163 +vn 0.3408 0.8124 0.4731 +vn 0.0545 -0.9540 0.2947 +vn 0.2707 -0.8259 0.4946 +vn 0.3126 -0.5243 0.7921 +vn 0.6503 -0.5294 0.5448 +vn 0.0895 -0.6967 0.7117 +vn 0.3217 -0.6893 0.6491 +vn 0.3091 -0.5109 0.8022 +vn 0.2182 -0.3925 0.8935 +vn 0.5492 -0.2889 0.7841 +vn -0.0002 0.1561 0.9877 +vn -0.0000 -0.8016 0.5978 +vn -0.0000 -0.7588 0.6514 +vn -0.0000 -0.4010 0.9161 +vn -0.0000 -0.3873 0.9220 +vn -0.0514 -0.8940 0.4451 +vn -0.2838 -0.7615 0.5828 +vn -0.2511 -0.8030 0.5405 +vn -0.1386 -0.7697 0.6232 +vn -0.3680 -0.8321 0.4149 +vn -0.3921 -0.4626 0.7952 +vn -0.4862 -0.5600 0.6709 +vn -0.1978 -0.2872 0.9372 +vn -0.2382 -0.4691 0.8504 +vn -0.4760 -0.2476 0.8438 +vn -0.3080 -0.8714 0.3818 +vn -0.3095 -0.8316 0.4612 +vn -0.1778 -0.8927 0.4141 +vn -0.2163 -0.6633 0.7164 +vn -0.2219 -0.6741 0.7045 +vn -0.1251 -0.7048 0.6983 +vn -0.4870 -0.4769 0.7317 +vn -0.4627 -0.3856 0.7983 +vn -0.6233 -0.4074 0.6675 +vn -0.0482 -0.4349 0.8992 +vn -0.6203 -0.3303 0.7114 +vn -0.2469 -0.1391 0.9590 +vn -0.0018 -0.8921 0.4518 +vn 0.0018 -0.7465 0.6654 +vn -0.0034 -0.3957 0.9184 +vn 0.0215 -0.9996 0.0172 +vn -0.0130 -0.9997 0.0198 +vn 0.0051 -0.9998 0.0172 +vn -0.0028 -0.9997 0.0242 +vn -0.0017 -1.0000 -0.0052 +vn -0.0080 -0.9993 0.0369 +vn -0.2434 -0.9681 0.0590 +vn -0.3742 -0.9261 -0.0483 +vn -0.5539 -0.8286 0.0816 +vn -0.7271 -0.6857 -0.0327 +vn -0.8287 -0.5577 0.0483 +vn -0.9185 -0.3953 -0.0079 +vn -0.9573 -0.2864 0.0379 +vn -0.9990 -0.0445 0.0015 +vn 0.1327 0.9907 0.0308 +vn 0.2994 0.9533 0.0405 +vn 0.3094 0.9501 0.0387 +vn 0.4760 0.8789 0.0290 +vn 0.6145 0.7877 0.0437 +vn 0.6636 0.7473 0.0340 +vn 0.8024 0.5959 0.0324 +vn 0.8413 0.5390 0.0418 +vn 0.9161 0.3996 0.0311 +vn 0.9584 0.2827 0.0402 +vn 0.9571 0.2870 0.0407 +vn 0.9917 0.1246 0.0313 +vn -0.0002 0.9990 0.0443 +vn -0.0000 0.9993 0.0380 +vn -0.2045 0.9785 0.0262 +vn -0.3906 0.9198 0.0375 +vn -0.4313 0.9011 0.0452 +vn -0.4775 0.8777 0.0399 +vn -0.6335 0.7730 0.0330 +vn -0.7378 0.6736 0.0434 +vn -0.7414 0.6697 0.0423 +vn -0.8349 0.5496 0.0295 +vn -0.9177 0.3958 0.0339 +vn -0.9585 0.2812 0.0472 +vn -0.9486 0.3138 0.0405 +vn -0.9871 0.1571 0.0316 +vn 0.9382 0.3448 -0.0295 +vn 0.6055 0.7953 -0.0273 +vn 0.5178 0.8550 -0.0301 +vn 0.9451 0.0510 -0.3226 +vn 0.8321 0.1013 -0.5453 +vn 0.2669 0.1936 -0.9441 +vn 0.7695 0.1727 -0.6148 +vn 0.4170 0.2440 -0.8756 +vn 0.8330 0.1957 -0.5175 +vn 0.2140 0.3456 -0.9136 +vn 0.9395 0.1391 -0.3131 +vn 0.4586 0.3796 -0.8035 +vn 0.3585 0.4758 -0.8031 +vn 0.8404 0.3041 -0.4485 +vn 0.5172 0.4854 -0.7049 +vn 0.4054 0.5807 -0.7060 +vn 0.9196 0.2569 -0.2971 +vn 0.7102 0.5114 -0.4838 +vn 0.6616 0.5701 -0.4871 +vn 0.6806 0.5835 -0.4432 +vn 0.4192 0.7656 -0.4880 +vn 0.9001 0.3700 -0.2303 +vn 0.7142 0.6442 -0.2739 +vn 0.3998 0.8257 -0.3980 +vn 0.7518 0.6265 -0.2057 +vn 0.6487 0.7396 -0.1796 +vn 0.6472 0.7437 -0.1678 +vn 0.5046 0.8548 -0.1211 +vn 0.4113 0.0619 -0.9094 +vn 0.5482 0.0953 -0.8309 +vn 0.8465 0.1036 -0.5222 +vn 0.0819 0.4354 -0.8965 +vn 0.2533 0.7188 -0.6474 +vn 0.1105 0.8641 -0.4911 +vn 0.1344 0.9035 -0.4069 +vn 0.1994 0.5995 -0.7752 +vn 0.2583 0.8081 -0.5294 +vn 0.2754 0.8245 -0.4944 +vn 0.3037 0.7556 -0.5804 +vn 0.2123 0.4661 -0.8589 +vn 0.4785 0.7973 -0.3678 +vn 0.4847 0.7605 -0.4322 +vn 0.3310 0.4320 -0.8389 +vn 0.4355 0.5252 -0.7310 +vn 0.5880 0.7672 -0.2564 +vn 0.6204 0.6459 -0.4450 +vn 0.3398 0.3288 -0.8812 +vn 0.7376 0.6208 -0.2657 +vn 0.5217 0.3774 -0.7651 +vn 0.7367 0.5584 -0.3814 +vn 0.4619 0.2832 -0.8405 +vn 0.8460 0.5060 -0.1680 +vn 0.8368 0.4002 -0.3736 +vn 0.5095 0.1870 -0.8399 +vn 0.5990 0.2078 -0.7733 +vn 0.8231 0.3270 -0.4642 +vn 0.9410 0.3356 -0.0429 +vn 0.7208 0.1219 -0.6823 +vn 0.9296 0.1773 -0.3230 +vn 0.9267 0.1774 -0.3313 +vn -0.0000 0.5909 -0.8067 +vn -0.0000 0.5874 -0.8093 +vn -0.0000 0.9089 -0.4171 +vn -0.0000 0.9363 -0.3513 +vn -0.1042 0.4580 -0.8829 +vn -0.3088 0.8818 -0.3566 +vn -0.0979 0.8185 -0.5660 +vn -0.1555 0.9182 -0.3643 +vn -0.2771 0.7714 -0.5728 +vn -0.2755 0.7678 -0.5784 +vn -0.2699 0.8283 -0.4909 +vn -0.2805 0.8263 -0.4884 +vn -0.4087 0.5488 -0.7292 +vn -0.4892 0.8654 0.1083 +vn -0.3524 0.5005 -0.7907 +vn -0.5679 0.7054 -0.4242 +vn -0.4327 0.3587 -0.8271 +vn -0.5867 0.5396 -0.6038 +vn -0.7301 0.6319 -0.2601 +vn -0.7260 0.6223 -0.2926 +vn -0.7713 0.5701 -0.2828 +vn -0.4323 0.2750 -0.8588 +vn -0.6994 0.3897 -0.5992 +vn -0.8455 0.5285 -0.0763 +vn -0.8088 0.4070 -0.4245 +vn -0.5271 0.1554 -0.8355 +vn -0.6548 0.2216 -0.7225 +vn -0.9314 0.2591 -0.2557 +vn -0.9495 0.2814 -0.1391 +vn -0.9717 0.2197 0.0872 +vn -0.9765 0.1095 -0.1855 +vn -0.9799 0.1082 -0.1677 +vn -0.7700 0.0899 -0.6316 +vn -0.5822 0.1040 -0.8064 +vn -0.9003 0.0806 -0.4277 +vn -0.4147 0.1677 -0.8944 +vn -0.6263 0.2462 -0.7397 +vn -0.6167 0.2593 -0.7433 +vn -0.8865 0.2077 -0.4136 +vn -0.6949 0.2805 -0.6621 +vn -0.4327 0.4560 -0.7777 +vn -0.8088 0.3345 -0.4836 +vn -0.5224 0.4835 -0.7024 +vn -0.3523 0.5724 -0.7404 +vn -0.8970 0.2851 -0.3378 +vn -0.8291 0.3927 -0.3979 +vn -0.4884 0.6267 -0.6072 +vn -0.3833 0.6512 -0.6550 +vn -0.8610 0.4007 -0.3133 +vn -0.6511 0.6344 -0.4167 +vn -0.5048 0.7063 -0.4962 +vn -0.6528 0.6826 -0.3284 +vn -0.5552 0.7606 -0.3366 +vn -0.9580 0.2661 -0.1066 +vn -0.8246 0.5545 -0.1125 +vn -0.4915 0.8324 -0.2559 +vn -0.7000 0.6997 -0.1428 +vn -0.5128 0.8502 -0.1190 +vn -0.9021 0.4306 -0.0300 +vn -0.7964 0.6042 -0.0262 +vn -0.4440 0.8955 -0.0310 +vn 0.9994 -0.0018 -0.0348 +vn 0.9994 -0.0000 -0.0342 +vn 0.9994 -0.0002 -0.0343 +vn 0.9993 0.0015 -0.0382 +vn 0.9994 -0.0067 -0.0332 +vn 0.9993 -0.0036 -0.0361 +vn 0.9994 -0.0000 -0.0347 +vn 0.9993 -0.0049 -0.0363 +vn 0.9994 -0.0010 -0.0353 +vn 0.9994 0.0117 -0.0333 +vn 0.9992 0.0164 -0.0362 +vn 0.9919 0.1209 -0.0380 +vn 0.9730 0.2282 -0.0358 +vn 0.9537 0.2995 -0.0290 +vn 0.9278 0.3713 -0.0358 +vn 0.8817 0.4703 -0.0382 +vn 0.8051 0.5924 -0.0314 +vn 0.7871 0.6159 -0.0348 +vn 0.6843 0.7282 -0.0376 +vn 0.6033 0.7968 -0.0324 +vn 0.5936 0.8040 -0.0337 +vn 0.4652 0.8843 -0.0398 +vn 0.3021 0.9527 -0.0326 +vn 0.3127 0.9493 -0.0312 +vn 0.1297 0.9908 -0.0389 +vn -0.0010 0.9994 -0.0336 +vn -0.0009 0.9995 -0.0328 +vn -0.0018 0.9995 -0.0325 +vn -0.0013 0.9994 -0.0332 +vn -0.0000 0.9994 -0.0354 +vn 0.0005 0.9995 -0.0322 +vn 0.0016 0.9995 -0.0319 +vn 0.0020 0.9995 -0.0316 +vn 0.0004 0.9994 -0.0340 +vn 0.0058 0.9996 -0.0270 +vn -0.0000 0.9994 -0.0351 +vn -0.0114 0.9989 -0.0464 +vn 0.0132 0.9987 -0.0494 +vn -0.9877 0.1513 -0.0400 +vn -0.9561 0.2908 -0.0352 +vn -0.9535 0.2994 -0.0341 +vn -0.8907 0.4533 -0.0358 +vn -0.8605 0.5085 -0.0320 +vn -0.8379 0.5447 -0.0357 +vn -0.7368 0.6750 -0.0385 +vn -0.6647 0.7465 -0.0306 +vn -0.6039 0.7962 -0.0372 +vn -0.4660 0.8841 -0.0358 +vn -0.4523 0.8912 -0.0343 +vn -0.2972 0.9541 -0.0364 +vn -0.2575 0.9657 -0.0330 +vn -0.1419 0.9891 -0.0384 +vn -0.9992 0.0049 -0.0390 +vn -0.9994 0.0005 -0.0345 +vn -0.9994 0.0012 -0.0348 +vn -0.9994 -0.0000 -0.0355 +vn -0.9994 -0.0000 -0.0354 +vn -0.9993 0.0034 -0.0378 +vn -0.9997 -0.0138 -0.0191 +vn -0.9994 0.0032 -0.0345 +vn -0.9990 0.0230 -0.0372 +vn -0.9993 0.0160 -0.0324 +vn -0.0000 -0.3162 -0.9487 +vn -0.0001 -0.3160 -0.9488 +vn -0.0002 -0.3174 -0.9483 +vn 0.0003 -0.3164 -0.9486 +vn -0.0001 -0.3177 -0.9482 +vn 0.0038 -0.2639 -0.9646 +vn -0.0070 -0.1957 -0.9806 +vn 0.0001 -0.0115 -0.9999 +vn 0.0020 -0.0081 -1.0000 +vn 0.5945 -0.1264 0.7941 +vn 0.6798 -0.1724 0.7129 +vn 0.6092 -0.2010 0.7672 +vn 0.5464 -0.3829 0.7449 +vn 0.7612 -0.1978 0.6176 +vn 0.9993 0.0001 0.0380 +vn 0.9993 0.0001 0.0372 +vn 0.9993 0.0060 0.0376 +vn -0.9993 0.0001 0.0379 +vn -0.9993 0.0001 0.0372 +vn -0.9992 -0.0141 0.0367 +vn -0.3236 -0.2285 0.9182 +vn 0.1841 -0.3840 0.9048 +vn -0.7637 -0.1149 0.6353 +vn -0.4337 -0.4116 0.8015 +vn -0.8546 -0.1275 0.5033 +vn -0.0014 -0.9993 0.0379 +vn -0.0000 -0.9993 0.0363 +vn -0.0000 -0.9994 0.0357 +vn -0.0069 -0.9990 0.0436 +vn 0.0011 -0.9994 0.0339 +vn 0.0005 -0.9993 0.0371 +vn -0.0043 -0.9995 0.0301 +vn 0.0015 -0.9993 0.0376 +vn 0.0037 -0.9992 0.0400 +vn 0.0004 -0.3184 -0.9479 +vn -0.0005 -0.3167 -0.9485 +vn 0.0003 -0.3198 -0.9475 +vn -0.0002 -0.0123 -0.9999 +vn -0.0034 -0.0058 -1.0000 +vn -0.0032 -0.2569 -0.9664 +vn 0.0039 -0.2206 -0.9753 +vn 0.0006 -0.0248 -0.9997 +vn 0.9998 0.0072 -0.0193 +vn 0.9998 0.0037 -0.0216 +vn 0.9994 0.0135 -0.0328 +vn 0.9997 0.0044 -0.0240 +vn 0.9996 0.0067 -0.0266 +vn 0.9999 -0.0101 -0.0019 +vn 0.1434 0.9895 -0.0171 +vn 0.2972 0.9546 -0.0204 +vn 0.3433 0.9389 -0.0239 +vn 0.4161 0.9091 -0.0205 +vn 0.5729 0.8194 -0.0214 +vn 0.5507 0.8344 -0.0243 +vn 0.6893 0.7242 -0.0169 +vn 0.8026 0.5962 -0.0210 +vn 0.8340 0.5512 -0.0260 +vn 0.9021 0.4311 -0.0180 +vn 0.9717 0.2351 -0.0232 +vn 0.9792 0.2017 -0.0202 +vn -0.0000 0.9997 -0.0234 +vn -0.0000 0.9997 -0.0224 +vn -0.1464 0.9891 -0.0180 +vn -0.2894 0.9569 -0.0232 +vn -0.3238 0.9459 -0.0205 +vn -0.4870 0.8732 -0.0200 +vn -0.5369 0.8433 -0.0233 +vn -0.6255 0.7800 -0.0187 +vn -0.7559 0.6543 -0.0232 +vn -0.7605 0.6490 -0.0224 +vn -0.8920 0.4517 -0.0169 +vn -0.9470 0.3202 -0.0253 +vn -0.9591 0.2824 -0.0220 +vn -0.9914 0.1292 -0.0193 +vn -0.9997 0.0073 -0.0236 +vn -0.9998 -0.0007 -0.0203 +vn -0.9995 0.0081 -0.0296 +vn -0.9994 0.0114 -0.0323 +vn -0.9994 -0.0307 0.0179 +vn -0.9998 -0.0034 -0.0210 +vn 0.9290 0.0001 -0.3700 +vn 0.7778 -0.0001 -0.6285 +vn 0.5132 0.0001 -0.8583 +vn 0.5976 0.0656 -0.7991 +vn 0.8437 0.1258 -0.5218 +vn 0.9220 0.0988 -0.3744 +vn 0.8587 0.1856 -0.4778 +vn 0.9144 0.2284 -0.3342 +vn 0.3042 0.0982 -0.9475 +vn 0.3992 0.1421 -0.9058 +vn 0.4567 0.1799 -0.8712 +vn 0.8100 0.3444 -0.4747 +vn 0.8752 0.3388 -0.3452 +vn 0.8205 0.4407 -0.3642 +vn 0.5102 0.3142 -0.8006 +vn 0.7385 0.4601 -0.4929 +vn 0.7579 0.5676 -0.3215 +vn 0.2852 0.2378 -0.9285 +vn 0.4964 0.4729 -0.7279 +vn 0.1058 0.1030 -0.9890 +vn 0.5160 0.5516 -0.6554 +vn 0.3788 0.5233 -0.7633 +vn 0.4308 0.5627 -0.7056 +vn 0.0964 0.2290 -0.9686 +vn 0.3112 0.5639 -0.7650 +vn 0.3361 0.6643 -0.6676 +vn 0.1448 0.4723 -0.8695 +vn 0.2472 0.7223 -0.6458 +vn 0.2542 0.8417 -0.4763 +vn 0.0766 0.5106 -0.8564 +vn 0.1063 0.8328 -0.5433 +vn 0.1062 0.8333 -0.5426 +vn 0.0001 0.2416 -0.9704 +vn -0.0001 0.4586 -0.8886 +vn -0.0000 0.8209 -0.5711 +vn -0.0000 0.8733 -0.4872 +vn -0.6812 0.1153 -0.7229 +vn -0.8887 0.1022 -0.4470 +vn -0.3643 0.1225 -0.9232 +vn -0.6055 0.1644 -0.7787 +vn -0.7945 0.2665 -0.5457 +vn -0.5650 0.3085 -0.7652 +vn -0.6210 0.3416 -0.7055 +vn -0.7532 0.3641 -0.5479 +vn -0.6997 0.4688 -0.5391 +vn -0.2046 0.1553 -0.9664 +vn -0.5493 0.5100 -0.6619 +vn -0.5771 0.5249 -0.6256 +vn -0.4464 0.5727 -0.6876 +vn -0.4628 0.5837 -0.6672 +vn -0.1266 0.2003 -0.9715 +vn -0.3275 0.6433 -0.6920 +vn -0.3292 0.6530 -0.6821 +vn -0.1804 0.6479 -0.7401 +vn -0.2336 0.7194 -0.6541 +vn -0.1073 0.7414 -0.6625 +vn -0.0990 0.8640 -0.4936 +vn -0.8854 0.0001 -0.4649 +vn -0.7419 -0.0001 -0.6705 +vn -0.3950 0.0001 -0.9187 +vn 1.0000 -0.0010 -0.0004 +vn 0.9944 -0.1024 -0.0274 +vn 1.0000 -0.0006 -0.0051 +vn 1.0000 -0.0057 -0.0059 +vn 1.0000 -0.0065 -0.0048 +vn 0.9646 -0.2635 -0.0020 +vn 0.9547 -0.2974 -0.0068 +vn 0.8223 -0.5690 -0.0075 +vn 0.7895 -0.6138 0.0001 +vn 0.5562 -0.8310 -0.0086 +vn 0.5387 -0.8425 -0.0056 +vn 0.2793 -0.9602 -0.0031 +vn 0.2452 -0.9695 -0.0073 +vn 0.0072 -1.0000 -0.0049 +vn 0.1200 -0.6955 0.7085 +vn 0.0061 -1.0000 -0.0045 +vn -0.0417 -0.9991 -0.0099 +vn -0.9951 0.0971 -0.0174 +vn -0.9994 0.0003 -0.0349 +vn -0.1290 0.9916 -0.0115 +vn -0.0011 0.9994 -0.0347 +vn -0.0068 0.9994 -0.0351 +vn -1.0000 -0.0014 -0.0052 +vn -0.9999 0.0138 -0.0061 +vn -1.0000 -0.0004 -0.0049 +vn -1.0000 -0.0032 -0.0054 +vn -1.0000 -0.0050 -0.0036 +vn -1.0000 -0.0040 -0.0051 +vn 0.0971 0.9951 -0.0174 +vn 0.0037 0.9994 -0.0348 +vn 0.0002 0.9994 -0.0349 +vn 0.9916 0.1287 -0.0115 +vn 0.9994 -0.0001 -0.0349 +vn -0.1199 -0.7388 0.6632 +vn -0.0134 -0.9999 -0.0037 +vn 0.0458 -0.9989 -0.0104 +vn -0.0051 -1.0000 -0.0070 +vn -0.9714 -0.2373 -0.0055 +vn -0.9709 -0.2395 -0.0052 +vn -0.8349 -0.5503 -0.0040 +vn -0.8355 -0.5495 -0.0038 +vn -0.6192 -0.7852 -0.0082 +vn -0.5574 -0.8302 0.0009 +vn -0.3505 -0.9365 -0.0113 +vn -0.2451 -0.9695 -0.0004 +vn -0.0000 -0.0000 -1.0000 +vn -0.0008 -0.0000 -1.0000 +vn -0.0001 -0.0000 -1.0000 +vn 0.0002 -0.0000 -1.0000 +vn -0.0054 -0.0000 -1.0000 +vn -0.0126 -0.0000 -0.9999 +vn 0.0142 -0.0000 -0.9999 +vn 0.0029 -0.0001 -1.0000 +vn -0.0001 -0.0001 -1.0000 +vn -0.0053 -0.0000 -1.0000 +vn 0.0027 -0.0000 -1.0000 +vn -0.0048 0.0013 -1.0000 +vn 0.0026 0.0006 -1.0000 +vn -0.0038 -0.0005 -1.0000 +vn 0.0017 -0.0008 -1.0000 +vn -0.0000 0.0002 -1.0000 +vn 0.0004 0.0003 -1.0000 +vn -0.0024 0.0019 -1.0000 +vn -0.0041 0.0080 -1.0000 +vn 0.0006 0.0023 -1.0000 +vn -0.0047 0.0073 -1.0000 +vn -0.0048 0.0073 -1.0000 +vn 0.0015 0.0023 -1.0000 +vn 0.0024 0.0009 -1.0000 +vn -0.0000 -0.0011 -1.0000 +vn -0.0000 -0.0003 -1.0000 +vn -0.0023 0.0079 -1.0000 +vn 0.0001 0.0003 -1.0000 +vn -0.0036 0.0060 -1.0000 +vn -0.0000 0.0069 -1.0000 +vn -0.0000 0.0070 -1.0000 +vn -0.0000 0.0004 -1.0000 +vn -0.0000 0.0003 -1.0000 +vn 0.9998 0.0216 -0.0048 +vn 0.9998 0.0163 -0.0116 +vn 0.2305 0.9726 0.0298 +vn 0.4852 0.8744 0.0073 +vn 0.4308 0.9020 -0.0270 +vn 0.7555 0.6549 0.0179 +vn 0.7289 0.6846 -0.0080 +vn 0.9238 0.3820 -0.0268 +vn 0.9502 0.3109 0.0220 +vn 0.0180 0.9996 -0.0223 +vn 0.0150 0.9997 -0.0175 +vn -0.0042 0.9999 -0.0116 +vn -0.0122 0.9999 0.0013 +vn -0.2289 0.9734 0.0021 +vn -0.2599 0.9655 -0.0154 +vn -0.5387 0.8420 0.0269 +vn -0.6069 0.7943 -0.0269 +vn -0.8281 0.5603 0.0178 +vn -0.8498 0.5270 -0.0080 +vn -0.9694 0.2455 0.0072 +vn -0.9734 0.2290 -0.0021 +vn -1.0000 0.0071 -0.0012 +vn -0.9996 0.0218 -0.0175 +vn -0.0000 -0.0001 1.0000 +vn 0.1177 0.9929 0.0192 +vn 0.0916 0.9957 -0.0167 +vn -0.2397 0.9707 0.0141 +vn -0.2630 0.9647 -0.0112 +vn 0.5244 0.8515 -0.0017 +vn 0.5140 0.8575 -0.0221 +vn -0.5279 0.8492 0.0124 +vn -0.5489 0.8357 -0.0179 +vn 0.8332 0.5524 0.0257 +vn -0.8185 0.5742 0.0193 +vn -0.8333 0.5525 -0.0167 +vn 0.8513 0.5242 -0.0212 +vn 0.9806 0.1948 0.0192 +vn 0.9787 0.2052 0.0048 +vn -0.9752 0.2205 0.0167 +vn -0.9806 0.1948 -0.0192 +vn 0.9807 -0.1948 -0.0192 +vn 0.9664 -0.2502 0.0590 +vn -0.9806 -0.1948 0.0192 +vn -0.9664 -0.2502 -0.0590 +vn 0.8392 -0.5387 -0.0752 +vn -0.8392 -0.5387 0.0752 +vn 0.7208 -0.6870 0.0926 +vn -0.7208 -0.6870 -0.0926 +vn 0.6090 -0.7918 -0.0470 +vn -0.5846 -0.8080 0.0735 +vn 0.3462 -0.9378 0.0242 +vn 0.3232 -0.9446 0.0577 +vn -0.3538 -0.9325 -0.0726 +vn -0.1741 -0.9802 0.0941 +vn 0.0039 -0.9977 -0.0678 +vn -0.2680 0.9633 0.0167 +vn -0.2630 0.9645 0.0238 +vn 0.5235 0.8501 0.0577 +vn 0.4635 0.8860 -0.0165 +vn -0.5482 0.8348 -0.0508 +vn 0.6926 0.7184 -0.0642 +vn -0.6559 0.7485 0.0978 +vn 0.8299 0.5503 0.0921 +vn -0.8299 0.5503 -0.0921 +vn 0.9419 0.3206 -0.1002 +vn -0.9419 0.3206 0.1002 +vn 0.9791 0.1945 0.0587 +vn -0.9791 0.1945 -0.0587 +vn 0.9829 -0.1795 -0.0404 +vn -0.9829 -0.1795 0.0404 +vn -0.6090 -0.7918 0.0470 +vn 0.3495 -0.9367 0.0193 +vn -0.3509 -0.9361 -0.0230 +vn -0.3547 -0.9348 -0.0176 +vn -0.0257 -0.9995 0.0161 +vn 0.0039 -0.9998 -0.0188 +vn 0.0914 0.9935 -0.0681 +vn -0.0914 0.9935 0.0681 +vn 0.2626 0.9632 0.0573 +vn -0.2626 0.9632 -0.0573 +vn 0.5489 0.8357 0.0179 +vn 0.5005 0.8643 -0.0502 +vn -0.5133 0.8564 0.0564 +vn -0.5490 0.8358 -0.0002 +vn 0.8333 0.5525 0.0167 +vn 0.8185 0.5742 -0.0193 +vn -0.8332 0.5524 -0.0257 +vn -0.8513 0.5242 0.0212 +vn 0.9752 0.2205 -0.0167 +vn -0.9787 0.2052 -0.0048 +vn -0.9807 -0.1948 0.0192 +vn -0.8472 -0.5268 0.0693 +vn -0.7216 -0.6878 -0.0791 +vn -0.6556 -0.7548 0.0212 +vn 0.3680 -0.9298 -0.0084 +vn -0.3483 -0.9374 -0.0032 +vn -0.3547 -0.9349 0.0074 +vn 0.0509 -0.9983 0.0266 +vn 0.0039 -0.9996 -0.0294 +vn 0.3719 -0.9281 -0.0191 +vn 0.4100 -0.9113 0.0384 +vn 0.6924 -0.7195 -0.0534 +vn 0.7468 -0.6636 0.0438 +vn 0.7569 -0.6495 -0.0723 +vn 0.6464 -0.7601 0.0661 +vn 0.4596 -0.8855 -0.0686 +vn 0.3622 -0.9308 0.0488 +vn 0.0015 -0.9998 -0.0175 +vn 0.0021 -0.9998 0.0220 +vn 0.3624 -0.9316 -0.0261 +vn 0.3704 -0.9288 -0.0073 +vn 0.6293 -0.7765 0.0309 +vn 0.6748 -0.7335 -0.0813 +vn 0.8386 -0.5376 0.0877 +vn 0.9123 -0.3932 -0.1143 +vn 0.9571 -0.2835 0.0607 +vn 1.0000 -0.0000 -0.0093 +vn 0.9998 -0.0000 -0.0212 +vn 0.9319 0.3625 -0.0147 +vn 0.9249 0.3791 0.0275 +vn 0.7356 0.6768 -0.0272 +vn 0.7181 0.6953 0.0312 +vn 0.3956 0.9178 -0.0334 +vn 0.3782 0.9256 0.0152 +vn -0.0000 1.0000 -0.0093 +vn 0.0001 1.0000 0.0054 +vn -0.9571 0.2835 0.0607 +vn -0.9123 0.3932 -0.1143 +vn -0.8386 0.5376 0.0877 +vn -0.6748 0.7335 -0.0812 +vn -0.6293 0.7765 0.0309 +vn -0.3652 0.9309 -0.0080 +vn -0.3625 0.9319 -0.0147 +vn -1.0000 -0.0000 -0.0053 +vn -0.9998 -0.0001 -0.0212 +vn -0.3624 -0.9316 0.0261 +vn -0.3975 -0.9156 -0.0600 +vn -0.6747 -0.7333 0.0839 +vn -0.7333 -0.6747 -0.0839 +vn -0.9166 -0.3951 0.0612 +vn -0.9309 -0.3650 -0.0148 +vn -0.0021 -0.9998 -0.0220 +vn -0.0011 -0.9989 0.0462 +vn -0.7581 -0.6506 0.0450 +vn -0.6660 -0.7406 -0.0897 +vn -0.4580 -0.8825 0.1069 +vn -0.2637 -0.9608 -0.0855 +vn -0.9195 -0.3929 0.0129 +vn -0.9181 -0.3955 -0.0273 +vn -0.3698 -0.9290 0.0140 +vn -0.4036 -0.9140 -0.0402 +vn -0.6924 -0.7195 0.0534 +vn -0.7468 -0.6636 -0.0438 +vn -0.0000 -0.9996 -0.0296 +vn -0.0002 -1.0000 -0.0037 +vn 0.0015 -0.9998 0.0199 +vn 0.9167 -0.3966 0.0492 +vn 0.9195 -0.3929 -0.0129 +vn -0.0418 -0.0344 -0.9985 +vn -0.3159 -0.1728 -0.9329 +vn -0.4357 -0.1778 -0.8824 +vn -0.2351 -0.3374 -0.9115 +vn -0.1846 -0.4573 -0.8700 +vn -0.4345 -0.3357 -0.8358 +vn -0.4215 -0.4658 -0.7781 +vn -0.1865 -0.4740 -0.8605 +vn -0.1360 -0.5388 -0.8314 +vn -0.6363 -0.2272 -0.7372 +vn -0.1328 -0.7328 -0.6674 +vn -0.7740 -0.1951 -0.6024 +vn -0.7727 -0.1974 -0.6033 +vn -0.4991 -0.5732 -0.6499 +vn -0.4754 -0.6913 -0.5442 +vn -0.3446 -0.7354 -0.5834 +vn -0.6562 -0.6234 -0.4252 +vn -0.9427 -0.1017 -0.3176 +vn -0.7759 -0.4547 -0.4373 +vn -0.7594 -0.4729 -0.4468 +vn -0.3458 -0.8318 -0.4341 +vn -0.2953 -0.8915 -0.3435 +vn -0.2159 -0.8866 -0.4092 +vn -0.7500 -0.5606 -0.3509 +vn -0.9067 -0.3365 -0.2543 +vn -0.8638 -0.4312 -0.2605 +vn -0.5261 -0.8445 -0.1001 +vn -0.1314 -0.9727 -0.1912 +vn 0.1140 -0.2972 -0.9480 +vn 0.2326 -0.2083 -0.9500 +vn 0.3351 -0.1893 -0.9230 +vn 0.2891 -0.1171 -0.9501 +vn 0.3331 -0.1160 -0.9357 +vn 0.0686 -0.4402 -0.8953 +vn 0.2261 -0.4518 -0.8630 +vn 0.3705 -0.4219 -0.8275 +vn 0.2648 -0.6654 -0.6979 +vn 0.3480 -0.4923 -0.7978 +vn 0.5669 -0.1610 -0.8079 +vn 0.1182 -0.6961 -0.7081 +vn 0.1338 -0.7155 -0.6857 +vn 0.5797 -0.5293 -0.6195 +vn 0.6818 -0.3961 -0.6151 +vn 0.7633 -0.2499 -0.5957 +vn 0.4460 -0.7287 -0.5197 +vn 0.3487 -0.7676 -0.5378 +vn 0.6651 -0.4962 -0.5581 +vn 0.7296 -0.3773 -0.5703 +vn 0.5048 -0.7604 -0.4085 +vn 0.8528 -0.2264 -0.4706 +vn 0.1974 -0.9258 -0.3224 +vn 0.8962 -0.1592 -0.4141 +vn 0.2157 -0.9362 -0.2774 +vn 0.3112 -0.9090 -0.2772 +vn 0.6050 -0.7114 -0.3576 +vn 0.9677 -0.1178 -0.2229 +vn 0.2918 -0.0017 -0.9565 +vn 0.4038 0.0009 -0.9148 +vn 0.5712 -0.0020 -0.8208 +vn 0.7203 0.0005 -0.6936 +vn 0.7905 -0.0017 -0.6125 +vn 0.9458 0.0022 -0.3249 +vn 0.9724 -0.0007 -0.2332 +vn 0.1598 0.2628 -0.9515 +vn 0.2417 0.2942 -0.9247 +vn 0.2947 0.1968 -0.9351 +vn 0.3781 0.2048 -0.9028 +vn 0.4395 0.1697 -0.8821 +vn 0.0810 0.5514 -0.8303 +vn 0.7105 0.1999 -0.6747 +vn 0.4126 0.5950 -0.6897 +vn 0.2384 0.6918 -0.6816 +vn 0.5738 0.6340 -0.5185 +vn 0.6623 0.5105 -0.5484 +vn 0.7643 0.4461 -0.4657 +vn 0.7793 0.2692 -0.5659 +vn 0.1968 0.9020 -0.3842 +vn 0.5900 0.7296 -0.3459 +vn 0.9437 0.1606 -0.2893 +vn 0.3401 0.9298 -0.1408 +vn 0.8617 0.4635 -0.2063 +vn 0.9665 0.2410 -0.0878 +vn -0.0889 0.1546 -0.9840 +vn -0.3671 0.1621 -0.9159 +vn -0.3305 0.2752 -0.9028 +vn -0.5405 0.1548 -0.8270 +vn -0.4725 0.4836 -0.7368 +vn -0.2200 0.5439 -0.8098 +vn -0.7157 0.3042 -0.6287 +vn -0.4940 0.4963 -0.7139 +vn -0.1339 0.7343 -0.6655 +vn -0.5488 0.5741 -0.6076 +vn -0.8194 0.3205 -0.4753 +vn -0.2980 0.8557 -0.4231 +vn -0.9000 0.2247 -0.3735 +vn -0.5362 0.7551 -0.3774 +vn -0.4280 0.8376 -0.3395 +vn -0.8122 0.5131 -0.2774 +vn -0.6487 0.7528 -0.1118 +vn -0.8147 0.5185 -0.2597 +vn -0.0054 0.0044 -1.0000 +vn 0.0467 -0.0005 -0.9989 +vn -0.0020 -0.0007 -1.0000 +vn -0.0028 -0.0027 -1.0000 +vn -0.0031 -0.0028 -1.0000 +vn -0.0013 -0.0029 -1.0000 +vn 0.0008 -0.0072 -1.0000 +vn -0.0000 -0.0069 -1.0000 +vn -0.0000 -0.0048 -1.0000 +vn 0.0033 -0.0104 -0.9999 +vn 0.0048 -0.0033 -1.0000 +vn 0.0058 -0.0070 -1.0000 +vn -0.0000 -0.0063 -1.0000 +vn 0.0022 -0.0007 -1.0000 +vn 0.0024 -0.0009 -1.0000 +vn -0.0027 0.0013 -1.0000 +vn 0.0028 0.0006 -1.0000 +vn -0.0444 -0.0411 -0.9982 +vn -0.1230 0.0013 -0.9924 +vn -0.2893 -0.0030 -0.9572 +vn -0.5702 0.0007 -0.8215 +vn -0.6264 -0.0014 -0.7795 +vn -0.8976 0.0024 -0.4408 +vn -0.9385 -0.0017 -0.3454 +vn -0.0000 -0.3403 -0.9403 +vn -0.0000 -0.3358 -0.9419 +vn -0.0000 -0.7684 -0.6400 +vn -0.0000 -0.7694 -0.6387 +vn -0.0000 -0.9567 -0.2912 +vn -0.0000 -0.9530 -0.3030 +vn 0.9990 0.0001 0.0445 +vn 0.9990 -0.0006 0.0439 +vn -0.9395 0.3409 0.0336 +vn -0.9187 0.3917 0.0510 +vn -0.7755 0.6294 0.0496 +vn -0.6901 0.7232 0.0269 +vn -0.6033 0.7954 0.0587 +vn -0.4069 0.9120 0.0525 +vn -0.3240 0.9456 0.0301 +vn -0.1450 0.9877 0.0593 +vn -0.0000 0.9989 0.0469 +vn -0.0001 0.9987 0.0519 +vn 0.0035 0.9987 0.0515 +vn 0.0505 0.9977 0.0461 +vn 0.3047 0.9516 0.0405 +vn 0.2536 0.9659 0.0515 +vn 0.4313 0.9002 0.0607 +vn 0.6494 0.7597 0.0336 +vn 0.6751 0.7364 0.0442 +vn 0.8594 0.5087 0.0517 +vn 0.8871 0.4603 0.0346 +vn 0.9808 0.1857 0.0602 +vn 0.9152 0.4028 -0.0105 +vn 0.8185 0.5735 -0.0333 +vn 0.5512 0.8342 -0.0139 +vn 0.4919 0.8703 -0.0240 +vn -0.0001 0.9998 -0.0201 +vn -0.0002 0.9997 -0.0242 +vn -0.6227 0.7822 -0.0193 +vn -0.6929 0.7201 -0.0366 +vn -0.9182 0.3959 -0.0082 +vn -0.9995 0.0027 -0.0316 +vn -0.9994 0.0017 -0.0352 +vn -0.9994 0.0005 -0.0350 +vn -0.9988 0.0337 -0.0364 +vn -0.2974 0.9547 -0.0128 +vn -0.4599 0.8856 -0.0644 +vn -0.6332 0.7740 -0.0021 +vn -0.7903 0.6088 -0.0691 +vn -0.9332 0.3591 -0.0124 +vn -0.9548 0.2948 -0.0386 +vn 0.0001 0.9990 -0.0452 +vn -0.0000 0.9991 -0.0423 +vn 0.9507 0.3085 -0.0302 +vn 0.9428 0.3308 -0.0406 +vn 0.7458 0.6656 -0.0278 +vn 0.7382 0.6738 -0.0334 +vn 0.3957 0.9181 -0.0232 +vn 0.4305 0.9016 -0.0421 +vn 0.9993 0.0025 -0.0377 +vn 0.9994 0.0018 -0.0353 +vn 0.9994 -0.0003 -0.0350 +vn -0.9990 0.0007 0.0437 +vn -0.9990 0.0003 0.0439 +vn -0.0001 -0.9990 0.0453 +vn 0.0001 -0.9991 0.0429 +vn -0.9866 -0.1571 0.0433 +vn -0.9868 -0.1560 0.0432 +vn -0.9444 -0.3265 0.0396 +vn -0.9554 -0.2922 0.0422 +vn -0.8841 -0.4653 0.0437 +vn -0.8913 -0.4514 0.0422 +vn -0.8291 -0.5573 0.0452 +vn -0.7931 -0.6077 0.0416 +vn -0.7191 -0.6934 0.0451 +vn -0.6754 -0.7363 0.0415 +vn -0.5413 -0.8399 0.0398 +vn -0.5807 -0.8130 0.0438 +vn -0.3897 -0.9197 0.0470 +vn -0.3163 -0.9478 0.0406 +vn -0.1639 -0.9855 0.0451 +vn -0.1380 -0.9895 0.0431 +vn 0.2026 -0.9784 0.0419 +vn 0.1460 -0.9882 0.0454 +vn 0.2938 -0.9547 0.0466 +vn 0.3873 -0.9210 0.0431 +vn 0.4154 -0.9085 0.0446 +vn 0.5241 -0.8506 0.0424 +vn 0.5417 -0.8394 0.0440 +vn 0.6830 -0.7293 0.0418 +vn 0.6949 -0.7179 0.0430 +vn 0.7902 -0.6115 0.0411 +vn 0.7811 -0.6230 0.0423 +vn 0.8878 -0.4583 0.0417 +vn 0.8964 -0.4412 0.0434 +vn 0.9482 -0.3145 0.0439 +vn 0.9495 -0.3107 0.0436 +vn 0.9861 -0.1597 0.0448 +vn 0.9888 -0.1429 0.0435 +vn 0.9371 0.2444 0.2494 +vn 0.8327 0.4650 0.3006 +vn 0.8668 0.2890 0.4064 +vn 0.6632 0.6775 0.3181 +vn 0.8170 0.2260 0.5305 +vn 0.4096 0.8893 0.2033 +vn 0.5851 0.7373 0.3377 +vn 0.7165 0.5532 0.4249 +vn 0.7027 0.2258 0.6747 +vn 0.6781 0.4110 0.6093 +vn 0.6566 0.4228 0.6246 +vn 0.5524 0.5826 0.5962 +vn 0.9505 0.0018 0.3108 +vn 0.8881 -0.0016 0.4596 +vn 0.7727 0.0026 0.6348 +vn -0.9998 0.0018 -0.0174 +vn -0.9993 0.0110 -0.0345 +vn 0.0186 0.9988 0.0453 +vn 0.3434 0.9382 0.0427 +vn 0.3548 0.9340 0.0418 +vn 0.6564 0.7532 0.0440 +vn 0.6821 0.7301 0.0422 +vn 0.8278 0.5593 0.0438 +vn 0.8450 0.5330 0.0424 +vn 0.9566 0.2878 0.0451 +vn 0.9728 0.2277 0.0421 +vn 0.2283 0.9024 0.3656 +vn 0.2895 0.8619 0.4164 +vn 0.4491 0.6213 0.6421 +vn 0.4438 0.6454 0.6217 +vn 0.5374 0.3242 0.7785 +vn 0.5619 0.2488 0.7889 +vn 0.9981 0.0287 0.0537 +vn 0.9993 0.0029 0.0375 +vn 0.8593 0.3219 0.3975 +vn 0.8645 0.3163 0.3906 +vn 0.6528 0.3963 0.6456 +vn 0.6350 0.3932 0.6649 +vn 0.8592 0.4009 0.3179 +vn 0.3053 0.4529 0.8377 +vn 0.4817 0.5140 0.7098 +vn 0.7315 0.5246 0.4355 +vn 0.5059 0.5595 0.6566 +vn 0.3066 0.4907 0.8156 +vn 0.8308 0.4626 0.3093 +vn 0.8777 0.1800 0.4441 +vn 0.8681 0.1901 0.4584 +vn 0.6957 0.2771 0.6627 +vn 0.6437 0.3048 0.7020 +vn 0.4139 0.3522 0.8394 +vn 0.2803 0.3854 0.8791 +vn 0.5881 0.7373 0.3325 +vn 0.1324 0.8899 0.4364 +vn 0.4371 0.8219 0.3653 +vn 0.8184 0.5182 0.2483 +vn 0.6014 0.6629 0.4460 +vn 0.2651 0.7661 0.5855 +vn 0.2431 0.7718 0.5876 +vn 0.6295 0.6280 0.4575 +vn 0.8749 0.3006 0.3798 +vn 0.8396 0.3590 0.4077 +vn 0.3035 0.6839 0.6634 +vn 0.5632 0.5058 0.6534 +vn 0.2321 0.5254 0.8186 +vn 0.6662 0.4071 0.6248 +vn 0.3255 0.4922 0.8073 +vn 0.0001 0.8989 0.4381 +vn -0.0000 0.8749 0.4844 +vn -0.0001 0.6454 0.7639 +vn -0.0000 0.5848 0.8111 +vn -0.1659 0.9002 0.4027 +vn -0.2446 0.8567 0.4541 +vn -0.8628 0.4355 0.2567 +vn -0.7661 0.5713 0.2946 +vn -0.5474 0.7525 0.3661 +vn -0.2689 0.7911 0.5494 +vn -0.6254 0.6404 0.4458 +vn -0.3192 0.7577 0.5691 +vn -0.8484 0.3866 0.3615 +vn -0.3215 0.6264 0.7102 +vn -0.4633 0.5385 0.7038 +vn -0.6529 0.4111 0.6362 +vn -0.4627 0.5474 0.6973 +vn -0.9147 0.1500 0.3752 +vn -0.9099 0.1563 0.3843 +vn -0.6472 0.3035 0.6994 +vn -0.5528 0.3134 0.7721 +vn -0.2284 0.3991 0.8880 +vn -0.9980 0.0225 0.0588 +vn -0.9983 0.0302 0.0506 +vn -0.8361 0.3655 0.4091 +vn -0.8653 0.3270 0.3800 +vn -0.8155 0.2965 0.4970 +vn -0.7499 0.3631 0.5529 +vn -0.5641 0.4408 0.6982 +vn -0.6821 0.4775 0.5538 +vn -0.7852 0.4789 0.3926 +vn -0.6987 0.5517 0.4555 +vn -0.7439 0.5997 0.2949 +vn -0.5745 0.5052 0.6440 +vn -0.9474 0.2329 -0.2195 +vn -0.3973 0.4612 0.7934 +vn 0.9995 0.0082 -0.0298 +vn 0.9998 0.0016 -0.0174 +vn -0.9721 0.2304 0.0430 +vn -0.9609 0.2733 0.0452 +vn -0.8663 0.4978 0.0418 +vn -0.8069 0.5888 0.0467 +vn -0.6399 0.7672 0.0435 +vn -0.6304 0.7750 0.0440 +vn -0.4476 0.8932 0.0431 +vn -0.3812 0.9234 0.0456 +vn -0.1583 0.9870 0.0283 +vn -0.2128 0.9762 0.0414 +vn -0.8802 0.2207 0.4203 +vn -0.8136 0.2964 0.5003 +vn -0.7912 0.4283 0.4366 +vn -0.6381 0.6886 0.3446 +vn -0.6937 0.5213 0.4970 +vn -0.4207 0.8524 0.3103 +vn -0.6643 0.1382 0.7345 +vn -0.4269 0.8539 0.2977 +vn -0.6563 0.4695 0.5906 +vn -0.6393 0.2951 0.7100 +vn -0.4701 0.6446 0.6029 +vn -0.1604 0.9483 0.2739 +vn -0.2071 0.9253 0.3176 +vn -0.4069 0.6859 0.6033 +vn -0.4473 0.6324 0.6325 +vn -0.5193 0.3893 0.7608 +vn -0.5716 0.2321 0.7870 +vn -0.9189 -0.0015 0.3946 +vn -0.8489 0.0019 0.5286 +vn -0.7986 -0.0000 0.6019 +vn -0.1307 -0.9227 0.3627 +vn -0.3299 -0.8934 0.3051 +vn -0.2452 -0.8756 0.4161 +vn -0.4910 -0.7908 0.3655 +vn -0.4241 -0.8000 0.4245 +vn -0.9520 -0.1512 0.2662 +vn -0.8566 -0.4152 0.3062 +vn -0.6313 -0.6509 0.4216 +vn -0.8760 -0.3281 0.3534 +vn -0.5322 -0.6904 0.4900 +vn -0.7706 -0.5453 0.3299 +vn -0.6408 -0.6194 0.4535 +vn -0.7650 -0.4619 0.4489 +vn -0.8453 -0.2122 0.4904 +vn -0.7266 -0.4418 0.5262 +vn -0.8307 -0.2432 0.5008 +vn -0.5270 -0.4670 0.7101 +vn -0.7052 -0.2546 0.6618 +vn -0.6462 -0.3169 0.6942 +vn -0.7209 -0.0866 0.6876 +vn 0.0789 -0.9309 0.3565 +vn 0.0001 -0.9064 0.4224 +vn -0.0002 -0.8286 0.5598 +vn 0.1513 -0.8712 0.4670 +vn 0.1424 -0.8201 0.5543 +vn 0.5082 -0.7865 0.3508 +vn 0.6220 -0.7194 0.3091 +vn 0.2775 -0.8082 0.5194 +vn 0.4352 -0.7549 0.4906 +vn 0.8423 -0.4625 0.2768 +vn 0.7442 -0.5854 0.3216 +vn 0.6082 -0.6791 0.4109 +vn 0.7408 -0.5540 0.3798 +vn 0.3062 -0.7458 0.5916 +vn 0.9009 -0.1154 0.4185 +vn 0.4292 -0.6233 0.6537 +vn 0.5092 -0.6165 0.6006 +vn 0.6556 -0.4979 0.5677 +vn 0.8136 -0.2644 0.5178 +vn 0.5116 -0.4879 0.7072 +vn 0.8049 -0.1790 0.5658 +vn 0.7140 -0.3329 0.6160 +vn 0.7159 -0.3374 0.6113 +vn 0.5803 -0.0024 0.8144 +vn 0.5826 -0.0017 0.8128 +vn 0.5848 0.0115 0.8111 +vn 0.0063 0.9989 0.0454 +vn 0.0145 0.9989 0.0439 +vn 0.0071 0.9990 0.0449 +vn 0.0075 0.9990 0.0451 +vn 0.0138 0.9989 0.0443 +vn 0.1868 0.8932 0.4091 +vn 0.2172 0.6764 0.7038 +vn 0.2270 0.6873 0.6900 +vn 0.3882 0.3105 0.8677 +vn 0.2558 0.4195 0.8709 +vn 0.1822 0.3662 0.9125 +vn 0.9821 0.1846 0.0377 +vn 0.9549 0.2906 0.0610 +vn 0.9192 0.3921 0.0370 +vn 0.7980 0.5998 0.0583 +vn 0.8259 0.5618 0.0473 +vn 0.7175 0.6956 0.0373 +vn 0.5403 0.8401 0.0487 +vn 0.5515 0.8325 0.0531 +vn 0.3610 0.9320 0.0337 +vn 0.2382 0.9698 0.0523 +vn 0.1774 0.9833 0.0408 +vn 0.7408 0.5928 0.3160 +vn 0.7428 0.5918 0.3130 +vn 0.6596 0.6832 0.3134 +vn 0.6532 0.6619 0.3676 +vn 0.8384 0.5297 -0.1284 +vn 0.5175 0.5588 0.6481 +vn 0.4489 0.5508 0.7036 +vn 0.3500 0.4320 0.8312 +vn 0.3092 0.4351 0.8457 +vn -0.0000 0.3959 0.9183 +vn 0.0003 0.4100 0.9121 +vn -0.0321 0.3907 0.9200 +vn -0.0001 0.3884 0.9215 +vn -0.0001 0.3915 0.9202 +vn -0.0000 0.3984 0.9172 +vn -0.1813 0.9831 0.0244 +vn -0.3568 0.9334 0.0380 +vn -0.4351 0.8981 0.0641 +vn -0.5523 0.8328 0.0373 +vn -0.7344 0.6769 0.0491 +vn -0.7442 0.6658 0.0538 +vn -0.8575 0.5130 0.0397 +vn -0.8926 0.4488 0.0443 +vn -0.9294 0.3636 0.0633 +vn -0.9449 0.3232 0.0527 +vn -0.9919 0.1217 0.0360 +vn -0.7490 0.6033 0.2739 +vn -0.6147 0.6228 0.4840 +vn -0.5190 0.5651 0.6413 +vn -0.3125 0.7648 0.5634 +vn -0.3277 0.4730 0.8179 +vn -0.3986 0.4861 0.7777 +vn -0.2933 0.3222 0.9001 +vn -0.0048 0.9990 0.0437 +vn -0.0103 0.9989 0.0453 +vn -0.0126 0.9990 0.0439 +vn -0.0116 0.9989 0.0454 +vn -0.0091 0.9989 0.0470 +vn -0.1056 0.9112 0.3983 +vn -0.2118 0.7165 0.6646 +vn -0.1934 0.6963 0.6912 +vn -0.3384 0.3160 0.8863 +vn -0.2090 0.4481 0.8692 +vn -0.5991 0.0013 0.8006 +vn -0.5740 -0.0024 0.8189 +vn -0.5800 -0.0005 0.8146 +vn -0.1003 -0.6448 0.7577 +vn -0.1722 -0.5706 0.8029 +vn -0.1838 -0.5513 0.8138 +vn -0.2740 -0.4700 0.8391 +vn -0.2501 -0.4839 0.8386 +vn -0.3670 -0.3672 0.8547 +vn -0.3832 -0.3298 0.8628 +vn -0.5588 -0.0680 0.8265 +vn -0.4322 -0.2639 0.8623 +vn -0.5132 -0.1462 0.8457 +vn -0.4573 -0.2042 0.8656 +vn -0.0001 -0.6994 0.7147 +vn -0.0000 -0.7030 0.7112 +vn 0.0425 -0.6850 0.7273 +vn 0.1366 -0.5923 0.7941 +vn 0.1729 -0.5693 0.8038 +vn 0.2301 -0.5053 0.8317 +vn 0.2437 -0.4969 0.8329 +vn 0.3570 -0.3693 0.8580 +vn 0.3672 -0.3428 0.8647 +vn 0.5549 -0.0816 0.8279 +vn 0.4620 -0.2255 0.8577 +vn 0.4719 -0.1930 0.8603 +vn 0.3669 0.0005 0.9303 +vn 0.2874 -0.0014 0.9578 +vn 0.1819 0.0021 0.9833 +vn 0.0127 0.9412 0.3377 +vn -0.0018 0.9023 0.4310 +vn 0.0058 0.6131 0.7899 +vn 0.0177 0.7079 0.7061 +vn 0.0136 0.4191 0.9078 +vn 0.0068 0.3682 0.9297 +vn 0.3717 0.8617 0.3454 +vn 0.1543 0.9667 0.2041 +vn 0.5029 0.7651 0.4022 +vn 0.1991 0.8279 0.5244 +vn 0.3525 0.8502 0.3911 +vn 0.4944 0.5426 0.6791 +vn 0.2141 0.8448 0.4904 +vn 0.3352 0.5614 0.7566 +vn 0.2667 0.3009 0.9156 +vn 0.2708 0.4659 0.8424 +vn -0.1266 0.5535 0.8232 +vn 0.1694 0.4467 0.8785 +vn 0.1924 0.2517 0.9485 +vn 0.1054 0.3443 0.9329 +vn -0.0000 0.2914 0.9566 +vn -0.0001 0.2637 0.9646 +vn -0.0001 0.1708 0.9853 +vn -0.0000 0.1333 0.9911 +vn -0.3362 0.8527 0.3999 +vn -0.5005 0.7346 0.4580 +vn -0.1667 0.9153 0.3666 +vn -0.1182 0.8809 0.4584 +vn -0.3567 0.8120 0.4620 +vn -0.4773 0.8134 0.3324 +vn -0.1621 0.7084 0.6869 +vn -0.3961 0.6763 0.6211 +vn -0.1683 0.6081 0.7758 +vn -0.3603 0.5527 0.7515 +vn -0.2779 0.4683 0.8387 +vn -0.0249 0.3512 0.9360 +vn -0.1681 0.3122 0.9350 +vn -0.2353 0.3813 0.8940 +vn -0.0006 0.9129 0.4081 +vn -0.0087 0.9313 0.3641 +vn -0.0062 0.7427 0.6697 +vn 0.0017 0.7060 0.7082 +vn -0.0152 0.3894 0.9210 +vn -0.0155 0.3919 0.9199 +vn -0.3492 0.0006 0.9371 +vn -0.3171 -0.0009 0.9484 +vn -0.0929 -0.4132 0.9059 +vn -0.1047 -0.4191 0.9019 +vn -0.1659 -0.2121 0.9631 +vn -0.2845 -0.0939 0.9541 +vn -0.1849 -0.2333 0.9547 +vn -0.0993 -0.1995 0.9748 +vn -0.0964 -0.0609 0.9935 +vn -0.0000 -0.5214 0.8533 +vn 0.0001 -0.5019 0.8649 +vn -0.0001 -0.2608 0.9654 +vn 0.0001 -0.1853 0.9827 +vn 0.0651 -0.4734 0.8784 +vn 0.2554 -0.2567 0.9321 +vn 0.1263 -0.2703 0.9545 +vn 0.1259 -0.2300 0.9650 +vn 0.0558 -0.2895 0.9555 +vn 0.1853 -0.0787 0.9795 +vn 0.2454 -0.0827 0.9659 +vn -0.0051 0.0017 1.0000 +vn -0.0070 0.0014 1.0000 +vn 0.0132 -0.0017 0.9999 +vn -0.0001 0.0004 1.0000 +vn -0.0000 -0.0002 1.0000 +vn 0.0053 -0.0013 1.0000 +vn -0.0049 -0.0007 1.0000 +vn 0.0018 0.0003 1.0000 +vn 0.0020 0.0003 1.0000 +vn 0.0026 0.0005 1.0000 +vn 0.0045 -0.0019 1.0000 +vn 0.5294 -0.8483 0.0097 +vn 0.5858 -0.8102 0.0217 +vn 0.8960 -0.4437 0.0175 +vn 0.9060 -0.4230 0.0138 +vn -0.0003 -1.0000 0.0027 +vn 0.0002 -0.9998 0.0217 +vn -0.8341 -0.5511 0.0258 +vn -0.7330 -0.6802 -0.0039 +vn -0.3997 -0.9160 0.0356 +vn 0.0001 0.9987 0.0509 +vn 0.0001 0.9986 0.0530 +vn 0.9998 -0.0025 0.0193 +vn 0.9998 -0.0016 0.0174 +vn -0.9998 -0.0054 0.0172 +vn -0.9999 -0.0038 0.0136 +vn 0.9981 0.0443 0.0433 +vn 0.9266 0.3739 0.0403 +vn 0.8946 0.4443 0.0477 +vn 0.7294 0.6829 0.0399 +vn 0.6230 0.7804 0.0527 +vn 0.4271 0.9036 0.0313 +vn 0.9990 0.0084 0.0429 +vn 0.9987 0.0247 0.0454 +vn -0.9985 0.0312 0.0446 +vn -0.9987 0.0208 0.0460 +vn -0.9575 0.2859 0.0390 +vn -0.8879 0.4574 0.0493 +vn -0.7894 0.6128 0.0370 +vn -0.6029 0.7959 0.0556 +vn -0.3997 0.9162 0.0287 +vn 0.9557 0.2908 0.0463 +vn 0.9467 0.3195 0.0405 +vn 0.7389 0.6723 0.0459 +vn 0.7207 0.6921 0.0396 +vn 0.3429 0.9382 0.0461 +vn 0.3264 0.9443 0.0424 +vn 0.0059 0.9989 0.0471 +vn 0.0113 0.9990 0.0438 +vn 0.0174 0.9989 0.0425 +vn -0.0000 0.9990 0.0436 +vn 0.9994 -0.0030 0.0348 +vn 0.9991 -0.0048 0.0415 +vn 0.4866 -0.8723 0.0475 +vn 0.5320 -0.8466 0.0157 +vn 0.8816 -0.4692 0.0517 +vn 0.9058 -0.4230 0.0225 +vn 0.0003 -0.9997 0.0252 +vn 0.0001 -0.9994 0.0355 +vn -0.9456 -0.3247 0.0213 +vn -0.9170 -0.3953 0.0533 +vn -0.6959 -0.7178 0.0211 +vn -0.6653 -0.7455 0.0406 +vn -0.3286 -0.9440 0.0288 +vn -0.3109 -0.9497 0.0366 +vn -0.9993 -0.0021 0.0384 +vn -0.9994 -0.0030 0.0348 +vn -0.0051 0.9990 0.0438 +vn -0.0190 0.9991 0.0385 +vn -0.0000 0.9988 0.0496 +vn -0.0320 0.9985 0.0442 +vn -0.2949 0.9540 0.0534 +vn -0.4497 0.8926 0.0326 +vn -0.6240 0.7796 0.0541 +vn -0.7382 0.6737 0.0353 +vn -0.9132 0.4050 0.0460 +vn -0.9104 0.4113 0.0443 +vn -0.9976 0.0496 0.0477 +vn 0.0016 0.0432 -0.9991 +vn -0.0043 0.0983 -0.9951 +vn 0.0002 0.0149 -0.9999 +vn -0.0001 0.3629 -0.9318 +vn 0.0001 0.3932 -0.9195 +vn -0.0001 0.5571 -0.8304 +vn 0.0002 0.6153 -0.7883 +vn -0.0002 0.7706 -0.6373 +vn 0.0002 0.8165 -0.5773 +vn -0.0000 0.9494 -0.3141 +vn -0.0001 0.9550 -0.2965 +vn -0.0000 -0.0012 -1.0000 +vn 0.0002 -0.0060 -1.0000 vt 0.647387 0.000318 vt 0.415797 0.008175 vt 0.276695 0.005359 @@ -1218,2359 +3032,2171 @@ vt 0.990601 0.996377 vt 0.010459 0.997145 vt 0.982620 0.999538 vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647395 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647400 0.000319 vt 0.647401 0.000319 vt 0.647400 0.000319 -vt 0.647401 0.000319 -vt 0.647400 0.000319 -vt 0.647401 0.000319 -vt 0.647400 0.000319 -vt 0.647401 0.000319 -vt 0.647400 0.000319 -vt 0.647400 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647400 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647401 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 vt 0.647406 0.000319 vt 0.647407 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647407 0.000319 -vt 0.647406 0.000319 -vt 0.647406 0.000319 -vt 0.647406 0.000319 -vt 0.647407 0.000319 -vt 0.647407 0.000319 -vt 0.647407 0.000318 -vt 0.647407 0.000318 -vt 0.647407 0.000318 -vt 0.647407 0.000318 vt 0.647407 0.000318 -vt 0.647407 0.000318 -vt 0.647408 0.000320 -vt 0.647408 0.000320 -vt 0.647408 0.000320 -vt 0.647408 0.000320 vt 0.647408 0.000320 -vt 0.647408 0.000320 -vt 0.647414 0.000320 vt 0.647414 0.000320 vt 0.647415 0.000320 -vt 0.647415 0.000320 -vt 0.647415 0.000320 -vt 0.647415 0.000320 -vt 0.647415 0.000320 -vt 0.647415 0.000320 -vt 0.647415 0.000320 -vt 0.647415 0.000346 -vt 0.647415 0.000346 -vt 0.647415 0.000346 -vt 0.647415 0.000346 -vt 0.647415 0.000346 vt 0.647415 0.000346 vt 0.647414 0.000346 -vt 0.647414 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 -vt 0.647387 0.000346 vt 0.647387 0.000346 vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647387 0.000320 -vt 0.647394 0.000320 -vt 0.647394 0.000320 -vt 0.647394 0.000320 -vt 0.647394 0.000320 -vt 0.647394 0.000320 vt 0.647394 0.000320 vt 0.647395 0.000318 vt 0.647394 0.000318 -vt 0.647395 0.000318 -vt 0.647395 0.000318 -vt 0.647395 0.000318 -vt 0.647395 0.000318 vt 0.647404 0.000318 -vt 0.647387 0.000318 s 0 -f 1/1 541/1 149/2 -f 412/1 541/1 1/1 -f 9/1 48/1 47/1 -f 6/1 9/1 47/1 -f 8/3 50/1 48/1 -f 9/1 8/3 48/1 -f 2/1 26/1 69/1 -f 71/1 2/1 69/1 -f 3/1 2/1 71/1 -f 72/1 3/1 71/1 -f 152/1 447/1 150/1 -f 448/1 447/1 152/1 -f 154/1 448/1 152/1 -f 154/1 4/1 448/1 -f 4/1 5/1 450/4 -f 154/1 5/1 4/1 -f 155/1 5/1 154/1 -f 528/1 5/1 155/1 -f 158/1 528/1 155/1 -f 159/1 528/1 158/1 -f 161/1 528/1 159/1 -f 322/1 528/1 161/1 -f 321/5 322/1 161/1 -f 7/1 9/1 6/1 -f 7/1 8/3 9/1 -f 165/1 10/1 7/1 -f 10/1 8/3 7/1 -f 165/1 13/1 10/1 -f 10/1 13/1 8/3 -f 11/1 12/1 165/1 -f 12/1 13/1 165/1 -f 14/1 12/1 11/1 -f 16/1 13/1 12/1 -f 16/1 12/1 14/1 -f 18/1 13/1 16/1 -f 15/1 16/1 14/1 -f 17/1 16/1 15/1 -f 17/1 18/1 16/1 -f 19/1 20/1 17/1 -f 20/1 18/1 17/1 -f 21/1 22/1 19/1 -f 22/1 20/1 19/1 -f 25/1 22/1 21/1 -f 166/1 25/1 21/1 -f 25/1 20/1 22/1 -f 23/1 24/1 166/1 -f 24/1 25/1 166/1 -f 27/1 26/1 2/1 -f 27/1 28/1 26/1 -f 27/1 29/1 28/1 -f 3/1 27/1 2/1 -f 3/1 29/1 27/1 -f 3/1 31/1 29/1 -f 29/1 30/1 28/1 -f 31/1 30/1 29/1 -f 142/1 31/1 3/1 -f 33/1 32/1 30/1 -f 31/1 33/1 30/1 -f 142/1 33/1 31/1 -f 36/1 35/1 32/1 -f 33/1 36/1 32/1 -f 34/1 36/1 33/1 -f 142/1 34/1 33/1 -f 144/1 34/1 142/1 -f 36/1 39/1 35/1 -f 37/1 39/1 36/1 -f 34/1 37/1 36/1 -f 144/1 37/1 34/1 -f 38/1 39/1 37/1 -f 144/1 38/1 37/1 -f 38/1 40/1 39/1 -f 144/1 41/1 38/1 -f 43/1 41/1 144/1 -f 41/1 40/1 38/1 -f 41/1 42/1 40/1 -f 43/1 42/1 41/1 -f 43/1 167/1 42/1 -f 169/1 167/1 43/1 -f 168/1 169/1 43/1 -f 437/1 240/1 237/1 -f 438/1 240/1 437/1 -f 438/1 242/1 240/1 -f 522/1 242/1 438/1 -f 44/1 242/1 522/1 -f 44/1 245/1 242/1 -f 44/1 246/1 245/1 -f 44/1 248/1 246/1 -f 46/1 248/1 44/1 -f 46/1 45/1 248/1 -f 46/1 282/1 45/1 -f 69/1 6/1 47/1 -f 69/1 26/1 6/1 -f 48/1 49/1 47/1 -f 51/1 52/1 49/1 -f 51/1 49/1 48/1 -f 50/1 51/1 48/1 -f 55/1 52/1 51/1 -f 55/1 51/1 50/1 -f 54/1 53/1 52/1 -f 55/1 54/1 52/1 -f 50/1 90/1 55/1 -f 90/1 54/1 55/1 -f 57/1 56/1 53/1 -f 54/1 57/1 53/1 -f 90/1 57/1 54/1 -f 57/1 58/1 56/1 -f 57/1 59/1 58/1 -f 90/1 59/1 57/1 -f 91/1 59/1 90/1 -f 59/1 60/1 58/1 -f 62/1 61/1 60/1 -f 59/1 62/1 60/1 -f 65/1 62/1 59/1 -f 91/1 65/1 59/1 -f 62/1 63/1 61/1 -f 64/1 66/1 63/1 -f 62/1 64/1 63/1 -f 65/1 64/1 62/1 -f 68/1 64/1 65/1 -f 64/1 67/1 66/1 -f 253/1 67/1 64/1 -f 68/1 253/1 64/1 -f 73/1 70/1 69/1 -f 70/1 71/1 69/1 -f 73/1 74/1 70/1 -f 70/1 72/1 71/1 -f 74/1 72/1 70/1 -f 74/1 76/1 72/1 -f 254/1 74/1 73/1 -f 75/1 74/1 254/1 -f 75/1 78/1 74/1 -f 78/1 76/1 74/1 -f 77/1 75/1 254/1 -f 77/1 79/1 75/1 -f 79/1 78/1 75/1 -f 80/1 78/1 79/1 -f 255/1 79/1 77/1 -f 255/1 81/1 79/1 -f 81/1 80/1 79/1 -f 80/1 82/1 78/1 -f 81/1 82/1 80/1 -f 83/1 84/1 255/1 -f 84/1 81/1 255/1 -f 84/1 82/1 81/1 -f 85/1 84/1 83/1 -f 88/1 82/1 84/1 -f 85/1 88/1 84/1 -f 86/1 85/1 83/1 -f 87/1 85/1 86/1 -f 87/1 88/1 85/1 -f 256/1 87/1 86/1 -f 256/1 89/1 87/1 -f 89/1 88/1 87/1 -f 89/1 136/1 88/1 -f 257/1 89/1 256/1 -f 257/1 136/1 89/1 -f 119/1 102/1 50/1 -f 8/3 119/1 50/1 -f 13/1 119/1 8/3 -f 102/1 90/1 50/1 -f 123/1 119/1 13/1 -f 102/1 107/1 90/1 -f 18/1 123/1 13/1 -f 129/1 123/1 18/1 -f 111/1 91/1 90/1 -f 107/1 111/1 90/1 -f 20/1 129/1 18/1 -f 111/1 65/1 91/1 -f 130/1 129/1 20/1 -f 111/1 113/1 65/1 -f 113/1 68/1 65/1 -f 25/1 130/1 20/1 -f 93/1 130/1 25/1 -f 92/1 68/1 113/1 -f 92/1 237/1 68/1 -f 437/1 237/1 92/1 -f 25/1 447/1 93/1 -f 150/1 447/1 25/1 -f 435/1 214/1 212/1 -f 217/1 435/1 293/1 -f 217/1 214/1 435/1 -f 223/1 292/1 98/1 -f 223/1 225/1 292/1 -f 225/1 94/1 292/1 -f 225/1 216/1 94/1 -f 216/1 95/1 94/1 -f 216/1 218/1 95/1 -f 218/1 293/1 95/1 -f 218/1 217/1 293/1 -f 233/1 224/1 96/1 -f 224/1 97/1 96/1 -f 224/1 222/1 97/1 -f 222/1 299/1 97/1 -f 222/1 223/1 299/1 -f 223/1 98/1 299/1 -f 305/1 185/1 96/1 -f 185/1 233/1 96/1 -f 186/1 185/1 305/1 -f 307/1 186/1 305/1 -f 187/1 186/1 307/1 -f 306/1 189/1 307/1 -f 189/1 187/1 307/1 -f 316/1 189/1 306/1 -f 197/1 189/1 316/1 -f 99/1 197/1 316/1 -f 198/1 197/1 99/1 -f 313/1 198/1 99/1 -f 196/1 198/1 313/1 -f 319/1 196/1 313/1 -f 202/1 196/1 319/1 -f 205/1 100/1 454/1 -f 100/1 205/1 319/1 -f 205/1 202/1 319/1 -f 103/1 102/1 101/1 -f 105/1 103/1 101/1 -f 327/1 105/1 101/1 -f 103/1 107/1 102/1 -f 105/1 104/1 103/1 -f 328/1 104/1 105/1 -f 104/1 107/1 103/1 -f 108/1 107/1 104/1 -f 328/1 108/1 104/1 -f 106/1 108/1 328/1 -f 109/1 107/1 108/1 -f 106/1 109/1 108/1 -f 109/1 111/1 107/1 -f 110/1 109/1 106/1 -f 109/1 112/1 111/1 -f 110/1 112/1 109/1 -f 330/1 112/1 110/1 -f 112/1 113/1 111/1 -f 114/1 113/1 112/1 -f 330/1 114/1 112/1 -f 331/1 114/1 330/1 -f 114/1 92/1 113/1 -f 115/1 92/1 114/1 -f 331/1 115/1 114/1 -f 115/1 283/1 92/1 -f 441/1 283/1 115/1 -f 119/1 101/1 102/1 -f 116/1 101/1 119/1 -f 117/1 101/1 116/1 -f 117/1 327/1 101/1 -f 118/1 327/1 117/1 -f 119/1 121/1 116/1 -f 121/1 120/1 116/1 -f 120/1 117/1 116/1 -f 120/1 118/1 117/1 -f 123/1 121/1 119/1 -f 121/1 122/1 120/1 -f 123/1 124/1 121/1 -f 124/1 122/1 121/1 -f 129/1 126/1 123/1 -f 126/1 124/1 123/1 -f 126/1 125/1 124/1 -f 127/1 126/1 129/1 -f 128/1 125/1 126/1 -f 127/1 128/1 126/1 -f 130/1 127/1 129/1 -f 130/1 131/1 127/1 -f 131/1 128/1 127/1 -f 133/1 132/1 130/1 -f 132/1 131/1 130/1 -f 133/1 134/1 132/1 -f 93/1 133/1 130/1 -f 284/1 134/1 133/1 -f 93/1 284/1 133/1 -f 285/1 284/1 93/1 -f 540/1 141/1 272/1 -f 520/1 540/1 272/1 -f 136/1 135/1 353/6 -f 136/1 338/1 135/1 -f 258/1 338/1 136/1 -f 258/1 340/1 338/1 -f 137/1 340/1 258/1 -f 261/1 340/1 137/1 -f 261/1 343/1 340/1 -f 262/1 343/1 261/1 -f 264/1 344/1 262/1 -f 344/1 343/1 262/1 -f 346/1 344/1 264/1 -f 138/1 346/1 264/1 -f 138/1 348/1 346/1 -f 139/1 348/1 138/1 -f 350/1 348/1 139/1 -f 268/1 350/1 139/1 -f 140/1 350/1 268/1 -f 141/1 140/1 268/1 -f 272/1 141/1 268/1 -f 356/1 3/1 72/1 -f 356/1 376/1 3/1 -f 76/1 356/1 72/1 -f 363/1 356/1 76/1 -f 376/1 142/1 3/1 -f 78/1 363/1 76/1 -f 376/1 380/1 142/1 -f 143/1 363/1 78/1 -f 82/1 143/1 78/1 -f 380/1 381/1 142/1 -f 381/1 144/1 142/1 -f 372/1 143/1 82/1 -f 387/1 144/1 381/1 -f 88/1 372/1 82/1 -f 353/6 372/1 88/1 -f 387/1 43/1 144/1 -f 136/1 353/6 88/1 -f 389/1 43/1 387/1 -f 389/1 168/1 43/1 -f 170/1 168/1 389/1 -f 395/1 170/1 389/1 -f 395/1 145/1 170/1 -f 396/1 145/1 395/1 -f 396/1 172/1 145/1 -f 146/1 172/1 396/1 -f 146/1 147/1 172/1 -f 399/1 147/1 146/1 -f 399/1 175/1 147/1 -f 403/1 175/1 399/1 -f 179/1 175/1 403/1 -f 404/1 179/1 403/1 -f 148/1 179/1 404/1 -f 406/1 148/1 404/1 -f 182/1 148/1 406/1 -f 407/1 182/1 406/1 -f 149/2 182/1 407/1 -f 1/1 149/2 407/1 -f 151/1 152/1 150/1 -f 413/1 153/1 151/1 -f 151/1 153/1 152/1 -f 153/1 154/1 152/1 -f 413/1 160/1 153/1 -f 153/1 157/1 154/1 -f 160/1 156/1 153/1 -f 156/1 157/1 153/1 -f 157/1 155/1 154/1 -f 158/1 155/1 157/1 -f 157/1 163/1 158/1 -f 160/1 162/1 156/1 -f 156/1 163/1 157/1 -f 162/1 163/1 156/1 -f 158/1 164/1 159/1 -f 164/1 161/1 159/1 -f 163/1 164/1 158/1 -f 162/1 164/1 163/1 -f 164/1 321/5 161/1 -f 413/1 24/1 23/1 -f 413/1 151/1 24/1 -f 151/1 150/1 24/1 -f 150/1 25/1 24/1 -f 26/1 7/1 6/1 -f 28/1 165/1 7/1 -f 26/1 28/1 7/1 -f 28/1 11/1 165/1 -f 30/1 14/1 11/1 -f 28/1 30/1 11/1 -f 32/1 15/1 14/1 -f 30/1 32/1 14/1 -f 35/1 17/1 15/1 -f 32/1 35/1 15/1 -f 35/1 19/1 17/1 -f 35/1 39/1 19/1 -f 39/1 21/1 19/1 -f 40/1 21/1 39/1 -f 40/1 166/1 21/1 -f 42/1 166/1 40/1 -f 42/1 23/1 166/1 -f 167/1 23/1 42/1 -f 170/1 169/1 168/1 -f 169/1 171/1 167/1 -f 170/1 171/1 169/1 -f 171/1 173/1 167/1 -f 145/1 171/1 170/1 -f 145/1 172/1 171/1 -f 172/1 173/1 171/1 -f 147/1 173/1 172/1 -f 147/1 174/1 173/1 -f 147/1 177/1 174/1 -f 175/1 177/1 147/1 -f 177/1 176/1 174/1 -f 179/1 177/1 175/1 -f 177/1 178/1 176/1 -f 179/1 178/1 177/1 -f 179/1 148/1 178/1 -f 180/1 176/1 178/1 -f 148/1 180/1 178/1 -f 180/1 181/1 176/1 -f 148/1 182/1 180/1 -f 183/1 181/1 180/1 -f 182/1 183/1 180/1 -f 149/2 183/1 182/1 -f 183/1 184/1 181/1 -f 541/1 184/1 183/1 -f 149/2 541/1 183/1 -f 186/1 188/1 185/1 -f 187/1 188/1 186/1 -f 188/1 191/1 185/1 -f 189/1 190/1 187/1 -f 200/1 189/1 197/1 -f 187/1 190/1 188/1 -f 200/1 193/1 189/1 -f 193/1 190/1 189/1 -f 188/1 192/1 191/1 -f 195/1 192/1 188/1 -f 190/1 195/1 188/1 -f 192/1 194/2 191/1 -f 193/1 195/1 190/1 -f 200/1 195/1 193/1 -f 195/1 194/2 192/1 -f 198/1 200/1 197/1 -f 196/1 201/1 198/1 -f 199/1 201/1 196/1 -f 202/1 199/1 196/1 -f 203/1 199/1 202/1 -f 198/1 201/1 200/1 -f 200/1 201/1 195/1 -f 203/1 201/1 199/1 -f 204/1 202/1 205/1 -f 204/1 203/1 202/1 -f 206/1 205/1 210/1 -f 205/1 458/1 210/1 -f 205/1 454/1 458/1 -f 206/1 204/1 205/1 -f 320/1 208/1 207/1 -f 208/1 325/1 207/1 -f 325/1 324/1 207/1 -f 208/1 415/1 325/1 -f 415/1 209/1 325/1 -f 415/1 210/1 209/1 -f 418/1 206/1 210/1 -f 415/1 416/1 210/1 -f 417/1 418/1 210/1 -f 416/1 417/1 210/1 -f 432/1 213/1 211/1 -f 212/1 213/1 432/1 -f 214/1 213/1 212/1 -f 215/1 213/1 214/1 -f 217/1 215/1 214/1 -f 219/1 215/1 217/1 -f 420/1 215/1 219/1 -f 219/1 217/1 218/1 -f 225/1 221/1 216/1 -f 221/1 218/1 216/1 -f 220/1 221/1 225/1 -f 221/1 219/1 218/1 -f 221/1 420/1 219/1 -f 230/1 221/1 220/1 -f 230/1 420/1 221/1 -f 233/1 226/1 224/1 -f 227/1 222/1 224/1 -f 227/1 228/1 222/1 -f 228/1 223/1 222/1 -f 228/1 225/1 223/1 -f 226/1 227/1 224/1 -f 220/1 225/1 228/1 -f 231/1 228/1 227/1 -f 229/1 227/1 226/1 -f 229/1 231/1 227/1 -f 230/1 220/1 228/1 -f 231/1 230/1 228/1 -f 229/1 232/1 231/1 -f 232/1 230/1 231/1 -f 185/1 226/1 233/1 -f 191/1 226/1 185/1 -f 191/1 229/1 226/1 -f 191/1 194/2 229/1 -f 194/2 232/1 229/1 -f 274/1 234/1 280/1 -f 235/1 422/1 274/1 -f 422/1 234/1 274/1 -f 425/1 235/1 274/1 -f 428/1 426/1 274/1 -f 426/1 425/1 274/1 -f 275/1 428/1 274/1 -f 211/1 428/1 275/1 -f 236/1 279/1 275/1 -f 279/1 211/1 275/1 -f 213/1 428/1 211/1 -f 240/1 238/1 237/1 -f 240/1 239/1 238/1 -f 241/1 239/1 240/1 -f 241/1 244/1 239/1 -f 244/1 243/1 239/1 -f 242/1 241/1 240/1 -f 245/1 241/1 242/1 -f 244/1 241/1 245/1 -f 249/1 243/1 244/1 -f 247/1 244/1 245/1 -f 246/1 247/1 245/1 -f 247/1 249/1 244/1 -f 249/1 252/1 243/1 -f 250/1 249/1 247/1 -f 248/1 247/1 246/1 -f 250/1 247/1 248/1 -f 45/1 250/1 248/1 -f 252/1 249/1 250/1 -f 45/1 251/1 250/1 -f 282/1 251/1 45/1 -f 251/1 252/1 250/1 -f 239/1 243/1 67/1 -f 253/1 239/1 67/1 -f 238/1 239/1 253/1 -f 68/1 238/1 253/1 -f 237/1 238/1 68/1 -f 49/1 73/1 47/1 -f 73/1 69/1 47/1 -f 52/1 73/1 49/1 -f 254/1 73/1 52/1 -f 53/1 254/1 52/1 -f 56/1 254/1 53/1 -f 77/1 254/1 56/1 -f 58/1 77/1 56/1 -f 255/1 77/1 58/1 -f 60/1 255/1 58/1 -f 83/1 255/1 60/1 -f 61/1 83/1 60/1 -f 86/1 83/1 61/1 -f 63/1 86/1 61/1 -f 66/1 86/1 63/1 -f 66/1 256/1 86/1 -f 67/1 256/1 66/1 -f 259/1 257/1 256/1 -f 259/1 258/1 257/1 -f 258/1 136/1 257/1 -f 259/1 137/1 258/1 -f 260/1 137/1 259/1 -f 260/1 261/1 137/1 -f 263/1 260/1 259/1 -f 263/1 262/1 260/1 -f 262/1 261/1 260/1 -f 263/1 265/1 262/1 -f 265/1 264/1 262/1 -f 138/1 264/1 265/1 -f 266/1 265/1 263/1 -f 266/1 139/1 265/1 -f 139/1 138/1 265/1 -f 267/1 268/1 266/1 -f 268/1 139/1 266/1 -f 270/1 267/1 266/1 -f 270/1 271/1 267/1 -f 271/1 272/1 267/1 -f 272/1 268/1 267/1 -f 269/1 271/1 270/1 -f 269/1 520/1 271/1 -f 520/1 272/1 271/1 -f 276/1 275/1 273/1 -f 275/1 274/1 273/1 -f 236/1 275/1 276/1 -f 277/1 236/1 276/1 -f 278/1 236/1 277/1 -f 279/1 236/1 278/1 -f 430/1 279/1 278/1 -f 211/1 279/1 430/1 -f 432/1 211/1 430/1 -f 251/1 280/1 252/1 -f 282/1 280/1 251/1 -f 46/1 281/1 282/1 -f 281/1 280/1 282/1 -f 273/1 274/1 281/1 -f 274/1 280/1 281/1 -f 436/1 283/1 441/1 -f 436/1 437/1 283/1 -f 437/1 92/1 283/1 -f 285/1 445/1 284/1 -f 446/1 445/1 285/1 -f 93/1 446/1 285/1 -f 447/1 446/1 93/1 -f 291/1 286/1 288/1 -f 291/1 435/1 286/1 -f 293/1 435/1 291/1 -f 297/1 289/1 287/1 -f 290/1 288/1 287/1 -f 298/1 289/1 297/1 -f 289/1 290/1 287/1 -f 95/1 288/1 290/1 -f 95/1 291/1 288/1 -f 98/1 289/1 298/1 -f 292/1 290/1 289/1 -f 98/1 292/1 289/1 -f 292/1 94/1 290/1 -f 94/1 95/1 290/1 -f 95/1 293/1 291/1 -f 300/1 295/1 294/1 -f 297/1 287/1 294/1 -f 295/1 296/1 294/1 -f 296/1 297/1 294/1 -f 295/1 97/1 296/1 -f 98/1 298/1 297/1 -f 300/1 97/1 295/1 -f 296/1 98/1 297/1 -f 97/1 299/1 296/1 -f 96/1 97/1 300/1 -f 299/1 98/1 296/1 -f 302/1 294/1 301/1 -f 302/1 300/1 294/1 -f 304/1 300/1 302/1 -f 304/1 96/1 300/1 -f 305/1 96/1 304/1 -f 301/1 303/1 302/1 -f 314/1 303/1 301/1 -f 309/1 314/1 301/1 -f 303/1 304/1 302/1 -f 310/1 314/1 309/1 -f 314/1 306/1 303/1 -f 316/1 306/1 314/1 -f 303/1 305/1 304/1 -f 307/1 305/1 303/1 -f 306/1 307/1 303/1 -f 308/1 310/1 309/1 -f 311/1 310/1 308/1 -f 317/1 311/1 308/1 -f 317/1 313/1 311/1 -f 315/1 313/1 317/1 -f 312/1 315/1 317/1 -f 311/1 99/1 310/1 -f 313/1 99/1 311/1 -f 310/1 316/1 314/1 -f 312/1 319/1 315/1 -f 99/1 316/1 310/1 -f 315/1 319/1 313/1 -f 318/1 312/1 317/1 -f 100/1 312/1 318/1 -f 100/1 319/1 312/1 -f 320/1 164/1 162/1 -f 320/1 321/5 164/1 -f 320/1 322/1 321/5 -f 320/1 323/1 322/1 -f 320/1 207/1 452/1 -f 323/1 320/1 452/1 -f 324/1 452/1 207/1 -f 324/1 453/1 452/1 -f 325/1 453/1 324/1 -f 325/1 326/1 453/1 -f 209/1 326/1 325/1 -f 209/1 456/1 326/1 -f 210/1 456/1 209/1 -f 210/1 458/1 456/1 -f 464/1 105/1 327/1 -f 464/1 462/1 105/1 -f 462/1 328/1 105/1 -f 462/1 106/1 328/1 -f 329/1 106/1 462/1 -f 329/1 110/1 106/1 -f 329/1 330/1 110/1 -f 461/1 330/1 329/1 -f 461/1 331/1 330/1 -f 443/1 331/1 461/1 -f 443/1 115/1 331/1 -f 443/1 441/1 115/1 -f 465/1 464/1 118/1 -f 464/1 327/1 118/1 -f 120/1 465/1 118/1 -f 122/1 465/1 120/1 -f 466/1 465/1 122/1 -f 124/1 466/1 122/1 -f 125/1 466/1 124/1 -f 128/1 332/1 125/1 -f 332/1 466/1 125/1 -f 131/1 332/1 128/1 -f 132/1 332/1 131/1 -f 134/1 332/1 132/1 -f 134/1 467/1 332/1 -f 284/1 467/1 134/1 -f 352/1 333/1 351/1 -f 540/1 333/1 352/1 -f 141/1 540/1 352/1 -f 334/1 337/1 355/1 -f 335/1 337/1 334/1 -f 338/1 335/1 135/1 -f 336/1 337/1 335/1 -f 338/1 336/1 335/1 -f 336/1 339/1 337/1 -f 338/1 340/1 336/1 -f 339/1 341/1 337/1 -f 340/1 339/1 336/1 -f 343/1 339/1 340/1 -f 339/1 342/1 341/1 -f 343/1 342/1 339/1 -f 343/1 344/1 342/1 -f 342/1 345/1 341/1 -f 344/1 345/1 342/1 -f 346/1 345/1 344/1 -f 346/1 347/1 345/1 -f 348/1 347/1 346/1 -f 347/1 349/1 345/1 -f 350/1 349/1 347/1 -f 348/1 350/1 347/1 -f 350/1 351/1 349/1 -f 140/1 351/1 350/1 -f 140/1 352/1 351/1 -f 141/1 352/1 140/1 -f 135/1 354/1 353/6 -f 135/1 335/1 354/1 -f 334/1 354/1 335/1 -f 358/1 357/1 356/1 -f 363/1 361/1 356/1 -f 358/1 360/1 357/1 -f 360/1 359/1 357/1 -f 361/1 358/1 356/1 -f 361/1 362/1 358/1 -f 362/1 360/1 358/1 -f 361/1 364/1 362/1 -f 363/1 365/1 361/1 -f 365/1 364/1 361/1 -f 365/1 367/1 364/1 -f 143/1 366/1 363/1 -f 366/1 365/1 363/1 -f 366/1 367/1 365/1 -f 368/1 367/1 366/1 -f 143/1 369/1 366/1 -f 369/1 368/1 366/1 -f 372/1 369/1 143/1 -f 369/1 370/1 368/1 -f 371/1 369/1 372/1 -f 371/1 370/1 369/1 -f 374/1 370/1 371/1 -f 353/6 354/1 372/1 -f 354/1 371/1 372/1 -f 354/1 373/1 371/1 -f 373/1 374/1 371/1 -f 334/1 373/1 354/1 -f 334/1 355/1 373/1 -f 355/1 374/1 373/1 -f 357/1 376/1 356/1 -f 357/1 375/1 376/1 -f 359/1 375/1 357/1 -f 475/1 375/1 359/1 -f 375/1 377/1 376/1 -f 377/1 380/1 376/1 -f 378/1 377/1 375/1 -f 475/1 378/1 375/1 -f 379/1 380/1 377/1 -f 378/1 379/1 377/1 -f 476/2 379/1 378/1 -f 476/2 380/1 379/1 -f 383/1 380/1 476/2 -f 477/1 383/1 476/2 -f 383/1 381/1 380/1 -f 477/1 382/1 383/1 -f 383/1 384/1 381/1 -f 385/1 384/1 383/1 -f 382/1 385/1 383/1 -f 479/1 385/1 382/1 -f 384/1 387/1 381/1 -f 386/1 387/1 384/1 -f 385/1 386/1 384/1 -f 479/1 386/1 385/1 -f 480/2 386/1 479/1 -f 386/1 388/1 387/1 -f 390/1 388/1 386/1 -f 480/2 390/1 386/1 -f 391/1 390/1 480/2 -f 388/1 389/1 387/1 -f 391/1 392/1 390/1 -f 392/1 393/1 390/1 -f 393/1 388/1 390/1 -f 393/1 389/1 388/1 -f 394/1 393/1 392/1 -f 393/1 395/1 389/1 -f 394/1 395/1 393/1 -f 396/1 395/1 394/1 -f 398/1 397/1 394/1 -f 397/1 396/1 394/1 -f 146/1 396/1 397/1 -f 398/1 400/1 397/1 -f 400/1 146/1 397/1 -f 400/1 399/1 146/1 -f 401/1 400/1 398/1 -f 401/1 402/1 400/1 -f 402/1 403/1 400/1 -f 403/1 399/1 400/1 -f 405/1 402/1 401/1 -f 405/1 404/1 402/1 -f 404/1 403/1 402/1 -f 408/1 404/1 405/1 -f 408/1 406/1 404/1 -f 411/1 408/1 405/1 -f 411/1 409/1 408/1 -f 407/1 406/1 408/1 -f 409/1 407/1 408/1 -f 409/1 1/1 407/1 -f 410/1 409/1 411/1 -f 410/1 412/1 409/1 -f 412/1 1/1 409/1 -f 181/1 23/1 167/1 -f 184/1 413/1 23/1 -f 181/1 184/1 23/1 -f 173/1 181/1 167/1 -f 176/1 181/1 173/1 -f 174/1 176/1 173/1 -f 482/1 413/1 184/1 -f 482/1 160/1 413/1 -f 482/1 162/1 160/1 -f 482/1 208/1 162/1 -f 208/1 320/1 162/1 -f 485/1 208/1 482/1 -f 414/1 208/1 485/1 -f 415/1 208/1 414/1 -f 488/1 415/1 414/1 -f 491/1 415/1 488/1 -f 416/1 415/1 491/1 -f 493/1 416/1 491/1 -f 494/1 416/1 493/1 -f 417/1 416/1 494/1 -f 497/1 417/1 494/1 -f 500/1 417/1 497/1 -f 502/1 418/1 500/1 -f 418/1 417/1 500/1 -f 504/1 418/1 502/1 -f 230/1 232/1 419/1 -f 428/1 215/1 419/1 -f 215/1 420/1 419/1 -f 420/1 230/1 419/1 -f 232/1 504/1 419/1 -f 204/1 418/1 504/1 -f 203/1 204/1 504/1 -f 194/2 195/1 504/1 -f 195/1 201/1 504/1 -f 201/1 203/1 504/1 -f 232/1 194/2 504/1 -f 428/1 213/1 215/1 -f 206/1 418/1 204/1 -f 234/1 508/1 421/1 -f 234/1 510/1 508/1 -f 422/1 510/1 234/1 -f 422/1 423/1 510/1 -f 235/1 423/1 422/1 -f 235/1 513/1 423/1 -f 235/1 424/1 513/1 -f 425/1 424/1 235/1 -f 425/1 516/1 424/1 -f 425/1 427/1 516/1 -f 425/1 426/1 427/1 -f 426/1 519/1 427/1 -f 426/1 428/1 519/1 -f 428/1 419/1 519/1 -f 270/1 259/1 256/1 -f 269/1 270/1 256/1 -f 67/1 269/1 256/1 -f 421/1 269/1 67/1 -f 243/1 421/1 67/1 -f 270/1 266/1 259/1 -f 266/1 263/1 259/1 -f 252/1 421/1 243/1 -f 280/1 234/1 252/1 -f 234/1 421/1 252/1 -f 429/1 273/1 281/1 -f 429/1 277/1 273/1 -f 277/1 276/1 273/1 -f 429/1 431/1 277/1 -f 431/1 278/1 277/1 -f 431/1 430/1 278/1 -f 431/1 432/1 430/1 -f 431/1 433/1 432/1 -f 525/1 212/1 432/1 -f 433/1 434/1 432/1 -f 434/1 525/1 432/1 -f 439/1 438/1 437/1 -f 436/1 439/1 437/1 -f 440/1 439/1 436/1 -f 439/1 522/1 438/1 -f 440/1 522/1 439/1 -f 436/1 441/1 443/1 -f 442/1 436/1 443/1 -f 442/1 440/1 436/1 -f 284/1 444/1 467/1 -f 445/1 444/1 284/1 -f 445/1 449/2 444/1 -f 448/1 446/1 447/1 -f 4/1 446/1 448/1 -f 4/1 445/1 446/1 -f 450/4 445/1 4/1 -f 450/4 449/2 445/1 -f 288/1 286/1 451/1 -f 553/1 301/1 451/1 -f 301/1 294/1 451/1 -f 287/1 288/1 451/1 -f 294/1 287/1 451/1 -f 309/1 301/1 553/1 -f 308/1 309/1 553/1 -f 318/1 317/1 553/1 -f 317/1 308/1 553/1 -f 530/1 323/1 452/1 -f 453/1 530/1 452/1 -f 457/1 530/1 453/1 -f 326/1 457/1 453/1 -f 456/1 457/1 326/1 -f 454/1 529/1 458/1 -f 529/1 455/1 458/1 -f 458/1 457/1 456/1 -f 459/1 457/1 458/1 -f 455/1 459/1 458/1 -f 463/1 460/1 464/1 -f 461/1 329/1 464/1 -f 460/1 443/1 464/1 -f 443/1 461/1 464/1 -f 465/1 463/1 464/1 -f 329/1 462/1 464/1 -f 562/1 463/1 465/1 -f 466/1 562/1 465/1 -f 332/1 562/1 466/1 -f 564/1 562/1 332/1 -f 467/1 564/1 332/1 -f 460/1 442/1 443/1 -f 444/1 556/1 467/1 -f 556/1 564/1 467/1 -f 468/1 564/1 556/1 -f 451/1 468/1 556/1 -f 469/1 451/1 556/1 -f 558/1 451/1 469/1 -f 559/1 451/1 558/1 -f 553/1 451/1 559/1 -f 351/1 333/1 474/1 -f 355/1 351/1 474/1 -f 337/1 351/1 355/1 -f 345/1 349/1 337/1 -f 349/1 351/1 337/1 -f 341/1 345/1 337/1 -f 360/1 470/1 359/1 -f 362/1 470/1 360/1 -f 471/1 470/1 362/1 -f 364/1 471/1 362/1 -f 472/1 471/1 364/1 -f 367/1 472/1 364/1 -f 368/1 472/1 367/1 -f 370/1 472/1 368/1 -f 473/1 472/1 370/1 -f 374/1 473/1 370/1 -f 374/1 474/1 473/1 -f 355/1 474/1 374/1 -f 359/1 470/1 475/1 -f 470/1 533/1 475/1 -f 533/1 378/1 475/1 -f 533/1 535/1 378/1 -f 535/1 476/2 378/1 -f 535/1 477/1 476/2 -f 535/1 478/1 477/1 -f 478/1 382/1 477/1 -f 478/1 536/1 382/1 -f 536/1 479/1 382/1 -f 536/1 480/2 479/1 -f 481/1 480/2 536/1 -f 481/1 391/1 480/2 -f 481/1 392/1 391/1 -f 481/1 410/1 392/1 -f 410/1 411/1 392/1 -f 411/1 394/1 392/1 -f 411/1 405/1 394/1 -f 405/1 401/1 394/1 -f 401/1 398/1 394/1 -f 483/1 482/1 184/1 -f 541/1 483/1 184/1 -f 487/1 483/1 541/1 -f 484/1 483/1 487/1 -f 484/1 485/1 483/1 -f 485/1 482/1 483/1 -f 486/1 485/1 484/1 -f 486/1 414/1 485/1 -f 492/1 484/1 487/1 -f 492/1 486/1 484/1 -f 489/1 486/1 492/1 -f 489/1 488/1 486/1 -f 488/1 414/1 486/1 -f 491/1 488/1 489/1 -f 492/1 490/1 489/1 -f 490/1 491/1 489/1 -f 493/1 491/1 490/1 -f 495/1 490/1 492/1 -f 495/1 493/1 490/1 -f 496/1 495/1 492/1 -f 495/1 494/1 493/1 -f 496/1 497/1 495/1 -f 497/1 494/1 495/1 -f 501/1 498/1 496/1 -f 498/1 497/1 496/1 -f 498/1 500/1 497/1 -f 501/1 499/1 498/1 -f 499/1 500/1 498/1 -f 499/1 502/1 500/1 -f 503/1 499/1 501/1 -f 503/1 502/1 499/1 -f 503/1 504/1 502/1 -f 503/1 501/1 518/1 -f 505/1 503/1 518/1 -f 504/1 503/1 505/1 -f 419/1 504/1 505/1 -f 508/1 506/1 507/1 -f 421/1 508/1 507/1 -f 509/1 511/1 506/1 -f 508/1 509/1 506/1 -f 510/1 509/1 508/1 -f 509/1 512/1 511/1 -f 423/1 512/1 509/1 -f 510/1 423/1 509/1 -f 513/1 512/1 423/1 -f 512/1 514/1 511/1 -f 424/1 514/1 512/1 -f 513/1 424/1 512/1 -f 516/1 515/1 514/1 -f 424/1 516/1 514/1 -f 515/1 517/1 514/1 -f 516/1 517/1 515/1 -f 427/1 517/1 516/1 -f 519/1 518/1 517/1 -f 427/1 519/1 517/1 -f 519/1 505/1 518/1 -f 419/1 505/1 519/1 -f 421/1 507/1 269/1 -f 507/1 520/1 269/1 -f 507/1 506/1 520/1 -f 523/1 522/1 521/1 -f 523/1 44/1 522/1 -f 523/1 46/1 44/1 -f 523/1 429/1 46/1 -f 429/1 281/1 46/1 -f 524/1 429/1 523/1 -f 431/1 429/1 524/1 -f 433/1 431/1 524/1 -f 547/1 433/1 524/1 -f 547/1 434/1 433/1 -f 551/1 434/1 547/1 -f 526/1 434/1 551/1 -f 526/1 525/1 434/1 -f 526/1 212/1 525/1 -f 286/1 435/1 212/1 -f 526/1 527/1 212/1 -f 527/1 286/1 212/1 -f 451/1 527/1 538/1 -f 286/1 527/1 451/1 -f 442/1 539/1 521/1 -f 522/1 442/1 521/1 -f 522/1 440/1 442/1 -f 5/1 544/1 542/1 -f 450/4 5/1 542/1 -f 528/1 544/1 5/1 -f 530/1 544/1 528/1 -f 322/1 530/1 528/1 -f 323/1 530/1 322/1 -f 444/1 542/1 560/1 -f 449/2 450/4 542/1 -f 444/1 449/2 542/1 -f 549/1 553/1 550/1 -f 549/1 318/1 553/1 -f 318/1 454/1 100/1 -f 549/1 529/1 454/1 -f 318/1 549/1 454/1 -f 549/1 531/1 529/1 -f 457/1 544/1 530/1 -f 457/1 546/1 544/1 -f 457/1 548/1 546/1 -f 459/1 548/1 457/1 -f 455/1 548/1 459/1 -f 552/1 548/1 455/1 -f 529/1 552/1 455/1 -f 531/1 552/1 529/1 -f 333/1 533/1 470/1 -f 474/1 333/1 470/1 -f 539/1 532/1 533/1 -f 532/1 534/1 533/1 -f 333/1 539/1 533/1 -f 472/1 473/1 470/1 -f 473/1 474/1 470/1 -f 534/1 535/1 533/1 -f 471/1 472/1 470/1 -f 534/1 478/1 535/1 -f 534/1 536/1 478/1 -f 534/1 537/1 536/1 -f 537/1 481/1 536/1 -f 537/1 410/1 481/1 -f 561/1 563/1 410/1 -f 563/1 538/1 410/1 -f 554/1 560/1 410/1 -f 537/1 561/1 410/1 -f 538/1 543/1 410/1 -f 557/1 555/1 410/1 -f 555/1 554/1 410/1 -f 543/1 557/1 410/1 -f 560/1 412/1 410/1 -f 540/1 539/1 333/1 -f 521/1 539/1 540/1 -f 506/1 521/1 520/1 -f 521/1 540/1 520/1 -f 560/1 541/1 412/1 -f 542/1 487/1 541/1 -f 560/1 542/1 541/1 -f 506/1 523/1 521/1 -f 544/1 487/1 542/1 -f 538/1 545/1 543/1 -f 506/1 524/1 523/1 -f 546/1 487/1 544/1 -f 511/1 524/1 506/1 -f 492/1 487/1 546/1 -f 538/1 550/1 545/1 -f 548/1 492/1 546/1 -f 511/1 547/1 524/1 -f 511/1 514/1 547/1 -f 496/1 492/1 548/1 -f 517/1 551/1 547/1 -f 514/1 517/1 547/1 -f 552/1 496/1 548/1 -f 501/1 496/1 552/1 -f 549/1 550/1 538/1 -f 527/1 549/1 538/1 -f 517/1 526/1 551/1 -f 531/1 501/1 552/1 -f 517/1 518/1 526/1 -f 518/1 527/1 526/1 -f 518/1 549/1 527/1 -f 518/1 501/1 549/1 -f 501/1 531/1 549/1 -f 550/1 559/1 545/1 -f 550/1 553/1 559/1 -f 555/1 556/1 554/1 -f 557/1 469/1 555/1 -f 469/1 556/1 555/1 -f 543/1 558/1 557/1 -f 558/1 469/1 557/1 -f 559/1 558/1 543/1 -f 545/1 559/1 543/1 -f 556/1 444/1 554/1 -f 444/1 560/1 554/1 -f 442/1 460/1 539/1 -f 460/1 532/1 539/1 -f 460/1 534/1 532/1 -f 463/1 534/1 460/1 -f 463/1 537/1 534/1 -f 562/1 537/1 463/1 -f 562/1 561/1 537/1 -f 564/1 561/1 562/1 -f 564/1 563/1 561/1 -f 468/1 563/1 564/1 -f 468/1 451/1 563/1 -f 451/1 538/1 563/1 -f 565/7 570/8 682/9 -f 567/10 565/7 682/9 -f 566/11 565/7 567/10 -f 599/12 566/11 567/10 -f 659/13 569/14 567/10 -f 568/15 599/12 567/10 -f 569/14 568/15 567/10 -f 570/8 684/16 682/9 -f 565/7 605/17 570/8 -f 605/17 606/18 570/8 -f 606/18 578/19 570/8 -f 640/20 638/21 569/14 -f 642/22 640/20 569/14 -f 581/23 642/22 569/14 -f 638/21 568/15 569/14 -f 571/24 605/17 565/7 -f 610/25 608/26 565/7 -f 608/26 571/24 565/7 -f 582/27 610/25 565/7 -f 588/28 582/27 565/7 -f 566/11 623/29 565/7 -f 623/29 572/30 565/7 -f 572/30 573/31 565/7 -f 573/31 624/32 565/7 -f 624/32 627/33 565/7 -f 627/33 588/28 565/7 -f 574/34 623/29 566/11 -f 575/35 574/34 566/11 -f 629/36 626/37 566/11 -f 599/12 629/36 566/11 -f 626/37 575/35 566/11 -f 638/21 576/38 568/15 -f 576/38 577/39 568/15 -f 577/39 643/40 568/15 -f 643/40 646/41 568/15 -f 646/41 599/12 568/15 -f 580/42 642/22 581/23 -f 578/19 579/43 570/8 -f 611/44 590/45 570/8 -f 579/43 611/44 570/8 -f 589/46 649/47 581/23 -f 649/47 580/42 581/23 -f 613/48 590/45 611/44 -f 588/28 614/49 582/27 -f 630/50 588/28 627/33 -f 599/12 584/51 629/36 -f 583/52 599/12 646/41 -f 589/46 585/53 649/47 -f 616/54 590/45 613/48 -f 632/55 588/28 630/50 -f 586/56 599/12 583/52 -f 588/28 619/57 614/49 -f 599/12 635/58 584/51 -f 589/46 655/59 585/53 -f 618/60 590/45 616/54 -f 633/61 588/28 632/55 -f 653/62 599/12 586/56 -f 622/63 590/45 618/60 -f 588/28 621/64 619/57 -f 636/65 588/28 633/61 -f 599/12 587/66 635/58 -f 657/67 599/12 653/62 -f 589/46 656/68 655/59 -f 588/28 590/45 621/64 -f 621/64 590/45 622/63 -f 599/12 588/28 636/65 -f 587/66 599/12 636/65 -f 589/46 599/12 657/67 -f 656/68 589/46 657/67 -f 662/69 599/12 589/46 -f 588/28 591/70 590/45 -f 593/71 599/12 662/69 -f 588/28 592/72 591/70 -f 592/72 595/73 594/74 -f 665/75 593/71 663/76 -f 667/77 593/71 665/75 -f 592/72 678/78 595/73 -f 596/79 593/71 667/77 -f 592/72 598/80 678/78 -f 597/81 593/71 596/79 -f 669/82 593/71 597/81 -f 599/12 592/72 588/28 -f 592/72 600/83 598/80 -f 675/84 592/72 599/12 -f 593/71 675/84 599/12 -f 675/84 593/71 669/82 -f 672/85 600/83 592/72 -f 669/82 601/86 675/84 -f 673/87 672/85 592/72 -f 601/86 602/88 675/84 -f 603/89 673/87 592/72 -f 675/84 603/89 592/72 -f 602/88 604/90 675/84 -f 690/91 606/92 698/93 -f 606/92 605/94 698/93 -f 605/94 607/95 698/93 -f 571/96 607/95 605/94 -f 692/97 578/98 690/91 -f 578/98 606/92 690/91 -f 571/96 702/99 607/95 -f 608/100 702/99 571/96 -f 694/101 578/98 692/97 -f 608/100 609/102 702/99 -f 610/103 609/102 608/100 -f 579/104 578/98 694/101 -f 704/105 611/106 694/101 -f 611/106 579/104 694/101 -f 610/103 612/107 609/102 -f 582/108 612/107 610/103 -f 613/109 611/106 704/105 -f 615/110 613/109 704/105 -f 582/108 706/111 612/107 -f 614/112 706/111 582/108 -f 616/113 613/109 615/110 -f 614/112 617/114 706/111 -f 709/115 616/113 615/110 -f 619/116 617/114 614/112 -f 618/117 616/113 709/115 -f 619/116 620/118 617/114 -f 622/119 618/117 709/115 -f 712/120 622/119 709/115 -f 621/121 620/118 619/116 -f 621/121 712/120 620/118 -f 712/120 621/121 622/119 -f 685/122 572/123 699/124 -f 572/123 623/125 699/124 -f 623/125 701/126 699/124 -f 574/127 701/126 623/125 -f 686/128 573/129 685/122 -f 573/129 572/123 685/122 -f 575/130 701/126 574/127 -f 624/131 573/129 686/128 -f 575/130 703/132 701/126 -f 625/133 624/131 686/128 -f 626/134 703/132 575/130 -f 627/135 624/131 625/133 -f 626/134 628/136 703/132 -f 697/137 627/135 625/133 -f 629/138 628/136 626/134 -f 630/139 627/135 697/137 -f 696/140 630/139 697/137 -f 629/138 631/141 628/136 -f 584/142 631/141 629/138 -f 632/143 630/139 696/140 -f 584/142 708/144 631/141 -f 695/145 632/143 696/140 -f 635/146 708/144 584/142 -f 633/147 632/143 695/145 -f 635/146 634/148 708/144 -f 636/149 633/147 695/145 -f 637/150 636/149 695/145 -f 635/146 711/151 634/148 -f 587/152 711/151 635/146 -f 587/152 637/150 711/151 -f 637/150 587/152 636/149 -f 576/153 638/154 689/155 -f 638/154 688/156 689/155 -f 639/157 576/153 689/155 -f 640/158 688/156 638/154 -f 641/159 577/160 639/157 -f 577/160 576/153 639/157 -f 640/158 687/161 688/156 -f 642/162 687/161 640/158 -f 644/163 643/164 641/159 -f 643/164 577/160 641/159 -f 580/165 687/161 642/162 -f 580/165 645/166 687/161 -f 647/167 646/168 644/163 -f 646/168 643/164 644/163 -f 580/165 648/169 645/166 -f 649/170 648/169 580/165 -f 583/171 646/168 647/167 -f 650/172 583/171 647/167 -f 649/170 707/173 648/169 -f 585/174 707/173 649/170 -f 586/175 583/171 650/172 -f 585/174 651/176 707/173 -f 654/177 586/175 650/172 -f 655/178 651/176 585/174 -f 655/178 652/179 651/176 -f 653/180 586/175 654/177 -f 657/181 653/180 654/177 -f 710/182 657/181 654/177 -f 655/178 713/183 652/179 -f 656/184 713/183 655/178 -f 713/183 657/181 710/182 -f 713/183 656/184 657/181 -f 660/185 659/186 658/187 -f 660/185 569/188 659/186 -f 661/189 569/188 660/185 -f 661/189 581/190 569/188 -f 662/191 589/192 705/193 -f 700/194 662/191 705/193 -f 593/195 662/191 700/194 -f 716/196 593/195 700/194 -f 664/197 593/195 716/196 -f 663/198 593/195 664/197 -f 666/199 663/198 664/197 -f 666/199 665/200 663/198 -f 666/199 667/201 665/200 -f 668/202 667/201 666/199 -f 668/202 596/203 667/201 -f 719/204 596/203 668/202 -f 719/204 597/205 596/203 -f 720/206 669/207 719/204 -f 669/207 597/205 719/204 -f 670/208 669/207 720/206 -f 670/208 601/209 669/207 -f 722/210 601/209 670/208 -f 722/210 602/211 601/209 -f 721/212 602/211 722/210 -f 721/212 604/213 602/211 -f 675/214 721/212 676/215 -f 675/214 604/213 721/212 -f 600/216 672/217 671/218 -f 672/217 714/219 671/218 -f 672/217 673/220 714/219 -f 673/220 674/221 714/219 -f 673/220 603/222 674/221 -f 603/222 675/214 674/221 -f 675/214 676/215 674/221 -f 598/223 671/218 715/224 -f 600/216 671/218 598/223 -f 594/225 595/226 677/227 -f 595/226 717/228 677/227 -f 595/226 678/229 717/228 -f 678/229 718/230 717/228 -f 678/229 598/223 718/230 -f 598/223 715/224 718/230 -f 679/231 594/225 677/227 -f 592/232 594/225 679/231 -f 590/233 681/234 680/235 -f 591/236 681/234 590/233 -f 591/236 679/231 681/234 -f 592/232 679/231 591/236 -f 570/237 680/235 693/238 -f 590/233 680/235 570/237 -f 682/239 684/240 683/241 -f 684/240 691/242 683/241 -f 684/240 570/237 691/242 -f 570/237 693/238 691/242 -f 658/187 567/243 683/241 -f 567/243 682/239 683/241 -f 659/186 567/243 658/187 -f 705/193 589/192 661/189 -f 589/192 581/190 661/189 -f 639/157 658/187 683/241 -f 686/128 685/122 683/241 -f 641/159 639/157 683/241 -f 625/133 686/128 683/241 -f 644/163 641/159 683/241 -f 690/91 698/93 683/241 -f 698/93 697/137 683/241 -f 697/137 625/133 683/241 -f 685/122 699/124 683/241 -f 699/124 644/163 683/241 -f 687/161 705/193 658/187 -f 688/156 687/161 658/187 -f 689/155 688/156 658/187 -f 639/157 689/155 658/187 -f 692/97 690/91 683/241 -f 691/242 692/97 683/241 -f 705/193 660/185 658/187 -f 705/193 661/189 660/185 -f 693/238 692/97 691/242 -f 694/101 692/97 693/238 -f 680/235 704/105 693/238 -f 704/105 694/101 693/238 -f 647/167 644/163 699/124 -f 637/150 695/145 698/93 -f 695/145 696/140 698/93 -f 696/140 697/137 698/93 -f 607/95 637/150 698/93 -f 654/177 650/172 699/124 -f 710/182 654/177 699/124 -f 700/194 710/182 699/124 -f 716/196 700/194 699/124 -f 701/126 716/196 699/124 -f 650/172 647/167 699/124 -f 702/99 637/150 607/95 -f 703/132 716/196 701/126 -f 609/102 637/150 702/99 -f 645/166 705/193 687/161 -f 628/136 716/196 703/132 -f 612/107 637/150 609/102 -f 648/169 705/193 645/166 -f 716/196 637/150 612/107 -f 680/235 615/110 704/105 -f 706/111 716/196 612/107 -f 631/141 716/196 628/136 -f 707/173 705/193 648/169 -f 617/114 716/196 706/111 -f 708/144 716/196 631/141 -f 651/176 705/193 707/173 -f 700/194 705/193 651/176 -f 680/235 709/115 615/110 -f 652/179 700/194 651/176 -f 620/118 716/196 617/114 -f 634/148 716/196 708/144 -f 680/235 712/120 709/115 -f 711/151 716/196 634/148 -f 713/183 700/194 652/179 -f 680/235 716/196 620/118 -f 712/120 680/235 620/118 -f 700/194 713/183 710/182 -f 637/150 716/196 711/151 -f 681/234 716/196 680/235 -f 676/215 716/196 681/234 -f 679/231 676/215 681/234 -f 714/219 674/221 679/231 -f 671/218 714/219 679/231 -f 674/221 676/215 679/231 -f 715/224 671/218 679/231 -f 718/230 715/224 679/231 -f 676/215 721/212 716/196 -f 677/227 717/228 679/231 -f 717/228 718/230 679/231 -f 721/212 664/197 716/196 -f 721/212 720/206 664/197 -f 720/206 719/204 664/197 -f 719/204 666/199 664/197 -f 719/204 668/202 666/199 -f 721/212 670/208 720/206 -f 721/212 722/210 670/208 -f 724/1 725/1 723/1 -f 725/1 728/1 723/1 -f 728/1 727/1 723/1 -f 724/1 726/1 725/1 -f 789/1 726/1 724/1 -f 725/1 730/1 728/1 -f 726/1 730/1 725/1 -f 789/1 731/1 726/1 -f 790/1 731/1 789/1 -f 728/1 733/1 727/1 -f 790/1 791/1 731/1 -f 727/1 732/1 729/1 -f 733/1 732/1 727/1 -f 726/1 734/1 730/1 -f 726/1 735/1 734/1 -f 731/1 735/1 726/1 -f 734/1 741/1 730/1 -f 732/1 737/1 729/1 -f 728/1 736/1 733/1 -f 730/1 736/1 728/1 -f 731/1 738/1 735/1 -f 740/1 738/1 731/1 -f 791/1 740/1 731/1 -f 741/1 736/1 730/1 -f 733/1 739/1 732/1 -f 736/1 739/1 733/1 -f 738/1 734/1 735/1 -f 791/1 792/1 740/1 -f 742/1 747/1 744/1 -f 745/1 749/1 742/1 -f 746/1 749/1 745/1 -f 743/1 746/1 745/1 -f 764/1 746/1 743/1 -f 744/1 747/1 751/1 -f 742/1 748/1 747/1 -f 749/1 753/1 742/1 -f 748/1 752/1 747/1 -f 742/1 753/1 748/1 -f 764/1 750/1 746/1 -f 747/1 755/1 751/1 -f 752/1 755/1 747/1 -f 749/1 758/1 753/1 -f 746/1 756/1 749/1 -f 750/1 754/1 746/1 -f 753/1 761/1 748/1 -f 748/1 761/1 752/1 -f 749/1 756/1 758/1 -f 746/1 754/1 756/1 -f 753/1 763/1 761/1 -f 750/1 757/1 754/1 -f 752/1 760/1 755/1 -f 759/1 757/1 750/1 -f 752/1 762/1 760/1 -f 761/1 762/1 752/1 -f 758/1 763/1 753/1 -f 759/1 793/1 757/1 -f 766/1 764/1 743/1 -f 768/1 764/1 766/1 -f 768/1 750/1 764/1 -f 773/1 750/1 768/1 -f 773/1 759/1 750/1 -f 798/1 759/1 773/1 -f 798/1 793/1 759/1 -f 767/1 769/1 765/1 -f 769/1 770/1 765/1 -f 770/1 766/1 765/1 -f 770/1 771/1 766/1 -f 771/1 768/1 766/1 -f 813/1 769/1 767/1 -f 771/1 773/1 768/1 -f 772/1 770/1 769/1 -f 813/1 772/1 769/1 -f 772/1 797/1 770/1 -f 797/1 771/1 770/1 -f 797/1 774/1 771/1 -f 774/1 773/1 771/1 -f 841/1 772/1 813/1 -f 796/1 797/1 772/1 -f 774/1 798/1 773/1 -f 841/1 796/1 772/1 -f 797/1 842/1 774/1 -f 842/1 798/1 774/1 -f 778/1 779/1 776/1 -f 777/1 776/1 775/1 -f 777/1 778/1 776/1 -f 780/1 777/1 775/1 -f 777/1 781/1 778/1 -f 781/1 779/1 778/1 -f 780/1 782/1 777/1 -f 782/1 781/1 777/1 -f 781/1 784/1 779/1 -f 782/1 783/1 781/1 -f 823/1 782/1 780/1 -f 897/1 784/1 781/1 -f 822/1 823/1 780/1 -f 783/1 825/1 781/1 -f 825/1 897/1 781/1 -f 823/1 783/1 782/1 -f 824/1 825/1 783/1 -f 824/1 783/1 823/1 -f 779/1 785/1 723/1 -f 776/1 779/1 723/1 -f 785/1 819/1 723/1 -f 819/1 724/1 723/1 -f 819/1 786/1 724/1 -f 786/1 818/1 724/1 -f 818/1 789/1 724/1 -f 787/1 789/1 818/1 -f 787/1 744/1 789/1 -f 788/1 742/1 787/1 -f 742/1 744/1 787/1 -f 816/1 742/1 788/1 -f 745/1 742/1 816/1 -f 743/1 745/1 816/1 -f 817/1 743/1 816/1 -f 767/1 766/1 817/1 -f 766/1 743/1 817/1 -f 765/1 766/1 767/1 -f 775/1 776/1 723/1 -f 727/1 775/1 723/1 -f 780/1 775/1 727/1 -f 729/1 780/1 727/1 -f 822/1 780/1 729/1 -f 737/1 822/1 729/1 -f 751/1 790/1 789/1 -f 744/1 751/1 789/1 -f 751/1 755/1 790/1 -f 755/1 791/1 790/1 -f 760/1 792/1 791/1 -f 755/1 760/1 791/1 -f 798/1 837/1 793/1 -f 826/1 837/1 798/1 -f 871/1 886/1 885/1 -f 871/1 866/1 886/1 -f 866/1 868/1 886/1 -f 868/1 799/1 886/1 -f 868/1 869/1 799/1 -f 869/1 865/1 799/1 -f 865/1 887/1 799/1 -f 865/1 867/1 887/1 -f 867/1 855/1 887/1 -f 855/1 888/1 887/1 -f 855/1 800/1 888/1 -f 855/1 801/1 800/1 -f 856/1 802/1 801/1 -f 855/1 856/1 801/1 -f 856/1 853/1 802/1 -f 853/1 803/1 802/1 -f 853/1 857/1 803/1 -f 857/1 854/1 803/1 -f 854/1 804/1 803/1 -f 854/1 850/1 804/1 -f 807/1 892/1 808/1 -f 807/1 806/1 892/1 -f 806/1 810/1 892/1 -f 806/1 809/1 810/1 -f 809/1 894/1 810/1 -f 809/1 795/1 894/1 -f 795/1 896/1 894/1 -f 795/1 794/1 896/1 -f 794/1 811/1 896/1 -f 812/1 767/1 817/1 -f 812/1 814/2 767/1 -f 814/2 813/1 767/1 -f 814/2 841/1 813/1 -f 815/1 788/1 787/1 -f 815/1 893/1 788/1 -f 893/1 816/1 788/1 -f 893/1 895/1 816/1 -f 895/1 817/1 816/1 -f 895/1 812/1 817/1 -f 815/1 787/1 818/1 -f 821/1 815/1 818/1 -f 889/1 819/1 785/1 -f 889/1 891/1 819/1 -f 891/1 786/1 819/1 -f 891/1 820/1 786/1 -f 821/1 818/1 786/1 -f 820/1 821/1 786/1 -f 898/1 889/1 785/1 -f 779/1 898/1 785/1 -f 784/1 898/1 779/1 -f 909/1 899/1 737/1 -f 899/1 822/1 737/1 -f 923/1 924/1 792/1 -f 760/1 923/1 792/1 -f 732/1 909/1 737/1 -f 914/1 909/1 732/1 -f 910/1 914/1 732/1 -f 739/1 910/1 732/1 -f 736/1 910/1 739/1 -f 913/1 910/1 736/1 -f 912/1 913/1 736/1 -f 741/1 912/1 736/1 -f 911/1 912/1 741/1 -f 734/1 911/1 741/1 -f 738/1 908/1 734/1 -f 908/1 911/1 734/1 -f 925/1 908/1 738/1 -f 740/1 925/1 738/1 -f 924/1 925/1 740/1 -f 792/1 924/1 740/1 -f 762/1 926/1 760/1 -f 926/1 923/1 760/1 -f 930/1 926/1 762/1 -f 761/1 930/1 762/1 -f 928/1 930/1 761/1 -f 763/1 928/1 761/1 -f 927/1 928/1 763/1 -f 758/1 927/1 763/1 -f 932/1 927/1 758/1 -f 756/1 929/1 758/1 -f 929/1 932/1 758/1 -f 754/1 929/1 756/1 -f 936/1 929/1 754/1 -f 757/1 938/1 754/1 -f 938/1 936/1 754/1 -f 837/1 938/1 757/1 -f 793/1 837/1 757/1 -f 827/1 828/1 826/1 -f 830/1 831/1 827/1 -f 831/1 828/1 827/1 -f 829/1 833/1 830/1 -f 831/1 832/1 828/1 -f 843/1 834/1 829/1 -f 834/1 833/1 829/1 -f 833/1 831/1 830/1 -f 836/1 832/1 831/1 -f 833/1 836/1 831/1 -f 835/1 836/1 833/1 -f 834/1 835/1 833/1 -f 828/1 837/1 826/1 -f 828/1 838/1 837/1 -f 832/1 838/1 828/1 -f 840/1 839/1 811/1 -f 794/1 840/1 811/1 -f 814/2 843/1 841/1 -f 829/1 796/1 841/1 -f 843/1 829/1 841/1 -f 829/1 830/1 796/1 -f 830/1 797/1 796/1 -f 830/1 827/1 797/1 -f 827/1 842/1 797/1 -f 827/1 826/1 842/1 -f 826/1 798/1 842/1 -f 941/1 942/1 843/1 -f 942/1 834/1 843/1 -f 942/1 835/1 834/1 -f 942/1 943/1 835/1 -f 943/1 945/1 835/1 -f 945/1 836/1 835/1 -f 804/1 844/1 949/1 -f 850/1 844/1 804/1 -f 848/1 847/1 844/1 -f 851/1 848/1 844/1 -f 845/1 848/1 851/1 -f 849/1 848/1 845/1 -f 846/1 847/1 848/1 -f 962/1 849/1 845/1 -f 849/1 846/1 848/1 -f 846/1 954/1 847/1 -f 849/1 957/1 846/1 -f 958/1 957/1 849/1 -f 962/1 958/1 849/1 -f 851/1 844/1 850/1 -f 863/1 851/1 850/1 -f 845/1 851/1 863/1 -f 864/1 845/1 863/1 -f 962/1 845/1 864/1 -f 852/1 962/1 864/1 -f 858/1 857/1 853/1 -f 859/1 856/1 855/1 -f 856/1 858/1 853/1 -f 857/1 861/1 854/1 -f 858/1 862/1 857/1 -f 860/1 858/1 856/1 -f 859/1 860/1 856/1 -f 862/1 861/1 857/1 -f 863/1 850/1 854/1 -f 861/1 863/1 854/1 -f 860/1 862/1 858/1 -f 864/1 861/1 862/1 -f 860/1 852/1 862/1 -f 864/1 863/1 861/1 -f 852/1 864/1 862/1 -f 867/1 859/1 855/1 -f 870/1 859/1 867/1 -f 872/1 859/1 870/1 -f 872/1 860/1 859/1 -f 865/1 870/1 867/1 -f 869/1 870/1 865/1 -f 871/1 873/1 866/1 -f 873/1 868/1 866/1 -f 868/1 874/1 869/1 -f 869/1 872/1 870/1 -f 873/1 874/1 868/1 -f 874/1 872/1 869/1 -f 876/1 873/1 871/1 -f 961/1 872/1 874/1 -f 873/1 961/1 874/1 -f 876/1 875/1 873/1 -f 875/1 961/1 873/1 -f 877/1 879/1 871/1 -f 879/1 876/1 871/1 -f 879/1 875/1 876/1 -f 879/1 882/1 875/1 -f 882/1 961/1 875/1 -f 877/1 871/1 965/1 -f 871/1 885/1 965/1 -f 878/1 879/1 877/1 -f 880/1 878/1 877/1 -f 878/1 883/1 879/1 -f 880/1 883/1 878/1 -f 883/1 882/1 879/1 -f 881/1 883/1 880/1 -f 966/1 968/1 881/1 -f 968/1 883/1 881/1 -f 967/1 968/1 966/1 -f 968/1 970/1 883/1 -f 970/1 882/1 883/1 -f 970/1 969/1 882/1 -f 805/1 807/1 808/1 -f 890/1 805/1 808/1 -f 898/1 808/1 889/1 -f 808/1 891/1 889/1 -f 890/1 808/1 898/1 -f 808/1 892/1 891/1 -f 892/1 820/1 891/1 -f 892/1 810/1 820/1 -f 810/1 821/1 820/1 -f 810/1 815/1 821/1 -f 894/1 815/1 810/1 -f 893/1 815/1 894/1 -f 896/1 893/1 894/1 -f 895/1 893/1 896/1 -f 811/1 895/1 896/1 -f 812/1 895/1 811/1 -f 839/1 812/1 811/1 -f 814/2 812/1 839/1 -f 899/1 823/1 822/1 -f 899/1 900/1 823/1 -f 900/1 824/1 823/1 -f 900/1 901/1 824/1 -f 901/1 825/1 824/1 -f 901/1 902/1 825/1 -f 902/1 897/1 825/1 -f 902/1 903/1 897/1 -f 898/1 784/1 897/1 -f 903/1 898/1 897/1 -f 978/1 900/1 899/1 -f 978/1 904/1 900/1 -f 904/1 901/1 900/1 -f 905/1 902/1 901/1 -f 904/1 905/1 901/1 -f 905/1 903/1 902/1 -f 977/1 904/1 978/1 -f 905/1 906/1 903/1 -f 907/1 905/1 904/1 -f 977/1 907/1 904/1 -f 907/1 906/1 905/1 -f 973/1 972/1 903/1 -f 906/1 973/1 903/1 -f 974/1 973/1 906/1 -f 907/1 974/1 906/1 -f 1010/1 974/1 907/1 -f 977/1 1010/1 907/1 -f 915/1 899/1 909/1 -f 978/1 899/1 915/1 -f 921/1 978/1 915/1 -f 924/1 979/1 925/1 -f 925/1 980/1 908/1 -f 979/1 980/1 925/1 -f 918/1 911/1 908/1 -f 980/1 918/1 908/1 -f 914/1 915/1 909/1 -f 913/1 919/1 910/1 -f 920/1 912/1 911/1 -f 919/1 914/1 910/1 -f 918/1 920/1 911/1 -f 916/1 913/1 912/1 -f 920/1 916/1 912/1 -f 916/1 919/1 913/1 -f 917/1 915/1 914/1 -f 916/1 981/1 919/1 -f 919/1 917/1 914/1 -f 920/1 981/1 916/1 -f 919/1 922/1 917/1 -f 981/1 922/1 919/1 -f 917/1 921/1 915/1 -f 926/1 931/1 923/1 -f 931/1 924/1 923/1 -f 931/1 979/1 924/1 -f 930/1 931/1 926/1 -f 930/1 935/1 931/1 -f 933/1 928/1 927/1 -f 932/1 933/1 927/1 -f 928/1 935/1 930/1 -f 933/1 982/1 928/1 -f 929/1 936/1 937/1 -f 929/1 934/1 932/1 -f 932/1 934/1 933/1 -f 937/1 934/1 929/1 -f 982/1 935/1 928/1 -f 838/1 938/1 837/1 -f 933/1 939/1 982/1 -f 934/1 939/1 933/1 -f 937/1 940/1 934/1 -f 938/1 984/1 936/1 -f 940/1 939/1 934/1 -f 838/1 984/1 938/1 -f 936/1 940/1 937/1 -f 984/1 940/1 936/1 -f 945/1 985/1 838/1 -f 832/1 945/1 838/1 -f 836/1 945/1 832/1 -f 843/1 814/2 839/1 -f 840/1 843/1 839/1 -f 988/1 840/1 953/1 -f 988/1 941/1 840/1 -f 941/1 843/1 840/1 -f 944/1 942/1 941/1 -f 943/1 942/1 944/1 -f 946/1 943/1 944/1 -f 947/1 945/1 943/1 -f 946/1 947/1 943/1 -f 948/1 947/1 946/1 -f 844/1 847/1 949/1 -f 847/1 950/1 949/1 -f 847/1 954/1 950/1 -f 955/1 951/1 950/1 -f 954/1 955/1 950/1 -f 955/1 987/1 951/1 -f 987/1 952/1 951/1 -f 987/1 989/1 952/1 -f 989/1 986/1 952/1 -f 986/1 953/1 952/1 -f 986/1 988/1 953/1 -f 846/1 956/1 954/1 -f 956/1 955/1 954/1 -f 956/1 987/1 955/1 -f 990/1 987/1 956/1 -f 959/244 956/1 846/1 -f 957/1 959/244 846/1 -f 959/244 990/1 956/1 -f 960/1 959/244 957/1 -f 958/1 960/1 957/1 -f 962/1 860/1 872/1 -f 961/1 962/1 872/1 -f 962/1 852/1 860/1 -f 882/1 962/1 961/1 -f 958/1 962/1 882/1 -f 969/1 958/1 882/1 -f 1007/1 998/1 963/1 -f 998/1 997/1 963/1 -f 997/1 964/1 963/1 -f 997/1 999/1 964/1 -f 999/1 967/1 964/1 -f 967/1 884/1 964/1 -f 967/1 966/1 884/1 -f 966/1 881/1 884/1 -f 881/1 965/1 884/1 -f 881/1 880/1 965/1 -f 880/1 877/1 965/1 -f 1003/1 968/1 967/1 -f 999/1 1003/1 967/1 -f 1003/1 970/1 968/1 -f 1000/1 1003/1 999/1 -f 970/1 971/1 969/1 -f 1003/1 971/1 970/1 -f 1006/1 971/1 1003/1 -f 805/1 890/1 898/1 -f 903/1 805/1 898/1 -f 903/1 963/1 805/1 -f 903/1 972/1 963/1 -f 972/1 1007/1 963/1 -f 1008/1 972/1 973/1 -f 974/1 1008/1 973/1 -f 974/1 975/1 1008/1 -f 1010/1 976/1 974/1 -f 976/1 975/1 974/1 -f 977/1 978/1 921/1 -f 1013/1 1010/1 921/1 -f 1010/1 977/1 921/1 -f 1018/1 980/1 979/1 -f 1018/1 918/1 980/1 -f 1018/1 1016/1 918/1 -f 1016/1 1011/1 918/1 -f 1011/1 920/1 918/1 -f 1011/1 981/1 920/1 -f 1011/1 1014/1 981/1 -f 917/1 1013/1 921/1 -f 1014/1 922/1 981/1 -f 922/1 1013/1 917/1 -f 1014/1 1013/1 922/1 -f 1020/1 1018/1 979/1 -f 931/1 1020/1 979/1 -f 935/1 1020/1 931/1 -f 1022/1 1020/1 935/1 -f 982/1 1022/1 935/1 -f 983/1 1022/1 982/1 -f 939/1 983/1 982/1 -f 940/1 983/1 939/1 -f 1023/1 983/1 940/1 -f 985/1 984/1 838/1 -f 984/1 1023/1 940/1 -f 985/1 1023/1 984/1 -f 947/1 985/1 945/1 -f 947/1 1026/1 985/1 -f 947/1 948/1 1026/1 -f 944/1 941/1 988/1 -f 993/1 944/1 988/1 -f 994/1 946/1 993/1 -f 946/1 944/1 993/1 -f 948/1 946/1 994/1 -f 1028/3 948/1 994/1 -f 991/1 986/1 989/1 -f 991/1 988/1 986/1 -f 990/1 989/1 987/1 -f 991/1 993/1 988/1 -f 959/244 991/1 989/1 -f 990/1 959/244 989/1 -f 992/1 993/1 991/1 -f 959/244 992/1 991/1 -f 960/1 995/1 959/244 -f 995/1 992/1 959/244 -f 1028/3 994/1 993/1 -f 992/1 1028/3 993/1 -f 996/1 992/1 995/1 -f 996/1 1028/3 992/1 -f 971/1 960/1 969/1 -f 960/1 958/1 969/1 -f 1006/1 960/1 971/1 -f 995/1 960/1 1006/1 -f 998/1 1002/1 997/1 -f 1000/1 999/1 997/1 -f 1001/1 998/1 1007/1 -f 1001/1 1004/1 998/1 -f 1004/1 1002/1 998/1 -f 1002/1 1000/1 997/1 -f 1009/1 1004/1 1001/1 -f 1002/1 1003/1 1000/1 -f 1004/1 1005/1 1002/1 -f 1005/1 1003/1 1002/1 -f 1005/1 1006/1 1003/1 -f 1009/1 1027/6 1004/1 -f 1027/6 1005/1 1004/1 -f 1027/6 1006/1 1005/1 -f 1008/1 1007/1 972/1 -f 1008/1 1001/1 1007/1 -f 975/1 1001/1 1008/1 -f 975/1 1009/1 1001/1 -f 976/1 1009/1 975/1 -f 976/1 1027/6 1009/1 -f 976/1 1010/1 1013/1 -f 1015/1 976/1 1013/1 -f 1018/1 1019/1 1016/1 -f 1012/1 1019/1 1018/1 -f 1016/1 1014/1 1011/1 -f 1014/1 1015/1 1013/1 -f 1016/1 1017/1 1014/1 -f 1019/1 1017/1 1016/1 -f 1014/1 1017/1 1015/1 -f 1020/1 1012/1 1018/1 -f 1021/1 1012/1 1020/1 -f 1019/1 1012/1 1021/1 -f 1021/1 1024/1 1019/1 -f 1022/1 1021/1 1020/1 -f 1023/1 1025/1 983/1 -f 983/1 1024/1 1022/1 -f 1025/1 1024/1 983/1 -f 1022/1 1024/1 1021/1 -f 1026/1 1025/1 1023/1 -f 985/1 1026/1 1023/1 -f 1017/1 976/1 1015/1 -f 1017/1 1027/6 976/1 -f 1017/1 1019/1 1027/6 -f 1024/1 995/1 1019/1 -f 995/1 1006/1 1019/1 -f 1006/1 1027/6 1019/1 -f 1024/1 996/1 995/1 -f 1028/3 996/1 1024/1 -f 1026/1 1028/3 1024/1 -f 1026/1 948/1 1028/3 -f 1025/1 1026/1 1024/1 -f 1046/1 1030/1 1045/1 -f 1056/1 1030/1 1046/1 -f 1031/1 1056/1 1046/1 -f 1032/1 1031/1 1046/1 -f 1045/1 1033/1 1042/1 -f 1030/1 1033/1 1045/1 -f 1036/1 1034/1 1035/1 -f 1042/1 1036/1 1035/1 -f 1033/1 1036/1 1042/1 -f 1066/1 1037/1 1067/1 -f 1066/1 1060/1 1037/1 -f 1039/1 1031/1 1032/1 -f 1038/1 1039/1 1032/1 -f 1035/1 1080/1 1077/1 -f 1035/1 1047/1 1080/1 -f 1040/1 1035/1 1077/1 -f 1042/1 1035/1 1040/1 -f 1041/1 1042/1 1040/1 -f 1043/1 1042/1 1041/1 -f 1045/1 1042/1 1043/1 -f 1044/1 1045/1 1043/1 -f 1044/1 1074/1 1045/1 -f 1074/1 1046/1 1045/1 -f 1074/1 1076/1 1046/1 -f 1076/1 1032/1 1046/1 -f 1076/1 1038/1 1032/1 -f 1076/1 1073/1 1038/1 -f 1048/1 1047/1 1035/1 -f 1034/1 1048/1 1035/1 -f 1086/1 1054/1 1061/1 -f 1058/1 1054/1 1086/1 -f 1053/1 1054/1 1058/1 -f 1059/1 1053/1 1058/1 -f 1060/1 1053/1 1059/1 -f 1037/1 1060/1 1059/1 -f 1061/1 1055/1 1084/1 -f 1054/1 1055/1 1061/1 -f 1051/1 1062/1 1085/1 -f 1062/1 1063/1 1085/1 -f 1062/1 1064/1 1063/1 -f 1062/1 1052/1 1064/1 -f 1052/1 1065/1 1064/1 -f 1052/1 1066/1 1065/1 -f 1066/1 1067/1 1065/1 -f 1055/1 1092/1 1084/1 -f 1055/1 1068/1 1092/1 -f 1068/1 1070/1 1092/1 -f 1068/1 1069/1 1070/1 -f 1069/1 1071/1 1070/1 -f 1069/1 1057/1 1071/1 -f 1038/1 1072/1 1071/1 -f 1039/1 1038/1 1071/1 -f 1057/1 1039/1 1071/1 -f 1038/1 1073/1 1072/1 -f 1072/1 1073/1 1093/1 -f 1073/1 1076/1 1093/1 -f 1074/1 1044/1 1094/1 -f 1075/1 1074/1 1094/1 -f 1076/1 1074/1 1075/1 -f 1093/1 1076/1 1075/1 -f 1094/1 1044/1 1089/1 -f 1044/1 1043/1 1089/1 -f 1088/1 1077/1 1087/1 -f 1040/1 1077/1 1088/1 -f 1078/1 1040/1 1088/1 -f 1041/1 1040/1 1078/1 -f 1089/1 1041/1 1078/1 -f 1043/1 1041/1 1089/1 -f 1077/1 1079/1 1087/1 -f 1077/1 1080/1 1079/1 -f 1080/1 1081/1 1079/1 -f 1047/1 1049/1 1081/1 -f 1080/1 1047/1 1081/1 -f 1048/1 1049/1 1047/1 -f 1049/1 1090/1 1081/1 -f 1049/1 1082/1 1090/1 -f 1082/1 1083/1 1090/1 -f 1082/1 1050/1 1083/1 -f 1050/1 1051/1 1083/1 -f 1051/1 1091/1 1083/1 -f 1051/1 1085/1 1091/1 -f 1085/1 1029/1 1091/1 -f 1029/1 1061/1 1084/1 -f 1085/1 1061/1 1029/1 -f 1085/1 1063/1 1061/1 -f 1063/1 1086/1 1061/1 -f 1063/1 1064/1 1086/1 -f 1058/1 1086/1 1064/1 -f 1064/1 1065/1 1058/1 -f 1065/1 1059/1 1058/1 -f 1065/1 1037/1 1059/1 -f 1065/1 1067/1 1037/1 -f 1079/1 1081/1 1087/1 -f 1081/1 1089/1 1087/1 -f 1089/1 1088/1 1087/1 -f 1089/1 1078/1 1088/1 -f 1081/1 1090/1 1089/1 -f 1090/1 1029/1 1089/1 -f 1029/1 1094/1 1089/1 -f 1083/1 1029/1 1090/1 -f 1091/1 1029/1 1083/1 -f 1070/1 1094/1 1029/1 -f 1092/1 1070/1 1029/1 -f 1084/1 1092/1 1029/1 -f 1071/1 1094/1 1070/1 -f 1071/1 1072/1 1094/1 -f 1072/1 1093/1 1094/1 -f 1093/1 1075/1 1094/1 -f 1103/1 1096/1 1095/1 -f 1103/1 1095/1 1099/1 -f 1109/1 1096/1 1103/1 -f 1099/1 1095/1 1108/1 -f 1099/1 1108/1 1097/1 -f 1098/1 1109/1 1103/1 -f 1110/1 1098/1 1103/1 -f 1103/1 1099/1 1104/1 -f 1105/1 1103/1 1100/1 -f 1101/1 1103/1 1104/1 -f 1100/1 1103/1 1101/1 -f 1101/1 1104/1 1102/1 -f 1107/1 1103/1 1105/1 -f 1102/1 1104/1 1106/1 -f 1124/1 1111/1 1113/1 -f 1112/1 1123/1 1111/1 -f 1125/1 1111/1 1124/1 -f 1126/1 1111/1 1125/1 -f 1111/1 1114/1 1112/1 -f 1119/1 1111/1 1126/1 -f 1111/1 1118/1 1114/1 -f 1115/1 1111/1 1119/1 -f 1116/1 1118/1 1111/1 -f 1115/1 1116/1 1111/1 -f 1116/1 1117/1 1118/1 -f 1121/1 1115/1 1119/1 -f 1117/1 1120/1 1118/1 -f 1122/1 1115/1 1121/1 -f 1100/1 1115/1 1105/1 -f 1104/1 1118/1 1106/1 -f 1095/1 1111/1 1108/1 -f 1098/1 1125/1 1109/1 -f 1108/1 1123/1 1097/1 -f 1107/1 1119/1 1103/1 -f 1110/1 1126/1 1098/1 -f 1097/1 1112/1 1099/1 -f 803/1 804/1 949/1 950/1 951/1 952/1 953/1 840/1 794/1 795/1 809/1 806/1 807/1 805/1 963/1 964/1 884/1 965/1 885/1 886/1 799/1 887/1 888/1 801/1 802/1 -f 1030/1 1056/1 1031/1 1039/1 1057/1 1069/1 1068/1 1055/1 1054/1 1053/1 1060/1 1066/1 1052/1 1062/1 1051/1 1050/1 1082/1 1049/1 1048/1 1034/1 1036/1 1033/1 -f 1116/1 1101/1 1102/1 1117/1 -f 1113/1 1096/1 1109/1 1124/1 -f 1108/1 1111/1 1123/1 -f 1126/1 1110/1 1103/1 1119/1 -f 1097/1 1123/1 1112/1 -f 1109/1 1125/1 1124/1 -f 1099/1 1112/1 1114/1 -f 1098/1 1126/1 1125/1 -f 1111/1 1095/1 1096/1 1113/1 -f 1121/1 1107/1 1105/1 1122/1 -f 1107/1 1121/1 1119/1 -f 1118/1 1104/1 1099/1 1114/1 -f 1115/1 1100/1 1101/1 1116/1 -f 1117/1 1102/1 1106/1 1120/1 -f 1105/1 1115/1 1122/1 -f 1106/1 1118/1 1120/1 +usemtl Material.001 +f 1/1/1 541/1/1 149/1/1 +f 412/1/2 541/1/2 1/1/2 +f 9/1/3 48/1/3 47/1/3 +f 6/1/4 9/1/4 47/1/4 +f 8/1/5 50/1/5 48/1/5 +f 9/1/6 8/1/6 48/1/6 +f 2/1/7 26/1/7 69/1/7 +f 71/1/8 2/1/8 69/1/8 +f 3/1/9 2/1/9 71/1/9 +f 72/1/10 3/1/10 71/1/10 +f 152/1/11 447/1/11 150/1/11 +f 448/1/12 447/1/12 152/1/12 +f 154/1/13 448/1/13 152/1/13 +f 154/1/14 4/1/14 448/1/14 +f 4/1/15 5/1/15 450/1/15 +f 154/1/16 5/1/16 4/1/16 +f 155/1/17 5/1/17 154/1/17 +f 528/1/18 5/1/18 155/1/18 +f 158/1/19 528/1/19 155/1/19 +f 159/1/20 528/1/20 158/1/20 +f 161/1/21 528/1/21 159/1/21 +f 322/1/22 528/1/22 161/1/22 +f 321/1/23 322/1/23 161/1/23 +f 7/1/24 9/1/24 6/1/24 +f 7/1/25 8/1/25 9/1/25 +f 165/1/26 10/1/26 7/1/26 +f 10/1/27 8/1/27 7/1/27 +f 165/1/28 13/1/28 10/1/28 +f 10/1/29 13/1/29 8/1/29 +f 11/1/30 12/1/30 165/1/30 +f 12/1/31 13/1/31 165/1/31 +f 14/1/32 12/1/32 11/1/32 +f 16/1/33 13/1/33 12/1/33 +f 16/1/34 12/1/34 14/1/34 +f 18/1/35 13/1/35 16/1/35 +f 15/1/36 16/1/36 14/1/36 +f 17/1/37 16/1/37 15/1/37 +f 17/1/38 18/1/38 16/1/38 +f 19/1/39 20/1/39 17/1/39 +f 20/1/40 18/1/40 17/1/40 +f 21/1/41 22/1/41 19/1/41 +f 22/1/42 20/1/42 19/1/42 +f 25/1/43 22/1/43 21/1/43 +f 166/1/44 25/1/44 21/1/44 +f 25/1/45 20/1/45 22/1/45 +f 23/1/46 24/1/46 166/1/46 +f 24/1/47 25/1/47 166/1/47 +f 27/1/48 26/1/48 2/1/48 +f 27/1/49 28/1/49 26/1/49 +f 27/1/50 29/1/50 28/1/50 +f 3/1/51 27/1/51 2/1/51 +f 3/1/52 29/1/52 27/1/52 +f 3/1/53 31/1/53 29/1/53 +f 29/1/54 30/1/54 28/1/54 +f 31/1/55 30/1/55 29/1/55 +f 142/1/56 31/1/56 3/1/56 +f 33/1/57 32/1/57 30/1/57 +f 31/1/58 33/1/58 30/1/58 +f 142/1/59 33/1/59 31/1/59 +f 36/1/60 35/1/60 32/1/60 +f 33/1/61 36/1/61 32/1/61 +f 34/1/62 36/1/62 33/1/62 +f 142/1/63 34/1/63 33/1/63 +f 144/1/64 34/1/64 142/1/64 +f 36/1/65 39/1/65 35/1/65 +f 37/1/66 39/1/66 36/1/66 +f 34/1/67 37/1/67 36/1/67 +f 144/1/68 37/1/68 34/1/68 +f 38/1/69 39/1/69 37/1/69 +f 144/1/70 38/1/70 37/1/70 +f 38/1/71 40/1/71 39/1/71 +f 144/1/72 41/1/72 38/1/72 +f 43/1/73 41/1/73 144/1/73 +f 41/1/74 40/1/74 38/1/74 +f 41/1/75 42/1/75 40/1/75 +f 43/1/76 42/1/76 41/1/76 +f 43/1/77 167/1/77 42/1/77 +f 169/1/78 167/1/78 43/1/78 +f 168/1/79 169/1/79 43/1/79 +f 437/1/80 240/1/80 237/1/80 +f 438/1/81 240/1/81 437/1/81 +f 438/1/82 242/1/82 240/1/82 +f 522/1/83 242/1/83 438/1/83 +f 44/1/84 242/1/84 522/1/84 +f 44/1/85 245/1/85 242/1/85 +f 44/1/86 246/1/86 245/1/86 +f 44/1/87 248/1/87 246/1/87 +f 46/1/88 248/1/88 44/1/88 +f 46/1/89 45/1/89 248/1/89 +f 46/1/90 282/1/90 45/1/90 +f 69/1/91 6/1/91 47/1/91 +f 69/1/92 26/1/92 6/1/92 +f 48/1/93 49/1/93 47/1/93 +f 51/1/94 52/1/94 49/1/94 +f 51/1/95 49/1/95 48/1/95 +f 50/1/96 51/1/96 48/1/96 +f 55/1/97 52/1/97 51/1/97 +f 55/1/98 51/1/98 50/1/98 +f 54/1/99 53/1/99 52/1/99 +f 55/1/100 54/1/100 52/1/100 +f 50/1/101 90/1/101 55/1/101 +f 90/1/102 54/1/102 55/1/102 +f 57/1/103 56/1/103 53/1/103 +f 54/1/104 57/1/104 53/1/104 +f 90/1/105 57/1/105 54/1/105 +f 57/1/106 58/1/106 56/1/106 +f 57/1/107 59/1/107 58/1/107 +f 90/1/108 59/1/108 57/1/108 +f 91/1/109 59/1/109 90/1/109 +f 59/1/110 60/1/110 58/1/110 +f 62/1/111 61/1/111 60/1/111 +f 59/1/112 62/1/112 60/1/112 +f 65/1/113 62/1/113 59/1/113 +f 91/1/114 65/1/114 59/1/114 +f 62/1/115 63/1/115 61/1/115 +f 64/1/116 66/1/116 63/1/116 +f 62/1/117 64/1/117 63/1/117 +f 65/1/118 64/1/118 62/1/118 +f 68/1/119 64/1/119 65/1/119 +f 64/1/120 67/1/120 66/1/120 +f 253/1/121 67/1/121 64/1/121 +f 68/1/122 253/1/122 64/1/122 +f 73/1/123 70/1/123 69/1/123 +f 70/1/124 71/1/124 69/1/124 +f 73/1/125 74/1/125 70/1/125 +f 70/1/126 72/1/126 71/1/126 +f 74/1/127 72/1/127 70/1/127 +f 74/1/128 76/1/128 72/1/128 +f 254/1/129 74/1/129 73/1/129 +f 75/1/130 74/1/130 254/1/130 +f 75/1/131 78/1/131 74/1/131 +f 78/1/132 76/1/132 74/1/132 +f 77/1/133 75/1/133 254/1/133 +f 77/1/134 79/1/134 75/1/134 +f 79/1/135 78/1/135 75/1/135 +f 80/1/136 78/1/136 79/1/136 +f 255/1/137 79/1/137 77/1/137 +f 255/1/138 81/1/138 79/1/138 +f 81/1/139 80/1/139 79/1/139 +f 80/1/140 82/1/140 78/1/140 +f 81/1/141 82/1/141 80/1/141 +f 83/1/142 84/1/142 255/1/142 +f 84/1/143 81/1/143 255/1/143 +f 84/1/144 82/1/144 81/1/144 +f 85/1/145 84/1/145 83/1/145 +f 88/1/146 82/1/146 84/1/146 +f 85/1/147 88/1/147 84/1/147 +f 86/1/148 85/1/148 83/1/148 +f 87/1/149 85/1/149 86/1/149 +f 87/1/150 88/1/150 85/1/150 +f 256/1/151 87/1/151 86/1/151 +f 256/1/152 89/1/152 87/1/152 +f 89/1/153 88/1/153 87/1/153 +f 89/1/154 136/1/154 88/1/154 +f 257/1/155 89/1/155 256/1/155 +f 257/1/156 136/1/156 89/1/156 +f 119/1/157 102/1/157 50/1/157 +f 8/1/158 119/1/158 50/1/158 +f 13/1/159 119/1/159 8/1/159 +f 102/1/160 90/1/160 50/1/160 +f 123/1/161 119/1/161 13/1/161 +f 102/1/162 107/1/162 90/1/162 +f 18/1/163 123/1/163 13/1/163 +f 129/1/164 123/1/164 18/1/164 +f 111/1/165 91/1/165 90/1/165 +f 107/1/166 111/1/166 90/1/166 +f 20/1/167 129/1/167 18/1/167 +f 111/1/168 65/1/168 91/1/168 +f 130/1/169 129/1/169 20/1/169 +f 111/1/170 113/1/170 65/1/170 +f 113/1/171 68/1/171 65/1/171 +f 25/1/172 130/1/172 20/1/172 +f 93/1/173 130/1/173 25/1/173 +f 92/1/174 68/1/174 113/1/174 +f 92/1/175 237/1/175 68/1/175 +f 437/1/176 237/1/176 92/1/176 +f 25/1/177 447/1/177 93/1/177 +f 150/1/178 447/1/178 25/1/178 +f 435/1/179 214/1/179 212/1/179 +f 217/1/180 435/1/180 293/1/180 +f 217/1/181 214/1/181 435/1/181 +f 223/1/182 292/1/182 98/1/182 +f 223/1/183 225/1/183 292/1/183 +f 225/1/184 94/1/184 292/1/184 +f 225/1/185 216/1/185 94/1/185 +f 216/1/186 95/1/186 94/1/186 +f 216/1/187 218/1/187 95/1/187 +f 218/1/188 293/1/188 95/1/188 +f 218/1/189 217/1/189 293/1/189 +f 233/1/190 224/1/190 96/1/190 +f 224/1/191 97/1/191 96/1/191 +f 224/1/192 222/1/192 97/1/192 +f 222/1/193 299/1/193 97/1/193 +f 222/1/194 223/1/194 299/1/194 +f 223/1/195 98/1/195 299/1/195 +f 305/1/196 185/1/196 96/1/196 +f 185/1/197 233/1/197 96/1/197 +f 186/1/198 185/1/198 305/1/198 +f 307/1/199 186/1/199 305/1/199 +f 187/1/200 186/1/200 307/1/200 +f 306/1/201 189/1/201 307/1/201 +f 189/1/202 187/1/202 307/1/202 +f 316/1/203 189/1/203 306/1/203 +f 197/1/204 189/1/204 316/1/204 +f 99/1/205 197/1/205 316/1/205 +f 198/1/206 197/1/206 99/1/206 +f 313/1/207 198/1/207 99/1/207 +f 196/1/208 198/1/208 313/1/208 +f 319/1/209 196/1/209 313/1/209 +f 202/1/210 196/1/210 319/1/210 +f 205/1/211 100/1/211 454/1/211 +f 100/1/212 205/1/212 319/1/212 +f 205/1/213 202/1/213 319/1/213 +f 103/1/214 102/1/214 101/1/214 +f 105/1/215 103/1/215 101/1/215 +f 327/1/216 105/1/216 101/1/216 +f 103/1/217 107/1/217 102/1/217 +f 105/1/218 104/1/218 103/1/218 +f 328/1/219 104/1/219 105/1/219 +f 104/1/220 107/1/220 103/1/220 +f 108/1/221 107/1/221 104/1/221 +f 328/1/222 108/1/222 104/1/222 +f 106/1/223 108/1/223 328/1/223 +f 109/1/224 107/1/224 108/1/224 +f 106/1/225 109/1/225 108/1/225 +f 109/1/226 111/1/226 107/1/226 +f 110/1/227 109/1/227 106/1/227 +f 109/1/228 112/1/228 111/1/228 +f 110/1/229 112/1/229 109/1/229 +f 330/1/230 112/1/230 110/1/230 +f 112/1/231 113/1/231 111/1/231 +f 114/1/232 113/1/232 112/1/232 +f 330/1/233 114/1/233 112/1/233 +f 331/1/234 114/1/234 330/1/234 +f 114/1/235 92/1/235 113/1/235 +f 115/1/236 92/1/236 114/1/236 +f 331/1/237 115/1/237 114/1/237 +f 115/1/238 283/1/238 92/1/238 +f 441/1/239 283/1/239 115/1/239 +f 119/1/240 101/1/240 102/1/240 +f 116/1/241 101/1/241 119/1/241 +f 117/1/242 101/1/242 116/1/242 +f 117/1/243 327/1/243 101/1/243 +f 118/1/244 327/1/244 117/1/244 +f 119/1/245 121/1/245 116/1/245 +f 121/1/246 120/1/246 116/1/246 +f 120/1/247 117/1/247 116/1/247 +f 120/1/248 118/1/248 117/1/248 +f 123/1/249 121/1/249 119/1/249 +f 121/1/250 122/1/250 120/1/250 +f 123/1/251 124/1/251 121/1/251 +f 124/1/252 122/1/252 121/1/252 +f 129/1/253 126/1/253 123/1/253 +f 126/1/254 124/1/254 123/1/254 +f 126/1/255 125/1/255 124/1/255 +f 127/1/256 126/1/256 129/1/256 +f 128/1/257 125/1/257 126/1/257 +f 127/1/258 128/1/258 126/1/258 +f 130/1/259 127/1/259 129/1/259 +f 130/1/260 131/1/260 127/1/260 +f 131/1/261 128/1/261 127/1/261 +f 133/1/262 132/1/262 130/1/262 +f 132/1/263 131/1/263 130/1/263 +f 133/1/264 134/1/264 132/1/264 +f 93/1/265 133/1/265 130/1/265 +f 284/1/266 134/1/266 133/1/266 +f 93/1/267 284/1/267 133/1/267 +f 285/1/268 284/1/268 93/1/268 +f 540/1/269 141/1/269 272/1/269 +f 520/1/270 540/1/270 272/1/270 +f 136/1/271 135/1/271 353/1/271 +f 136/1/272 338/1/272 135/1/272 +f 258/1/273 338/1/273 136/1/273 +f 258/1/274 340/1/274 338/1/274 +f 137/1/275 340/1/275 258/1/275 +f 261/1/276 340/1/276 137/1/276 +f 261/1/277 343/1/277 340/1/277 +f 262/1/278 343/1/278 261/1/278 +f 264/1/279 344/1/279 262/1/279 +f 344/1/280 343/1/280 262/1/280 +f 346/1/281 344/1/281 264/1/281 +f 138/1/282 346/1/282 264/1/282 +f 138/1/283 348/1/283 346/1/283 +f 139/1/284 348/1/284 138/1/284 +f 350/1/285 348/1/285 139/1/285 +f 268/1/286 350/1/286 139/1/286 +f 140/1/287 350/1/287 268/1/287 +f 141/1/288 140/1/288 268/1/288 +f 272/1/289 141/1/289 268/1/289 +f 356/1/290 3/1/290 72/1/290 +f 356/1/291 376/1/291 3/1/291 +f 76/1/292 356/1/292 72/1/292 +f 363/1/293 356/1/293 76/1/293 +f 376/1/294 142/1/294 3/1/294 +f 78/1/295 363/1/295 76/1/295 +f 376/1/296 380/1/296 142/1/296 +f 143/1/297 363/1/297 78/1/297 +f 82/1/298 143/1/298 78/1/298 +f 380/1/299 381/1/299 142/1/299 +f 381/1/300 144/1/300 142/1/300 +f 372/1/301 143/1/301 82/1/301 +f 387/1/302 144/1/302 381/1/302 +f 88/1/303 372/1/303 82/1/303 +f 353/1/304 372/1/304 88/1/304 +f 387/1/305 43/1/305 144/1/305 +f 136/1/306 353/1/306 88/1/306 +f 389/1/307 43/1/307 387/1/307 +f 389/1/308 168/1/308 43/1/308 +f 170/1/309 168/1/309 389/1/309 +f 395/1/310 170/1/310 389/1/310 +f 395/1/311 145/1/311 170/1/311 +f 396/1/312 145/1/312 395/1/312 +f 396/1/313 172/1/313 145/1/313 +f 146/1/314 172/1/314 396/1/314 +f 146/1/315 147/1/315 172/1/315 +f 399/1/316 147/1/316 146/1/316 +f 399/1/317 175/1/317 147/1/317 +f 403/1/318 175/1/318 399/1/318 +f 179/1/319 175/1/319 403/1/319 +f 404/1/320 179/1/320 403/1/320 +f 148/1/321 179/1/321 404/1/321 +f 406/1/322 148/1/322 404/1/322 +f 182/1/323 148/1/323 406/1/323 +f 407/1/324 182/1/324 406/1/324 +f 149/1/325 182/1/325 407/1/325 +f 1/1/326 149/1/326 407/1/326 +f 151/1/327 152/1/327 150/1/327 +f 413/1/328 153/1/328 151/1/328 +f 151/1/329 153/1/329 152/1/329 +f 153/1/330 154/1/330 152/1/330 +f 413/1/331 160/1/331 153/1/331 +f 153/1/332 157/1/332 154/1/332 +f 160/1/333 156/1/333 153/1/333 +f 156/1/334 157/1/334 153/1/334 +f 157/1/335 155/1/335 154/1/335 +f 158/1/336 155/1/336 157/1/336 +f 157/1/337 163/1/337 158/1/337 +f 160/1/338 162/1/338 156/1/338 +f 156/1/339 163/1/339 157/1/339 +f 162/1/340 163/1/340 156/1/340 +f 158/1/341 164/1/341 159/1/341 +f 164/1/342 161/1/342 159/1/342 +f 163/1/343 164/1/343 158/1/343 +f 162/1/344 164/1/344 163/1/344 +f 164/1/345 321/1/345 161/1/345 +f 413/1/346 24/1/346 23/1/346 +f 413/1/347 151/1/347 24/1/347 +f 151/1/348 150/1/348 24/1/348 +f 150/1/349 25/1/349 24/1/349 +f 26/1/350 7/1/350 6/1/350 +f 28/1/351 165/1/351 7/1/351 +f 26/1/352 28/1/352 7/1/352 +f 28/1/353 11/1/353 165/1/353 +f 30/1/354 14/1/354 11/1/354 +f 28/1/355 30/1/355 11/1/355 +f 32/1/356 15/1/356 14/1/356 +f 30/1/357 32/1/357 14/1/357 +f 35/1/358 17/1/358 15/1/358 +f 32/1/359 35/1/359 15/1/359 +f 35/1/360 19/1/360 17/1/360 +f 35/1/361 39/1/361 19/1/361 +f 39/1/362 21/1/362 19/1/362 +f 40/1/363 21/1/363 39/1/363 +f 40/1/364 166/1/364 21/1/364 +f 42/1/365 166/1/365 40/1/365 +f 42/1/366 23/1/366 166/1/366 +f 167/1/367 23/1/367 42/1/367 +f 170/1/368 169/1/368 168/1/368 +f 169/1/369 171/1/369 167/1/369 +f 170/1/370 171/1/370 169/1/370 +f 171/1/371 173/1/371 167/1/371 +f 145/1/372 171/1/372 170/1/372 +f 145/1/373 172/1/373 171/1/373 +f 172/1/374 173/1/374 171/1/374 +f 147/1/375 173/1/375 172/1/375 +f 147/1/376 174/1/376 173/1/376 +f 147/1/377 177/1/377 174/1/377 +f 175/1/378 177/1/378 147/1/378 +f 177/1/379 176/1/379 174/1/379 +f 179/1/380 177/1/380 175/1/380 +f 177/1/381 178/1/381 176/1/381 +f 179/1/382 178/1/382 177/1/382 +f 179/1/383 148/1/383 178/1/383 +f 180/1/384 176/1/384 178/1/384 +f 148/1/385 180/1/385 178/1/385 +f 180/1/386 181/1/386 176/1/386 +f 148/1/387 182/1/387 180/1/387 +f 183/1/388 181/1/388 180/1/388 +f 182/1/389 183/1/389 180/1/389 +f 149/1/390 183/1/390 182/1/390 +f 183/1/391 184/1/391 181/1/391 +f 541/1/392 184/1/392 183/1/392 +f 149/1/393 541/1/393 183/1/393 +f 186/1/394 188/1/394 185/1/394 +f 187/1/395 188/1/395 186/1/395 +f 188/1/396 191/1/396 185/1/396 +f 189/1/397 190/1/397 187/1/397 +f 200/1/398 189/1/398 197/1/398 +f 187/1/399 190/1/399 188/1/399 +f 200/1/400 193/1/400 189/1/400 +f 193/1/401 190/1/401 189/1/401 +f 188/1/402 192/1/402 191/1/402 +f 195/1/403 192/1/403 188/1/403 +f 190/1/404 195/1/404 188/1/404 +f 192/1/405 194/1/405 191/1/405 +f 193/1/406 195/1/406 190/1/406 +f 200/1/407 195/1/407 193/1/407 +f 195/1/408 194/1/408 192/1/408 +f 198/1/409 200/1/409 197/1/409 +f 196/1/410 201/1/410 198/1/410 +f 199/1/411 201/1/411 196/1/411 +f 202/1/412 199/1/412 196/1/412 +f 203/1/413 199/1/413 202/1/413 +f 198/1/414 201/1/414 200/1/414 +f 200/1/415 201/1/415 195/1/415 +f 203/1/416 201/1/416 199/1/416 +f 204/1/417 202/1/417 205/1/417 +f 204/1/418 203/1/418 202/1/418 +f 206/1/419 205/1/419 210/1/419 +f 205/1/420 458/1/420 210/1/420 +f 205/1/421 454/1/421 458/1/421 +f 206/1/422 204/1/422 205/1/422 +f 320/1/423 208/1/423 207/1/423 +f 208/1/423 325/1/423 207/1/423 +f 325/1/424 324/1/424 207/1/424 +f 208/1/423 415/1/423 325/1/423 +f 415/1/423 209/1/423 325/1/423 +f 415/1/423 210/1/423 209/1/423 +f 418/1/423 206/1/423 210/1/423 +f 415/1/423 416/1/423 210/1/423 +f 417/1/423 418/1/423 210/1/423 +f 416/1/423 417/1/423 210/1/423 +f 432/1/425 213/1/425 211/1/425 +f 212/1/426 213/1/426 432/1/426 +f 214/1/427 213/1/427 212/1/427 +f 215/1/428 213/1/428 214/1/428 +f 217/1/429 215/1/429 214/1/429 +f 219/1/430 215/1/430 217/1/430 +f 420/1/431 215/1/431 219/1/431 +f 219/1/432 217/1/432 218/1/432 +f 225/1/433 221/1/433 216/1/433 +f 221/1/434 218/1/434 216/1/434 +f 220/1/435 221/1/435 225/1/435 +f 221/1/436 219/1/436 218/1/436 +f 221/1/437 420/1/437 219/1/437 +f 230/1/438 221/1/438 220/1/438 +f 230/1/439 420/1/439 221/1/439 +f 233/1/440 226/1/440 224/1/440 +f 227/1/441 222/1/441 224/1/441 +f 227/1/442 228/1/442 222/1/442 +f 228/1/443 223/1/443 222/1/443 +f 228/1/444 225/1/444 223/1/444 +f 226/1/445 227/1/445 224/1/445 +f 220/1/446 225/1/446 228/1/446 +f 231/1/447 228/1/447 227/1/447 +f 229/1/448 227/1/448 226/1/448 +f 229/1/449 231/1/449 227/1/449 +f 230/1/450 220/1/450 228/1/450 +f 231/1/451 230/1/451 228/1/451 +f 229/1/452 232/1/452 231/1/452 +f 232/1/453 230/1/453 231/1/453 +f 185/1/454 226/1/454 233/1/454 +f 191/1/455 226/1/455 185/1/455 +f 191/1/456 229/1/456 226/1/456 +f 191/1/457 194/1/457 229/1/457 +f 194/1/458 232/1/458 229/1/458 +f 274/1/423 234/1/423 280/1/423 +f 235/1/423 422/1/423 274/1/423 +f 422/1/423 234/1/423 274/1/423 +f 425/1/423 235/1/423 274/1/423 +f 428/1/423 426/1/423 274/1/423 +f 426/1/423 425/1/423 274/1/423 +f 275/1/423 428/1/423 274/1/423 +f 211/1/423 428/1/423 275/1/423 +f 236/1/423 279/1/423 275/1/423 +f 279/1/423 211/1/423 275/1/423 +f 213/1/423 428/1/423 211/1/423 +f 240/1/459 238/1/459 237/1/459 +f 240/1/460 239/1/460 238/1/460 +f 241/1/461 239/1/461 240/1/461 +f 241/1/462 244/1/462 239/1/462 +f 244/1/463 243/1/463 239/1/463 +f 242/1/464 241/1/464 240/1/464 +f 245/1/465 241/1/465 242/1/465 +f 244/1/466 241/1/466 245/1/466 +f 249/1/467 243/1/467 244/1/467 +f 247/1/468 244/1/468 245/1/468 +f 246/1/469 247/1/469 245/1/469 +f 247/1/470 249/1/470 244/1/470 +f 249/1/471 252/1/471 243/1/471 +f 250/1/472 249/1/472 247/1/472 +f 248/1/473 247/1/473 246/1/473 +f 250/1/474 247/1/474 248/1/474 +f 45/1/475 250/1/475 248/1/475 +f 252/1/476 249/1/476 250/1/476 +f 45/1/477 251/1/477 250/1/477 +f 282/1/478 251/1/478 45/1/478 +f 251/1/479 252/1/479 250/1/479 +f 239/1/480 243/1/480 67/1/480 +f 253/1/481 239/1/481 67/1/481 +f 238/1/482 239/1/482 253/1/482 +f 68/1/483 238/1/483 253/1/483 +f 237/1/484 238/1/484 68/1/484 +f 49/1/485 73/1/485 47/1/485 +f 73/1/486 69/1/486 47/1/486 +f 52/1/487 73/1/487 49/1/487 +f 254/1/488 73/1/488 52/1/488 +f 53/1/489 254/1/489 52/1/489 +f 56/1/490 254/1/490 53/1/490 +f 77/1/491 254/1/491 56/1/491 +f 58/1/492 77/1/492 56/1/492 +f 255/1/493 77/1/493 58/1/493 +f 60/1/494 255/1/494 58/1/494 +f 83/1/495 255/1/495 60/1/495 +f 61/1/496 83/1/496 60/1/496 +f 86/1/497 83/1/497 61/1/497 +f 63/1/498 86/1/498 61/1/498 +f 66/1/499 86/1/499 63/1/499 +f 66/1/500 256/1/500 86/1/500 +f 67/1/501 256/1/501 66/1/501 +f 259/1/502 257/1/502 256/1/502 +f 259/1/503 258/1/503 257/1/503 +f 258/1/504 136/1/504 257/1/504 +f 259/1/505 137/1/505 258/1/505 +f 260/1/506 137/1/506 259/1/506 +f 260/1/507 261/1/507 137/1/507 +f 263/1/508 260/1/508 259/1/508 +f 263/1/509 262/1/509 260/1/509 +f 262/1/510 261/1/510 260/1/510 +f 263/1/511 265/1/511 262/1/511 +f 265/1/512 264/1/512 262/1/512 +f 138/1/513 264/1/513 265/1/513 +f 266/1/514 265/1/514 263/1/514 +f 266/1/515 139/1/515 265/1/515 +f 139/1/516 138/1/516 265/1/516 +f 267/1/517 268/1/517 266/1/517 +f 268/1/518 139/1/518 266/1/518 +f 270/1/519 267/1/519 266/1/519 +f 270/1/520 271/1/520 267/1/520 +f 271/1/521 272/1/521 267/1/521 +f 272/1/522 268/1/522 267/1/522 +f 269/1/523 271/1/523 270/1/523 +f 269/1/524 520/1/524 271/1/524 +f 520/1/525 272/1/525 271/1/525 +f 276/1/526 275/1/526 273/1/526 +f 275/1/527 274/1/527 273/1/527 +f 236/1/528 275/1/528 276/1/528 +f 277/1/529 236/1/529 276/1/529 +f 278/1/530 236/1/530 277/1/530 +f 279/1/531 236/1/531 278/1/531 +f 430/1/532 279/1/532 278/1/532 +f 211/1/533 279/1/533 430/1/533 +f 432/1/534 211/1/534 430/1/534 +f 251/1/535 280/1/535 252/1/535 +f 282/1/536 280/1/536 251/1/536 +f 46/1/537 281/1/537 282/1/537 +f 281/1/538 280/1/538 282/1/538 +f 273/1/539 274/1/539 281/1/539 +f 274/1/540 280/1/540 281/1/540 +f 436/1/541 283/1/541 441/1/541 +f 436/1/542 437/1/542 283/1/542 +f 437/1/543 92/1/543 283/1/543 +f 285/1/544 445/1/544 284/1/544 +f 446/1/545 445/1/545 285/1/545 +f 93/1/546 446/1/546 285/1/546 +f 447/1/547 446/1/547 93/1/547 +f 291/1/548 286/1/548 288/1/548 +f 291/1/549 435/1/549 286/1/549 +f 293/1/550 435/1/550 291/1/550 +f 297/1/551 289/1/551 287/1/551 +f 290/1/552 288/1/552 287/1/552 +f 298/1/553 289/1/553 297/1/553 +f 289/1/554 290/1/554 287/1/554 +f 95/1/555 288/1/555 290/1/555 +f 95/1/556 291/1/556 288/1/556 +f 98/1/557 289/1/557 298/1/557 +f 292/1/558 290/1/558 289/1/558 +f 98/1/559 292/1/559 289/1/559 +f 292/1/560 94/1/560 290/1/560 +f 94/1/561 95/1/561 290/1/561 +f 95/1/562 293/1/562 291/1/562 +f 300/1/563 295/1/563 294/1/563 +f 297/1/564 287/1/564 294/1/564 +f 295/1/565 296/1/565 294/1/565 +f 296/1/566 297/1/566 294/1/566 +f 295/1/567 97/1/567 296/1/567 +f 98/1/568 298/1/568 297/1/568 +f 300/1/569 97/1/569 295/1/569 +f 296/1/570 98/1/570 297/1/570 +f 97/1/571 299/1/571 296/1/571 +f 96/1/572 97/1/572 300/1/572 +f 299/1/573 98/1/573 296/1/573 +f 302/1/574 294/1/574 301/1/574 +f 302/1/575 300/1/575 294/1/575 +f 304/1/576 300/1/576 302/1/576 +f 304/1/577 96/1/577 300/1/577 +f 305/1/578 96/1/578 304/1/578 +f 301/1/579 303/1/579 302/1/579 +f 314/1/580 303/1/580 301/1/580 +f 309/1/581 314/1/581 301/1/581 +f 303/1/582 304/1/582 302/1/582 +f 310/1/583 314/1/583 309/1/583 +f 314/1/584 306/1/584 303/1/584 +f 316/1/585 306/1/585 314/1/585 +f 303/1/586 305/1/586 304/1/586 +f 307/1/587 305/1/587 303/1/587 +f 306/1/588 307/1/588 303/1/588 +f 308/1/589 310/1/589 309/1/589 +f 311/1/590 310/1/590 308/1/590 +f 317/1/591 311/1/591 308/1/591 +f 317/1/592 313/1/592 311/1/592 +f 315/1/593 313/1/593 317/1/593 +f 312/1/594 315/1/594 317/1/594 +f 311/1/595 99/1/595 310/1/595 +f 313/1/596 99/1/596 311/1/596 +f 310/1/597 316/1/597 314/1/597 +f 312/1/598 319/1/598 315/1/598 +f 99/1/599 316/1/599 310/1/599 +f 315/1/600 319/1/600 313/1/600 +f 318/1/601 312/1/601 317/1/601 +f 100/1/602 312/1/602 318/1/602 +f 100/1/603 319/1/603 312/1/603 +f 320/1/604 164/1/604 162/1/604 +f 320/1/605 321/1/605 164/1/605 +f 320/1/606 322/1/606 321/1/606 +f 320/1/607 323/1/607 322/1/607 +f 320/1/608 207/1/608 452/1/608 +f 323/1/609 320/1/609 452/1/609 +f 324/1/610 452/1/610 207/1/610 +f 324/1/611 453/1/611 452/1/611 +f 325/1/612 453/1/612 324/1/612 +f 325/1/613 326/1/613 453/1/613 +f 209/1/614 326/1/614 325/1/614 +f 209/1/615 456/1/615 326/1/615 +f 210/1/616 456/1/616 209/1/616 +f 210/1/617 458/1/617 456/1/617 +f 464/1/618 105/1/618 327/1/618 +f 464/1/619 462/1/619 105/1/619 +f 462/1/620 328/1/620 105/1/620 +f 462/1/621 106/1/621 328/1/621 +f 329/1/622 106/1/622 462/1/622 +f 329/1/623 110/1/623 106/1/623 +f 329/1/624 330/1/624 110/1/624 +f 461/1/625 330/1/625 329/1/625 +f 461/1/626 331/1/626 330/1/626 +f 443/1/627 331/1/627 461/1/627 +f 443/1/628 115/1/628 331/1/628 +f 443/1/629 441/1/629 115/1/629 +f 465/1/630 464/1/630 118/1/630 +f 464/1/631 327/1/631 118/1/631 +f 120/1/632 465/1/632 118/1/632 +f 122/1/633 465/1/633 120/1/633 +f 466/1/634 465/1/634 122/1/634 +f 124/1/635 466/1/635 122/1/635 +f 125/1/636 466/1/636 124/1/636 +f 128/1/637 332/1/637 125/1/637 +f 332/1/638 466/1/638 125/1/638 +f 131/1/639 332/1/639 128/1/639 +f 132/1/640 332/1/640 131/1/640 +f 134/1/641 332/1/641 132/1/641 +f 134/1/642 467/1/642 332/1/642 +f 284/1/643 467/1/643 134/1/643 +f 352/1/644 333/1/644 351/1/644 +f 540/1/645 333/1/645 352/1/645 +f 141/1/646 540/1/646 352/1/646 +f 334/1/647 337/1/647 355/1/647 +f 335/1/648 337/1/648 334/1/648 +f 338/1/649 335/1/649 135/1/649 +f 336/1/650 337/1/650 335/1/650 +f 338/1/651 336/1/651 335/1/651 +f 336/1/652 339/1/652 337/1/652 +f 338/1/653 340/1/653 336/1/653 +f 339/1/654 341/1/654 337/1/654 +f 340/1/655 339/1/655 336/1/655 +f 343/1/656 339/1/656 340/1/656 +f 339/1/657 342/1/657 341/1/657 +f 343/1/658 342/1/658 339/1/658 +f 343/1/659 344/1/659 342/1/659 +f 342/1/660 345/1/660 341/1/660 +f 344/1/661 345/1/661 342/1/661 +f 346/1/662 345/1/662 344/1/662 +f 346/1/663 347/1/663 345/1/663 +f 348/1/664 347/1/664 346/1/664 +f 347/1/665 349/1/665 345/1/665 +f 350/1/666 349/1/666 347/1/666 +f 348/1/667 350/1/667 347/1/667 +f 350/1/668 351/1/668 349/1/668 +f 140/1/669 351/1/669 350/1/669 +f 140/1/670 352/1/670 351/1/670 +f 141/1/671 352/1/671 140/1/671 +f 135/1/672 354/1/672 353/1/672 +f 135/1/673 335/1/673 354/1/673 +f 334/1/674 354/1/674 335/1/674 +f 358/1/675 357/1/675 356/1/675 +f 363/1/676 361/1/676 356/1/676 +f 358/1/677 360/1/677 357/1/677 +f 360/1/678 359/1/678 357/1/678 +f 361/1/679 358/1/679 356/1/679 +f 361/1/680 362/1/680 358/1/680 +f 362/1/681 360/1/681 358/1/681 +f 361/1/682 364/1/682 362/1/682 +f 363/1/683 365/1/683 361/1/683 +f 365/1/684 364/1/684 361/1/684 +f 365/1/685 367/1/685 364/1/685 +f 143/1/686 366/1/686 363/1/686 +f 366/1/687 365/1/687 363/1/687 +f 366/1/688 367/1/688 365/1/688 +f 368/1/689 367/1/689 366/1/689 +f 143/1/690 369/1/690 366/1/690 +f 369/1/691 368/1/691 366/1/691 +f 372/1/692 369/1/692 143/1/692 +f 369/1/693 370/1/693 368/1/693 +f 371/1/694 369/1/694 372/1/694 +f 371/1/695 370/1/695 369/1/695 +f 374/1/696 370/1/696 371/1/696 +f 353/1/697 354/1/697 372/1/697 +f 354/1/698 371/1/698 372/1/698 +f 354/1/699 373/1/699 371/1/699 +f 373/1/700 374/1/700 371/1/700 +f 334/1/701 373/1/701 354/1/701 +f 334/1/702 355/1/702 373/1/702 +f 355/1/703 374/1/703 373/1/703 +f 357/1/704 376/1/704 356/1/704 +f 357/1/705 375/1/705 376/1/705 +f 359/1/706 375/1/706 357/1/706 +f 475/1/707 375/1/707 359/1/707 +f 375/1/708 377/1/708 376/1/708 +f 377/1/709 380/1/709 376/1/709 +f 378/1/710 377/1/710 375/1/710 +f 475/1/711 378/1/711 375/1/711 +f 379/1/712 380/1/712 377/1/712 +f 378/1/713 379/1/713 377/1/713 +f 476/1/714 379/1/714 378/1/714 +f 476/1/715 380/1/715 379/1/715 +f 383/1/716 380/1/716 476/1/716 +f 477/1/717 383/1/717 476/1/717 +f 383/1/718 381/1/718 380/1/718 +f 477/1/719 382/1/719 383/1/719 +f 383/1/720 384/1/720 381/1/720 +f 385/1/721 384/1/721 383/1/721 +f 382/1/722 385/1/722 383/1/722 +f 479/1/723 385/1/723 382/1/723 +f 384/1/724 387/1/724 381/1/724 +f 386/1/725 387/1/725 384/1/725 +f 385/1/726 386/1/726 384/1/726 +f 479/1/727 386/1/727 385/1/727 +f 480/1/728 386/1/728 479/1/728 +f 386/1/729 388/1/729 387/1/729 +f 390/1/730 388/1/730 386/1/730 +f 480/1/731 390/1/731 386/1/731 +f 391/1/732 390/1/732 480/1/732 +f 388/1/733 389/1/733 387/1/733 +f 391/1/734 392/1/734 390/1/734 +f 392/1/735 393/1/735 390/1/735 +f 393/1/736 388/1/736 390/1/736 +f 393/1/737 389/1/737 388/1/737 +f 394/1/738 393/1/738 392/1/738 +f 393/1/739 395/1/739 389/1/739 +f 394/1/740 395/1/740 393/1/740 +f 396/1/741 395/1/741 394/1/741 +f 398/1/742 397/1/742 394/1/742 +f 397/1/743 396/1/743 394/1/743 +f 146/1/744 396/1/744 397/1/744 +f 398/1/745 400/1/745 397/1/745 +f 400/1/746 146/1/746 397/1/746 +f 400/1/747 399/1/747 146/1/747 +f 401/1/748 400/1/748 398/1/748 +f 401/1/749 402/1/749 400/1/749 +f 402/1/750 403/1/750 400/1/750 +f 403/1/751 399/1/751 400/1/751 +f 405/1/752 402/1/752 401/1/752 +f 405/1/753 404/1/753 402/1/753 +f 404/1/754 403/1/754 402/1/754 +f 408/1/755 404/1/755 405/1/755 +f 408/1/756 406/1/756 404/1/756 +f 411/1/757 408/1/757 405/1/757 +f 411/1/758 409/1/758 408/1/758 +f 407/1/759 406/1/759 408/1/759 +f 409/1/760 407/1/760 408/1/760 +f 409/1/761 1/1/761 407/1/761 +f 410/1/762 409/1/762 411/1/762 +f 410/1/763 412/1/763 409/1/763 +f 412/1/764 1/1/764 409/1/764 +f 181/1/765 23/1/765 167/1/765 +f 184/1/766 413/1/766 23/1/766 +f 181/1/767 184/1/767 23/1/767 +f 173/1/768 181/1/768 167/1/768 +f 176/1/769 181/1/769 173/1/769 +f 174/1/770 176/1/770 173/1/770 +f 482/1/771 413/1/771 184/1/771 +f 482/1/772 160/1/772 413/1/772 +f 482/1/773 162/1/773 160/1/773 +f 482/1/774 208/1/774 162/1/774 +f 208/1/775 320/1/775 162/1/775 +f 485/1/776 208/1/776 482/1/776 +f 414/1/777 208/1/777 485/1/777 +f 415/1/778 208/1/778 414/1/778 +f 488/1/779 415/1/779 414/1/779 +f 491/1/780 415/1/780 488/1/780 +f 416/1/781 415/1/781 491/1/781 +f 493/1/782 416/1/782 491/1/782 +f 494/1/783 416/1/783 493/1/783 +f 417/1/784 416/1/784 494/1/784 +f 497/1/785 417/1/785 494/1/785 +f 500/1/786 417/1/786 497/1/786 +f 502/1/787 418/1/787 500/1/787 +f 418/1/788 417/1/788 500/1/788 +f 504/1/789 418/1/789 502/1/789 +f 230/1/790 232/1/790 419/1/790 +f 428/1/791 215/1/791 419/1/791 +f 215/1/792 420/1/792 419/1/792 +f 420/1/793 230/1/793 419/1/793 +f 232/1/794 504/1/794 419/1/794 +f 204/1/795 418/1/795 504/1/795 +f 203/1/796 204/1/796 504/1/796 +f 194/1/797 195/1/797 504/1/797 +f 195/1/798 201/1/798 504/1/798 +f 201/1/799 203/1/799 504/1/799 +f 232/1/800 194/1/800 504/1/800 +f 428/1/801 213/1/801 215/1/801 +f 206/1/802 418/1/802 204/1/802 +f 234/1/803 508/1/803 421/1/803 +f 234/1/804 510/1/804 508/1/804 +f 422/1/805 510/1/805 234/1/805 +f 422/1/806 423/1/806 510/1/806 +f 235/1/807 423/1/807 422/1/807 +f 235/1/808 513/1/808 423/1/808 +f 235/1/809 424/1/809 513/1/809 +f 425/1/810 424/1/810 235/1/810 +f 425/1/811 516/1/811 424/1/811 +f 425/1/812 427/1/812 516/1/812 +f 425/1/813 426/1/813 427/1/813 +f 426/1/814 519/1/814 427/1/814 +f 426/1/815 428/1/815 519/1/815 +f 428/1/816 419/1/816 519/1/816 +f 270/1/817 259/1/817 256/1/817 +f 269/1/818 270/1/818 256/1/818 +f 67/1/819 269/1/819 256/1/819 +f 421/1/820 269/1/820 67/1/820 +f 243/1/821 421/1/821 67/1/821 +f 270/1/822 266/1/822 259/1/822 +f 266/1/823 263/1/823 259/1/823 +f 252/1/824 421/1/824 243/1/824 +f 280/1/825 234/1/825 252/1/825 +f 234/1/826 421/1/826 252/1/826 +f 429/1/827 273/1/827 281/1/827 +f 429/1/827 277/1/827 273/1/827 +f 277/1/828 276/1/828 273/1/828 +f 429/1/829 431/1/829 277/1/829 +f 431/1/830 278/1/830 277/1/830 +f 431/1/831 430/1/831 278/1/831 +f 431/1/832 432/1/832 430/1/832 +f 431/1/833 433/1/833 432/1/833 +f 525/1/834 212/1/834 432/1/834 +f 433/1/835 434/1/835 432/1/835 +f 434/1/835 525/1/835 432/1/835 +f 439/1/836 438/1/836 437/1/836 +f 436/1/837 439/1/837 437/1/837 +f 440/1/838 439/1/838 436/1/838 +f 439/1/839 522/1/839 438/1/839 +f 440/1/840 522/1/840 439/1/840 +f 436/1/841 441/1/841 443/1/841 +f 442/1/842 436/1/842 443/1/842 +f 442/1/843 440/1/843 436/1/843 +f 284/1/844 444/1/844 467/1/844 +f 445/1/845 444/1/845 284/1/845 +f 445/1/846 449/1/846 444/1/846 +f 448/1/847 446/1/847 447/1/847 +f 4/1/848 446/1/848 448/1/848 +f 4/1/849 445/1/849 446/1/849 +f 450/1/850 445/1/850 4/1/850 +f 450/1/851 449/1/851 445/1/851 +f 288/1/852 286/1/852 451/1/852 +f 553/1/853 301/1/853 451/1/853 +f 301/1/854 294/1/854 451/1/854 +f 287/1/855 288/1/855 451/1/855 +f 294/1/856 287/1/856 451/1/856 +f 309/1/857 301/1/857 553/1/857 +f 308/1/858 309/1/858 553/1/858 +f 318/1/859 317/1/859 553/1/859 +f 317/1/860 308/1/860 553/1/860 +f 530/1/827 323/1/827 452/1/827 +f 453/1/827 530/1/827 452/1/827 +f 457/1/861 530/1/861 453/1/861 +f 326/1/862 457/1/862 453/1/862 +f 456/1/863 457/1/863 326/1/863 +f 454/1/864 529/1/864 458/1/864 +f 529/1/865 455/1/865 458/1/865 +f 458/1/866 457/1/866 456/1/866 +f 459/1/867 457/1/867 458/1/867 +f 455/1/868 459/1/868 458/1/868 +f 463/1/423 460/1/423 464/1/423 +f 461/1/423 329/1/423 464/1/423 +f 460/1/423 443/1/423 464/1/423 +f 443/1/423 461/1/423 464/1/423 +f 465/1/423 463/1/423 464/1/423 +f 329/1/423 462/1/423 464/1/423 +f 562/1/423 463/1/423 465/1/423 +f 466/1/423 562/1/423 465/1/423 +f 332/1/423 562/1/423 466/1/423 +f 564/1/423 562/1/423 332/1/423 +f 467/1/423 564/1/423 332/1/423 +f 460/1/423 442/1/423 443/1/423 +f 444/1/423 556/1/423 467/1/423 +f 556/1/423 564/1/423 467/1/423 +f 468/1/423 564/1/423 556/1/423 +f 451/1/423 468/1/423 556/1/423 +f 469/1/423 451/1/423 556/1/423 +f 558/1/423 451/1/423 469/1/423 +f 559/1/423 451/1/423 558/1/423 +f 553/1/423 451/1/423 559/1/423 +f 351/1/869 333/1/869 474/1/869 +f 355/1/870 351/1/870 474/1/870 +f 337/1/871 351/1/871 355/1/871 +f 345/1/872 349/1/872 337/1/872 +f 349/1/873 351/1/873 337/1/873 +f 341/1/874 345/1/874 337/1/874 +f 360/1/875 470/1/875 359/1/875 +f 362/1/876 470/1/876 360/1/876 +f 471/1/877 470/1/877 362/1/877 +f 364/1/878 471/1/878 362/1/878 +f 472/1/879 471/1/879 364/1/879 +f 367/1/880 472/1/880 364/1/880 +f 368/1/881 472/1/881 367/1/881 +f 370/1/882 472/1/882 368/1/882 +f 473/1/883 472/1/883 370/1/883 +f 374/1/884 473/1/884 370/1/884 +f 374/1/885 474/1/885 473/1/885 +f 355/1/886 474/1/886 374/1/886 +f 359/1/887 470/1/887 475/1/887 +f 470/1/888 533/1/888 475/1/888 +f 533/1/889 378/1/889 475/1/889 +f 533/1/890 535/1/890 378/1/890 +f 535/1/891 476/1/891 378/1/891 +f 535/1/892 477/1/892 476/1/892 +f 535/1/893 478/1/893 477/1/893 +f 478/1/894 382/1/894 477/1/894 +f 478/1/895 536/1/895 382/1/895 +f 536/1/896 479/1/896 382/1/896 +f 536/1/897 480/1/897 479/1/897 +f 481/1/898 480/1/898 536/1/898 +f 481/1/899 391/1/899 480/1/899 +f 481/1/900 392/1/900 391/1/900 +f 481/1/901 410/1/901 392/1/901 +f 410/1/902 411/1/902 392/1/902 +f 411/1/903 394/1/903 392/1/903 +f 411/1/904 405/1/904 394/1/904 +f 405/1/905 401/1/905 394/1/905 +f 401/1/906 398/1/906 394/1/906 +f 483/1/907 482/1/907 184/1/907 +f 541/1/908 483/1/908 184/1/908 +f 487/1/909 483/1/909 541/1/909 +f 484/1/910 483/1/910 487/1/910 +f 484/1/911 485/1/911 483/1/911 +f 485/1/912 482/1/912 483/1/912 +f 486/1/913 485/1/913 484/1/913 +f 486/1/914 414/1/914 485/1/914 +f 492/1/915 484/1/915 487/1/915 +f 492/1/916 486/1/916 484/1/916 +f 489/1/917 486/1/917 492/1/917 +f 489/1/918 488/1/918 486/1/918 +f 488/1/919 414/1/919 486/1/919 +f 491/1/920 488/1/920 489/1/920 +f 492/1/921 490/1/921 489/1/921 +f 490/1/922 491/1/922 489/1/922 +f 493/1/923 491/1/923 490/1/923 +f 495/1/924 490/1/924 492/1/924 +f 495/1/925 493/1/925 490/1/925 +f 496/1/926 495/1/926 492/1/926 +f 495/1/927 494/1/927 493/1/927 +f 496/1/928 497/1/928 495/1/928 +f 497/1/929 494/1/929 495/1/929 +f 501/1/930 498/1/930 496/1/930 +f 498/1/931 497/1/931 496/1/931 +f 498/1/932 500/1/932 497/1/932 +f 501/1/933 499/1/933 498/1/933 +f 499/1/934 500/1/934 498/1/934 +f 499/1/935 502/1/935 500/1/935 +f 503/1/936 499/1/936 501/1/936 +f 503/1/937 502/1/937 499/1/937 +f 503/1/938 504/1/938 502/1/938 +f 503/1/939 501/1/939 518/1/939 +f 505/1/940 503/1/940 518/1/940 +f 504/1/941 503/1/941 505/1/941 +f 419/1/942 504/1/942 505/1/942 +f 508/1/943 506/1/943 507/1/943 +f 421/1/944 508/1/944 507/1/944 +f 509/1/945 511/1/945 506/1/945 +f 508/1/946 509/1/946 506/1/946 +f 510/1/947 509/1/947 508/1/947 +f 509/1/948 512/1/948 511/1/948 +f 423/1/949 512/1/949 509/1/949 +f 510/1/950 423/1/950 509/1/950 +f 513/1/951 512/1/951 423/1/951 +f 512/1/952 514/1/952 511/1/952 +f 424/1/953 514/1/953 512/1/953 +f 513/1/954 424/1/954 512/1/954 +f 516/1/955 515/1/955 514/1/955 +f 424/1/956 516/1/956 514/1/956 +f 515/1/957 517/1/957 514/1/957 +f 516/1/958 517/1/958 515/1/958 +f 427/1/959 517/1/959 516/1/959 +f 519/1/960 518/1/960 517/1/960 +f 427/1/961 519/1/961 517/1/961 +f 519/1/962 505/1/962 518/1/962 +f 419/1/963 505/1/963 519/1/963 +f 421/1/964 507/1/964 269/1/964 +f 507/1/965 520/1/965 269/1/965 +f 507/1/966 506/1/966 520/1/966 +f 523/1/967 522/1/967 521/1/967 +f 523/1/968 44/1/968 522/1/968 +f 523/1/969 46/1/969 44/1/969 +f 523/1/970 429/1/970 46/1/970 +f 429/1/971 281/1/971 46/1/971 +f 524/1/972 429/1/972 523/1/972 +f 431/1/973 429/1/973 524/1/973 +f 433/1/974 431/1/974 524/1/974 +f 547/1/975 433/1/975 524/1/975 +f 547/1/976 434/1/976 433/1/976 +f 551/1/977 434/1/977 547/1/977 +f 526/1/978 434/1/978 551/1/978 +f 526/1/979 525/1/979 434/1/979 +f 526/1/980 212/1/980 525/1/980 +f 286/1/981 435/1/981 212/1/981 +f 526/1/982 527/1/982 212/1/982 +f 527/1/983 286/1/983 212/1/983 +f 451/1/984 527/1/984 538/1/984 +f 286/1/985 527/1/985 451/1/985 +f 442/1/986 539/1/986 521/1/986 +f 522/1/987 442/1/987 521/1/987 +f 522/1/988 440/1/988 442/1/988 +f 5/1/989 544/1/989 542/1/989 +f 450/1/990 5/1/990 542/1/990 +f 528/1/991 544/1/991 5/1/991 +f 530/1/992 544/1/992 528/1/992 +f 322/1/993 530/1/993 528/1/993 +f 323/1/994 530/1/994 322/1/994 +f 444/1/995 542/1/995 560/1/995 +f 449/1/996 450/1/996 542/1/996 +f 444/1/997 449/1/997 542/1/997 +f 549/1/998 553/1/998 550/1/998 +f 549/1/999 318/1/999 553/1/999 +f 318/1/1000 454/1/1000 100/1/1000 +f 549/1/1001 529/1/1001 454/1/1001 +f 318/1/1002 549/1/1002 454/1/1002 +f 549/1/1003 531/1/1003 529/1/1003 +f 457/1/1004 544/1/1004 530/1/1004 +f 457/1/1005 546/1/1005 544/1/1005 +f 457/1/1006 548/1/1006 546/1/1006 +f 459/1/1007 548/1/1007 457/1/1007 +f 455/1/1008 548/1/1008 459/1/1008 +f 552/1/1009 548/1/1009 455/1/1009 +f 529/1/1010 552/1/1010 455/1/1010 +f 531/1/1011 552/1/1011 529/1/1011 +f 333/1/1012 533/1/1012 470/1/1012 +f 474/1/1012 333/1/1012 470/1/1012 +f 539/1/1012 532/1/1012 533/1/1012 +f 532/1/1012 534/1/1012 533/1/1012 +f 333/1/1012 539/1/1012 533/1/1012 +f 472/1/1012 473/1/1012 470/1/1012 +f 473/1/1012 474/1/1012 470/1/1012 +f 534/1/1012 535/1/1012 533/1/1012 +f 471/1/1012 472/1/1012 470/1/1012 +f 534/1/1012 478/1/1012 535/1/1012 +f 534/1/1012 536/1/1012 478/1/1012 +f 534/1/1012 537/1/1012 536/1/1012 +f 537/1/1012 481/1/1012 536/1/1012 +f 537/1/1012 410/1/1012 481/1/1012 +f 561/1/1012 563/1/1012 410/1/1012 +f 563/1/1012 538/1/1012 410/1/1012 +f 554/1/1012 560/1/1012 410/1/1012 +f 537/1/1012 561/1/1012 410/1/1012 +f 538/1/1012 543/1/1012 410/1/1012 +f 557/1/1012 555/1/1012 410/1/1012 +f 555/1/1012 554/1/1012 410/1/1012 +f 543/1/1012 557/1/1012 410/1/1012 +f 560/1/1013 412/1/1013 410/1/1013 +f 540/1/1014 539/1/1014 333/1/1014 +f 521/1/1015 539/1/1015 540/1/1015 +f 506/1/1016 521/1/1016 520/1/1016 +f 521/1/1017 540/1/1017 520/1/1017 +f 560/1/1018 541/1/1018 412/1/1018 +f 542/1/1019 487/1/1019 541/1/1019 +f 560/1/1020 542/1/1020 541/1/1020 +f 506/1/1021 523/1/1021 521/1/1021 +f 544/1/1022 487/1/1022 542/1/1022 +f 538/1/1012 545/1/1012 543/1/1012 +f 506/1/1023 524/1/1023 523/1/1023 +f 546/1/1024 487/1/1024 544/1/1024 +f 511/1/1025 524/1/1025 506/1/1025 +f 492/1/1026 487/1/1026 546/1/1026 +f 538/1/1027 550/1/1027 545/1/1027 +f 548/1/1028 492/1/1028 546/1/1028 +f 511/1/1029 547/1/1029 524/1/1029 +f 511/1/1030 514/1/1030 547/1/1030 +f 496/1/1031 492/1/1031 548/1/1031 +f 517/1/1032 551/1/1032 547/1/1032 +f 514/1/1033 517/1/1033 547/1/1033 +f 552/1/1034 496/1/1034 548/1/1034 +f 501/1/1035 496/1/1035 552/1/1035 +f 549/1/1036 550/1/1036 538/1/1036 +f 527/1/1037 549/1/1037 538/1/1037 +f 517/1/1038 526/1/1038 551/1/1038 +f 531/1/1039 501/1/1039 552/1/1039 +f 517/1/1040 518/1/1040 526/1/1040 +f 518/1/1041 527/1/1041 526/1/1041 +f 518/1/1042 549/1/1042 527/1/1042 +f 518/1/1043 501/1/1043 549/1/1043 +f 501/1/1044 531/1/1044 549/1/1044 +f 550/1/1045 559/1/1045 545/1/1045 +f 550/1/1046 553/1/1046 559/1/1046 +f 555/1/1047 556/1/1047 554/1/1047 +f 557/1/1048 469/1/1048 555/1/1048 +f 469/1/1049 556/1/1049 555/1/1049 +f 543/1/1050 558/1/1050 557/1/1050 +f 558/1/1051 469/1/1051 557/1/1051 +f 559/1/1052 558/1/1052 543/1/1052 +f 545/1/1053 559/1/1053 543/1/1053 +f 556/1/1054 444/1/1054 554/1/1054 +f 444/1/1055 560/1/1055 554/1/1055 +f 442/1/1056 460/1/1056 539/1/1056 +f 460/1/1057 532/1/1057 539/1/1057 +f 460/1/1058 534/1/1058 532/1/1058 +f 463/1/1059 534/1/1059 460/1/1059 +f 463/1/1060 537/1/1060 534/1/1060 +f 562/1/1061 537/1/1061 463/1/1061 +f 562/1/1062 561/1/1062 537/1/1062 +f 564/1/1063 561/1/1063 562/1/1063 +f 564/1/1064 563/1/1064 561/1/1064 +f 468/1/1065 563/1/1065 564/1/1065 +f 468/1/1066 451/1/1066 563/1/1066 +f 451/1/1067 538/1/1067 563/1/1067 +f 565/2/423 570/3/423 682/4/423 +f 567/5/423 565/2/423 682/4/423 +f 566/6/423 565/2/423 567/5/423 +f 599/7/423 566/6/423 567/5/423 +f 659/8/423 569/9/423 567/5/423 +f 568/10/423 599/7/423 567/5/423 +f 569/9/423 568/10/423 567/5/423 +f 570/3/423 684/11/423 682/4/423 +f 565/2/423 605/12/423 570/3/423 +f 605/12/423 606/13/423 570/3/423 +f 606/13/423 578/14/423 570/3/423 +f 640/15/423 638/16/423 569/9/423 +f 642/17/423 640/15/423 569/9/423 +f 581/18/423 642/17/423 569/9/423 +f 638/16/423 568/10/423 569/9/423 +f 571/19/423 605/12/423 565/2/423 +f 610/20/423 608/21/423 565/2/423 +f 608/21/423 571/19/423 565/2/423 +f 582/22/423 610/20/423 565/2/423 +f 588/23/423 582/22/423 565/2/423 +f 566/6/423 623/24/423 565/2/423 +f 623/24/423 572/25/423 565/2/423 +f 572/25/423 573/26/423 565/2/423 +f 573/26/423 624/27/423 565/2/423 +f 624/27/423 627/28/423 565/2/423 +f 627/28/423 588/23/423 565/2/423 +f 574/29/423 623/24/423 566/6/423 +f 575/30/423 574/29/423 566/6/423 +f 629/31/423 626/32/423 566/6/423 +f 599/7/423 629/31/423 566/6/423 +f 626/32/423 575/30/423 566/6/423 +f 638/16/423 576/33/423 568/10/423 +f 576/33/423 577/34/423 568/10/423 +f 577/34/423 643/35/423 568/10/423 +f 643/35/423 646/36/423 568/10/423 +f 646/36/423 599/7/423 568/10/423 +f 580/37/423 642/17/423 581/18/423 +f 578/14/423 579/38/423 570/3/423 +f 611/39/423 590/40/423 570/3/423 +f 579/38/423 611/39/423 570/3/423 +f 589/41/423 649/42/423 581/18/423 +f 649/42/423 580/37/423 581/18/423 +f 613/43/423 590/40/423 611/39/423 +f 588/23/423 614/44/423 582/22/423 +f 630/45/423 588/23/423 627/28/423 +f 599/7/423 584/46/423 629/31/423 +f 583/47/423 599/7/423 646/36/423 +f 589/41/423 585/48/423 649/42/423 +f 616/49/423 590/40/423 613/43/423 +f 632/50/423 588/23/423 630/45/423 +f 586/51/423 599/7/423 583/47/423 +f 588/23/423 619/52/423 614/44/423 +f 599/7/423 635/53/423 584/46/423 +f 589/41/423 655/54/423 585/48/423 +f 618/55/423 590/40/423 616/49/423 +f 633/56/423 588/23/423 632/50/423 +f 653/57/423 599/7/423 586/51/423 +f 622/58/423 590/40/423 618/55/423 +f 588/23/423 621/59/423 619/52/423 +f 636/60/423 588/23/423 633/56/423 +f 599/7/423 587/61/423 635/53/423 +f 657/62/423 599/7/423 653/57/423 +f 589/41/423 656/63/423 655/54/423 +f 588/23/423 590/40/423 621/59/423 +f 621/59/423 590/40/423 622/58/423 +f 599/7/423 588/23/423 636/60/423 +f 587/61/423 599/7/423 636/60/423 +f 589/41/423 599/7/423 657/62/423 +f 656/63/423 589/41/423 657/62/423 +f 662/64/423 599/7/423 589/41/423 +f 588/23/423 591/65/423 590/40/423 +f 593/66/423 599/7/423 662/64/423 +f 588/23/1068 592/67/1068 591/65/1068 +f 592/67/423 595/68/423 594/69/423 +f 665/70/423 593/66/423 663/71/423 +f 667/72/423 593/66/423 665/70/423 +f 592/67/423 678/73/423 595/68/423 +f 596/74/423 593/66/423 667/72/423 +f 592/67/423 598/75/423 678/73/423 +f 597/76/423 593/66/423 596/74/423 +f 669/77/423 593/66/423 597/76/423 +f 599/7/423 592/67/423 588/23/423 +f 592/67/423 600/78/423 598/75/423 +f 675/79/423 592/67/423 599/7/423 +f 593/66/423 675/79/423 599/7/423 +f 675/79/423 593/66/423 669/77/423 +f 672/80/423 600/78/423 592/67/423 +f 669/77/423 601/81/423 675/79/423 +f 673/82/423 672/80/423 592/67/423 +f 601/81/423 602/83/423 675/79/423 +f 603/84/423 673/82/423 592/67/423 +f 675/79/423 603/84/423 592/67/423 +f 602/83/423 604/85/423 675/79/423 +f 690/86/1069 606/86/1069 698/86/1069 +f 606/86/1070 605/86/1070 698/86/1070 +f 605/86/1071 607/86/1071 698/86/1071 +f 571/86/1072 607/86/1072 605/86/1072 +f 692/86/1073 578/86/1073 690/86/1073 +f 578/86/1074 606/86/1074 690/86/1074 +f 571/86/1075 702/86/1075 607/86/1075 +f 608/86/1076 702/86/1076 571/86/1076 +f 694/86/1077 578/86/1077 692/86/1077 +f 608/86/1078 609/86/1078 702/86/1078 +f 610/86/1079 609/86/1079 608/86/1079 +f 579/86/1080 578/86/1080 694/86/1080 +f 704/86/1081 611/86/1081 694/86/1081 +f 611/86/1082 579/86/1082 694/86/1082 +f 610/86/1083 612/86/1083 609/86/1083 +f 582/86/1084 612/86/1084 610/86/1084 +f 613/86/1085 611/86/1085 704/86/1085 +f 615/86/1086 613/86/1086 704/86/1086 +f 582/86/1087 706/86/1087 612/86/1087 +f 614/86/1088 706/86/1088 582/86/1088 +f 616/86/1089 613/86/1089 615/86/1089 +f 614/86/1090 617/86/1090 706/86/1090 +f 709/86/1091 616/86/1091 615/86/1091 +f 619/86/1092 617/86/1092 614/86/1092 +f 618/86/1093 616/86/1093 709/86/1093 +f 619/86/1094 620/86/1094 617/86/1094 +f 622/86/1095 618/86/1095 709/86/1095 +f 712/86/1096 622/86/1096 709/86/1096 +f 621/86/1097 620/86/1097 619/86/1097 +f 621/86/1098 712/86/1098 620/86/1098 +f 712/86/1099 621/86/1099 622/86/1099 +f 685/87/1069 572/87/1069 699/87/1069 +f 572/87/1070 623/87/1070 699/87/1070 +f 623/87/1100 701/87/1100 699/87/1100 +f 574/87/1101 701/87/1101 623/87/1101 +f 686/87/1102 573/87/1102 685/87/1102 +f 573/87/1103 572/87/1103 685/87/1103 +f 575/87/1104 701/87/1104 574/87/1104 +f 624/88/1105 573/87/1105 686/87/1105 +f 575/87/1106 703/87/1106 701/87/1106 +f 625/88/1107 624/88/1107 686/87/1107 +f 626/87/1108 703/87/1108 575/87/1108 +f 627/88/1109 624/88/1109 625/88/1109 +f 626/87/1110 628/87/1110 703/87/1110 +f 697/88/1111 627/88/1111 625/88/1111 +f 629/87/1112 628/87/1112 626/87/1112 +f 630/88/1113 627/88/1113 697/88/1113 +f 696/88/1086 630/88/1086 697/88/1086 +f 629/87/1114 631/87/1114 628/87/1114 +f 584/87/1088 631/87/1088 629/87/1088 +f 632/88/1089 630/88/1089 696/88/1089 +f 584/87/1090 708/87/1090 631/87/1090 +f 695/87/1091 632/88/1091 696/88/1091 +f 635/87/1092 708/87/1092 584/87/1092 +f 633/87/1093 632/88/1093 695/87/1093 +f 635/87/1115 634/87/1115 708/87/1115 +f 636/87/1095 633/87/1095 695/87/1095 +f 637/87/1116 636/87/1116 695/87/1116 +f 635/87/1117 711/87/1117 634/87/1117 +f 587/87/1118 711/87/1118 635/87/1118 +f 587/87/1119 637/87/1119 711/87/1119 +f 637/87/1120 587/87/1120 636/87/1120 +f 576/89/1121 638/90/1121 689/89/1121 +f 638/90/1122 688/90/1122 689/89/1122 +f 639/89/1123 576/89/1123 689/89/1123 +f 640/90/1124 688/90/1124 638/90/1124 +f 641/89/1125 577/89/1125 639/89/1125 +f 577/89/1126 576/89/1126 639/89/1126 +f 640/90/1127 687/90/1127 688/90/1127 +f 642/90/1128 687/90/1128 640/90/1128 +f 644/89/1129 643/89/1129 641/89/1129 +f 643/89/1130 577/89/1130 641/89/1130 +f 580/90/1131 687/90/1131 642/90/1131 +f 580/90/1132 645/90/1132 687/90/1132 +f 647/89/1081 646/89/1081 644/89/1081 +f 646/89/1133 643/89/1133 644/89/1133 +f 580/90/1134 648/90/1134 645/90/1134 +f 649/90/1084 648/90/1084 580/90/1084 +f 583/89/1085 646/89/1085 647/89/1085 +f 650/89/1086 583/89/1086 647/89/1086 +f 649/90/1135 707/90/1135 648/90/1135 +f 585/90/1088 707/90/1088 649/90/1088 +f 586/89/1089 583/89/1089 650/89/1089 +f 585/90/1136 651/90/1136 707/90/1136 +f 654/89/1091 586/89/1091 650/89/1091 +f 655/90/1137 651/90/1137 585/90/1137 +f 655/90/1138 652/90/1138 651/90/1138 +f 653/89/1093 586/89/1093 654/89/1093 +f 657/89/1095 653/89/1095 654/89/1095 +f 710/89/1139 657/89/1139 654/89/1139 +f 655/90/1140 713/90/1140 652/90/1140 +f 656/90/1141 713/90/1141 655/90/1141 +f 713/90/1142 657/89/1142 710/89/1142 +f 713/90/1143 656/90/1143 657/89/1143 +f 660/91/1144 659/91/1144 658/91/1144 +f 660/91/1145 569/91/1145 659/91/1145 +f 661/91/1146 569/91/1146 660/91/1146 +f 661/91/1147 581/91/1147 569/91/1147 +f 662/92/1148 589/92/1148 705/92/1148 +f 700/92/1149 662/92/1149 705/92/1149 +f 593/92/1150 662/92/1150 700/92/1150 +f 716/92/1151 593/92/1151 700/92/1151 +f 664/93/1152 593/92/1152 716/92/1152 +f 663/93/1153 593/92/1153 664/93/1153 +f 666/94/1154 663/93/1154 664/93/1154 +f 666/94/1155 665/94/1155 663/93/1155 +f 666/94/1156 667/94/1156 665/94/1156 +f 668/94/1157 667/94/1157 666/94/1157 +f 668/94/1158 596/94/1158 667/94/1158 +f 719/94/1159 596/94/1159 668/94/1159 +f 719/94/1160 597/94/1160 596/94/1160 +f 720/95/1161 669/95/1161 719/94/1161 +f 669/95/1162 597/94/1162 719/94/1162 +f 670/95/1163 669/95/1163 720/95/1163 +f 670/95/1164 601/95/1164 669/95/1164 +f 722/95/1165 601/95/1165 670/95/1165 +f 722/95/1166 602/95/1166 601/95/1166 +f 721/96/1167 602/95/1167 722/95/1167 +f 721/96/1168 604/96/1168 602/95/1168 +f 675/97/1169 721/96/1169 676/97/1169 +f 675/97/1170 604/96/1170 721/96/1170 +f 600/97/1171 672/97/1171 671/97/1171 +f 672/97/1172 714/97/1172 671/97/1172 +f 672/97/1173 673/97/1173 714/97/1173 +f 673/97/1174 674/97/1174 714/97/1174 +f 673/97/1175 603/97/1175 674/97/1175 +f 603/97/1176 675/97/1176 674/97/1176 +f 675/97/1177 676/97/1177 674/97/1177 +f 598/98/1178 671/97/1178 715/98/1178 +f 600/97/1179 671/97/1179 598/98/1179 +f 594/98/1180 595/98/1180 677/98/1180 +f 595/98/1181 717/98/1181 677/98/1181 +f 595/98/1182 678/98/1182 717/98/1182 +f 678/98/1183 718/98/1183 717/98/1183 +f 678/98/1184 598/98/1184 718/98/1184 +f 598/98/1185 715/98/1185 718/98/1185 +f 679/99/1186 594/98/1186 677/98/1186 +f 592/99/1187 594/98/1187 679/99/1187 +f 590/99/1188 681/99/1188 680/99/1188 +f 591/99/1189 681/99/1189 590/99/1189 +f 591/99/1190 679/99/1190 681/99/1190 +f 592/99/1191 679/99/1191 591/99/1191 +f 570/100/1192 680/99/1192 693/101/1192 +f 590/99/1193 680/99/1193 570/100/1193 +f 682/100/1194 684/100/1194 683/100/1194 +f 684/100/1195 691/100/1195 683/100/1195 +f 684/100/1196 570/100/1196 691/100/1196 +f 570/100/1197 693/101/1197 691/100/1197 +f 658/91/1198 567/102/1198 683/100/1198 +f 567/102/1199 682/100/1199 683/100/1199 +f 659/91/1200 567/102/1200 658/91/1200 +f 705/92/1201 589/92/1201 661/91/1201 +f 589/92/1202 581/91/1202 661/91/1202 +f 639/89/1012 658/91/1012 683/100/1012 +f 686/87/1012 685/87/1012 683/100/1012 +f 641/89/1012 639/89/1012 683/100/1012 +f 625/88/1012 686/87/1012 683/100/1012 +f 644/89/1012 641/89/1012 683/100/1012 +f 690/86/1012 698/86/1012 683/100/1012 +f 698/86/1012 697/88/1012 683/100/1012 +f 697/88/1012 625/88/1012 683/100/1012 +f 685/87/1012 699/87/1012 683/100/1012 +f 699/87/1012 644/89/1012 683/100/1012 +f 687/90/1012 705/92/1012 658/91/1012 +f 688/90/1012 687/90/1012 658/91/1012 +f 689/89/1012 688/90/1012 658/91/1012 +f 639/89/1012 689/89/1012 658/91/1012 +f 692/86/1012 690/86/1012 683/100/1012 +f 691/100/1012 692/86/1012 683/100/1012 +f 705/92/1012 660/91/1012 658/91/1012 +f 705/92/1012 661/91/1012 660/91/1012 +f 693/101/1012 692/86/1012 691/100/1012 +f 694/86/1012 692/86/1012 693/101/1012 +f 680/99/1012 704/86/1012 693/101/1012 +f 704/86/1012 694/86/1012 693/101/1012 +f 647/89/1012 644/89/1012 699/87/1012 +f 637/87/1012 695/87/1012 698/86/1012 +f 695/87/1012 696/88/1012 698/86/1012 +f 696/88/1012 697/88/1012 698/86/1012 +f 607/86/1012 637/87/1012 698/86/1012 +f 654/89/1012 650/89/1012 699/87/1012 +f 710/89/1012 654/89/1012 699/87/1012 +f 700/92/1012 710/89/1012 699/87/1012 +f 716/92/1012 700/92/1012 699/87/1012 +f 701/87/1012 716/92/1012 699/87/1012 +f 650/89/1012 647/89/1012 699/87/1012 +f 702/86/1012 637/87/1012 607/86/1012 +f 703/87/1012 716/92/1012 701/87/1012 +f 609/86/1012 637/87/1012 702/86/1012 +f 645/90/1012 705/92/1012 687/90/1012 +f 628/87/1012 716/92/1012 703/87/1012 +f 612/86/1012 637/87/1012 609/86/1012 +f 648/90/1012 705/92/1012 645/90/1012 +f 716/92/1012 637/87/1012 612/86/1012 +f 680/99/1012 615/86/1012 704/86/1012 +f 706/86/1012 716/92/1012 612/86/1012 +f 631/87/1012 716/92/1012 628/87/1012 +f 707/90/1012 705/92/1012 648/90/1012 +f 617/86/1012 716/92/1012 706/86/1012 +f 708/87/1012 716/92/1012 631/87/1012 +f 651/90/1012 705/92/1012 707/90/1012 +f 700/92/1012 705/92/1012 651/90/1012 +f 680/99/1012 709/86/1012 615/86/1012 +f 652/90/1012 700/92/1012 651/90/1012 +f 620/86/1012 716/92/1012 617/86/1012 +f 634/87/1012 716/92/1012 708/87/1012 +f 680/99/1012 712/86/1012 709/86/1012 +f 711/87/1012 716/92/1012 634/87/1012 +f 713/90/1012 700/92/1012 652/90/1012 +f 680/99/1012 716/92/1012 620/86/1012 +f 712/86/1012 680/99/1012 620/86/1012 +f 700/92/1012 713/90/1012 710/89/1012 +f 637/87/1012 716/92/1012 711/87/1012 +f 681/99/1012 716/92/1012 680/99/1012 +f 676/97/1012 716/92/1012 681/99/1012 +f 679/99/1012 676/97/1012 681/99/1012 +f 714/97/1012 674/97/1012 679/99/1012 +f 671/97/1012 714/97/1012 679/99/1012 +f 674/97/1012 676/97/1012 679/99/1012 +f 715/98/1012 671/97/1012 679/99/1012 +f 718/98/1012 715/98/1012 679/99/1012 +f 676/97/1012 721/96/1012 716/92/1012 +f 677/98/1012 717/98/1012 679/99/1012 +f 717/98/1012 718/98/1012 679/99/1012 +f 721/96/1012 664/93/1012 716/92/1012 +f 721/96/1012 720/95/1012 664/93/1012 +f 720/95/1012 719/94/1012 664/93/1012 +f 719/94/1012 666/94/1012 664/93/1012 +f 719/94/1012 668/94/1012 666/94/1012 +f 721/96/1012 670/95/1012 720/95/1012 +f 721/96/1012 722/95/1012 670/95/1012 +f 724/1/1203 725/1/1203 723/1/1203 +f 725/1/1204 728/1/1204 723/1/1204 +f 728/1/1205 727/1/1205 723/1/1205 +f 724/1/1206 726/1/1206 725/1/1206 +f 789/1/1207 726/1/1207 724/1/1207 +f 725/1/1208 730/1/1208 728/1/1208 +f 726/1/1209 730/1/1209 725/1/1209 +f 789/1/1210 731/1/1210 726/1/1210 +f 790/1/1211 731/1/1211 789/1/1211 +f 728/1/1212 733/1/1212 727/1/1212 +f 790/1/1213 791/1/1213 731/1/1213 +f 727/1/1214 732/1/1214 729/1/1214 +f 733/1/1215 732/1/1215 727/1/1215 +f 726/1/1216 734/1/1216 730/1/1216 +f 726/1/1217 735/1/1217 734/1/1217 +f 731/1/1218 735/1/1218 726/1/1218 +f 734/1/1219 741/1/1219 730/1/1219 +f 732/1/1220 737/1/1220 729/1/1220 +f 728/1/1221 736/1/1221 733/1/1221 +f 730/1/1222 736/1/1222 728/1/1222 +f 731/1/1223 738/1/1223 735/1/1223 +f 740/1/1224 738/1/1224 731/1/1224 +f 791/1/1225 740/1/1225 731/1/1225 +f 741/1/1226 736/1/1226 730/1/1226 +f 733/1/1227 739/1/1227 732/1/1227 +f 736/1/1228 739/1/1228 733/1/1228 +f 738/1/1229 734/1/1229 735/1/1229 +f 791/1/1230 792/1/1230 740/1/1230 +f 742/1/1231 747/1/1231 744/1/1231 +f 745/1/1232 749/1/1232 742/1/1232 +f 746/1/1233 749/1/1233 745/1/1233 +f 743/1/1234 746/1/1234 745/1/1234 +f 764/1/1235 746/1/1235 743/1/1235 +f 744/1/1236 747/1/1236 751/1/1236 +f 742/1/1237 748/1/1237 747/1/1237 +f 749/1/1238 753/1/1238 742/1/1238 +f 748/1/1239 752/1/1239 747/1/1239 +f 742/1/1240 753/1/1240 748/1/1240 +f 764/1/1241 750/1/1241 746/1/1241 +f 747/1/1242 755/1/1242 751/1/1242 +f 752/1/1243 755/1/1243 747/1/1243 +f 749/1/1244 758/1/1244 753/1/1244 +f 746/1/1245 756/1/1245 749/1/1245 +f 750/1/1246 754/1/1246 746/1/1246 +f 753/1/1247 761/1/1247 748/1/1247 +f 748/1/1248 761/1/1248 752/1/1248 +f 749/1/1249 756/1/1249 758/1/1249 +f 746/1/1250 754/1/1250 756/1/1250 +f 753/1/1251 763/1/1251 761/1/1251 +f 750/1/1252 757/1/1252 754/1/1252 +f 752/1/1253 760/1/1253 755/1/1253 +f 759/1/1254 757/1/1254 750/1/1254 +f 752/1/1255 762/1/1255 760/1/1255 +f 761/1/1256 762/1/1256 752/1/1256 +f 758/1/1257 763/1/1257 753/1/1257 +f 759/1/1258 793/1/1258 757/1/1258 +f 766/1/1259 764/1/1259 743/1/1259 +f 768/1/1260 764/1/1260 766/1/1260 +f 768/1/1261 750/1/1261 764/1/1261 +f 773/1/1262 750/1/1262 768/1/1262 +f 773/1/1263 759/1/1263 750/1/1263 +f 798/1/1264 759/1/1264 773/1/1264 +f 798/1/1265 793/1/1265 759/1/1265 +f 767/1/1266 769/1/1266 765/1/1266 +f 769/1/1267 770/1/1267 765/1/1267 +f 770/1/1268 766/1/1268 765/1/1268 +f 770/1/1269 771/1/1269 766/1/1269 +f 771/1/1270 768/1/1270 766/1/1270 +f 813/1/1271 769/1/1271 767/1/1271 +f 771/1/1272 773/1/1272 768/1/1272 +f 772/1/1273 770/1/1273 769/1/1273 +f 813/1/1274 772/1/1274 769/1/1274 +f 772/1/1275 797/1/1275 770/1/1275 +f 797/1/1276 771/1/1276 770/1/1276 +f 797/1/1277 774/1/1277 771/1/1277 +f 774/1/1278 773/1/1278 771/1/1278 +f 841/1/1279 772/1/1279 813/1/1279 +f 796/1/1280 797/1/1280 772/1/1280 +f 774/1/1281 798/1/1281 773/1/1281 +f 841/1/1282 796/1/1282 772/1/1282 +f 797/1/1283 842/1/1283 774/1/1283 +f 842/1/1284 798/1/1284 774/1/1284 +f 778/1/1285 779/1/1285 776/1/1285 +f 777/1/1286 776/1/1286 775/1/1286 +f 777/1/1287 778/1/1287 776/1/1287 +f 780/1/1288 777/1/1288 775/1/1288 +f 777/1/1289 781/1/1289 778/1/1289 +f 781/1/1290 779/1/1290 778/1/1290 +f 780/1/1291 782/1/1291 777/1/1291 +f 782/1/1292 781/1/1292 777/1/1292 +f 781/1/1293 784/1/1293 779/1/1293 +f 782/1/1294 783/1/1294 781/1/1294 +f 823/1/1295 782/1/1295 780/1/1295 +f 897/1/1296 784/1/1296 781/1/1296 +f 822/1/1297 823/1/1297 780/1/1297 +f 783/1/1298 825/1/1298 781/1/1298 +f 825/1/1299 897/1/1299 781/1/1299 +f 823/1/1300 783/1/1300 782/1/1300 +f 824/1/1301 825/1/1301 783/1/1301 +f 824/1/1302 783/1/1302 823/1/1302 +f 779/1/1303 785/1/1303 723/1/1303 +f 776/1/1304 779/1/1304 723/1/1304 +f 785/1/1305 819/1/1305 723/1/1305 +f 819/1/1306 724/1/1306 723/1/1306 +f 819/1/1307 786/1/1307 724/1/1307 +f 786/1/1308 818/1/1308 724/1/1308 +f 818/1/1309 789/1/1309 724/1/1309 +f 787/1/1310 789/1/1310 818/1/1310 +f 787/1/1311 744/1/1311 789/1/1311 +f 788/1/1312 742/1/1312 787/1/1312 +f 742/1/1313 744/1/1313 787/1/1313 +f 816/1/1314 742/1/1314 788/1/1314 +f 745/1/1315 742/1/1315 816/1/1315 +f 743/1/1316 745/1/1316 816/1/1316 +f 817/1/1317 743/1/1317 816/1/1317 +f 767/1/1318 766/1/1318 817/1/1318 +f 766/1/1319 743/1/1319 817/1/1319 +f 765/1/1320 766/1/1320 767/1/1320 +f 775/1/1321 776/1/1321 723/1/1321 +f 727/1/1322 775/1/1322 723/1/1322 +f 780/1/1323 775/1/1323 727/1/1323 +f 729/1/1324 780/1/1324 727/1/1324 +f 822/1/1325 780/1/1325 729/1/1325 +f 737/1/1326 822/1/1326 729/1/1326 +f 751/1/1327 790/1/1327 789/1/1327 +f 744/1/1328 751/1/1328 789/1/1328 +f 751/1/1329 755/1/1329 790/1/1329 +f 755/1/1330 791/1/1330 790/1/1330 +f 760/1/1331 792/1/1331 791/1/1331 +f 755/1/1332 760/1/1332 791/1/1332 +f 798/1/1333 837/1/1333 793/1/1333 +f 826/1/1334 837/1/1334 798/1/1334 +f 871/1/1335 886/1/1335 885/1/1335 +f 871/1/1336 866/1/1336 886/1/1336 +f 866/1/1337 868/1/1337 886/1/1337 +f 868/1/1338 799/1/1338 886/1/1338 +f 868/1/1339 869/1/1339 799/1/1339 +f 869/1/1340 865/1/1340 799/1/1340 +f 865/1/1341 887/1/1341 799/1/1341 +f 865/1/1342 867/1/1342 887/1/1342 +f 867/1/1343 855/1/1343 887/1/1343 +f 855/1/1344 888/1/1344 887/1/1344 +f 855/1/1345 800/1/1345 888/1/1345 +f 855/1/1346 801/1/1346 800/1/1346 +f 856/1/1347 802/1/1347 801/1/1347 +f 855/1/1348 856/1/1348 801/1/1348 +f 856/1/1349 853/1/1349 802/1/1349 +f 853/1/1350 803/1/1350 802/1/1350 +f 853/1/1351 857/1/1351 803/1/1351 +f 857/1/1352 854/1/1352 803/1/1352 +f 854/1/1353 804/1/1353 803/1/1353 +f 854/1/1354 850/1/1354 804/1/1354 +f 807/1/1355 892/1/1355 808/1/1355 +f 807/1/1356 806/1/1356 892/1/1356 +f 806/1/1357 810/1/1357 892/1/1357 +f 806/1/1358 809/1/1358 810/1/1358 +f 809/1/1359 894/1/1359 810/1/1359 +f 809/1/1360 795/1/1360 894/1/1360 +f 795/1/1361 896/1/1361 894/1/1361 +f 795/1/1362 794/1/1362 896/1/1362 +f 794/1/1363 811/1/1363 896/1/1363 +f 812/1/1364 767/1/1364 817/1/1364 +f 812/1/1365 814/1/1365 767/1/1365 +f 814/1/1366 813/1/1366 767/1/1366 +f 814/1/1367 841/1/1367 813/1/1367 +f 815/1/1368 788/1/1368 787/1/1368 +f 815/1/1369 893/1/1369 788/1/1369 +f 893/1/1370 816/1/1370 788/1/1370 +f 893/1/1371 895/1/1371 816/1/1371 +f 895/1/1372 817/1/1372 816/1/1372 +f 895/1/1373 812/1/1373 817/1/1373 +f 815/1/1374 787/1/1374 818/1/1374 +f 821/1/1375 815/1/1375 818/1/1375 +f 889/1/1376 819/1/1376 785/1/1376 +f 889/1/1377 891/1/1377 819/1/1377 +f 891/1/1378 786/1/1378 819/1/1378 +f 891/1/1379 820/1/1379 786/1/1379 +f 821/1/1380 818/1/1380 786/1/1380 +f 820/1/1381 821/1/1381 786/1/1381 +f 898/1/1382 889/1/1382 785/1/1382 +f 779/1/1383 898/1/1383 785/1/1383 +f 784/1/1384 898/1/1384 779/1/1384 +f 909/1/1385 899/1/1385 737/1/1385 +f 899/1/1386 822/1/1386 737/1/1386 +f 923/1/1387 924/1/1387 792/1/1387 +f 760/1/1388 923/1/1388 792/1/1388 +f 732/1/1389 909/1/1389 737/1/1389 +f 914/1/1390 909/1/1390 732/1/1390 +f 910/1/1391 914/1/1391 732/1/1391 +f 739/1/1392 910/1/1392 732/1/1392 +f 736/1/1393 910/1/1393 739/1/1393 +f 913/1/1394 910/1/1394 736/1/1394 +f 912/1/1395 913/1/1395 736/1/1395 +f 741/1/1396 912/1/1396 736/1/1396 +f 911/1/1397 912/1/1397 741/1/1397 +f 734/1/1398 911/1/1398 741/1/1398 +f 738/1/1399 908/1/1399 734/1/1399 +f 908/1/1400 911/1/1400 734/1/1400 +f 925/1/1401 908/1/1401 738/1/1401 +f 740/1/1402 925/1/1402 738/1/1402 +f 924/1/1403 925/1/1403 740/1/1403 +f 792/1/1404 924/1/1404 740/1/1404 +f 762/1/1405 926/1/1405 760/1/1405 +f 926/1/1406 923/1/1406 760/1/1406 +f 930/1/1407 926/1/1407 762/1/1407 +f 761/1/1408 930/1/1408 762/1/1408 +f 928/1/1409 930/1/1409 761/1/1409 +f 763/1/1410 928/1/1410 761/1/1410 +f 927/1/1411 928/1/1411 763/1/1411 +f 758/1/1412 927/1/1412 763/1/1412 +f 932/1/1413 927/1/1413 758/1/1413 +f 756/1/1414 929/1/1414 758/1/1414 +f 929/1/1415 932/1/1415 758/1/1415 +f 754/1/1416 929/1/1416 756/1/1416 +f 936/1/1417 929/1/1417 754/1/1417 +f 757/1/1418 938/1/1418 754/1/1418 +f 938/1/1419 936/1/1419 754/1/1419 +f 837/1/1420 938/1/1420 757/1/1420 +f 793/1/1421 837/1/1421 757/1/1421 +f 827/1/1422 828/1/1422 826/1/1422 +f 830/1/1423 831/1/1423 827/1/1423 +f 831/1/1424 828/1/1424 827/1/1424 +f 829/1/1425 833/1/1425 830/1/1425 +f 831/1/1426 832/1/1426 828/1/1426 +f 843/1/1427 834/1/1427 829/1/1427 +f 834/1/1428 833/1/1428 829/1/1428 +f 833/1/1429 831/1/1429 830/1/1429 +f 836/1/1430 832/1/1430 831/1/1430 +f 833/1/1431 836/1/1431 831/1/1431 +f 835/1/1432 836/1/1432 833/1/1432 +f 834/1/1433 835/1/1433 833/1/1433 +f 828/1/1434 837/1/1434 826/1/1434 +f 828/1/1435 838/1/1435 837/1/1435 +f 832/1/1436 838/1/1436 828/1/1436 +f 840/1/1437 839/1/1437 811/1/1437 +f 794/1/1438 840/1/1438 811/1/1438 +f 814/1/1439 843/1/1439 841/1/1439 +f 829/1/1440 796/1/1440 841/1/1440 +f 843/1/1441 829/1/1441 841/1/1441 +f 829/1/1442 830/1/1442 796/1/1442 +f 830/1/1443 797/1/1443 796/1/1443 +f 830/1/1444 827/1/1444 797/1/1444 +f 827/1/1445 842/1/1445 797/1/1445 +f 827/1/1446 826/1/1446 842/1/1446 +f 826/1/1447 798/1/1447 842/1/1447 +f 941/1/1448 942/1/1448 843/1/1448 +f 942/1/1449 834/1/1449 843/1/1449 +f 942/1/1450 835/1/1450 834/1/1450 +f 942/1/1451 943/1/1451 835/1/1451 +f 943/1/1452 945/1/1452 835/1/1452 +f 945/1/1453 836/1/1453 835/1/1453 +f 804/1/1454 844/1/1454 949/1/1454 +f 850/1/1455 844/1/1455 804/1/1455 +f 848/1/1456 847/1/1456 844/1/1456 +f 851/1/1457 848/1/1457 844/1/1457 +f 845/1/1458 848/1/1458 851/1/1458 +f 849/1/1459 848/1/1459 845/1/1459 +f 846/1/1460 847/1/1460 848/1/1460 +f 962/1/1461 849/1/1461 845/1/1461 +f 849/1/1462 846/1/1462 848/1/1462 +f 846/1/1463 954/1/1463 847/1/1463 +f 849/1/1464 957/1/1464 846/1/1464 +f 958/1/1465 957/1/1465 849/1/1465 +f 962/1/1466 958/1/1466 849/1/1466 +f 851/1/1467 844/1/1467 850/1/1467 +f 863/1/1468 851/1/1468 850/1/1468 +f 845/1/1469 851/1/1469 863/1/1469 +f 864/1/1470 845/1/1470 863/1/1470 +f 962/1/1471 845/1/1471 864/1/1471 +f 852/1/1472 962/1/1472 864/1/1472 +f 858/1/1473 857/1/1473 853/1/1473 +f 859/1/1474 856/1/1474 855/1/1474 +f 856/1/1475 858/1/1475 853/1/1475 +f 857/1/1476 861/1/1476 854/1/1476 +f 858/1/1477 862/1/1477 857/1/1477 +f 860/1/1478 858/1/1478 856/1/1478 +f 859/1/1479 860/1/1479 856/1/1479 +f 862/1/1480 861/1/1480 857/1/1480 +f 863/1/1481 850/1/1481 854/1/1481 +f 861/1/1482 863/1/1482 854/1/1482 +f 860/1/1483 862/1/1483 858/1/1483 +f 864/1/1484 861/1/1484 862/1/1484 +f 860/1/1485 852/1/1485 862/1/1485 +f 864/1/1486 863/1/1486 861/1/1486 +f 852/1/1487 864/1/1487 862/1/1487 +f 867/1/1488 859/1/1488 855/1/1488 +f 870/1/1489 859/1/1489 867/1/1489 +f 872/1/1490 859/1/1490 870/1/1490 +f 872/1/1491 860/1/1491 859/1/1491 +f 865/1/1492 870/1/1492 867/1/1492 +f 869/1/1493 870/1/1493 865/1/1493 +f 871/1/1494 873/1/1494 866/1/1494 +f 873/1/1495 868/1/1495 866/1/1495 +f 868/1/1496 874/1/1496 869/1/1496 +f 869/1/1497 872/1/1497 870/1/1497 +f 873/1/1498 874/1/1498 868/1/1498 +f 874/1/1499 872/1/1499 869/1/1499 +f 876/1/1500 873/1/1500 871/1/1500 +f 961/1/1501 872/1/1501 874/1/1501 +f 873/1/1502 961/1/1502 874/1/1502 +f 876/1/1503 875/1/1503 873/1/1503 +f 875/1/1504 961/1/1504 873/1/1504 +f 877/1/1505 879/1/1505 871/1/1505 +f 879/1/1506 876/1/1506 871/1/1506 +f 879/1/1507 875/1/1507 876/1/1507 +f 879/1/1508 882/1/1508 875/1/1508 +f 882/1/1509 961/1/1509 875/1/1509 +f 877/1/1510 871/1/1510 965/1/1510 +f 871/1/1511 885/1/1511 965/1/1511 +f 878/1/1512 879/1/1512 877/1/1512 +f 880/1/1513 878/1/1513 877/1/1513 +f 878/1/1514 883/1/1514 879/1/1514 +f 880/1/1515 883/1/1515 878/1/1515 +f 883/1/1516 882/1/1516 879/1/1516 +f 881/1/1517 883/1/1517 880/1/1517 +f 966/1/1518 968/1/1518 881/1/1518 +f 968/1/1519 883/1/1519 881/1/1519 +f 967/1/1520 968/1/1520 966/1/1520 +f 968/1/1521 970/1/1521 883/1/1521 +f 970/1/1522 882/1/1522 883/1/1522 +f 970/1/1523 969/1/1523 882/1/1523 +f 805/1/1524 807/1/1524 808/1/1524 +f 890/1/1525 805/1/1525 808/1/1525 +f 898/1/1012 808/1/1012 889/1/1012 +f 808/1/1012 891/1/1012 889/1/1012 +f 890/1/1012 808/1/1012 898/1/1012 +f 808/1/1012 892/1/1012 891/1/1012 +f 892/1/1012 820/1/1012 891/1/1012 +f 892/1/1012 810/1/1012 820/1/1012 +f 810/1/1012 821/1/1012 820/1/1012 +f 810/1/1012 815/1/1012 821/1/1012 +f 894/1/1012 815/1/1012 810/1/1012 +f 893/1/1012 815/1/1012 894/1/1012 +f 896/1/1012 893/1/1012 894/1/1012 +f 895/1/1012 893/1/1012 896/1/1012 +f 811/1/1012 895/1/1012 896/1/1012 +f 812/1/1012 895/1/1012 811/1/1012 +f 839/1/1012 812/1/1012 811/1/1012 +f 814/1/1012 812/1/1012 839/1/1012 +f 899/1/1526 823/1/1526 822/1/1526 +f 899/1/1527 900/1/1527 823/1/1527 +f 900/1/1528 824/1/1528 823/1/1528 +f 900/1/1529 901/1/1529 824/1/1529 +f 901/1/1530 825/1/1530 824/1/1530 +f 901/1/1531 902/1/1531 825/1/1531 +f 902/1/1532 897/1/1532 825/1/1532 +f 902/1/1533 903/1/1533 897/1/1533 +f 898/1/1534 784/1/1534 897/1/1534 +f 903/1/1535 898/1/1535 897/1/1535 +f 978/1/1536 900/1/1536 899/1/1536 +f 978/1/1537 904/1/1537 900/1/1537 +f 904/1/1538 901/1/1538 900/1/1538 +f 905/1/1539 902/1/1539 901/1/1539 +f 904/1/1540 905/1/1540 901/1/1540 +f 905/1/1541 903/1/1541 902/1/1541 +f 977/1/1542 904/1/1542 978/1/1542 +f 905/1/1543 906/1/1543 903/1/1543 +f 907/1/1544 905/1/1544 904/1/1544 +f 977/1/1545 907/1/1545 904/1/1545 +f 907/1/1546 906/1/1546 905/1/1546 +f 973/1/1547 972/1/1547 903/1/1547 +f 906/1/1548 973/1/1548 903/1/1548 +f 974/1/1549 973/1/1549 906/1/1549 +f 907/1/1550 974/1/1550 906/1/1550 +f 1010/1/1551 974/1/1551 907/1/1551 +f 977/1/1552 1010/1/1552 907/1/1552 +f 915/1/1553 899/1/1553 909/1/1553 +f 978/1/1554 899/1/1554 915/1/1554 +f 921/1/1555 978/1/1555 915/1/1555 +f 924/1/1556 979/1/1556 925/1/1556 +f 925/1/1557 980/1/1557 908/1/1557 +f 979/1/1558 980/1/1558 925/1/1558 +f 918/1/1559 911/1/1559 908/1/1559 +f 980/1/1560 918/1/1560 908/1/1560 +f 914/1/1561 915/1/1561 909/1/1561 +f 913/1/1562 919/1/1562 910/1/1562 +f 920/1/1563 912/1/1563 911/1/1563 +f 919/1/1564 914/1/1564 910/1/1564 +f 918/1/1565 920/1/1565 911/1/1565 +f 916/1/1566 913/1/1566 912/1/1566 +f 920/1/1567 916/1/1567 912/1/1567 +f 916/1/1568 919/1/1568 913/1/1568 +f 917/1/1569 915/1/1569 914/1/1569 +f 916/1/1570 981/1/1570 919/1/1570 +f 919/1/1571 917/1/1571 914/1/1571 +f 920/1/1572 981/1/1572 916/1/1572 +f 919/1/1573 922/1/1573 917/1/1573 +f 981/1/1574 922/1/1574 919/1/1574 +f 917/1/1575 921/1/1575 915/1/1575 +f 926/1/1576 931/1/1576 923/1/1576 +f 931/1/1577 924/1/1577 923/1/1577 +f 931/1/1578 979/1/1578 924/1/1578 +f 930/1/1579 931/1/1579 926/1/1579 +f 930/1/1580 935/1/1580 931/1/1580 +f 933/1/1581 928/1/1581 927/1/1581 +f 932/1/1582 933/1/1582 927/1/1582 +f 928/1/1583 935/1/1583 930/1/1583 +f 933/1/1584 982/1/1584 928/1/1584 +f 929/1/1585 936/1/1585 937/1/1585 +f 929/1/1586 934/1/1586 932/1/1586 +f 932/1/1587 934/1/1587 933/1/1587 +f 937/1/1588 934/1/1588 929/1/1588 +f 982/1/1589 935/1/1589 928/1/1589 +f 838/1/1590 938/1/1590 837/1/1590 +f 933/1/1591 939/1/1591 982/1/1591 +f 934/1/1592 939/1/1592 933/1/1592 +f 937/1/1593 940/1/1593 934/1/1593 +f 938/1/1594 984/1/1594 936/1/1594 +f 940/1/1595 939/1/1595 934/1/1595 +f 838/1/1596 984/1/1596 938/1/1596 +f 936/1/1597 940/1/1597 937/1/1597 +f 984/1/1598 940/1/1598 936/1/1598 +f 945/1/1599 985/1/1599 838/1/1599 +f 832/1/1600 945/1/1600 838/1/1600 +f 836/1/1601 945/1/1601 832/1/1601 +f 843/1/1602 814/1/1602 839/1/1602 +f 840/1/1603 843/1/1603 839/1/1603 +f 988/1/1604 840/1/1604 953/1/1604 +f 988/1/1605 941/1/1605 840/1/1605 +f 941/1/1606 843/1/1606 840/1/1606 +f 944/1/1607 942/1/1607 941/1/1607 +f 943/1/1608 942/1/1608 944/1/1608 +f 946/1/1609 943/1/1609 944/1/1609 +f 947/1/1610 945/1/1610 943/1/1610 +f 946/1/1611 947/1/1611 943/1/1611 +f 948/1/1612 947/1/1612 946/1/1612 +f 844/1/1613 847/1/1613 949/1/1613 +f 847/1/1614 950/1/1614 949/1/1614 +f 847/1/1615 954/1/1615 950/1/1615 +f 955/1/1616 951/1/1616 950/1/1616 +f 954/1/1617 955/1/1617 950/1/1617 +f 955/1/1618 987/1/1618 951/1/1618 +f 987/1/1619 952/1/1619 951/1/1619 +f 987/1/1620 989/1/1620 952/1/1620 +f 989/1/1621 986/1/1621 952/1/1621 +f 986/1/1622 953/1/1622 952/1/1622 +f 986/1/1623 988/1/1623 953/1/1623 +f 846/1/1624 956/1/1624 954/1/1624 +f 956/1/1625 955/1/1625 954/1/1625 +f 956/1/1626 987/1/1626 955/1/1626 +f 990/1/1627 987/1/1627 956/1/1627 +f 959/1/1628 956/1/1628 846/1/1628 +f 957/1/1629 959/1/1629 846/1/1629 +f 959/1/1630 990/1/1630 956/1/1630 +f 960/1/1631 959/1/1631 957/1/1631 +f 958/1/1632 960/1/1632 957/1/1632 +f 962/1/1633 860/1/1633 872/1/1633 +f 961/1/1634 962/1/1634 872/1/1634 +f 962/1/1635 852/1/1635 860/1/1635 +f 882/1/1636 962/1/1636 961/1/1636 +f 958/1/1637 962/1/1637 882/1/1637 +f 969/1/1638 958/1/1638 882/1/1638 +f 1007/1/1639 998/1/1639 963/1/1639 +f 998/1/1640 997/1/1640 963/1/1640 +f 997/1/1641 964/1/1641 963/1/1641 +f 997/1/1642 999/1/1642 964/1/1642 +f 999/1/1643 967/1/1643 964/1/1643 +f 967/1/1644 884/1/1644 964/1/1644 +f 967/1/1645 966/1/1645 884/1/1645 +f 966/1/1646 881/1/1646 884/1/1646 +f 881/1/1647 965/1/1647 884/1/1647 +f 881/1/1648 880/1/1648 965/1/1648 +f 880/1/1649 877/1/1649 965/1/1649 +f 1003/1/1650 968/1/1650 967/1/1650 +f 999/1/1651 1003/1/1651 967/1/1651 +f 1003/1/1652 970/1/1652 968/1/1652 +f 1000/1/1653 1003/1/1653 999/1/1653 +f 970/1/1654 971/1/1654 969/1/1654 +f 1003/1/1655 971/1/1655 970/1/1655 +f 1006/1/1656 971/1/1656 1003/1/1656 +f 805/1/1657 890/1/1657 898/1/1657 +f 903/1/1658 805/1/1658 898/1/1658 +f 903/1/1659 963/1/1659 805/1/1659 +f 903/1/1660 972/1/1660 963/1/1660 +f 972/1/1661 1007/1/1661 963/1/1661 +f 1008/1/1662 972/1/1662 973/1/1662 +f 974/1/1663 1008/1/1663 973/1/1663 +f 974/1/1664 975/1/1664 1008/1/1664 +f 1010/1/1665 976/1/1665 974/1/1665 +f 976/1/1666 975/1/1666 974/1/1666 +f 977/1/1667 978/1/1667 921/1/1667 +f 1013/1/1668 1010/1/1668 921/1/1668 +f 1010/1/1669 977/1/1669 921/1/1669 +f 1018/1/1670 980/1/1670 979/1/1670 +f 1018/1/1671 918/1/1671 980/1/1671 +f 1018/1/1672 1016/1/1672 918/1/1672 +f 1016/1/1673 1011/1/1673 918/1/1673 +f 1011/1/1674 920/1/1674 918/1/1674 +f 1011/1/1675 981/1/1675 920/1/1675 +f 1011/1/1676 1014/1/1676 981/1/1676 +f 917/1/1677 1013/1/1677 921/1/1677 +f 1014/1/1678 922/1/1678 981/1/1678 +f 922/1/1679 1013/1/1679 917/1/1679 +f 1014/1/1680 1013/1/1680 922/1/1680 +f 1020/1/1681 1018/1/1681 979/1/1681 +f 931/1/1682 1020/1/1682 979/1/1682 +f 935/1/1683 1020/1/1683 931/1/1683 +f 1022/1/1684 1020/1/1684 935/1/1684 +f 982/1/1685 1022/1/1685 935/1/1685 +f 983/1/1686 1022/1/1686 982/1/1686 +f 939/1/1687 983/1/1687 982/1/1687 +f 940/1/1688 983/1/1688 939/1/1688 +f 1023/1/1689 983/1/1689 940/1/1689 +f 985/1/1690 984/1/1690 838/1/1690 +f 984/1/1691 1023/1/1691 940/1/1691 +f 985/1/1692 1023/1/1692 984/1/1692 +f 947/1/1693 985/1/1693 945/1/1693 +f 947/1/1694 1026/1/1694 985/1/1694 +f 947/1/1695 948/1/1695 1026/1/1695 +f 944/1/1696 941/1/1696 988/1/1696 +f 993/1/1697 944/1/1697 988/1/1697 +f 994/1/1698 946/1/1698 993/1/1698 +f 946/1/1699 944/1/1699 993/1/1699 +f 948/1/1700 946/1/1700 994/1/1700 +f 1028/1/1701 948/1/1701 994/1/1701 +f 991/1/1702 986/1/1702 989/1/1702 +f 991/1/1703 988/1/1703 986/1/1703 +f 990/1/1704 989/1/1704 987/1/1704 +f 991/1/1705 993/1/1705 988/1/1705 +f 959/1/1706 991/1/1706 989/1/1706 +f 990/1/1707 959/1/1707 989/1/1707 +f 992/1/1708 993/1/1708 991/1/1708 +f 959/1/1709 992/1/1709 991/1/1709 +f 960/1/1710 995/1/1710 959/1/1710 +f 995/1/1711 992/1/1711 959/1/1711 +f 1028/1/1712 994/1/1712 993/1/1712 +f 992/1/1713 1028/1/1713 993/1/1713 +f 996/1/1714 992/1/1714 995/1/1714 +f 996/1/1715 1028/1/1715 992/1/1715 +f 971/1/1716 960/1/1716 969/1/1716 +f 960/1/1717 958/1/1717 969/1/1717 +f 1006/1/1718 960/1/1718 971/1/1718 +f 995/1/1719 960/1/1719 1006/1/1719 +f 998/1/1720 1002/1/1720 997/1/1720 +f 1000/1/1721 999/1/1721 997/1/1721 +f 1001/1/1722 998/1/1722 1007/1/1722 +f 1001/1/1723 1004/1/1723 998/1/1723 +f 1004/1/1724 1002/1/1724 998/1/1724 +f 1002/1/1725 1000/1/1725 997/1/1725 +f 1009/1/1726 1004/1/1726 1001/1/1726 +f 1002/1/1727 1003/1/1727 1000/1/1727 +f 1004/1/1728 1005/1/1728 1002/1/1728 +f 1005/1/1729 1003/1/1729 1002/1/1729 +f 1005/1/1730 1006/1/1730 1003/1/1730 +f 1009/1/1731 1027/1/1731 1004/1/1731 +f 1027/1/1732 1005/1/1732 1004/1/1732 +f 1027/1/1733 1006/1/1733 1005/1/1733 +f 1008/1/1734 1007/1/1734 972/1/1734 +f 1008/1/1735 1001/1/1735 1007/1/1735 +f 975/1/1736 1001/1/1736 1008/1/1736 +f 975/1/1737 1009/1/1737 1001/1/1737 +f 976/1/1738 1009/1/1738 975/1/1738 +f 976/1/1739 1027/1/1739 1009/1/1739 +f 976/1/1740 1010/1/1740 1013/1/1740 +f 1015/1/1741 976/1/1741 1013/1/1741 +f 1018/1/1742 1019/1/1742 1016/1/1742 +f 1012/1/1743 1019/1/1743 1018/1/1743 +f 1016/1/1744 1014/1/1744 1011/1/1744 +f 1014/1/1745 1015/1/1745 1013/1/1745 +f 1016/1/1746 1017/1/1746 1014/1/1746 +f 1019/1/1747 1017/1/1747 1016/1/1747 +f 1014/1/1748 1017/1/1748 1015/1/1748 +f 1020/1/1749 1012/1/1749 1018/1/1749 +f 1021/1/1750 1012/1/1750 1020/1/1750 +f 1019/1/1751 1012/1/1751 1021/1/1751 +f 1021/1/1752 1024/1/1752 1019/1/1752 +f 1022/1/1753 1021/1/1753 1020/1/1753 +f 1023/1/1754 1025/1/1754 983/1/1754 +f 983/1/1755 1024/1/1755 1022/1/1755 +f 1025/1/1756 1024/1/1756 983/1/1756 +f 1022/1/1757 1024/1/1757 1021/1/1757 +f 1026/1/1758 1025/1/1758 1023/1/1758 +f 985/1/1759 1026/1/1759 1023/1/1759 +f 1017/1/1760 976/1/1760 1015/1/1760 +f 1017/1/1761 1027/1/1761 976/1/1761 +f 1017/1/1762 1019/1/1762 1027/1/1762 +f 1024/1/1763 995/1/1763 1019/1/1763 +f 995/1/1764 1006/1/1764 1019/1/1764 +f 1006/1/1765 1027/1/1765 1019/1/1765 +f 1024/1/1766 996/1/1766 995/1/1766 +f 1028/1/1767 996/1/1767 1024/1/1767 +f 1026/1/1768 1028/1/1768 1024/1/1768 +f 1026/1/1769 948/1/1769 1028/1/1769 +f 1025/1/1770 1026/1/1770 1024/1/1770 +f 1046/1/1771 1030/1/1771 1045/1/1771 +f 1056/1/1772 1030/1/1772 1046/1/1772 +f 1031/1/1773 1056/1/1773 1046/1/1773 +f 1032/1/1774 1031/1/1774 1046/1/1774 +f 1045/1/1775 1033/1/1775 1042/1/1775 +f 1030/1/1776 1033/1/1776 1045/1/1776 +f 1036/1/1777 1034/1/1777 1035/1/1777 +f 1042/1/1778 1036/1/1778 1035/1/1778 +f 1033/1/1779 1036/1/1779 1042/1/1779 +f 1066/1/1780 1037/1/1780 1067/1/1780 +f 1066/1/1781 1060/1/1781 1037/1/1781 +f 1039/1/1782 1031/1/1782 1032/1/1782 +f 1038/1/1783 1039/1/1783 1032/1/1783 +f 1035/1/423 1080/1/423 1077/1/423 +f 1035/1/423 1047/1/423 1080/1/423 +f 1040/1/423 1035/1/423 1077/1/423 +f 1042/1/423 1035/1/423 1040/1/423 +f 1041/1/423 1042/1/423 1040/1/423 +f 1043/1/423 1042/1/423 1041/1/423 +f 1045/1/423 1042/1/423 1043/1/423 +f 1044/1/423 1045/1/423 1043/1/423 +f 1044/1/423 1074/1/423 1045/1/423 +f 1074/1/423 1046/1/423 1045/1/423 +f 1074/1/423 1076/1/423 1046/1/423 +f 1076/1/423 1032/1/423 1046/1/423 +f 1076/1/423 1038/1/423 1032/1/423 +f 1076/1/423 1073/1/423 1038/1/423 +f 1048/1/1784 1047/1/1784 1035/1/1784 +f 1034/1/1785 1048/1/1785 1035/1/1785 +f 1086/1/1786 1054/1/1786 1061/1/1786 +f 1058/1/1787 1054/1/1787 1086/1/1787 +f 1053/1/1788 1054/1/1788 1058/1/1788 +f 1059/1/1789 1053/1/1789 1058/1/1789 +f 1060/1/1790 1053/1/1790 1059/1/1790 +f 1037/1/1791 1060/1/1791 1059/1/1791 +f 1061/1/1792 1055/1/1792 1084/1/1792 +f 1054/1/1793 1055/1/1793 1061/1/1793 +f 1051/1/1794 1062/1/1794 1085/1/1794 +f 1062/1/1795 1063/1/1795 1085/1/1795 +f 1062/1/1796 1064/1/1796 1063/1/1796 +f 1062/1/1797 1052/1/1797 1064/1/1797 +f 1052/1/1798 1065/1/1798 1064/1/1798 +f 1052/1/1799 1066/1/1799 1065/1/1799 +f 1066/1/1800 1067/1/1800 1065/1/1800 +f 1055/1/1801 1092/1/1801 1084/1/1801 +f 1055/1/1802 1068/1/1802 1092/1/1802 +f 1068/1/1803 1070/1/1803 1092/1/1803 +f 1068/1/1804 1069/1/1804 1070/1/1804 +f 1069/1/1805 1071/1/1805 1070/1/1805 +f 1069/1/1806 1057/1/1806 1071/1/1806 +f 1038/1/1807 1072/1/1807 1071/1/1807 +f 1039/1/1808 1038/1/1808 1071/1/1808 +f 1057/1/1809 1039/1/1809 1071/1/1809 +f 1038/1/1810 1073/1/1810 1072/1/1810 +f 1072/1/1811 1073/1/1811 1093/1/1811 +f 1073/1/1812 1076/1/1812 1093/1/1812 +f 1074/1/1813 1044/1/1813 1094/1/1813 +f 1075/1/1814 1074/1/1814 1094/1/1814 +f 1076/1/1815 1074/1/1815 1075/1/1815 +f 1093/1/1816 1076/1/1816 1075/1/1816 +f 1094/1/1817 1044/1/1817 1089/1/1817 +f 1044/1/1818 1043/1/1818 1089/1/1818 +f 1088/1/1819 1077/1/1819 1087/1/1819 +f 1040/1/1820 1077/1/1820 1088/1/1820 +f 1078/1/1821 1040/1/1821 1088/1/1821 +f 1041/1/1822 1040/1/1822 1078/1/1822 +f 1089/1/1823 1041/1/1823 1078/1/1823 +f 1043/1/1824 1041/1/1824 1089/1/1824 +f 1077/1/1825 1079/1/1825 1087/1/1825 +f 1077/1/1826 1080/1/1826 1079/1/1826 +f 1080/1/1827 1081/1/1827 1079/1/1827 +f 1047/1/1828 1049/1/1828 1081/1/1828 +f 1080/1/1829 1047/1/1829 1081/1/1829 +f 1048/1/1830 1049/1/1830 1047/1/1830 +f 1049/1/1831 1090/1/1831 1081/1/1831 +f 1049/1/1832 1082/1/1832 1090/1/1832 +f 1082/1/1833 1083/1/1833 1090/1/1833 +f 1082/1/1834 1050/1/1834 1083/1/1834 +f 1050/1/1835 1051/1/1835 1083/1/1835 +f 1051/1/1836 1091/1/1836 1083/1/1836 +f 1051/1/1837 1085/1/1837 1091/1/1837 +f 1085/1/1838 1029/1/1838 1091/1/1838 +f 1029/1/1839 1061/1/1839 1084/1/1839 +f 1085/1/1840 1061/1/1840 1029/1/1840 +f 1085/1/1841 1063/1/1841 1061/1/1841 +f 1063/1/1842 1086/1/1842 1061/1/1842 +f 1063/1/1843 1064/1/1843 1086/1/1843 +f 1058/1/1844 1086/1/1844 1064/1/1844 +f 1064/1/1845 1065/1/1845 1058/1/1845 +f 1065/1/1846 1059/1/1846 1058/1/1846 +f 1065/1/1847 1037/1/1847 1059/1/1847 +f 1065/1/1848 1067/1/1848 1037/1/1848 +f 1079/1/1012 1081/1/1012 1087/1/1012 +f 1081/1/1012 1089/1/1012 1087/1/1012 +f 1089/1/1012 1088/1/1012 1087/1/1012 +f 1089/1/1012 1078/1/1012 1088/1/1012 +f 1081/1/1012 1090/1/1012 1089/1/1012 +f 1090/1/1012 1029/1/1012 1089/1/1012 +f 1029/1/1012 1094/1/1012 1089/1/1012 +f 1083/1/1012 1029/1/1012 1090/1/1012 +f 1091/1/1849 1029/1/1849 1083/1/1849 +f 1070/1/1012 1094/1/1012 1029/1/1012 +f 1092/1/1012 1070/1/1012 1029/1/1012 +f 1084/1/1850 1092/1/1850 1029/1/1850 +f 1071/1/1012 1094/1/1012 1070/1/1012 +f 1071/1/1012 1072/1/1012 1094/1/1012 +f 1072/1/1012 1093/1/1012 1094/1/1012 +f 1093/1/1012 1075/1/1012 1094/1/1012 +f 803/1/1012 804/1/1012 949/1/1012 950/1/1012 951/1/1012 952/1/1012 953/1/1012 840/1/1012 794/1/1012 795/1/1012 809/1/1012 806/1/1012 807/1/1012 805/1/1012 963/1/1012 964/1/1012 884/1/1012 965/1/1012 885/1/1012 886/1/1012 799/1/1012 887/1/1012 888/1/1012 801/1/1012 802/1/1012 +f 1030/1/423 1056/1/423 1031/1/423 1039/1/423 1057/1/423 1069/1/423 1068/1/423 1055/1/423 1054/1/423 1053/1/423 1060/1/423 1066/1/423 1052/1/423 1062/1/423 1051/1/423 1050/1/423 1082/1/423 1049/1/423 1048/1/423 1034/1/423 1036/1/423 1033/1/423 From 48bfed0643d037703afc71b822265bf69f161aed Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Nov 2024 17:43:14 +0100 Subject: [PATCH 077/276] Changed endpoint and (pre-)flatten/massage data to be more inline with db. Move calculations out of server, into Cura. CURA-12262 --- plugins/SliceInfoPlugin/SliceInfo.py | 45 ++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 411146d0653..61ebd059a5f 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -1,11 +1,12 @@ # Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. +import datetime import json import os import platform import time -from typing import Optional, Set, TYPE_CHECKING +from typing import Any, Optional, Set, TYPE_CHECKING from PyQt6.QtCore import pyqtSlot, QObject from PyQt6.QtNetwork import QNetworkRequest @@ -33,7 +34,18 @@ class SliceInfo(QObject, Extension): no model files are being sent (Just a SHA256 hash of the model). """ - info_url = "https://stats.ultimaker.com/api/cura" + info_url = "https://statistics.ultimaker.com/api/v2/cura/slice" + + _adjust_flattened_names = { + "extruders_extruder": "extruders", + "extruders_settings": "extruders", + "models_model": "models", + "models_transformation_data": "models_transformation", + "print_settings_": "", + "print_times": "print_time", + "active_machine_": "", + "slice_uuid": "slice_id", + } def __init__(self, parent = None): QObject.__init__(self, parent) @@ -112,6 +124,26 @@ def _getUserModifiedSettingKeys(self) -> list: return list(sorted(user_modified_setting_keys)) + def _flattenData(self, data: Any, result: dict, current_flat_key: Optional[str] = None, lift_list: bool = False) -> None: + if isinstance(data, dict): + for key, value in data.items(): + total_flat_key = key if current_flat_key is None else f"{current_flat_key}_{key}" + self._flattenData(value, result, total_flat_key, lift_list) + elif isinstance(data, list): + for item in data: + self._flattenData(item, result, current_flat_key, True) + else: + actual_flat_key = current_flat_key.lower() + for key, value in self._adjust_flattened_names.items(): + if actual_flat_key.startswith(key): + actual_flat_key = actual_flat_key.replace(key, value) + if lift_list: + if actual_flat_key not in result: + result[actual_flat_key] = [] + result[actual_flat_key].append(data) + else: + result[actual_flat_key] = data + def _onWriteStarted(self, output_device): try: if not self._application.getPreferences().getValue("info/send_slice_info"): @@ -126,7 +158,7 @@ def _onWriteStarted(self, output_device): data = dict() # The data that we're going to submit. data["time_stamp"] = time.time() - data["schema_version"] = 0 + data["schema_version"] = 1000 data["cura_version"] = self._application.getVersion() data["cura_build_type"] = ApplicationMetadata.CuraBuildType org_id = user_profile.get("organization_id", None) if user_profile else None @@ -298,6 +330,13 @@ def _onWriteStarted(self, output_device): "time_backend": int(round(time_backend)), } + # Massage data into format used in the DB: + flat_data = dict() + self._flattenData(data, flat_data) + data = flat_data + timestamp = datetime.datetime.utcfromtimestamp(float(data["time_stamp"])) + data["timestamp"] = f"{str(timestamp)} UTC" + # Convert data to bytes binary_data = json.dumps(data).encode("utf-8") From 08f310b300defd785773f937bdd8beaf93fb9f90 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 7 Nov 2024 11:02:46 +0100 Subject: [PATCH 078/276] (SliceInfo) Do timestamp server-side. part of CURA-12262 --- plugins/SliceInfoPlugin/SliceInfo.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 61ebd059a5f..81c0ca05c83 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -157,7 +157,6 @@ def _onWriteStarted(self, output_device): global_stack = machine_manager.activeMachine data = dict() # The data that we're going to submit. - data["time_stamp"] = time.time() data["schema_version"] = 1000 data["cura_version"] = self._application.getVersion() data["cura_build_type"] = ApplicationMetadata.CuraBuildType @@ -334,8 +333,6 @@ def _onWriteStarted(self, output_device): flat_data = dict() self._flattenData(data, flat_data) data = flat_data - timestamp = datetime.datetime.utcfromtimestamp(float(data["time_stamp"])) - data["timestamp"] = f"{str(timestamp)} UTC" # Convert data to bytes binary_data = json.dumps(data).encode("utf-8") From f8fb33928dbcd3302fc1aee75950a7fecc498b96 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 8 Nov 2024 10:18:25 +0100 Subject: [PATCH 079/276] Rename Outer Wall Acceleration to avoid doubles CURA-12270 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d02da8c0311..221b397b125 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8982,7 +8982,7 @@ }, "wall_0_acceleration": { - "label": "Outer Wall Acceleration", + "label": "Outer Wall Start Acceleration", "description": "This is the acceleration with which to reach the top speed when printing an outer wall.", "enabled": "wall_0_start_speed_ratio < 100.0", "type": "float", @@ -9009,7 +9009,7 @@ }, "wall_0_deceleration": { - "label": "Outer Wall Deceleration", + "label": "Outer Wall End Deceleration", "description": "This is the deceleration with which to end printing an outer wall.", "enabled": "wall_0_end_speed_ratio < 100.0", "type": "float", From 7306aed7f7ec03f2a16f5a138fa50f527fc14345 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Nov 2024 15:21:10 +0100 Subject: [PATCH 080/276] Make the message close button bigger CURA-12253 --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 32eee7e5d67..160799be6e9 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -646,7 +646,7 @@ "wizard_progress": [10.0, 0.0], "message": [30.0, 5.0], - "message_close": [1, 1], + "message_close": [2, 2], "message_radius": [0.25, 0.25], "message_action_button": [0, 2.5], "message_image": [15.0, 10.0], From 0991c3c01d2f685dd69eb0fadf51e42a2ffe0b12 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Nov 2024 16:13:10 +0100 Subject: [PATCH 081/276] Loop back to the beginning when ending simulation playback CURA-12192 --- plugins/SimulationView/SimulationView.py | 13 +++++-------- .../SimulationView/SimulationViewMainComponent.qml | 4 +--- plugins/SimulationView/SimulationViewProxy.py | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index b4333219145..10861acfd02 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -222,12 +222,11 @@ def setTime(self, time: float) -> None: self.setPath(i + fractional_value) - def advanceTime(self, time_increase: float) -> bool: + def advanceTime(self, time_increase: float) -> None: """ Advance the time by the given amount. :param time_increase: The amount of time to advance (in seconds). - :return: True if the time was advanced, False if the end of the simulation was reached. """ total_duration = 0.0 if len(self.cumulativeLineDuration()) > 0: @@ -237,15 +236,13 @@ def advanceTime(self, time_increase: float) -> bool: # If we have reached the end of the simulation, go to the next layer. if self.getCurrentLayer() == self.getMaxLayers(): # If we are already at the last layer, go to the first layer. - self.setTime(total_duration) - return False - - # advance to the next layer, and reset the time - self.setLayer(self.getCurrentLayer() + 1) + self.setLayer(0) + else: + # advance to the next layer, and reset the time + self.setLayer(self.getCurrentLayer() + 1) self.setTime(0.0) else: self.setTime(self._current_time + time_increase) - return True def cumulativeLineDuration(self) -> List[float]: # Make sure _cumulative_line_duration is initialized properly diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index d9e7a95bc1c..602d403a8ad 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -144,9 +144,7 @@ Item { // divide by 1000 to account for ms to s conversion const advance_time = simulationTimer.interval / 1000.0; - if (!UM.SimulationView.advanceTime(advance_time)) { - playButton.pauseSimulation(); - } + UM.SimulationView.advanceTime(advance_time); // The status must be set here instead of in the resumeSimulation function otherwise it won't work // correctly, because part of the logic is in this trigger function. isSimulationPlaying = true; diff --git a/plugins/SimulationView/SimulationViewProxy.py b/plugins/SimulationView/SimulationViewProxy.py index bf449a99d11..30fed1422c2 100644 --- a/plugins/SimulationView/SimulationViewProxy.py +++ b/plugins/SimulationView/SimulationViewProxy.py @@ -54,9 +54,9 @@ def numPaths(self): def currentPath(self): return self._simulation_view.getCurrentPath() - @pyqtSlot(float, result=bool) - def advanceTime(self, duration: float) -> bool: - return self._simulation_view.advanceTime(duration) + @pyqtSlot(float) + def advanceTime(self, duration: float) -> None: + self._simulation_view.advanceTime(duration) @pyqtProperty(int, notify=currentPathChanged) def minimumPath(self): From 9a1e384f9ae293a217dbaa8d64adf1e753963ec3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 12 Nov 2024 15:45:57 +0100 Subject: [PATCH 082/276] Fix deploy step --- conanfile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 21a8c808434..e59dc1eb9c1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -90,7 +90,7 @@ def _urls(self): @property def _base_dir(self): - return Path(self.source_folder, "venv") + return Path(self.source_folder if self.source_folder is not None else self.deploy_folder, "venv") @property def _share_dir(self): @@ -199,7 +199,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in data: # get the paths from conan package if data["package"] == self.name: - src_path = str(Path(self.source_folder, data["src"])) + src_path = str(Path(self._base_dir, data["src"])) else: if data["package"] not in self.dependencies: continue @@ -216,7 +216,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in binary: # get the paths from conan package src_path = os.path.join(self.dependencies[binary["package"]].package_folder, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder - src_path = str(Path(self.source_folder, binary["root"], binary["src"])) + src_path = str(Path(self._base_dir, binary["root"], binary["src"])) if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: @@ -402,7 +402,7 @@ def build(self): self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def deploy(self): - copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.install_folder, "packaging"), keep_path = True) + copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.deploy_folder, "packaging"), keep_path = True) # Copy resources of Cura (keep folder structure) needed by pyinstaller to determine the module structure copy(self, "*", os.path.join(self.package_folder, self.cpp_info.bindirs[0]), str(self._base_dir), keep_path = False) @@ -445,8 +445,8 @@ def deploy(self): self._generate_cura_version(os.path.join(self._site_packages, "cura")) - entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) - self._generate_pyinstaller_spec(location = self._base_dir, + entitlements_file = "'{}'".format(Path(self.deploy_folder, "packaging", "MacOS", "cura.entitlements")) + self._generate_pyinstaller_spec(location = self.deploy_folder, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") From e026cd8c13f23024859e9aa18b59c15494de8ca6 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Tue, 12 Nov 2024 16:40:51 +0000 Subject: [PATCH 083/276] Set conan package version 5.9.0 --- conandata.yml | 14 +++++++------- resources/conandata.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4336dd073ce..babc7c0a1b8 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,16 +1,16 @@ -version: "5.9.0-beta.2" +version: "5.9.0" requirements: - - "cura_resources/5.9.0-beta.2" - - "uranium/5.9.0-beta.2" - - "curaengine/5.9.0-beta.2" - - "cura_binary_data/5.9.0-beta.2" - - "fdm_materials/5.9.0-beta.2" + - "cura_resources/5.9.0" + - "uranium/5.9.0" + - "curaengine/5.9.0" + - "cura_binary_data/5.9.0" + - "fdm_materials/5.9.0" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.9.0-beta.2" + - "fdm_materials/5.9.0" - "cura_private_data/(latest)@internal/testing" urls: default: diff --git a/resources/conandata.yml b/resources/conandata.yml index 0c252e8bc22..9d7f9f67025 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.9.0-beta.2" +version: "5.9.0" From 38b496102ff449d9f6ff513e7d8a5bc248693357 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 12 Nov 2024 21:33:01 +0100 Subject: [PATCH 084/276] Make url schemes more robust against alternate formats CURA-12282 --- cura/CuraApplication.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 4d2f4f964b4..94f6a17f97e 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1895,23 +1895,20 @@ def _openUrl(self, url: QUrl) -> None: def on_finish(response): content_disposition_header_key = QByteArray("content-disposition".encode()) - if not response.hasRawHeader(content_disposition_header_key): - Logger.log("w", "Could not find Content-Disposition header in response from {0}".format( - model_url.url())) - # Use the last part of the url as the filename, and assume it is an STL file - filename = model_url.path().split("/")[-1] + ".stl" - else: + filename = model_url.path().split("/")[-1] + ".stl" + + if response.hasRawHeader(content_disposition_header_key): # content_disposition is in the format # ``` - # content_disposition attachment; "filename=[FILENAME]" + # content_disposition attachment; filename="[FILENAME]" # ``` # Use a regex to extract the filename content_disposition = str(response.rawHeader(content_disposition_header_key).data(), encoding='utf-8') - content_disposition_match = re.match(r'attachment; filename="(?P.*)"', + content_disposition_match = re.match(r'attachment; filename="?(?P.*)"?', content_disposition) - assert content_disposition_match is not None - filename = content_disposition_match.group("filename") + if content_disposition_match is not None: + filename = content_disposition_match.group("filename") tmp = tempfile.NamedTemporaryFile(suffix=filename, delete=False) with open(tmp.name, "wb") as f: From f4980450f2c6851b4e7265bc343115c9642e9402 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 12 Nov 2024 22:47:07 +0100 Subject: [PATCH 085/276] Force extruder position to stick during retrieval of property. Otherwise other parts of the stack(s) could have another value for limit-to-extruder, depending on if the user updates the chosen extruder (for example for support) quickly enough that we're in the middle of the operation. (Locking would probably more complicated, since we not only need a recurrent lock, but a lock on a few but not all classes based on a method call....) CURA-12223 --- cura/Settings/ExtruderStack.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index 645abeb0f62..98ab2b817cc 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from typing import Any, Dict, TYPE_CHECKING, Optional @@ -12,11 +12,8 @@ from UM.Settings.Interfaces import ContainerInterface, PropertyEvaluationContext from UM.Util import parseBool -import cura.CuraApplication - from . import Exceptions from .CuraContainerStack import CuraContainerStack, _ContainerIndexes -from .ExtruderManager import ExtruderManager if TYPE_CHECKING: from cura.Settings.GlobalStack import GlobalStack @@ -141,7 +138,11 @@ def getProperty(self, key: str, property_name: str, context: Optional[PropertyEv context.popContainer() return result - limit_to_extruder = super().getProperty(key, "limit_to_extruder", context) + if not context: + context = PropertyEvaluationContext(self) + if "extruder_position" not in context.context: + context.context["extruder_position"] = super().getProperty(key, "limit_to_extruder", context) + limit_to_extruder = context.context["extruder_position"] if limit_to_extruder is not None: limit_to_extruder = str(limit_to_extruder) From 7507ebad6ab41120f90ad434ce25914cd7e89464 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 12 Nov 2024 23:09:23 +0100 Subject: [PATCH 086/276] Fix for url-schemes with quotes Last quote would not be matched due to the optional last quote in the regex, resulting in an `.stl"` extension CURA-12282 --- cura/CuraApplication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 94f6a17f97e..97c4c7e2fcc 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1905,10 +1905,10 @@ def on_finish(response): # Use a regex to extract the filename content_disposition = str(response.rawHeader(content_disposition_header_key).data(), encoding='utf-8') - content_disposition_match = re.match(r'attachment; filename="?(?P.*)"?', + content_disposition_match = re.match(r'attachment; filename=(?P.*)', content_disposition) if content_disposition_match is not None: - filename = content_disposition_match.group("filename") + filename = content_disposition_match.group("filename").strip("\"") tmp = tempfile.NamedTemporaryFile(suffix=filename, delete=False) with open(tmp.name, "wb") as f: From 440b51c189fe77f2ea39159f6c4379f3da1ce4b0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 09:20:21 +0100 Subject: [PATCH 087/276] Add debug information to try and fix build --- conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.py b/conanfile.py index e59dc1eb9c1..4c6346454b8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -203,6 +203,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e else: if data["package"] not in self.dependencies: continue + print(data["package"], dir(self.dependencies[data["package"]])) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From b660885a587a2afb642c26d94dc7dce3aa7ba2f6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 13 Nov 2024 09:28:55 +0100 Subject: [PATCH 088/276] Fix 'AttributeError' (defensive coding). should fix sentry#CURA-1D2 --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 851e8528009..82b52d3dde5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -398,7 +398,7 @@ def _validateVariantsAndMaterials(self, global_stack) -> None: self.setVariantByName(extruder.getMetaDataEntry("position"), machine_node.preferred_variant_name) variant_node = machine_node.variants.get(machine_node.preferred_variant_name) - material_node = variant_node.materials.get(extruder.material.getMetaDataEntry("base_file")) + material_node = variant_node.materials.get(extruder.material.getMetaDataEntry("base_file")) if variant_node else None if material_node is None: Logger.log("w", "An extruder has an unknown material, switching it to the preferred material") if not self.setMaterialById(extruder.getMetaDataEntry("position"), machine_node.preferred_material): From f0a720526732d0dc1c4eacbdab1facbdf893c31c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 13 Nov 2024 09:29:53 +0100 Subject: [PATCH 089/276] Fix 'OverflowError' (defensive coding). should fix sentry#CURA-1EB --- cura/UI/CuraSplashScreen.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/UI/CuraSplashScreen.py b/cura/UI/CuraSplashScreen.py index 331fb2e880f..a61c13a19b1 100644 --- a/cura/UI/CuraSplashScreen.py +++ b/cura/UI/CuraSplashScreen.py @@ -1,5 +1,6 @@ # Copyright (c) 2020 Ultimaker B.V. # Uranium is released under the terms of the LGPLv3 or higher. +import math from PyQt6.QtCore import Qt, QCoreApplication, QTimer from PyQt6.QtGui import QPixmap, QColor, QFont, QPen, QPainter @@ -51,6 +52,7 @@ def updateLoadingImage(self): self._last_update_time = time.time() # Since we don't know how much time actually passed, check how many intervals of 50 we had. self._loading_image_rotation_angle -= 10 * (time_since_last_update * 1000 / 50) + self._loading_image_rotation_angle = math.fmod(self._loading_image_rotation_angle, 360) self.repaint() # Override the mousePressEvent so the splashscreen doesn't disappear when clicked From 1c6e14eb7d15ccc74aae1d4404e45ee965537eb6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 13 Nov 2024 09:31:02 +0100 Subject: [PATCH 090/276] Attempt to fix 'FileNotFoundError' (defensive coding). hopefully fixes sentry#CURA-3JS --- cura/UI/WelcomePagesModel.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py index 5faf39311e3..833f34e269b 100644 --- a/cura/UI/WelcomePagesModel.py +++ b/cura/UI/WelcomePagesModel.py @@ -217,8 +217,7 @@ def getPageIndexById(self, page_id: str) -> Optional[int]: def _getBuiltinWelcomePagePath(page_filename: str) -> QUrl: """Convenience function to get QUrl path to pages that's located in "resources/qml/WelcomePages".""" from cura.CuraApplication import CuraApplication - return QUrl.fromLocalFile(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, - os.path.join("WelcomePages", page_filename))) + return QUrl.fromLocalFile(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "WelcomePages", page_filename)) # FIXME: HACKs for optimization that we don't update the model every time the active machine gets changed. def _onActiveMachineChanged(self) -> None: From b78143546c911ba3408d3ad94cb1ee349fc47dc4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 10:25:04 +0100 Subject: [PATCH 091/276] Add more debug printed information --- conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 4c6346454b8..d81eae4075b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -203,7 +203,10 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e else: if data["package"] not in self.dependencies: continue - print(data["package"], dir(self.dependencies[data["package"]])) + print("#########################################", data["package"]) + print(dir(self.dependencies[data["package"]])) + for attr in dir(self.dependencies[data["package"]]): + print(attr, self.dependencies[data["package"]].__getattribute__(attr)) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From 22e0ada1b5bd4833c478cf07cca83444b3f7d9fe Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:44:57 +0100 Subject: [PATCH 092/276] Fix layer height (0.1mm iso 0.15mm) for the normal mode of the UM2 machine. PP-539 --- resources/quality/ultimaker2/um2_normal.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg index c4731f4d9cd..f9c4f6b7051 100644 --- a/resources/quality/ultimaker2/um2_normal.inst.cfg +++ b/resources/quality/ultimaker2/um2_normal.inst.cfg @@ -11,4 +11,5 @@ type = quality weight = 0 [values] +layer_height = 0.1 From 1e9eeb8ac5d7def789407770798574203124b753 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 13:27:21 +0100 Subject: [PATCH 093/276] Change cura_resources package type --- resources/conanfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/conanfile.py b/resources/conanfile.py index 666b5719e8a..4f2e9af467b 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -15,9 +15,8 @@ class CuraResource(ConanFile): url = "https://github.com/Ultimaker/cura" description = "Cura Resources" topics = ("conan", "cura") - settings = "os", "compiler", "build_type", "arch" no_copy_source = True - package_type = "header-library" + package_type = "shared-library" @property def _shared_resources(self): From 85644b621e77130f1c2ec22d3d55f9eee64b3920 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 13:33:15 +0100 Subject: [PATCH 094/276] Remove debug print --- conanfile.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d81eae4075b..e59dc1eb9c1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -203,10 +203,6 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e else: if data["package"] not in self.dependencies: continue - print("#########################################", data["package"]) - print(dir(self.dependencies[data["package"]])) - for attr in dir(self.dependencies[data["package"]]): - print(attr, self.dependencies[data["package"]].__getattribute__(attr)) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From 4fedf332a09162829cdd8e4f472f631c473e5347 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 16:22:03 +0100 Subject: [PATCH 095/276] Raise exceptions on critical errors --- conandata.yml | 12 ++++++------ conanfile.py | 15 +++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/conandata.yml b/conandata.yml index d1fd19af9f9..77b6469f78e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -38,13 +38,13 @@ pyinstaller: src: "plugins" dst: "share/cura/plugins" native_cad_plugin: - package: "native_cad_plugin" - src: "res/plugins/NativeCADplugin" - dst: "share/cura/plugins/NativeCADplugin" + package: "native_cad_plugin" + src: "res/plugins/NativeCADplugin" + dst: "share/cura/plugins/NativeCADplugin" native_cad_plugin_bundled: - package: "native_cad_plugin" - src: "res/bundled_packages" - dst: "share/cura/resources/bundled_packages" + package: "native_cad_plugin" + src: "res/bundled_packages" + dst: "share/cura/resources/bundled_packages" cura_resources: package: "cura" src: "resources" diff --git a/conanfile.py b/conanfile.py index e59dc1eb9c1..b1280385b30 100644 --- a/conanfile.py +++ b/conanfile.py @@ -207,9 +207,12 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) else: - continue - if Path(src_path).exists(): - datas.append((str(src_path), data["dst"])) + raise ConanException("Misformatted conan data for pyinstaller datas, expected either package or root option") + + if not Path(src_path).exists(): + raise ConanException(f"Missing folder {src_path} for pyinstaller data {data}") + + datas.append((str(src_path), data["dst"])) binaries = [] for binary in pyinstaller_metadata["binaries"].values(): @@ -220,10 +223,10 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: - continue + raise ConanException("Misformatted conan data for pyinstaller binaries, expected either package or root option") + if not Path(src_path).exists(): - self.output.warning(f"Source path for binary {binary['binary']} does not exist") - continue + raise ConanException(f"Missing folder {src_path} for pyinstaller binary {binary}") for bin in Path(src_path).glob(binary["binary"] + "*[.exe|.dll|.so|.dylib|.so.]*"): binaries.append((str(bin), binary["dst"])) From f02481cd1c19c040d30b384dc8b5454a74cee994 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 13 Nov 2024 16:39:57 +0100 Subject: [PATCH 096/276] Start moving installer code to Conan-v2 for Windows too. CURA-11622 --- .github/workflows/windows.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 704aa4ddde7..2ff8dffe91b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,7 +10,7 @@ on: required: true type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args: eq.: --requires' default: '' required: false type: string @@ -24,13 +24,6 @@ on: default: false required: true type: boolean - architecture: - description: 'Architecture' - required: true - default: 'X64' - type: choice - options: - - X64 operating_system: description: 'OS' required: true @@ -42,12 +35,12 @@ on: jobs: windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main + # FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} - architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} secrets: inherit From 079fd092174ad3de7d6e25cfac503b7892559cb9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 09:56:20 +0100 Subject: [PATCH 097/276] Display corner preference only with sharpest corner CURA-12292 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5faa4d32086..c8d737d5d5b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1426,7 +1426,7 @@ "z_seam_corner_weighted": "Smart Hiding" }, "default_value": "z_seam_corner_inner", - "enabled": "z_seam_type != 'random'", + "enabled": "z_seam_type == 'sharpest_corner'", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, From 55e91cdb483e457e07622106aa5daed1ba565e63 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 10:03:16 +0100 Subject: [PATCH 098/276] Add warning limit for scarf seam suspicious length CURA-12301 --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5faa4d32086..d8b1f4a28eb 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8934,6 +8934,7 @@ "type": "float", "default_value": 0, "minimum_value": "0", + "maximum_value_warning": "50.0", "unit": "mm", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_extruder": true, From bec1ff12436699f588daa4784efbb39923dd4990 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 13:59:27 +0100 Subject: [PATCH 099/276] Fix pyinstaller resources deployment --- conandata.yml | 2 ++ conanfile.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 77b6469f78e..9b0517a7447 100644 --- a/conandata.yml +++ b/conandata.yml @@ -82,6 +82,8 @@ pyinstaller: package: "cura_binary_data" src: "windows" dst: "share/windows" + oses: + - "Windows" fdm_materials: package: "fdm_materials" src: "res/resources/materials" diff --git a/conanfile.py b/conanfile.py index b1280385b30..04782345b67 100644 --- a/conanfile.py +++ b/conanfile.py @@ -197,9 +197,12 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if not self.options.internal and data.get("internal", False): continue + if "oses" in data and self.settings.os not in data["oses"]: + continue + if "package" in data: # get the paths from conan package if data["package"] == self.name: - src_path = str(Path(self._base_dir, data["src"])) + src_path = str(Path(self.source_folder, data["src"])) else: if data["package"] not in self.dependencies: continue @@ -219,7 +222,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in binary: # get the paths from conan package src_path = os.path.join(self.dependencies[binary["package"]].package_folder, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder - src_path = str(Path(self._base_dir, binary["root"], binary["src"])) + src_path = str(Path(self.source_folder, binary["root"], binary["src"])) if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: From 8bd69ecc3dd9e52149b5f24cbdc167bb0be65c3e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 14:29:07 +0100 Subject: [PATCH 100/276] Store versions script in deploy folder --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 04782345b67..cacb97c7e1d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -447,7 +447,7 @@ def deploy(self): env_prefix = env_prefix) ext = ".sh" if self.settings.os != "Windows" else ".ps1" - save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) + save(self, os.path.join(self.deploy_folder, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) self._generate_cura_version(os.path.join(self._site_packages, "cura")) From 85cd1422666b9cde72cdf6dfed1dab153bf76b44 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 14:55:28 +0100 Subject: [PATCH 101/276] Add explicit errors on missing package information --- conanfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index cacb97c7e1d..901c5026039 100644 --- a/conanfile.py +++ b/conanfile.py @@ -205,7 +205,12 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e src_path = str(Path(self.source_folder, data["src"])) else: if data["package"] not in self.dependencies: - continue + raise ConanException(f"Required package {data["package"]} does not exist as a dependency") + + package_folder = self.dependencies[data["package"]].package_folder + if package_folder is None: + raise ConanException(f"Unable to find package_folder for {data["package"]}, check that it has not been skipped") + src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From 3910ab0b78bb20eaf71d762fe3a87218aea95eaf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 15:04:39 +0100 Subject: [PATCH 102/276] Do not include enterprise resources if not needed --- conandata.yml | 2 ++ conanfile.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9b0517a7447..be238bd4c08 100644 --- a/conandata.yml +++ b/conandata.yml @@ -41,10 +41,12 @@ pyinstaller: package: "native_cad_plugin" src: "res/plugins/NativeCADplugin" dst: "share/cura/plugins/NativeCADplugin" + enterprise_only: true native_cad_plugin_bundled: package: "native_cad_plugin" src: "res/bundled_packages" dst: "share/cura/resources/bundled_packages" + enterprise_only: true cura_resources: package: "cura" src: "resources" diff --git a/conanfile.py b/conanfile.py index 901c5026039..edf755ae43e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -194,7 +194,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] for data in pyinstaller_metadata["datas"].values(): - if not self.options.internal and data.get("internal", False): + if (not self.options.internal and data.get("internal", False)) or (not self.options.enterprise and data.get("enterprise_only", False)): continue if "oses" in data and self.settings.os not in data["oses"]: From f50676a18cb60c7cc970cf95fedbd1bd1a7d4b81 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 15:46:54 +0100 Subject: [PATCH 103/276] Fix pyinstaller file generation in some cases --- conanfile.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index edf755ae43e..639343db9ab 100644 --- a/conanfile.py +++ b/conanfile.py @@ -190,7 +190,7 @@ def _generate_cura_version(self, location): python_installs=self._python_installs(), )) - def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): + def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file, cura_source_folder): pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] for data in pyinstaller_metadata["datas"].values(): @@ -202,7 +202,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e if "package" in data: # get the paths from conan package if data["package"] == self.name: - src_path = str(Path(self.source_folder, data["src"])) + src_path = str(Path(cura_source_folder, data["src"])) else: if data["package"] not in self.dependencies: raise ConanException(f"Required package {data["package"]} does not exist as a dependency") @@ -391,7 +391,8 @@ def generate(self): icon_path="'{}'".format(os.path.join(self.source_folder, "packaging", self.conan_data["pyinstaller"]["icon"][ str(self.settings.os)])).replace("\\", "\\\\"), - entitlements_file=entitlements_file if self.settings.os == "Macos" else "None" + entitlements_file=entitlements_file if self.settings.os == "Macos" else "None", + cura_source_folder=self.source_folder ) if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: @@ -460,7 +461,8 @@ def deploy(self): self._generate_pyinstaller_spec(location = self.deploy_folder, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), - entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") + entitlements_file = entitlements_file if self.settings.os == "Macos" else "None", + cura_source_folder = self.package_folder) def package(self): copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) From cd48c7cb9db1f9a00897b604ba0e4097ded26e69 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 11:33:42 +0100 Subject: [PATCH 104/276] Add debug information for python dependencies generation --- conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conanfile.py b/conanfile.py index 639343db9ab..f0d3fb4c7b4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -154,11 +154,13 @@ def _python_installs(self): env = "conanrun", stdout = buffer) + print(f"############################################################ {buffer.getvalue()}") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") python_installs[name] = {"version": version} + print(python_installs) return python_installs def _generate_cura_version(self, location): @@ -173,6 +175,8 @@ def _generate_cura_version(self, location): internal_tag = f"+internal" if self.options.internal else "" cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}{internal_tag}" + self.output.info(f"Write CuraVersion.py to {self.recipe_folder}") + with open(os.path.join(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( cura_app_name = self.name, From 0e363202ed725f43e6817f01a92c04f64bdbb709 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 11:39:01 +0100 Subject: [PATCH 105/276] Remove specific PYTHONPATH --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index f0d3fb4c7b4..c1ff14f01da 100644 --- a/conanfile.py +++ b/conanfile.py @@ -143,7 +143,7 @@ def _python_installs(self): # list of python installs run_env = VirtualRunEnv(self) env = run_env.environment() - env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) + #env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) venv_vars = env.vars(self, scope = "run") outer = '"' if self.settings.os == "Windows" else "'" From 35e52efcfa6205d566806d356eadb69cd2103e6a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 11:55:43 +0100 Subject: [PATCH 106/276] Change environment to gater Python dependencies --- conanfile.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/conanfile.py b/conanfile.py index c1ff14f01da..e69c5f1e74e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -141,20 +141,22 @@ def _python_installs(self): python_installs = {} # list of python installs - run_env = VirtualRunEnv(self) - env = run_env.environment() + # run_env = VirtualRunEnv(self) + # env = run_env.environment() #env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) - venv_vars = env.vars(self, scope = "run") + # venv_vars = env.vars(self, scope = "run") outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - with venv_vars.apply(): - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "conanrun", - stdout = buffer) + # with venv_vars.apply(): + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", + env = "run", + stdout = buffer) print(f"############################################################ {buffer.getvalue()}") + # for name, value in venv_vars.items(): + # print(f"{name}={value}") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") From ebe701899d1066780b71024b122e5ae94ec136d5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 12:06:53 +0100 Subject: [PATCH 107/276] Use Python virtual env to get dependencies --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index e69c5f1e74e..facff0e647c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -151,7 +151,7 @@ def _python_installs(self): buffer = StringIO() # with venv_vars.apply(): self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "run", + env = "virtual_python_env", stdout = buffer) print(f"############################################################ {buffer.getvalue()}") From 806fedef618fb9af778cb0586f03f2d56b7ec71f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 12:15:41 +0100 Subject: [PATCH 108/276] An other desperate attempt to get the proper env --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index facff0e647c..237da96a199 100644 --- a/conanfile.py +++ b/conanfile.py @@ -151,7 +151,7 @@ def _python_installs(self): buffer = StringIO() # with venv_vars.apply(): self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "virtual_python_env", + env = ["conanrun", "virtual_python_env"], stdout = buffer) print(f"############################################################ {buffer.getvalue()}") From 656573e905efa0483239de44239dad19d60ffc67 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 14:12:30 +0100 Subject: [PATCH 109/276] User proper environment to get dependencies list --- conanfile.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/conanfile.py b/conanfile.py index 237da96a199..47ca471e2b8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -88,9 +88,13 @@ def _urls(self): return "staging" return "default" + @property + def _root_dir(self): + return Path(self.deploy_folder if hasattr(self, "deploy_folder") else self.source_folder) + @property def _base_dir(self): - return Path(self.source_folder if self.source_folder is not None else self.deploy_folder, "venv") + return self._root_dir.joinpath("venv") @property def _share_dir(self): @@ -140,23 +144,14 @@ def _python_installs(self): self.output.info("Collecting python installs") python_installs = {} - # list of python installs - # run_env = VirtualRunEnv(self) - # env = run_env.environment() - #env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) - # venv_vars = env.vars(self, scope = "run") - outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - # with venv_vars.apply(): - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = ["conanrun", "virtual_python_env"], + env_path = str(self._root_dir.joinpath("conanrun")) + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", + env = env_path, stdout = buffer) - print(f"############################################################ {buffer.getvalue()}") - # for name, value in venv_vars.items(): - # print(f"{name}={value}") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") From fc8581709525802dc441ceff639b026ab1fd6922 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 15:28:43 +0100 Subject: [PATCH 110/276] Change the way we get Python installs --- CuraVersion.py.jinja | 3 ++- conanfile.py | 21 --------------------- cura/__init__.py | 4 ++++ 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 515293b8af0..2f0de1872cf 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -1,6 +1,8 @@ # Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. +import importlib.metadata + CuraAppName = "{{ cura_app_name }}" CuraAppDisplayName = "{{ cura_app_display_name }}" CuraVersion = "{{ cura_version }}" @@ -14,4 +16,3 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" CuraLatestURL = "{{ cura_latest_url }}" ConanInstalls = {{ conan_installs }} -PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index 47ca471e2b8..a4b6dd3d10a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -140,26 +140,6 @@ def _conan_installs(self): } return conan_installs - def _python_installs(self): - self.output.info("Collecting python installs") - python_installs = {} - - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' - buffer = StringIO() - env_path = str(self._root_dir.joinpath("conanrun")) - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = env_path, - stdout = buffer) - - packages = str(buffer.getvalue()).strip('\r\n').split(";") - for package in packages: - name, version = package.split(",") - python_installs[name] = {"version": version} - - print(python_installs) - return python_installs - def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -188,7 +168,6 @@ def _generate_cura_version(self, location): cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"], cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"], conan_installs=self._conan_installs(), - python_installs=self._python_installs(), )) def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file, cura_source_folder): diff --git a/cura/__init__.py b/cura/__init__.py index e69de29bb2d..d4ff0f2a6d6 100644 --- a/cura/__init__.py +++ b/cura/__init__.py @@ -0,0 +1,4 @@ +import importlib.metadata +from . import CuraVersion + +CuraVersion.PythonInstalls = {package.metadata['Name']: {'version': package.metadata['Version']} for package in importlib.metadata.distributions()} From 535b9423ba19f2c7ce0794d93b58fae695501c74 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:25:39 +0100 Subject: [PATCH 111/276] Updated Changelog for stable Updated Changelog for stable, contributes to CURA-12285 --- resources/texts/change_log.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index aabe7687e41..2d4188034b0 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -24,21 +24,30 @@ - Fixed a bug that prevented the "Sync materials with printers" page from displaying when accessed immediately after starting Cura or signing in - Fixed a bug where reloading an updated model would result in not all the duplicates of the model being updated - Fixed a bug that showed incompatible materials when switching between printers with a different filament diameter. -- Fixed a bug where tree support in enclosed holes have missing layers +- Fixed a bug where tree support in enclosed holes has missing layers - Made improvements in the G-codePathModify slot for Engine Plugins, contributed by @ThomasRahm - Fixed a bug that prevented changes to the initial layer diameter from being applied properly, contributed by @ThomasRahm - Fixed a rounding issue in the engine math, @0x5844 -* Bugs resolved after the first Beta +* Bugs resolved since the Beta release - Spiralize outer contour no longer adds unnecessary seams to the model - When coasting is enabled the printhead no longer drops down -- Updated the strategy for sharpest corner - smart hiding seam location combination +- Fixed coasting strategy so it's only applied to outer/inner walls, and not to skin, top-bottom, or infill +- Fixed wiping direction when printing a single wall +- Improved wiping in combination with the scarf seam +- Significantly improved the strategy for sharpest corner - smart hiding seam location combination - Fixed a bug where long scarf seams and short scarf seam steps would result in the seam being moved outward - Fixed a bug where seam acceleration and deceleration were not working - Fixed a bug where infill was wrongly removed from narrow spaces - Triple-clicking values and searches that you entered now has you select everything so you can edit it in the field similar to other desktop applications - Updated dependencies and improved how unwanted and unused binaries are excluded from the building process. - Added Eazao material for the new Eazao printers +- Updated the urls schemes to make them more robust when attempting to open files in Cura +- Retract before outer wall now only works on the initial layer +- Resolved the biggest crashes coming in via the analyzing tool in the cura engine +- Removed an unwanted Z-hop when starting a new layer +- Layer starts are more visible in the print preview with the scarf seam +- Made the X to close windows a little bigger * Printer definitions, profiles, and materials: - Introduced Makerbot Sketch Sprint @@ -48,6 +57,7 @@ - Various setting improvements for ABS and Nylon for UltiMaker Method series - Various setting improvements for dual extrusion support for the UltiMaker Method series - Implemented a hard limit so the bed temperature cannot be more than 120C on all UltiMaker printers. +- Fixed an error in the profile Ultimaker 2 profile naming - Introduced the Creality CR-M4, contributed by @kixell - Introduced Eazao M500, M600, M700, and Potter, and updated the Eazao Zero, contributed by @Eazo - Introduced ZYYX+, ZYYX Pro, and ZYYX Pro ii, contributed by @theodorhansson @@ -57,12 +67,6 @@ - Updated Japanese translations by @h1data - Brazilian Portuguese by @Patola -* Known issues -- This second beta introduces a change that affects the UI so please use buttons, dropdowns, menus, and flows. We hope we did this correctly but it is a tricky change. If you see the crash please report it to us, and we will also see it show up in our crash tracking tool. -- There is a slight regression in terms of seam alignment in different strategies we hope to resolve before stable -- We see an increase in micro-segments in the outer wall, which we hope to resolve before stable -- We see rare cases of Cura crashing after opening project files with custom extruders or printer settings than the printer that is already loaded - [5.8.1] * Bug fixes: From 83dba9696b7e33a7795b2a0693dd4fa92875c5d7 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:32:52 +0100 Subject: [PATCH 112/276] Applied suggestions from the code review Applied suggestions from the code review Co-authored-by: HellAholic Co-authored-by: Erwan MATHIEU --- resources/texts/change_log.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 2d4188034b0..ba1393a1fcf 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -22,11 +22,11 @@ - Fixed a bug so objects in a 3MF reload in the same position as they were saved again, contributed by @nilsiism - Fixed an issue where overhanging walls and walls that were adjacent to overhanging walls were not printed at the correct speed - Fixed a bug that prevented the "Sync materials with printers" page from displaying when accessed immediately after starting Cura or signing in -- Fixed a bug where reloading an updated model would result in not all the duplicates of the model being updated +- Fixed a bug where reloading an updated model would not update the duplicates of the model on the build plate - Fixed a bug that showed incompatible materials when switching between printers with a different filament diameter. - Fixed a bug where tree support in enclosed holes has missing layers - Made improvements in the G-codePathModify slot for Engine Plugins, contributed by @ThomasRahm -- Fixed a bug that prevented changes to the initial layer diameter from being applied properly, contributed by @ThomasRahm +- Fixed a bug that prevented changes to the initial layer diameter from being applied properly in tree support, contributed by @ThomasRahm - Fixed a rounding issue in the engine math, @0x5844 * Bugs resolved since the Beta release @@ -36,18 +36,18 @@ - Fixed wiping direction when printing a single wall - Improved wiping in combination with the scarf seam - Significantly improved the strategy for sharpest corner - smart hiding seam location combination -- Fixed a bug where long scarf seams and short scarf seam steps would result in the seam being moved outward -- Fixed a bug where seam acceleration and deceleration were not working +- Fixed a bug where long scarf seam length and short scarf seam steps would result in the seam being moved outward +- Fixed a bug where seam acceleration and deceleration around seam were not working - Fixed a bug where infill was wrongly removed from narrow spaces - Triple-clicking values and searches that you entered now has you select everything so you can edit it in the field similar to other desktop applications - Updated dependencies and improved how unwanted and unused binaries are excluded from the building process. - Added Eazao material for the new Eazao printers - Updated the urls schemes to make them more robust when attempting to open files in Cura -- Retract before outer wall now only works on the initial layer -- Resolved the biggest crashes coming in via the analyzing tool in the cura engine +- Retract before outer wall now works correctly on all layers +- Resolved top reported crashes coming in via the analyzing tool Sentry - Removed an unwanted Z-hop when starting a new layer - Layer starts are more visible in the print preview with the scarf seam -- Made the X to close windows a little bigger +- Made the X to close floating and pop up windows a little bigger * Printer definitions, profiles, and materials: - Introduced Makerbot Sketch Sprint @@ -56,7 +56,7 @@ - Introduced Labs Extruder for the UltiMaker Method series together with BASF Ultrafuse 316L, TPE SEBS 1300 95A, and Polymax PC. Except BASF Ultrafuse 316L is not available on the Method XL. - Various setting improvements for ABS and Nylon for UltiMaker Method series - Various setting improvements for dual extrusion support for the UltiMaker Method series -- Implemented a hard limit so the bed temperature cannot be more than 120C on all UltiMaker printers. +- Implemented a hard limit so the bed temperature cannot be more than 120°C on all UltiMaker printers. - Fixed an error in the profile Ultimaker 2 profile naming - Introduced the Creality CR-M4, contributed by @kixell - Introduced Eazao M500, M600, M700, and Potter, and updated the Eazao Zero, contributed by @Eazo From 5b3eef64a6bfbe92e342dd15a7bfdf5855d1d3d0 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:41:05 +0100 Subject: [PATCH 113/276] More review changes Added more suggestions from HellAholic --- resources/texts/change_log.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 2d4188034b0..caf2280bedc 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -6,13 +6,13 @@ - Introduced Build Fan Speed at Height, Build Fan Speed at Layer, and Build Volume Fan Number to control extra fans, like those controlling the build volume separately - Added the "Extra Infill Lines to Support Skins" setting and other improvements to help make printing over sparse infill more reliable, contributed by @Hello1024 - Significant UI speed improvements interacting with custom settings especially if your printer has multiple extruders -- Introduced an Anycolor option for the UltiMaker S and F series enabling you to print with any UltiMaker color loaded in the material station that is compatible with the printjobs. Note that it’s only compatible with the latest version of the firmware (for Factor 4 >=10.1 and for S-series >=9.0) +- Introduced an Anycolor option for the UltiMaker S and F series enabling you to print with any UltiMaker color loaded in the material station that is compatible with the printjobs. Note that it’s only compatible with the latest version of the firmware (for Factor 4 >=10.1 and for S-series >=9.0, and it does not include the UltiMaker S3) - Added an option to Export Package for Technical Support to the help menu, it includes a project file with the settings but also the logs - Improved the way materials are selected when using multiple extruders to print the build plate adhesion so it doesn't default to the first extruder but the best option instead. - Improved processes so not only installers but also executables inside installers are signed for Windows -- Introduced an error message that informs when a file is too big to slice +- Introduced improvements to how models and projects with large file size (500MB) slice. A message was also added to inform the user when a file size is too big to slice. - Made it possible for multiple Engine plugins that are registered to the same slot to be used together. (Only for Modify plugins, and Plugins will be addressed alphabetically) -- Moved the Gradual Flow Engine Plug-in to CuraEngine instead +- Moved the Gradual Flow Engine Plug-in to CuraEngine, this also resolved slicing crashes when the plugin was used in combination with large number of smaller models that were printed at once. - Improved and expanded the Insert at Layer Change post-processing script, contributed by @GregValiant - Improved and expanded the Time Lapse Post Processing script, contributed by @GregValiant - Added a registry entry to provide the option to silent uninstall on Windows, contributed by @Rotzbua @@ -53,7 +53,7 @@ - Introduced Makerbot Sketch Sprint - Introduced Makerbot Sketch and Sketch Large - Introduced new materials to the UltiMaker Method series, ABS, PETG, Nylon-CF, and Tough PLA -- Introduced Labs Extruder for the UltiMaker Method series together with BASF Ultrafuse 316L, TPE SEBS 1300 95A, and Polymax PC. Except BASF Ultrafuse 316L is not available on the Method XL. +- Introduced new materials for Labs Extruder of the UltiMaker Method series, BASF Ultrafuse 316L, TPE SEBS 1300 95A, and Polymax PC. Except BASF Ultrafuse 316L is not available on the Method XL. - Various setting improvements for ABS and Nylon for UltiMaker Method series - Various setting improvements for dual extrusion support for the UltiMaker Method series - Implemented a hard limit so the bed temperature cannot be more than 120C on all UltiMaker printers. From 6a7cfca0a58a3df3cdecf0bf17ca510d4109c885 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 13:58:19 +0100 Subject: [PATCH 114/276] Revert "Change the way we get Python installs" This reverts commit fc8581709525802dc441ceff639b026ab1fd6922. --- CuraVersion.py.jinja | 3 +-- conanfile.py | 21 +++++++++++++++++++++ cura/__init__.py | 4 ---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 2f0de1872cf..515293b8af0 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -1,8 +1,6 @@ # Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. -import importlib.metadata - CuraAppName = "{{ cura_app_name }}" CuraAppDisplayName = "{{ cura_app_display_name }}" CuraVersion = "{{ cura_version }}" @@ -16,3 +14,4 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" CuraLatestURL = "{{ cura_latest_url }}" ConanInstalls = {{ conan_installs }} +PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index a4b6dd3d10a..47ca471e2b8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -140,6 +140,26 @@ def _conan_installs(self): } return conan_installs + def _python_installs(self): + self.output.info("Collecting python installs") + python_installs = {} + + outer = '"' if self.settings.os == "Windows" else "'" + inner = "'" if self.settings.os == "Windows" else '"' + buffer = StringIO() + env_path = str(self._root_dir.joinpath("conanrun")) + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", + env = env_path, + stdout = buffer) + + packages = str(buffer.getvalue()).strip('\r\n').split(";") + for package in packages: + name, version = package.split(",") + python_installs[name] = {"version": version} + + print(python_installs) + return python_installs + def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -168,6 +188,7 @@ def _generate_cura_version(self, location): cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"], cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"], conan_installs=self._conan_installs(), + python_installs=self._python_installs(), )) def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file, cura_source_folder): diff --git a/cura/__init__.py b/cura/__init__.py index d4ff0f2a6d6..e69de29bb2d 100644 --- a/cura/__init__.py +++ b/cura/__init__.py @@ -1,4 +0,0 @@ -import importlib.metadata -from . import CuraVersion - -CuraVersion.PythonInstalls = {package.metadata['Name']: {'version': package.metadata['Version']} for package in importlib.metadata.distributions()} From e044d941440843f1cc2102c39dcef69b54b970c0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 14:04:22 +0100 Subject: [PATCH 115/276] Use virtual env for dependencies --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 47ca471e2b8..322c79ab258 100644 --- a/conanfile.py +++ b/conanfile.py @@ -147,7 +147,7 @@ def _python_installs(self): outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - env_path = str(self._root_dir.joinpath("conanrun")) + env_path = str(self._root_dir.joinpath("virtual_python_env")) self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", env = env_path, stdout = buffer) From bd6cf743a4a1aeb161f17c402e15f37391d57498 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:30:34 +0100 Subject: [PATCH 116/276] Fix warning issue Method machines with BASF Metal filament. PP-541 --- resources/definitions/ultimaker_method_base.def.json | 12 ++++++++++-- ...thod_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- ...hodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index ff2f9fc2218..1e5eb952ed0 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -142,7 +142,11 @@ "value": "min(extruderValues('extruder_nr'))" }, "adhesion_type": { "value": "'raft'" }, - "bottom_thickness": { "value": "top_bottom_thickness" }, + "bottom_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness" + }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, @@ -576,7 +580,11 @@ "minimum_value_warning": 0.3, "value": "4*layer_height" }, - "top_thickness": { "value": "top_bottom_thickness * 1.5" }, + "top_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness * 1.5" + }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index 11a738ba810..74b11bcb643 100644 --- a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -32,7 +32,7 @@ skin_overlap = 20.0 skirt_brim_minimal_length = 100.0 speed_print = 25 support_enable = False -top_bottom_thickness = =layer_height * 2 +top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0 top_thickness = =top_bottom_thickness wall_0_material_flow_layer_0 = 110 wall_x_material_flow_layer_0 = 110 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index f4d07747513..8fd51cbe460 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -32,7 +32,7 @@ skin_overlap = 20.0 skirt_brim_minimal_length = 100.0 speed_print = 25 support_enable = False -top_bottom_thickness = =layer_height * 2 +top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0 top_thickness = =top_bottom_thickness wall_0_material_flow_layer_0 = 110 wall_x_material_flow_layer_0 = 110 From 5be6e564418e4fcb4b5bc43575cdc5b5cbef3fc1 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 18 Nov 2024 14:32:30 +0100 Subject: [PATCH 117/276] Revert "Fix warning issue Method machines with BASF Metal filament." This reverts commit bd6cf743a4a1aeb161f17c402e15f37391d57498. --- resources/definitions/ultimaker_method_base.def.json | 12 ++---------- ...thod_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- ...hodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 1e5eb952ed0..ff2f9fc2218 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -142,11 +142,7 @@ "value": "min(extruderValues('extruder_nr'))" }, "adhesion_type": { "value": "'raft'" }, - "bottom_thickness": - { - "minimum_value_warning": 0.3, - "value": "top_bottom_thickness" - }, + "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, @@ -580,11 +576,7 @@ "minimum_value_warning": 0.3, "value": "4*layer_height" }, - "top_thickness": - { - "minimum_value_warning": 0.3, - "value": "top_bottom_thickness * 1.5" - }, + "top_thickness": { "value": "top_bottom_thickness * 1.5" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index 74b11bcb643..11a738ba810 100644 --- a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -32,7 +32,7 @@ skin_overlap = 20.0 skirt_brim_minimal_length = 100.0 speed_print = 25 support_enable = False -top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0 +top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness wall_0_material_flow_layer_0 = 110 wall_x_material_flow_layer_0 = 110 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index 8fd51cbe460..f4d07747513 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -32,7 +32,7 @@ skin_overlap = 20.0 skirt_brim_minimal_length = 100.0 speed_print = 25 support_enable = False -top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0 +top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness wall_0_material_flow_layer_0 = 110 wall_x_material_flow_layer_0 = 110 From de3613e92ff0d0b559a23f38fe30bdd7a42c17f6 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:30:34 +0100 Subject: [PATCH 118/276] Fix warning issue Method machines with BASF Metal filament. PP-541 --- resources/definitions/ultimaker_method_base.def.json | 12 ++++++++++-- ...thod_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- ...hodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index ff2f9fc2218..1e5eb952ed0 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -142,7 +142,11 @@ "value": "min(extruderValues('extruder_nr'))" }, "adhesion_type": { "value": "'raft'" }, - "bottom_thickness": { "value": "top_bottom_thickness" }, + "bottom_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness" + }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, @@ -576,7 +580,11 @@ "minimum_value_warning": 0.3, "value": "4*layer_height" }, - "top_thickness": { "value": "top_bottom_thickness * 1.5" }, + "top_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness * 1.5" + }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index 11a738ba810..74b11bcb643 100644 --- a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -32,7 +32,7 @@ skin_overlap = 20.0 skirt_brim_minimal_length = 100.0 speed_print = 25 support_enable = False -top_bottom_thickness = =layer_height * 2 +top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0 top_thickness = =top_bottom_thickness wall_0_material_flow_layer_0 = 110 wall_x_material_flow_layer_0 = 110 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index f4d07747513..8fd51cbe460 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -32,7 +32,7 @@ skin_overlap = 20.0 skirt_brim_minimal_length = 100.0 speed_print = 25 support_enable = False -top_bottom_thickness = =layer_height * 2 +top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0 top_thickness = =top_bottom_thickness wall_0_material_flow_layer_0 = 110 wall_x_material_flow_layer_0 = 110 From ed5a12d28a446a73d4acfc2cc91c2c239143ca7c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 16:21:41 +0100 Subject: [PATCH 119/276] Remove ZYYX Pro II printer which remains untested CURA-12312 --- resources/definitions/zyyx_pro_ii.def.json | 82 ------------------- .../extruders/zyyx_pro_ii_extruder.def.json | 15 ---- .../flex/zyyx_pro_ii_04_flex_fast.inst.cfg | 21 ----- .../flex/zyyx_pro_ii_04_flex_fine.inst.cfg | 21 ----- .../flex/zyyx_pro_ii_04_flex_normal.inst.cfg | 21 ----- .../pla/zyyx_pro_ii_04_pla_fast.inst.cfg | 42 ---------- .../pla/zyyx_pro_ii_04_pla_fine.inst.cfg | 42 ---------- .../pla/zyyx_pro_ii_04_pla_normal.inst.cfg | 42 ---------- .../zyyx_pro_ii_04_global_fast.inst.cfg | 40 --------- .../zyyx_pro_ii_04_global_fine.inst.cfg | 40 --------- .../zyyx_pro_ii_04_global_normal.inst.cfg | 40 --------- .../flex/zyyx_pro_ii_06_flex_fast.inst.cfg | 21 ----- .../flex/zyyx_pro_ii_06_flex_fine.inst.cfg | 21 ----- .../flex/zyyx_pro_ii_06_flex_normal.inst.cfg | 21 ----- .../pla/zyyx_pro_ii_06_pla_fast.inst.cfg | 42 ---------- .../pla/zyyx_pro_ii_06_pla_fine.inst.cfg | 42 ---------- .../pla/zyyx_pro_ii_06_pla_normal.inst.cfg | 42 ---------- .../zyyx_pro_ii_06_global_fast.inst.cfg | 40 --------- .../zyyx_pro_ii_06_global_fine.inst.cfg | 40 --------- .../zyyx_pro_ii_06_global_normal.inst.cfg | 42 ---------- .../flex/zyyx_pro_ii_12_flex_normal.inst.cfg | 21 ----- .../pla/zyyx_pro_ii_12_pla_normal.inst.cfg | 42 ---------- .../zyyx_pro_ii_12_global_normal.inst.cfg | 40 --------- .../flex/zyyx_pro_ii_02_flex_normal.inst.cfg | 21 ----- .../pla/zyyx_pro_ii_02_pla_normal.inst.cfg | 42 ---------- .../zyyx_pro_ii_02_global_normal.inst.cfg | 40 --------- .../zyyx/zyyx_pro_ii_carbon0.4.inst.cfg | 16 ---- .../zyyx/zyyx_pro_ii_carbon0.6.inst.cfg | 16 ---- .../zyyx/zyyx_pro_ii_carbon1.2.inst.cfg | 64 --------------- .../zyyx/zyyx_pro_ii_multi0.2.inst.cfg | 49 ----------- 30 files changed, 1068 deletions(-) delete mode 100644 resources/definitions/zyyx_pro_ii.def.json delete mode 100644 resources/extruders/zyyx_pro_ii_extruder.def.json delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg delete mode 100644 resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg delete mode 100644 resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg delete mode 100644 resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg delete mode 100644 resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg diff --git a/resources/definitions/zyyx_pro_ii.def.json b/resources/definitions/zyyx_pro_ii.def.json deleted file mode 100644 index 892f3042b0b..00000000000 --- a/resources/definitions/zyyx_pro_ii.def.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "version": 2, - "name": "ZYYX Pro II", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "ZYYX Labs AB", - "manufacturer": "ZYYX Labs AB", - "file_formats": "text/x-gcode", - "platform": "zyyx_pro_platform.stl", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine": "zyyx_pro_ii", - "machine_extruder_trains": { "0": "zyyx_pro_ii_extruder" }, - "machine_x3g_variant": "z", - "preferred_material": "zyyx_pla", - "preferred_quality_type": "normal", - "preferred_variant_name": "Carbon0.4", - "quality_definition": "zyyx_pro_ii", - "setting_version": 3, - "variants_name": "SwiftTool24" - }, - "overrides": - { - "gantry_height": { "value": "10" }, - "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, - "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 235 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-58, 117.5], - [-58, 108], - [-50, 108], - [-50, 117.5] - ], - [ - [119, 117.5], - [119, 108], - [140, 108], - [140, 117.5] - ], - [ - [-58, -117.5], - [-58, -108], - [-50, -108], - [-50, -117.5] - ], - [ - [119, -117.5], - [119, -108], - [140, -108], - [140, -117.5] - ] - ] - }, - "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, - "machine_gcode_flavor": { "default_value": "Makerbot" }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [-37, 50], - [25, 50], - [25, -40], - [-37, -40] - ] - }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 210 }, - "machine_name": { "default_value": "ZYYX Pro II" }, - "machine_start_gcode": { "default_value": ";start of ZYYX Pro II startcode\n M73 P0; enable build progress\n G21; set units to mm\n G90; set positioning to absolute\n G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z20 F3000\n G1 X-120 Y-110 Z10 F3000\n G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value\n M420 P10; set back fan speed 10 off 11-20 10-100%\n M140 S10 T0; set 100% heater power\n M140 S99 T0; set chamber heater negative hysteresis 19 degrees\n M140 S110 T0; set chamber heater positive hysteresis 10 degrees\n M140 S{material_bed_temperature_layer_0} T0; set chamber temperature\n M104 S100 T0; set extruder temp 100 while heating\n M134 T0; wait for heated chamber temperature\n M420 P13; set fan speed 10 off 11-20 10-100%\n G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value\n ; Perform probing of build plate\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z5 F200\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0\n M131 A; store surface calibration point 1\n G1 X0 Y0 Z5 F200\n G1 X-182 Y0 Z5 F3000; move to 2nd probing point\n G161 Z F200\n M131 B; store surface calibration point 2\n G92 X-182 Y0 Z0 E0\n G1 X-182 Y0 Z5 F200\n G1 X0 Y0 Z5 F3000; move to home point\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0; set reference again\n G1 X0 Y0 Z5 F200; clear Z\n G1 X0 Y-228 Z5 F3000; move to 3rd calibration point\n G161 Z F200\n M131 AB; store surface calibration point 3\n M132 AB; activate auto leveling\n G92 X0 Y-228 Z0 E0\n G1 X0 Y-228 Z5 F200\n G162 X Y F3000\n G161 Z F200\n G92 X135 Y115 Z0 E0\n M132 Z; Recall stored home offset for Z axis\n G1 X135 Y115 Z5 F450; clear nozzle from hole\n G1 X0 Y115 Z5 F3000; clear nozzle from hole\n ; end of ZYYX pro build plate calibration\n M127; turn off fan\n M104 S{material_print_temperature_layer_0} T0\n M133 T0 ; stabilize extruder temperature\n ;SET_ZXPARAM\n ;SET_SUPPORT_BUMPMAP\n G92 E0 ; Set E to 0\n ; end of ZYYX Pro II start code" }, - "machine_steps_per_mm_e": { "default_value": 415 }, - "machine_steps_per_mm_x": { "default_value": 88.888889 }, - "machine_steps_per_mm_y": { "default_value": 88.888889 }, - "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_width": { "default_value": 285 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file diff --git a/resources/extruders/zyyx_pro_ii_extruder.def.json b/resources/extruders/zyyx_pro_ii_extruder.def.json deleted file mode 100644 index ebda1a6fc12..00000000000 --- a/resources/extruders/zyyx_pro_ii_extruder.def.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": - { - "machine": "zyyx_pro_ii", - "position": "0" - }, - "overrides": - { - "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg deleted file mode 100644 index 4319f179bba..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = fast -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg deleted file mode 100644 index 1fe4ffd7c8f..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fine -version = 4 - -[metadata] -material = generic_pla -quality_type = fine -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg deleted file mode 100644 index 90c4254961f..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg deleted file mode 100644 index 6732d610c66..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = fast -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.3 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg deleted file mode 100644 index db1659b871b..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fine -version = 4 - -[metadata] -material = generic_pla -quality_type = fine -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.15 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 30 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg deleted file mode 100644 index 3817e040fcb..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.2 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg deleted file mode 100644 index 847ac209e4d..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fast -version = 4 - -[metadata] -global_quality = True -quality_type = fast -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.3 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg deleted file mode 100644 index 508e8808175..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fine -version = 4 - -[metadata] -global_quality = True -quality_type = fine -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.15 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 30 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg deleted file mode 100644 index d7b01a7ae61..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon0.4 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.2 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg deleted file mode 100644 index e01028beaa6..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = fast -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg deleted file mode 100644 index 7204aad8829..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fine -version = 4 - -[metadata] -material = generic_pla -quality_type = fine -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg deleted file mode 100644 index f5df71563f1..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg deleted file mode 100644 index 824655ffad8..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = fast -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.3 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 70 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg deleted file mode 100644 index 63beda8df72..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fine -version = 4 - -[metadata] -material = generic_pla -quality_type = fine -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.15 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 30 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 50 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg deleted file mode 100644 index 2637e3b7fbe..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.2 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg deleted file mode 100644 index 5ffa680b49d..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fast -version = 4 - -[metadata] -global_quality = True -quality_type = fast -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.3 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 70 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg deleted file mode 100644 index f1efe4cde49..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Fine -version = 4 - -[metadata] -global_quality = True -quality_type = fine -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.15 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 30 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 50 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg deleted file mode 100644 index 22c0edf5961..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon0.6 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.2 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg deleted file mode 100644 index 60dc7a557c0..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon1.2 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg deleted file mode 100644 index 9ef2fd5f7e5..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon1.2 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.4 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg deleted file mode 100644 index 36d23c001ad..00000000000 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 24 -type = quality -variant = Carbon1.2 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.4 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg deleted file mode 100644 index 6641abe078e..00000000000 --- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Multi0.2 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 - diff --git a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg deleted file mode 100644 index 7d22f046498..00000000000 --- a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 24 -type = quality -variant = Multi0.2 -weight = 0 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.2 -material_bed_temperature = 35 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg deleted file mode 100644 index 84027310fa2..00000000000 --- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 24 -type = quality -variant = Multi0.2 -weight = -2 - -[values] -adhesion_type = skirt -brim_width = 7 -infill_overlap = -2 -infill_pattern = quarter_cubic -layer_height = 0.2 -material_flow = 420.0 -material_flow_layer_0 = 150.0 -retraction_amount = 1.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -retraction_speed = 20 -skin_overlap = 15 -skirt_line_count = 2 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -top_bottom_thickness = =layer_height*3 -wall_thickness = =line_width *2 - diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg deleted file mode 100644 index ac231a5cfb6..00000000000 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Carbon0.4 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 24 -type = variant - -[values] -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = Carbon0.4 -machine_nozzle_size = 0.4 -machine_nozzle_tip_outer_diameter = 1.6 - diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg deleted file mode 100644 index 7521ae0357f..00000000000 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Carbon0.6 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 24 -type = variant - -[values] -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = Carbon0.6 -machine_nozzle_size = 0.6 -machine_nozzle_tip_outer_diameter = 1.8 - diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg deleted file mode 100644 index 0145237bf42..00000000000 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg +++ /dev/null @@ -1,64 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Carbon1.2 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 24 -type = variant - -[values] -acceleration_enabled = True -acceleration_print = 4000 -brim_width = 7 -cool_fan_speed = 7 -cool_fan_speed_max = 100 -cool_min_speed = 5 -infill_before_walls = False -infill_pattern = triangles -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) -layer_height = 0.2 -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -machine_nozzle_id = Carbon1.2 -machine_nozzle_size = 1.2 -machine_nozzle_tip_outer_diameter = 2.4 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_print_temperature = 200 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -prime_tower_enable = False -prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 -skin_overlap = 5 -speed_layer_0 = 20 -speed_print = 35 -speed_topbottom = =math.ceil(speed_print * 25 / 35) -speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = 20 -switch_extruder_retraction_amount = 16.5 -top_bottom_thickness = 1.4 -wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width -wall_thickness = 2 - diff --git a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg deleted file mode 100644 index edf7db4f98c..00000000000 --- a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg +++ /dev/null @@ -1,49 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Multi0.2 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 24 -type = variant - -[values] -brim_width = 7 -layer_height_0 = 0.17 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -machine_nozzle_id = Multi0.2 -machine_nozzle_size = 0.2 -machine_nozzle_tip_outer_diameter = 1.0 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 -retraction_count_max = 25 -retraction_extrusion_window = 1 -retraction_min_travel = 0.7 -retraction_prime_speed = =retraction_speed -skin_overlap = 15 -speed_layer_0 = 20 -speed_print = 55 -speed_topbottom = 20 -speed_wall = =math.ceil(speed_print * 30 / 55) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length -top_bottom_thickness = 1.2 -wall_line_width_x = 0.23 -wall_thickness = 1.3 - From 4949ffdb92bee9789846e5777b99dd8bc20588b1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 16:31:22 +0100 Subject: [PATCH 120/276] Remove mention of ZYYX Pro II --- resources/texts/change_log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index c2fe26754d4..1bd4dea654d 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -60,7 +60,7 @@ - Fixed an error in the profile Ultimaker 2 profile naming - Introduced the Creality CR-M4, contributed by @kixell - Introduced Eazao M500, M600, M700, and Potter, and updated the Eazao Zero, contributed by @Eazo -- Introduced ZYYX+, ZYYX Pro, and ZYYX Pro ii, contributed by @theodorhansson +- Introduced ZYYX+ and ZYYX Pro, contributed by @theodorhansson - Updated acceleration settings for the Creality Ender-2 V3 SE, contributed by @T9Air * Community Translations From 8551e3c892738c90ffb8f28947a06ae70dd429d3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 16:50:21 +0100 Subject: [PATCH 121/276] Add notes for Z-fighting bug and Wayland performance --- resources/texts/change_log.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 1bd4dea654d..dbbdfcc195b 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -48,6 +48,9 @@ - Removed an unwanted Z-hop when starting a new layer - Layer starts are more visible in the print preview with the scarf seam - Made the X to close floating and pop up windows a little bigger +- Fixed a bug where the build plate could be displayed incorrectly in the 3D view +- Improved the visuals of printers with a build plate texture, they now render more consistently regardless of zoom or angle of view +- The UI now displays correctly on Wayland, with this fix we noticed some performance drop compared to X11 * Printer definitions, profiles, and materials: - Introduced Makerbot Sketch Sprint From 596615c4337602236b87ea16b79141e8b72a71d2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 16:58:13 +0100 Subject: [PATCH 122/276] Remove double message --- resources/texts/change_log.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index dbbdfcc195b..97c2da39b0e 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -48,7 +48,6 @@ - Removed an unwanted Z-hop when starting a new layer - Layer starts are more visible in the print preview with the scarf seam - Made the X to close floating and pop up windows a little bigger -- Fixed a bug where the build plate could be displayed incorrectly in the 3D view - Improved the visuals of printers with a build plate texture, they now render more consistently regardless of zoom or angle of view - The UI now displays correctly on Wayland, with this fix we noticed some performance drop compared to X11 From 23b896251fd1409c08c7bb6f89c978ac8093d46d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 19 Nov 2024 09:22:51 +0100 Subject: [PATCH 123/276] Split dev and installer requirements --- conandata.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index be238bd4c08..8599b20145c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -632,12 +632,14 @@ pip_requirements: pip_requirements_dev: - pytest - - pyinstaller==6.3.0 - - pyinstaller-hooks-contrib - pyyaml - sip==6.5.1 - jinja2 +pip_requirements_installer: + - pyinstaller==6.3.0 + - pyinstaller-hooks-contrib + python_translation_source_folders: - cura - plugins From 5e204ab24202fee7e909b7e6caf27398ef4d18d3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 19 Nov 2024 09:23:09 +0100 Subject: [PATCH 124/276] Use virtual python env to get dependencies --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 322c79ab258..d0addf71886 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,6 +24,7 @@ class CuraConan(ConanFile): build_policy = "missing" exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" + generators = "VirtualPythonEnv" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -147,9 +148,8 @@ def _python_installs(self): outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - env_path = str(self._root_dir.joinpath("virtual_python_env")) self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = env_path, + env = "virtual_python_env", stdout = buffer) packages = str(buffer.getvalue()).strip('\r\n').split(";") From f282f874023a24bbbd10bcb34304cbb1665be306 Mon Sep 17 00:00:00 2001 From: CoreCode Date: Wed, 20 Nov 2024 14:22:16 +0100 Subject: [PATCH 125/276] Update UltiMaker-Cura.spec.jinja --- UltiMaker-Cura.spec.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 2dce96282e6..a24ce1558a9 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -75,7 +75,7 @@ app = BUNDLE( coll, name='{{ display_name }}.app', icon={{ icon }}, - bundle_identifier={{ osx_bundle_identifier }} + "_" + '{{ display_name }}'.replace(" ", "_") + "_" {{ short_version }}, + bundle_identifier={{ osx_bundle_identifier }} + "_" + '{{ display_name }}'.replace(" ", "_"), version={{ version }}, info_plist={ 'CFBundleDisplayName': '{{ display_name }}', From 43a3db9c5d8fc752291b8634bb3043a1719f1ee5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 20 Nov 2024 21:36:43 +0100 Subject: [PATCH 126/276] Remove build steps from Conan recipe --- .github/workflows/conan-package.yml | 2 - CuraVersion.py.jinja | 1 + conandata.yml | 18 ++--- conanfile.py | 100 ++++++++++++---------------- 4 files changed, 53 insertions(+), 68 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 65e467f4c37..6f190788953 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -38,6 +38,4 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: package_name: cura - platform_windows: false - platform_mac: false secrets: inherit diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 515293b8af0..0a3b0241eb6 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -4,6 +4,7 @@ CuraAppName = "{{ cura_app_name }}" CuraAppDisplayName = "{{ cura_app_display_name }}" CuraVersion = "{{ cura_version }}" +CuraVersionFull = "{{ cura_version_full }}" CuraBuildType = "{{ cura_build_type }}" CuraDebugMode = {{ cura_debug_mode }} CuraCloudAPIRoot = "{{ cura_cloud_api_root }}" diff --git a/conandata.yml b/conandata.yml index 8599b20145c..12c70f84555 100644 --- a/conandata.yml +++ b/conandata.yml @@ -244,8 +244,8 @@ pycharm_targets: name: pytest in TestSettingVisibilityPresets.py script_name: tests/Settings/TestSettingVisibilityPresets.py -pip_requirements: - any: +pip_requirements_core: + any_os: libCharon: url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" PyQt6-NetworkAuth: @@ -631,14 +631,16 @@ pip_requirements: - sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 pip_requirements_dev: - - pytest - - pyyaml - - sip==6.5.1 - - jinja2 + any_os: + pytest: {} + pyyaml: {} + sip: { version: "6.5.1" } + jinja2: {} pip_requirements_installer: - - pyinstaller==6.3.0 - - pyinstaller-hooks-contrib + any_os: + pyinstaller: { version: "6.3.0" } + pyinstaller-hooks-contrib: {} python_translation_source_folders: - cura diff --git a/conanfile.py b/conanfile.py index d0addf71886..b16e72a4e1c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,7 +24,7 @@ class CuraConan(ConanFile): build_policy = "missing" exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" - generators = "VirtualPythonEnv" + generators = "VirtualPythonEnv"#, "VirtualRunEnv" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -61,21 +61,21 @@ def _i18n_options(self): # FIXME: These env vars should be defined in the runenv. _cura_env = None - @property - def _cura_run_env(self): - if self._cura_env: - return self._cura_env - - self._cura_env = Environment() - self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) - self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) - self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) - - if self.settings.os == "Linux": - self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") - self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") - self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") - return self._cura_env + # @property + # def _cura_run_env(self): + # if self._cura_env: + # return self._cura_env + # + # self._cura_env = Environment() + # self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) + # self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) + # self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) + # + # if self.settings.os == "Linux": + # self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") + # self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") + # self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") + # return self._cura_env @property def _app_name(self): @@ -160,6 +160,23 @@ def _python_installs(self): print(python_installs) return python_installs + # def _generate_version_summary(self): + # version = self.conf.get("user.cura:version", default = self.version, check_type = str) + # cura_version = Version(version) + # + # version_data = { + # "version_major": cura_version.major, + # "version_minor": cura_version.minor, + # "version_patch": cura_version.patch, + # "version_build": cura_version.build if cura_version.build != "" else "0", + # "version_full": self.version, + # "cura_app_name": self._app_name, + # } + # + # file_path = os.path.join(os.getcwd(), 'version_summary.yml') + # self.output.info(f"Generating version summary to {file_path}") + # save(self, file_path, activate_github_actions_version_env) + def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -179,6 +196,7 @@ def _generate_cura_version(self, location): cura_app_name = self.name, cura_app_display_name = self._app_name, cura_version = cura_version, + cura_version_full = self.version, cura_build_type = "Enterprise" if self.options.enterprise else "", cura_debug_mode = self.options.cura_debug_mode, cura_cloud_api_root = self.conan_data["urls"][self._urls]["cloud_api_root"], @@ -294,9 +312,6 @@ def export_sources(self): copy(self, "*", os.path.join(self.recipe_folder, "cura"), os.path.join(self.export_sources_folder, "cura"), excludes="CuraVersion.py") copy(self, "*", os.path.join(self.recipe_folder, "packaging"), os.path.join(self.export_sources_folder, "packaging")) copy(self, "*", os.path.join(self.recipe_folder, ".run_templates"), os.path.join(self.export_sources_folder, ".run_templates")) - copy(self, "requirements.txt", self.recipe_folder, self.export_sources_folder) - copy(self, "requirements-dev.txt", self.recipe_folder, self.export_sources_folder) - copy(self, "requirements-ultimaker.txt", self.recipe_folder, self.export_sources_folder) copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder) def config_options(self): @@ -327,8 +342,8 @@ def build_requirements(self): def layout(self): self.folders.source = "." - self.folders.build = "venv" - self.folders.generators = os.path.join(self.folders.build, "conan") + self.folders.build = "build" + self.folders.generators = os.path.join(self.folders.build, "generators") self.cpp.package.libdirs = [os.path.join("site-packages", "cura")] self.cpp.package.bindirs = ["bin"] @@ -336,12 +351,12 @@ def layout(self): def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) - cura_run_envvars = self._cura_run_env.vars(self, scope = "run") - ext = ".ps1" if self.settings.os == "Windows" else ".sh" - cura_run_envvars.save_script(os.path.join(self.folders.generators, f"cura_run_environment{ext}")) + # cura_run_envvars = self._cura_run_env.vars(self, scope = "run") + # ext = ".ps1" if self.settings.os == "Windows" else ".sh" + # cura_run_envvars.save_script(os.path.join(self.folders.generators, f"cura_run_environment{ext}")) - vr = VirtualRunEnv(self) - vr.generate() + # vr = VirtualRunEnv(self) + # vr.generate() self._generate_cura_version(str(Path(self.source_folder, "cura"))) @@ -435,29 +450,6 @@ def deploy(self): copy(self, "*", uranium.resdirs[1], str(self._share_dir.joinpath("uranium", "plugins")), keep_path = True) copy(self, "*", uranium.libdirs[0], str(self._site_packages.joinpath("UM")), keep_path = True) - # Generate the GitHub Action version info Environment - version = self.conf.get("user.cura:version", default = self.version, check_type = str) - cura_version = Version(version) - env_prefix = "Env:" if self.settings.os == "Windows" else "" - activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV - """).render(cura_version_major = cura_version.major, - cura_version_minor = cura_version.minor, - cura_version_patch = cura_version.patch, - cura_version_build = cura_version.build if cura_version.build != "" else "0", - cura_version_full = self.version, - cura_app_name = self._app_name, - env_prefix = env_prefix) - - ext = ".sh" if self.settings.os != "Windows" else ".ps1" - save(self, os.path.join(self.deploy_folder, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) - - self._generate_cura_version(os.path.join(self._site_packages, "cura")) - entitlements_file = "'{}'".format(Path(self.deploy_folder, "packaging", "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self.deploy_folder, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), @@ -471,8 +463,8 @@ def package(self): copy(self, "*", src = os.path.join(self.source_folder, "resources"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[0])) copy(self, "*.mo", os.path.join(self.build_folder, "resources"), os.path.join(self.package_folder, "resources")) copy(self, "*", src = os.path.join(self.source_folder, "plugins"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[1])) - copy(self, "requirement*.txt", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1])) copy(self, "*", src = os.path.join(self.source_folder, "packaging"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[2])) + copy(self, "pip_requirements_*.txt", src = self.generators_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1])) # Remove the fdm_materials from the package rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], "materials")) @@ -488,12 +480,4 @@ def package_info(self): self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "plugins")) def package_id(self): - # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py - # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` - del self.info.options.enterprise - del self.info.options.staging - del self.info.options.pyinstaller - del self.info.options.cloud_api_version - del self.info.options.display_name - del self.info.options.cura_debug_mode self.info.options.rm_safe("enable_i18n") From f2343e98ce95e900b14477c21e8859416ad5c999 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 21 Nov 2024 10:50:28 +0100 Subject: [PATCH 127/276] Remove dead code --- CuraVersion.py.jinja | 1 + conanfile.py | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 0a3b0241eb6..76a75b4e3ab 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -15,4 +15,5 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" CuraLatestURL = "{{ cura_latest_url }}" ConanInstalls = {{ conan_installs }} + PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index b16e72a4e1c..7d9e910f9a9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -58,25 +58,6 @@ def set_version(self): def _i18n_options(self): return self.conf.get("user.i18n:options", default = {"extract": True, "build": True}, check_type = dict) - # FIXME: These env vars should be defined in the runenv. - _cura_env = None - - # @property - # def _cura_run_env(self): - # if self._cura_env: - # return self._cura_env - # - # self._cura_env = Environment() - # self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) - # self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) - # self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) - # - # if self.settings.os == "Linux": - # self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") - # self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") - # self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") - # return self._cura_env - @property def _app_name(self): if self.options.enterprise: @@ -160,23 +141,6 @@ def _python_installs(self): print(python_installs) return python_installs - # def _generate_version_summary(self): - # version = self.conf.get("user.cura:version", default = self.version, check_type = str) - # cura_version = Version(version) - # - # version_data = { - # "version_major": cura_version.major, - # "version_minor": cura_version.minor, - # "version_patch": cura_version.patch, - # "version_build": cura_version.build if cura_version.build != "" else "0", - # "version_full": self.version, - # "cura_app_name": self._app_name, - # } - # - # file_path = os.path.join(os.getcwd(), 'version_summary.yml') - # self.output.info(f"Generating version summary to {file_path}") - # save(self, file_path, activate_github_actions_version_env) - def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -351,12 +315,6 @@ def layout(self): def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) - # cura_run_envvars = self._cura_run_env.vars(self, scope = "run") - # ext = ".ps1" if self.settings.os == "Windows" else ".sh" - # cura_run_envvars.save_script(os.path.join(self.folders.generators, f"cura_run_environment{ext}")) - - # vr = VirtualRunEnv(self) - # vr.generate() self._generate_cura_version(str(Path(self.source_folder, "cura"))) From b8fd3d7ab0753ba65f388cd3cbcf36f87b42d7c3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 21 Nov 2024 11:15:31 +0100 Subject: [PATCH 128/276] Remove pyinstaller spec generation at generate() time --- conanfile.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/conanfile.py b/conanfile.py index 7d9e910f9a9..6a0fe99b7eb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -32,7 +32,6 @@ class CuraConan(ConanFile): options = { "enterprise": [True, False], "staging": [True, False], - "pyinstaller": [True, False], "cloud_api_version": ["ANY"], "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles @@ -42,7 +41,6 @@ class CuraConan(ConanFile): default_options = { "enterprise": False, "staging": False, - "pyinstaller": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented @@ -355,20 +353,6 @@ def generate(self): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.pyinstaller: - entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) - self._generate_pyinstaller_spec( - location=self.generators_folder, - entrypoint_location="'{}'".format( - os.path.join(self.source_folder, self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace( - "\\", "\\\\"), - icon_path="'{}'".format(os.path.join(self.source_folder, "packaging", - self.conan_data["pyinstaller"]["icon"][ - str(self.settings.os)])).replace("\\", "\\\\"), - entitlements_file=entitlements_file if self.settings.os == "Macos" else "None", - cura_source_folder=self.source_folder - ) - if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: vb = VirtualBuildEnv(self) vb.generate() From 50b13cdd77687787236737e8dfe7634a020d9dd7 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 22 Nov 2024 10:56:41 +0100 Subject: [PATCH 129/276] Cleanup code --- conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 6a0fe99b7eb..311c3183b45 100644 --- a/conanfile.py +++ b/conanfile.py @@ -136,7 +136,6 @@ def _python_installs(self): name, version = package.split(",") python_installs[name] = {"version": version} - print(python_installs) return python_installs def _generate_cura_version(self, location): @@ -372,6 +371,9 @@ def build(self): self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def deploy(self): + ''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not + the original purpose in the Conan philosophy ''' + copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.deploy_folder, "packaging"), keep_path = True) # Copy resources of Cura (keep folder structure) needed by pyinstaller to determine the module structure From 2b8a96042174f317bb81c477bcb4d9bdbbf7919a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 22 Nov 2024 16:06:03 +0100 Subject: [PATCH 130/276] Use most recent get-diff action --- .github/workflows/printer-linter-format.yml | 2 +- .github/workflows/printer-linter-pr-diagnose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index d8e136f1568..87a8cdcc94b 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - uses: technote-space/get-diff-action@v6 + - uses: greguintow/get-diff-action@v7 with: PATTERNS: | resources/+(definitions|extruders)/*.def.json diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index e70cabce7d1..e14c763e9e8 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -19,7 +19,7 @@ jobs: with: fetch-depth: 2 - - uses: technote-space/get-diff-action@v6 + - uses: greguintow/get-diff-action@v7 with: DIFF_FILTER: AMRCD PATTERNS: | From 1feadb4be71c1b60515f61daa00458a772a2b70e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:33:53 +0100 Subject: [PATCH 131/276] Update/fix nightly build (untested) --- .github/workflows/installers.yml | 16 +-- .github/workflows/nightly-stable.yml | 17 ++++ .github/workflows/nightly-testing.yml | 17 ++++ .github/workflows/nightly.yml | 99 +++++++++++++++++++ ...d.jinja => nightly_release_notes.md.jinja} | 4 +- 5 files changed, 136 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/nightly-stable.yml create mode 100644 .github/workflows/nightly-testing.yml create mode 100644 .github/workflows/nightly.yml rename .github/workflows/{release_notes.md.jinja => nightly_release_notes.md.jinja} (98%) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 134b2f5e89c..b2b91b7e732 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: @@ -24,11 +24,6 @@ on: default: false required: true type: boolean - nightly: - description: 'Upload to nightly release' - default: false - required: true - type: boolean workflow_call: inputs: @@ -48,15 +43,6 @@ on: default: false required: true type: boolean - nightly: - default: false - required: true - type: boolean - - schedule: - # Daily at 4:15 CET (main-branch) and 5:15 CET (release-branch) - - cron: '15 3 * * *' - - cron: '15 4 * * *' env: CONAN_ARGS: ${{ inputs.conan_args || '' }} diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml new file mode 100644 index 00000000000..d8e1754fcfd --- /dev/null +++ b/.github/workflows/nightly-stable.yml @@ -0,0 +1,17 @@ +name: Nightly build - stable release +run-name: Nightly build - stable release + +on: + schedule: + # Daily at 5:15 CET + - cron: '15 4 * * *' + +jobs: + build-nightly: +# FIXME: Use main once merged + uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + with: +# FIXME: Use stable channel once merged + cura_conan_version: "cura/[*]@ultimaker/cura_11622" + release_tag: "nightly" + caller_workflow: "nightly-stable.yml" diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml new file mode 100644 index 00000000000..e00d65ab859 --- /dev/null +++ b/.github/workflows/nightly-testing.yml @@ -0,0 +1,17 @@ +name: Nightly build - dev release +run-name: Nightly build - dev release + +on: + schedule: + # Daily at 4:15 CET + - cron: '15 3 * * *' + +jobs: + build-nightly: +# FIXME: Use main once merged + uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + with: +# FIXME: Use testing channel once merged + cura_conan_version: "cura/[*]@ultimaker/cura_11622" + release_tag: "nightly-5.6" # Fixed version, we reuse the same tag forever + caller_workflow: "nightly-testing.yml" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml new file mode 100644 index 00000000000..92c7ba64a09 --- /dev/null +++ b/.github/workflows/nightly.yml @@ -0,0 +1,99 @@ +name: Nightly build +run-name: Nightly build + +on: + workflow_call: + inputs: + cura_conan_version: + default: '' + required: true + type: string + release_tag: + default: '' + required: true + type: string + caller_workflow: + default: '' + required: true + type: string + + +jobs: + create-installers: + name: Create installers + id: create-installers +# FIXME: Use main once merged + uses: ultimaker/cura/github/workflows/installers.yml@CURA-11622_conan_v2 + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + secrets: inherit + + update-nightly-release: + runs-on: ubuntu-latest + needs: [ create-installers ] + steps: + - name: Download installers jobs artifacts + uses: actions/download-artifact@v4 + with: + path: installers + merge-multiple: true + + - name: Rename the installers + id: rename-installers + shell: python + working-directory: installers + run: | + import os + + first_file = True + + for file in os.listdir("."): + if file.startswith("UltiMaker-Cura-"): + # Find the commit tag, and replace it with "nightly" + index_plus = file.index("+") + file_start = file[:index_plus] + file_end = file[index_plus:] + file_end = file_end[file_end.index("-")+1:] + + new_file_name = f"{file_start}-nightly-{file_end}" + os.rename(file, new_file_name) + + if first_file: + first_file = False + + short_version = file_start.split("-")[2] + short_version = ".".join(short_version.split(".")[:2]) + + with open(os.environ["GITHUB_OUTPUT"], "a") as github_output: + github_output.write(f"cura_version={file_start}\n") + github_output.write(f"short_version={file_start}\n") + + + - name: create the release notes + shell: python + run: | + import os + import datetime + from jinja2 import Template + + with open(".github/workflows/nightly_release_notes.md.jinja", "r") as f: + release_notes = Template(f.read()) + + short_version = "${{ steps.rename-installers.outputs.short_version }}" + caller_workflow = "${{ inputs.caller_workflow }}" + is_main = os.getenv("GITHUB_REF") == "refs/heads/main" + + with open("release-notes.md", "w") as f: + f.write(release_notes.render( + timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), + caller_workflow=caller_workflow, + branch="" if is_main else short_version, + branch_specific="" is_main else f"?branch={short_version}", + )) + + - name: Update nightly release description (with date) + if: always() + run: | + gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja similarity index 98% rename from .github/workflows/release_notes.md.jinja rename to .github/workflows/nightly_release_notes.md.jinja index e66eeca6772..62edf164084 100644 --- a/.github/workflows/release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,7 +4,7 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml/badge.svg{{ branch_specific }} +| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }} ?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results @@ -36,4 +36,4 @@ | **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml) | | **pySavitar** | [![conan-package](https://github.com/Ultimaker/pySavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pySavitar/actions/workflows/conan-package.yml) | | **libnest2d** | [![conan-package](https://github.com/Ultimaker/libnest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/conan-package.yml) | -| **pynest2d** | [![conan-package](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml) | \ No newline at end of file +| **pynest2d** | [![conan-package](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml) | From b9a915024ef774d9de09c5f911427dca50aed3eb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:34:42 +0100 Subject: [PATCH 132/276] Always build binary translations files at build time --- conanfile.py | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/conanfile.py b/conanfile.py index 311c3183b45..2c34d55c4d4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,7 +24,8 @@ class CuraConan(ConanFile): build_policy = "missing" exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" - generators = "VirtualPythonEnv"#, "VirtualRunEnv" + generators = "VirtualPythonEnv" + tool_requires = "gettext/0.21" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -36,7 +37,7 @@ class CuraConan(ConanFile): "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles "internal": [True, False], - "enable_i18n": [True, False], + "i18n_extract": [True, False], } default_options = { "enterprise": False, @@ -45,17 +46,13 @@ class CuraConan(ConanFile): "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented "internal": False, - "enable_i18n": False, + "i18n_extract": False, } def set_version(self): if not self.version: self.version = self.conan_data["version"] - @property - def _i18n_options(self): - return self.conf.get("user.i18n:options", default = {"extract": True, "build": True}, check_type = dict) - @property def _app_name(self): if self.options.enterprise: @@ -275,15 +272,14 @@ def export_sources(self): copy(self, "*", os.path.join(self.recipe_folder, ".run_templates"), os.path.join(self.export_sources_folder, ".run_templates")) copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder) - def config_options(self): - if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): - del self.options.enable_i18n - def validate(self): version = self.conf.get("user.cura:version", default = self.version, check_type = str) if version and Version(version) <= Version("4"): raise ConanInvalidConfiguration("Only versions 5+ are support") + if self.options.i18n_extract and self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): + raise ConanInvalidConfiguration("Unable to extract translations on Windows without Bash installed") + def requirements(self): for req in self.conan_data["requirements"]: if self.options.internal and "fdm_materials" in req: @@ -297,10 +293,6 @@ def requirements(self): self.requires(req) self.requires("cpython/3.12.2") - def build_requirements(self): - if self.options.get_safe("enable_i18n", False): - self.test_requires("gettext/0.21") - def layout(self): self.folders.source = "." self.folders.build = "build" @@ -352,7 +344,7 @@ def generate(self): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: + if self.options.i18n_extract: vb = VirtualBuildEnv(self) vb.generate() @@ -362,13 +354,16 @@ def generate(self): pot.generate() def build(self): - if self.options.get_safe("enable_i18n", False) and self._i18n_options["build"]: - for po_file in Path(self.source_folder, "resources", "i18n").glob("**/*.po"): - mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) - mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) - mkdir(self, str(unix_path(self, Path(mo_file).parent))) - cpp_info = self.dependencies["gettext"].cpp_info - self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) + if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): + self.output.warning("Skipping generation of binary translation files because Bash could not be found and is required") + return + + for po_file in Path(self.source_folder, "resources", "i18n").glob("**/*.po"): + mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) + mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) + mkdir(self, str(unix_path(self, Path(mo_file).parent))) + cpp_info = self.dependencies["gettext"].cpp_info + self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def deploy(self): ''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not From 644751fa730b82684904749d33bbe6e13949e665 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:46:03 +0100 Subject: [PATCH 133/276] Restore binaries upload for nightlies --- .github/workflows/nightly.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 92c7ba64a09..d5fd0e98d2d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -91,9 +91,13 @@ jobs: branch_specific="" is_main else f"?branch={short_version}", )) - - name: Update nightly release description (with date) + - name: Update nightly release description and binaries if: always() run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md + + for file in "installers/*"; do + gh release upload ${{ inputs.release_tag }} $file --clobber + done env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bb07c0840bc16d6bbdf63ed3adceb7db9b01a57c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:50:41 +0100 Subject: [PATCH 134/276] Remove the nightlies build from installers --- .github/workflows/installers.yml | 218 +++---------------------------- 1 file changed, 16 insertions(+), 202 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index b2b91b7e732..2e512660817 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -44,28 +44,16 @@ on: required: true type: boolean -env: - CONAN_ARGS: ${{ inputs.conan_args || '' }} - ENTERPRISE: ${{ inputs.enterprise || false }} - STAGING: ${{ inputs.staging || false }} jobs: - default_values: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - latest_release: '5.6' - latest_release_schedule_hour: 4 - latest_release_tag: 'nightly' - windows-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} architecture: X64 operating_system: self-hosted-Windows-X64 secrets: inherit @@ -75,10 +63,10 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} operating_system: self-hosted-Ubuntu22-X64 secrets: inherit @@ -86,10 +74,10 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} architecture: X64 operating_system: self-hosted-X64 secrets: inherit @@ -98,184 +86,10 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} architecture: ARM64 operating_system: self-hosted-ARM64 secrets: inherit - - # Run and update nightly release when the nightly input is set to true or if the schedule is triggered - update-nightly-release: - if: ${{ inputs.nightly || github.event_name == 'schedule' }} - runs-on: ubuntu-latest - needs: [ default_values, windows-installer, linux-installer, macos-installer, macos-arm-installer ] - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 1 - - - name: Download the run info - uses: actions/download-artifact@v4 - with: - name: linux-run-info - - - name: Set the run info as environment variables - run: | - . run_info.sh - - - name: Output the name file name and extension - id: filename - shell: python - run: | - import os - import datetime - enterprise = "-Enterprise" if "${{ github.event.inputs.enterprise }}" == "true" else "" - linux = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-X64" - mac_x64_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64" - mac_x64_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64" - mac_arm_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64" - mac_arm_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64" - win_msi = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64" - win_exe = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64" - nightly_name = "UltiMaker-Cura-" + os.getenv('CURA_VERSION_FULL').split("+")[0] - nightly_creation_time = str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) - output_env = os.environ["GITHUB_OUTPUT"] - content = "" - if os.path.exists(output_env): - with open(output_env, "r") as f: - content = f.read() - with open(output_env, "w") as f: - f.write(content) - f.writelines(f"LINUX={linux}\n") - f.writelines(f"MAC_X64_DMG={mac_x64_dmg}\n") - f.writelines(f"MAC_X64_PKG={mac_x64_pkg}\n") - f.writelines(f"MAC_ARM_DMG={mac_arm_dmg}\n") - f.writelines(f"MAC_ARM_PKG={mac_arm_pkg}\n") - f.writelines(f"WIN_MSI={win_msi}\n") - f.writelines(f"WIN_EXE={win_exe}\n") - f.writelines(f"NIGHTLY_NAME={nightly_name}\n") - f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n") - - - name: Download linux installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.LINUX }}-AppImage - path: installers - - - name: Download linux installer jobs asc artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.LINUX }}-asc - path: installers - - - name: Rename Linux installer to nightlies - run: | - mv installers/${{ steps.filename.outputs.LINUX }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage - mv installers/${{ steps.filename.outputs.LINUX }}.AppImage.asc installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc - - - name: Update nightly release for Linux - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Download win msi installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.WIN_MSI }}-msi - path: installers - - - name: Download win exe installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.WIN_EXE }}-exe - path: installers - - - name: Rename Windows installers to nightlies - run: | - mv installers/${{ steps.filename.outputs.WIN_MSI }}.msi installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi - mv installers/${{ steps.filename.outputs.WIN_EXE }}.exe installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe - - - name: Update nightly release for Windows - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Download MacOS (X64) dmg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg - path: installers - - - name: Download MacOS (X64) pkg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg - path: installers - - - name: Rename MacOS (X64) installers to nightlies - run: | - mv installers/${{ steps.filename.outputs.MAC_X64_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg - mv installers/${{ steps.filename.outputs.MAC_X64_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg - - - name: Update nightly release for MacOS (X64) - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Download MacOS (ARM-64) dmg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg - path: installers - - - name: Download MacOS (ARM-64) pkg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg - path: installers - - - name: Rename MacOS (ARM-64) installers to nightlies - run: | - mv installers/${{ steps.filename.outputs.MAC_ARM_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg - mv installers/${{ steps.filename.outputs.MAC_ARM_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg - - - name: Update nightly release for MacOS (ARM-64) - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: create the release notes - shell: python - run: | - import os - import datetime - from jinja2 import Template - - with open(".github/workflows/release_notes.md.jinja", "r") as f: - release_notes = Template(f.read()) - - current_nightly_beta = "${{ needs.default_values.outputs.release_tag }}".split("nightly-")[-1] - with open("release-notes.md", "w") as f: - f.write(release_notes.render( - timestamp="${{ steps.filename.outputs.NIGHTLY_TIME }}", - branch="" if "${{ needs.default-values.outputs.release_tag == 'nightly' }}" == 'true' else current_nightly_beta, - branch_specific="" if os.getenv("GITHUB_REF") == "refs/heads/main" else f"?branch={current_nightly_beta}", - )) - - - name: Update nightly release description (with date) - if: always() - run: | - gh release edit ${{ needs.default_values.outputs.release_tag }} --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes-file release-notes.md - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6d0a30d496d904af32c4d8319239322c3d925a3f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 11:51:11 +0100 Subject: [PATCH 135/276] Use simplified package creation workflow --- .github/workflows/conan-package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 6f190788953..961052d69f7 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -36,6 +36,4 @@ jobs: # FIXME: Use main once merged conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 - with: - package_name: cura secrets: inherit From 9002e010cfa10aa4358ecfacb02c9a8fdfc1344c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 26 Nov 2024 15:06:48 +0100 Subject: [PATCH 136/276] Fix syntax of thrown errors. done as part of CURA-11622 --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 2c34d55c4d4..23f77b708c0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -182,11 +182,11 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e src_path = str(Path(cura_source_folder, data["src"])) else: if data["package"] not in self.dependencies: - raise ConanException(f"Required package {data["package"]} does not exist as a dependency") + raise ConanException(f"Required package {data['package']} does not exist as a dependency") - package_folder = self.dependencies[data["package"]].package_folder + package_folder = self.dependencies[data['package']].package_folder if package_folder is None: - raise ConanException(f"Unable to find package_folder for {data["package"]}, check that it has not been skipped") + raise ConanException(f"Unable to find package_folder for {data['package']}, check that it has not been skipped") src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder From c8f040e90e876affac9b4816867be06735ad3c54 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:56:23 +0100 Subject: [PATCH 137/276] Use production environment for Sentry --- .github/workflows/installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 2e512660817..943083138e4 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -37,11 +37,11 @@ on: type: string enterprise: default: false - required: true + required: false type: boolean staging: default: false - required: true + required: false type: boolean From a1657dc329e0df114573f9928f5af47b96c3ca29 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:58:24 +0100 Subject: [PATCH 138/276] Use more explicit tag for nightlies --- .github/workflows/nightly-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index e00d65ab859..0d66c17e204 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -13,5 +13,5 @@ jobs: with: # FIXME: Use testing channel once merged cura_conan_version: "cura/[*]@ultimaker/cura_11622" - release_tag: "nightly-5.6" # Fixed version, we reuse the same tag forever + release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" From 6313a89cd6a02c5912cc67b6cda54a4a3c9b5ce5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:59:01 +0100 Subject: [PATCH 139/276] Use uptodate install python script --- .github/workflows/printer-linter-format.yml | 2 +- .github/workflows/printer-linter-pr-diagnose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 87a8cdcc94b..07ba8bb989c 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Python and pip if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11.x cache: 'pip' diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index e14c763e9e8..106c9123e6d 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Python and pip if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11.x cache: "pip" From b46c89ad983802566fc1f4e7ad8d3d6679d9d06e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:59:42 +0100 Subject: [PATCH 140/276] Update release candidate workflow --- .../release-process_release-candidate.yml | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 1afb8aad048..2d9bd77757b 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -99,7 +99,6 @@ jobs: run: | echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" - create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main @@ -113,38 +112,17 @@ jobs: conan_recipe_root: "resources" with: repository: ${{ matrix.repository }} - ref_name: ${{ needs.parse-version.outputs.branch_name }} - version: ${{ inputs.cura_version }} - conan_release: true - conan_user_channel: ultimaker/stable - conan_internal: false - conan_latest: true + branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit - create-cura-package: - name: Create conan package for Cura - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main - needs: [parse-version, create-dependencies-packages] - with: - repository: Cura - ref_name: ${{ needs.parse-version.outputs.branch_name }} - version: ${{ inputs.cura_version }} - conan_release: true - conan_user_channel: ultimaker/stable - conan_internal: false - conan_latest: true - secrets: inherit - create-installers: name: Create installers uses: ./.github/workflows/installers.yml needs: [parse-version, create-cura-package] with: - cura_conan_version: cura/${{ inputs.cura_version }}@/ - enterprise: false - staging: false - nightly: false + cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable + conan_args: "-c user.sentry:environment=production" secrets: inherit create-release-draft: @@ -174,7 +152,7 @@ jobs: body: formatted_changelog.txt - name: Download artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: path: artifacts merge-multiple: true From 5782ee435abf1a0cd5222d299af2e49af0a2b1d1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:16:15 +0100 Subject: [PATCH 141/276] Fix called step name --- .github/workflows/release-process_release-candidate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 2d9bd77757b..1560f48c16d 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -99,8 +99,8 @@ jobs: run: | echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" - create-dependencies-packages: - name: Create conan packages for dependencies + create-packages: + name: Create conan packages uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, freeze-packages-versions] strategy: @@ -119,7 +119,7 @@ jobs: create-installers: name: Create installers uses: ./.github/workflows/installers.yml - needs: [parse-version, create-cura-package] + needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable conan_args: "-c user.sentry:environment=production" From 6704265bc371bd6af6ba8c02181b28e62af72829 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:23:42 +0100 Subject: [PATCH 142/276] Use the workflows from the branch --- .github/workflows/release-process_release-candidate.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 1560f48c16d..7809b93aeb0 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -32,7 +32,8 @@ jobs: freeze-packages-versions: name: Freeze packges versions - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main +# FIXME: Use main once merged + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} @@ -101,7 +102,8 @@ jobs: create-packages: name: Create conan packages - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-11622_conan_v2 needs: [parse-version, freeze-packages-versions] strategy: matrix: From a9a4c5d49e80bf4800cb7d45e22ef3fcea3f4594 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:33:29 +0100 Subject: [PATCH 143/276] Fix jobs dependencies --- .github/workflows/installers.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 943083138e4..012efe38da8 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -48,7 +48,6 @@ on: jobs: windows-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -61,7 +60,6 @@ jobs: # FIXME: Use main once merged linux-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -72,7 +70,6 @@ jobs: macos-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -84,7 +81,6 @@ jobs: macos-arm-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 09be7723558854a797d2f918fab6868528f13d1b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:49:34 +0100 Subject: [PATCH 144/276] Use workflows from branch --- .github/workflows/installers.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 012efe38da8..8c73200231d 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -47,7 +47,8 @@ on: jobs: windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -69,7 +70,8 @@ jobs: secrets: inherit macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -80,7 +82,8 @@ jobs: secrets: inherit macos-arm-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 0000ba334cedc8f69904752bd6f58de6df972986 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 11:17:13 +0100 Subject: [PATCH 145/276] Use gettext tools in path (experimental) --- conanfile.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 23f77b708c0..6fce951def5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -25,7 +25,7 @@ class CuraConan(ConanFile): exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" generators = "VirtualPythonEnv" - tool_requires = "gettext/0.21" + tool_requires = "gettext/0.22.5" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -348,9 +348,7 @@ def generate(self): vb = VirtualBuildEnv(self) vb.generate() - # # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement - cpp_info = self.dependencies["gettext"].cpp_info - pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) + pot = self.python_requires["translationextractor"].module.ExtractTranslations(self) pot.generate() def build(self): @@ -362,8 +360,7 @@ def build(self): mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mkdir(self, str(unix_path(self, Path(mo_file).parent))) - cpp_info = self.dependencies["gettext"].cpp_info - self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) + self.run(f"msgfmt {po_file} -o {mo_file} -f", env="conanbuild") def deploy(self): ''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not From 19743d000891fcd7d032278627acc71d183a2191 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 11:52:19 +0100 Subject: [PATCH 146/276] Remove windows installer architecture argument --- .github/workflows/installers.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 8c73200231d..a7ee9bfc492 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -54,7 +54,6 @@ jobs: conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise == 'true' }} staging: ${{ inputs.staging == 'true' }} - architecture: X64 operating_system: self-hosted-Windows-X64 secrets: inherit From 0b323764abeb25d1244875183d121f43c8855421 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 11:57:49 +0100 Subject: [PATCH 147/276] Set proper repository name for packages creation --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 7809b93aeb0..8fab10613ab 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -113,7 +113,7 @@ jobs: - repository: Cura conan_recipe_root: "resources" with: - repository: ${{ matrix.repository }} + repository: Ultimaker/${{ matrix.repository }} branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit From dd659e3fbe7991b6357782fb20b8017f0944e377 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 12:04:16 +0100 Subject: [PATCH 148/276] Give branch name to script to avoid recalculating it --- .github/workflows/release-process_feature-freeze.yml | 1 + .github/workflows/release-process_release-candidate.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 3a077996652..d3a4b35fc95 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -28,5 +28,6 @@ jobs: needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} + branch: ${{ needs.parse-version.outputs.branch_name }} create_feature_branch: true secrets: inherit diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 8fab10613ab..ecd20449f60 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -37,6 +37,7 @@ jobs: needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} + branch: ${{ needs.parse-version.outputs.branch_name }} create_feature_branch: false secrets: inherit From 2ef1462f824d1d14c8e1badb302439c8471a4495 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 26 Nov 2024 15:21:48 +0100 Subject: [PATCH 149/276] Update pywin32. done as part of CURA-11622 --- conandata.yml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/conandata.yml b/conandata.yml index 12c70f84555..131c52bd834 100644 --- a/conandata.yml +++ b/conandata.yml @@ -610,20 +610,26 @@ pip_requirements_core: - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 pywin32: - version: "303" - hashes: - - sha256:6fed4af057039f309263fd3285d7b8042d41507343cd5fa781d98fcc5b90e8bb - - sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 - - sha256:d9b5d87ca944eb3aa4cd45516203ead4b37ab06b8b777c54aedc35975dec0dee - - sha256:fcf44032f5b14fcda86028cdf49b6ebdaea091230eb0a757282aa656e4732439 - - sha256:aad484d52ec58008ca36bd4ad14a71d7dd0a99db1a4ca71072213f63bf49c7d9 - - sha256:2a09632916b6bb231ba49983fe989f2f625cea237219530e81a69239cd0c4559 - - sha256:b1675d82bcf6dbc96363fca747bac8bff6f6e4a447a4287ac652aa4b9adc796e - - sha256:c268040769b48a13367221fced6d4232ed52f044ffafeda247bd9d2c6bdc29ca - - sha256:5f9ec054f5a46a0f4dfd72af2ce1372f3d5a6e4052af20b858aa7df2df7d355b - - sha256:793bf74fce164bcffd9d57bb13c2c15d56e43c9542a7b9687b4fccf8f8a41aba - - sha256:7d3271c98434617a11921c5ccf74615794d97b079e22ed7773790822735cc352 - - sha256:79cbb862c11b9af19bcb682891c1b91942ec2ff7de8151e2aea2e175899cda34 + version: "306" + hashes: + - sha256:796ff4426437896550d2981b9c2ac0ffd75238ad9ea2d3bfa67a1abd546d262e + - sha256:4fc888c59b3c0bef905ce7eb7e2106a07712015ea1c8234b703a088d46110e8e + - sha256:a5ab5381813b40f264fa3495b98af850098f814a25a63589a8e9eb12560f450c + - sha256:5d8c8015b24a7d6855b1550d8e660d8daa09983c80e5daf89a273e5c6fb5095a + - sha256:575621b90f0dc2695fec346b2d6302faebd4f0f45c05ea29404cefe35d89442b + - sha256:100a5442b7332070983c4cd03f2e906a5648a5104b8a7f50175f7906efd16bb6 + - sha256:587f3e19696f4bf96fde9d8a57cec74a57021ad5f204c9e627e15c33ff568897 + - sha256:00b3e11ef09ede56c6a43c71f2d31857cf7c54b0ab6e78ac659497abd2834f47 + - sha256:9b4de86c8d909aed15b7011182c8cab38c8850de36e6afb1f0db22b8959e3091 + - sha256:1c44539a37a5b7b21d02ab34e6a4d314e0788f1690d65b48e9b0b89f31abbbed + - sha256:fd380990e792eaf6827fcb7e187b2b4b1cede0585e3d0c9e84201ec27b9905e4 + - sha256:ef313c46d4c18dfb82a2431e3051ac8f112ccee1a34f29c263c583c568db63cd + - sha256:1f696ab352a2ddd63bd07430080dd598e6369152ea13a25ebcdd2f503a38f1ff + - sha256:13dcb914ed4347019fbec6697a01a0aec61019c1046c2b905410d197856326a6 + - sha256:5794e764ebcabf4ff08c555b31bd348c9025929371763b2183172ff4708152f0 + - sha256:3b92622e29d651c6b783e368ba7d6722b1634b8e70bd376fd7610fe1992e19de + - sha256:7873ca4dc60ab3287919881a7d4f88baee4a6e639aa6962de25a98ba6b193341 + - sha256:71b3322d949b4cc20776436a9c9ba0eeedcbc9c650daa536df63f0ff111bb920 pywin32-ctypes: version: "0.2.0" hashes: From b7a5b2fd62d3b134ec0b275217a7283c4cc76939 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 27 Nov 2024 09:19:56 +0100 Subject: [PATCH 150/276] (win build) make it work locally again part if CURA-11622 --- conanfile.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6fce951def5..39767f67f26 100644 --- a/conanfile.py +++ b/conanfile.py @@ -121,12 +121,13 @@ def _python_installs(self): self.output.info("Collecting python installs") python_installs = {} - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' + temp_exec = "temp.py" + code = f"import importlib.metadata; print(';'.join([(package.metadata['Name']+','+ package.metadata['Version']) for package in importlib.metadata.distributions()]))" + save(self, temp_exec, code) + buffer = StringIO() - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "virtual_python_env", - stdout = buffer) + self.run(f"""python {temp_exec}""", env = "virtual_python_env", stdout = buffer) + rm(self, temp_exec, ".") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: From 12961014621ac9ac77da18855deddac06dc8fc80 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 13:48:41 +0100 Subject: [PATCH 151/276] Name installers --- .github/workflows/installers.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index a7ee9bfc492..e0ed6dbfe7a 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -48,6 +48,7 @@ on: jobs: windows-installer: # FIXME: Use main once merged + name: Create Windows installer uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} @@ -59,6 +60,7 @@ jobs: # FIXME: Use main once merged linux-installer: + name: Create Linux AppImage uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} @@ -70,6 +72,7 @@ jobs: macos-installer: # FIXME: Use main once merged + name: Create MacOS-X64 packages uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} @@ -82,6 +85,7 @@ jobs: macos-arm-installer: # FIXME: Use main once merged + name: Create MacOS-ARM64 packages uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} From af22593326fd0a75044ed35f50de507b6744e33a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 14:42:57 +0100 Subject: [PATCH 152/276] Remove version limit --- conanfile.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6fce951def5..6d261126961 100644 --- a/conanfile.py +++ b/conanfile.py @@ -273,10 +273,6 @@ def export_sources(self): copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder) def validate(self): - version = self.conf.get("user.cura:version", default = self.version, check_type = str) - if version and Version(version) <= Version("4"): - raise ConanInvalidConfiguration("Only versions 5+ are support") - if self.options.i18n_extract and self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): raise ConanInvalidConfiguration("Unable to extract translations on Windows without Bash installed") From 33ac9a9bc1323ae7b51fcefea82823ea46e2cdaa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 16:25:33 +0100 Subject: [PATCH 153/276] Use workflow from branch --- .github/workflows/release-process_feature-freeze.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index d3a4b35fc95..e366a4a642e 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -24,7 +24,8 @@ jobs: feature-freeze: name: Process feature freeze - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main +# FIXME: Use main once merged + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} From 9238e7e5b71eebbc592d6b30f061cc8b5ebfcd00 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 16:32:47 +0100 Subject: [PATCH 154/276] Give proper branch name --- .github/workflows/release-process_feature-freeze.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index e366a4a642e..07242790ce0 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -15,6 +15,7 @@ jobs: runs-on: ubuntu-latest outputs: package_version: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }}.0-alpha.1 + branch: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }} steps: - name: Parse version string id: version_parser @@ -29,6 +30,6 @@ jobs: needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} - branch: ${{ needs.parse-version.outputs.branch_name }} + branch: ${{ needs.parse-version.outputs.branch }} create_feature_branch: true secrets: inherit From d8200a3cb3837280bc998b30a81664a4eb8233fd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 17:56:16 +0100 Subject: [PATCH 155/276] Use simplified package creation workflow --- .github/workflows/conan-package-resources.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 4bad3d2bcb1..dbc2558a43b 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -25,7 +25,6 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - package_name: cura_resources conan_recipe_root: "./resources/" platform_windows: false platform_mac: false From f807af1b54cb49875a6bd954d30ba334f52ddac5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 10:46:04 +0100 Subject: [PATCH 156/276] Add warning for Conan2 migration --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 37978a30f91..d3fa8f55ce8 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@

    +# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️ + [![Badge Issues]][Issues]    [![Badge PullRequests]][PullRequests]    [![Badge Closed]][Closed] From 0d5d0fe846ac2817c8892ecc89a06c50b6b92946 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 14:32:49 +0100 Subject: [PATCH 157/276] Rename tmp Python file to a more explicit name --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 42fb4c8faf4..0bd04d33636 100644 --- a/conanfile.py +++ b/conanfile.py @@ -121,13 +121,13 @@ def _python_installs(self): self.output.info("Collecting python installs") python_installs = {} - temp_exec = "temp.py" + collect_python_installs = "collect_python_installs.py" code = f"import importlib.metadata; print(';'.join([(package.metadata['Name']+','+ package.metadata['Version']) for package in importlib.metadata.distributions()]))" - save(self, temp_exec, code) + save(self, collect_python_installs, code) buffer = StringIO() - self.run(f"""python {temp_exec}""", env = "virtual_python_env", stdout = buffer) - rm(self, temp_exec, ".") + self.run(f"""python {collect_python_installs}""", env = "virtual_python_env", stdout = buffer) + rm(self, collect_python_installs, ".") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: From 1b83a35236f8f8fc95ea60a185d7e5453c586368 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 15:37:05 +0100 Subject: [PATCH 158/276] Update Mac installer workflow --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ffc9b27b8be..12f58616ae8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,8 +43,9 @@ on: - macos-12 jobs: +# FIXME: Use main once merged macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 05aecd77aaaea7319f7bd81ef867d2edac90c157 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 15:54:13 +0100 Subject: [PATCH 159/276] Bump pywin32 and pywin32-ctypes --- conandata.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conandata.yml b/conandata.yml index 6bf259357a1..b157cce42a2 100644 --- a/conandata.yml +++ b/conandata.yml @@ -621,7 +621,7 @@ pip_requirements_core: - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 pywin32: - version: "306" + version: "308" hashes: - sha256:796ff4426437896550d2981b9c2ac0ffd75238ad9ea2d3bfa67a1abd546d262e - sha256:4fc888c59b3c0bef905ce7eb7e2106a07712015ea1c8234b703a088d46110e8e @@ -642,10 +642,10 @@ pip_requirements_core: - sha256:7873ca4dc60ab3287919881a7d4f88baee4a6e639aa6962de25a98ba6b193341 - sha256:71b3322d949b4cc20776436a9c9ba0eeedcbc9c650daa536df63f0ff111bb920 pywin32-ctypes: - version: "0.2.0" + version: "0.2.3" hashes: - - sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 - - sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 + - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 + - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 pip_requirements_dev: any_os: From f59e19f061202f7b346f1845286ff00d0945774f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 09:02:32 +0100 Subject: [PATCH 160/276] Update python version --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 0bd04d33636..497ab88808a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -358,7 +358,7 @@ def requirements(self): if self.options.enterprise: for req in self.conan_data["requirements_enterprise"]: self.requires(req) - self.requires("cpython/3.12.2") + self.requires("cpython/3.12.7") def layout(self): self.folders.source = "." From c002ba7afe1b5c8e4dde00cac5ec93acee0e25d2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 09:56:33 +0100 Subject: [PATCH 161/276] Bump dulcificum version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index b157cce42a2..786d423e5d0 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.0-alpha.0@ultimaker/cura_11622" + - "dulcificum/0.2.1-alpha.0@ultimaker/cura_11622" - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" requirements_internal: From 55e2967551017934e2838ee68eb5114872f7dd24 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 10:19:46 +0100 Subject: [PATCH 162/276] Use proper dulcificum version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 786d423e5d0..b346282c41b 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.1-alpha.0@ultimaker/cura_11622" + - "dulcificum/0.2.1@ultimaker/cura_11622" - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" requirements_internal: From 85c2d2f078a4e90bb64a4bfb7bbfbf8eabe5c9cd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 11:40:29 +0100 Subject: [PATCH 163/276] Use common script for installers --- .github/workflows/installers.yml | 68 +------------------ .github/workflows/nightly.yml | 43 +++--------- .../release-process_release-candidate.yml | 3 +- 3 files changed, 15 insertions(+), 99 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index e0ed6dbfe7a..f19af8a745a 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -7,91 +7,29 @@ on: cura_conan_version: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' - required: true type: string conan_args: description: 'Conan args, e.g. --requires' default: '' - required: false type: string enterprise: description: 'Build Cura as an Enterprise edition' default: false - required: true type: boolean staging: description: 'Use staging API' default: false - required: true - type: boolean - - workflow_call: - inputs: - cura_conan_version: - default: 'cura/latest@ultimaker/testing' - required: true - type: string - conan_args: - default: '' - required: false - type: string - enterprise: - default: false - required: false - type: boolean - staging: - default: false - required: false type: boolean jobs: - windows-installer: -# FIXME: Use main once merged - name: Create Windows installer - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} - operating_system: self-hosted-Windows-X64 - secrets: inherit - -# FIXME: Use main once merged - linux-installer: - name: Create Linux AppImage - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} - operating_system: self-hosted-Ubuntu22-X64 - secrets: inherit - - macos-installer: -# FIXME: Use main once merged - name: Create MacOS-X64 packages - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} - architecture: X64 - operating_system: self-hosted-X64 - secrets: inherit - - macos-arm-installer: + installers: # FIXME: Use main once merged - name: Create MacOS-ARM64 packages - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 + name: Create installers + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise == 'true' }} staging: ${{ inputs.staging == 'true' }} - architecture: ARM64 - operating_system: self-hosted-ARM64 secrets: inherit diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d5fd0e98d2d..4b7403b7e94 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -5,15 +5,12 @@ on: workflow_call: inputs: cura_conan_version: - default: '' required: true type: string release_tag: - default: '' required: true type: string caller_workflow: - default: '' required: true type: string @@ -23,51 +20,31 @@ jobs: name: Create installers id: create-installers # FIXME: Use main once merged - uses: ultimaker/cura/github/workflows/installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} secrets: inherit update-nightly-release: + name: Upload installers runs-on: ubuntu-latest needs: [ create-installers ] steps: + - name: Setup the build environment +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2 + - name: Download installers jobs artifacts uses: actions/download-artifact@v4 with: + pattern: UltiMaker-Cura-* path: installers merge-multiple: true - name: Rename the installers id: rename-installers - shell: python working-directory: installers - run: | - import os - - first_file = True - - for file in os.listdir("."): - if file.startswith("UltiMaker-Cura-"): - # Find the commit tag, and replace it with "nightly" - index_plus = file.index("+") - file_start = file[:index_plus] - file_end = file[index_plus:] - file_end = file_end[file_end.index("-")+1:] - - new_file_name = f"{file_start}-nightly-{file_end}" - os.rename(file, new_file_name) - - if first_file: - first_file = False - - short_version = file_start.split("-")[2] - short_version = ".".join(short_version.split(".")[:2]) - - with open(os.environ["GITHUB_OUTPUT"], "a") as github_output: - github_output.write(f"cura_version={file_start}\n") - github_output.write(f"short_version={file_start}\n") - + run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT - name: create the release notes shell: python @@ -92,11 +69,11 @@ jobs: )) - name: Update nightly release description and binaries - if: always() + working-directory: installers run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md - for file in "installers/*"; do + for file in "*"; do gh release upload ${{ inputs.release_tag }} $file --clobber done env: diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index ecd20449f60..caa132c8304 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -121,7 +121,8 @@ jobs: create-installers: name: Create installers - uses: ./.github/workflows/installers.yml +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable From 1b9f1c55367bc0199cc36ef59e457c2cb3c6dbff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 29 Nov 2024 11:40:47 +0100 Subject: [PATCH 164/276] Add preference to actually set the flip preference for Y handle --- resources/qml/Preferences/GeneralPage.qml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 4cc87e9644f..a686fca8e54 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -109,6 +109,9 @@ UM.PreferencesPage UM.Preferences.resetPreference("general/restore_window_geometry") restoreWindowPositionCheckbox.checked = boolCheck(UM.Preferences.getValue("general/restore_window_geometry")) + UM.Preferences.resetPreference("tool/flip_y_axis_tool_handle") + flipToolhandleYCheckbox.checked = boolcheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) + UM.Preferences.resetPreference("general/camera_perspective_mode") //var defaultCameraMode = UM.Preferences.getValue("general/camera_perspective_mode") // /setDefaultCameraMode(defaultCameraMode) @@ -662,6 +665,21 @@ UM.PreferencesPage } } } + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height + text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?") + + UM.CheckBox + { + id: flipToolhandleYCheckbox + text: catalog.i18nc("@option:check", "Flip toolhandle Y axis") + checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) + onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked) + } + } + Item { From a1d59b28ac3ec0672866dc354becc5dc309c429b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 13:43:08 +0100 Subject: [PATCH 165/276] Use proper package name for charon/libcharon --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index b346282c41b..5b1980f3094 100644 --- a/conandata.yml +++ b/conandata.yml @@ -257,7 +257,7 @@ pycharm_targets: pip_requirements_core: any_os: - libCharon: + charon: url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" PyQt6-NetworkAuth: version: "6.6.0" From c245b29fc48e392da3dfdaa08efba934a6806f92 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 16:46:56 +0100 Subject: [PATCH 166/276] Add hash for setuptools package --- conandata.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conandata.yml b/conandata.yml index 5b1980f3094..e13e116e422 100644 --- a/conandata.yml +++ b/conandata.yml @@ -298,6 +298,11 @@ pip_requirements_core: hashes: - sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 - sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e + setuptools: + version: "75.6.0" + hashes: + - sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d + - sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6 sentry-sdk: version: "0.13.5" hashes: From 7b9c66278572ea49e4f5b21e3d23d443731ace74 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 1 Dec 2024 16:35:19 +0100 Subject: [PATCH 167/276] add resolveOrValue --- resources/definitions/sovol_base_bowden.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/sovol_base_bowden.def.json b/resources/definitions/sovol_base_bowden.def.json index 670b24fffc2..0f389a25f83 100644 --- a/resources/definitions/sovol_base_bowden.def.json +++ b/resources/definitions/sovol_base_bowden.def.json @@ -10,6 +10,6 @@ "overrides": { "retraction_amount": { "default_value": 5 }, - "retraction_speed": { "value": "machine_max_feedrate_e" } + "retraction_speed": { "value": "resolveOrValue('machine_max_feedrate_e')" } } } \ No newline at end of file From ef8ddcfbe7bc5a72dd4598aa978a606352d16791 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 2 Dec 2024 08:59:00 +0100 Subject: [PATCH 168/276] bump version --- resources/definitions/sovol_base_bowden.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/sovol_base_bowden.def.json b/resources/definitions/sovol_base_bowden.def.json index 0f389a25f83..1f359c3dc00 100644 --- a/resources/definitions/sovol_base_bowden.def.json +++ b/resources/definitions/sovol_base_bowden.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Sovol Base Bowden Printer", "inherits": "sovol_base", "metadata": @@ -12,4 +12,4 @@ "retraction_amount": { "default_value": 5 }, "retraction_speed": { "value": "resolveOrValue('machine_max_feedrate_e')" } } -} \ No newline at end of file +} From 63f91fa56334426119d0bd1b61b6bf18acba666d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 2 Dec 2024 08:00:18 +0000 Subject: [PATCH 169/276] Applied printer-linter format --- resources/definitions/sovol_base_bowden.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/sovol_base_bowden.def.json b/resources/definitions/sovol_base_bowden.def.json index 1f359c3dc00..ad03842a472 100644 --- a/resources/definitions/sovol_base_bowden.def.json +++ b/resources/definitions/sovol_base_bowden.def.json @@ -12,4 +12,4 @@ "retraction_amount": { "default_value": 5 }, "retraction_speed": { "value": "resolveOrValue('machine_max_feedrate_e')" } } -} +} \ No newline at end of file From 8d332f5bcc06f602361634c483100f245fe67cea Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 10:31:27 +0100 Subject: [PATCH 170/276] Revert CPython to 3.12.2 Unfortunately, 3.12.7 doesn't build on Windows yet --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 497ab88808a..0bd04d33636 100644 --- a/conanfile.py +++ b/conanfile.py @@ -358,7 +358,7 @@ def requirements(self): if self.options.enterprise: for req in self.conan_data["requirements_enterprise"]: self.requires(req) - self.requires("cpython/3.12.7") + self.requires("cpython/3.12.2") def layout(self): self.folders.source = "." From dfbc17a745fcd021276d76b33c7789f166158959 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 14:35:39 +0100 Subject: [PATCH 171/276] Display commands of package creation --- packaging/MacOS/build_macos.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index fc78abf76f2..d3e1c1cfd95 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -56,6 +56,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v else: print("CODESIGN_IDENTITY missing. The installer is not being signed") + print(f"Run package build command [{" ".join(pkg_build_arguments)}]") subprocess.run(pkg_build_arguments) # This automatically generates a distribution.xml file that is used to build the installer. @@ -67,6 +68,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v "--package", Path(dist_path, component_filename), # Package that will be inside installer Path(dist_path, "distribution.xml"), # Output location for sythesized distributions file ] + print(f"Run distribution creation command [{" ".join(distribution_creation_arguments)}]") subprocess.run(distribution_creation_arguments) # This creates the distributable package (Installer) @@ -80,6 +82,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v if codesign_identity: installer_creation_arguments.extend(["--sign", codesign_identity]) + print(f"Run installer creation command [{" ".join(installer_creation_arguments)}]") subprocess.run(installer_creation_arguments) From 6aa386bd1e03d9a7ca61c7d3a15cca86059345ee Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 14:45:15 +0100 Subject: [PATCH 172/276] Fix display of executed command --- packaging/MacOS/build_macos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index d3e1c1cfd95..9038063af75 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -56,7 +56,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v else: print("CODESIGN_IDENTITY missing. The installer is not being signed") - print(f"Run package build command [{" ".join(pkg_build_arguments)}]") + print(f"Run package build command [{" ".join([str(arg) for arg in pkg_build_arguments])}]") subprocess.run(pkg_build_arguments) # This automatically generates a distribution.xml file that is used to build the installer. @@ -68,7 +68,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v "--package", Path(dist_path, component_filename), # Package that will be inside installer Path(dist_path, "distribution.xml"), # Output location for sythesized distributions file ] - print(f"Run distribution creation command [{" ".join(distribution_creation_arguments)}]") + print(f"Run distribution creation command [{" ".join([str(arg) for arg in distribution_creation_arguments])}]") subprocess.run(distribution_creation_arguments) # This creates the distributable package (Installer) @@ -82,7 +82,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v if codesign_identity: installer_creation_arguments.extend(["--sign", codesign_identity]) - print(f"Run installer creation command [{" ".join(installer_creation_arguments)}]") + print(f"Run installer creation command [{" ".join([str(arg) for arg in installer_creation_arguments])}]") subprocess.run(installer_creation_arguments) From 68175c2d01134024343ab6737b1aa0346e05b432 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 15:11:56 +0100 Subject: [PATCH 173/276] Display all commands and fail on error --- packaging/MacOS/build_macos.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index 9038063af75..a495a027695 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -25,7 +25,8 @@ def build_dmg(source_path: str, dist_path: str, filename: str, app_name: str) -> f"{dist_path}/{filename}", f"{dist_path}/{app_name}"] - subprocess.run(arguments) + print(f"Run create dmg command [{" ".join([str(arg) for arg in arguments])}]") + subprocess.run(arguments, check=True) def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_version: str, installer_filename: str) -> None: @@ -57,7 +58,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v print("CODESIGN_IDENTITY missing. The installer is not being signed") print(f"Run package build command [{" ".join([str(arg) for arg in pkg_build_arguments])}]") - subprocess.run(pkg_build_arguments) + subprocess.run(pkg_build_arguments, check=True) # This automatically generates a distribution.xml file that is used to build the installer. # If you want to make any changes to how the installer functions, this file should be changed to do that. @@ -69,7 +70,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v Path(dist_path, "distribution.xml"), # Output location for sythesized distributions file ] print(f"Run distribution creation command [{" ".join([str(arg) for arg in distribution_creation_arguments])}]") - subprocess.run(distribution_creation_arguments) + subprocess.run(distribution_creation_arguments, check=True) # This creates the distributable package (Installer) installer_creation_arguments = [ @@ -83,7 +84,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v installer_creation_arguments.extend(["--sign", codesign_identity]) print(f"Run installer creation command [{" ".join([str(arg) for arg in installer_creation_arguments])}]") - subprocess.run(installer_creation_arguments) + subprocess.run(installer_creation_arguments, check=True) def notarize_file(dist_path: str, filename: str) -> None: @@ -102,7 +103,8 @@ def notarize_file(dist_path: str, filename: str) -> None: Path(dist_path, filename) ] - subprocess.run(notarize_arguments) + print(f"Run notarize command [{" ".join([str(arg) for arg in notarize_arguments])}]") + subprocess.run(notarize_arguments, check=True) def create_pkg_installer(filename: str, dist_path: str, cura_version: str, app_name: str) -> None: From 80b7babdeac43794a0a9dab0193d3326665efa5f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 15:35:00 +0100 Subject: [PATCH 174/276] Bump pyinstaller version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index e13e116e422..9d4282274af 100644 --- a/conandata.yml +++ b/conandata.yml @@ -661,7 +661,7 @@ pip_requirements_dev: pip_requirements_installer: any_os: - pyinstaller: { version: "6.3.0" } + pyinstaller: { version: "6.11.1" } pyinstaller-hooks-contrib: {} python_translation_source_folders: From 285126e65a6fc64bb686aaba91d8ce6253b50482 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 10:09:10 +0100 Subject: [PATCH 175/276] Remove pywin32 explicit dependency --- conandata.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/conandata.yml b/conandata.yml index 9d4282274af..535a0f41dc7 100644 --- a/conandata.yml +++ b/conandata.yml @@ -625,32 +625,6 @@ pip_requirements_core: - sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 - pywin32: - version: "308" - hashes: - - sha256:796ff4426437896550d2981b9c2ac0ffd75238ad9ea2d3bfa67a1abd546d262e - - sha256:4fc888c59b3c0bef905ce7eb7e2106a07712015ea1c8234b703a088d46110e8e - - sha256:a5ab5381813b40f264fa3495b98af850098f814a25a63589a8e9eb12560f450c - - sha256:5d8c8015b24a7d6855b1550d8e660d8daa09983c80e5daf89a273e5c6fb5095a - - sha256:575621b90f0dc2695fec346b2d6302faebd4f0f45c05ea29404cefe35d89442b - - sha256:100a5442b7332070983c4cd03f2e906a5648a5104b8a7f50175f7906efd16bb6 - - sha256:587f3e19696f4bf96fde9d8a57cec74a57021ad5f204c9e627e15c33ff568897 - - sha256:00b3e11ef09ede56c6a43c71f2d31857cf7c54b0ab6e78ac659497abd2834f47 - - sha256:9b4de86c8d909aed15b7011182c8cab38c8850de36e6afb1f0db22b8959e3091 - - sha256:1c44539a37a5b7b21d02ab34e6a4d314e0788f1690d65b48e9b0b89f31abbbed - - sha256:fd380990e792eaf6827fcb7e187b2b4b1cede0585e3d0c9e84201ec27b9905e4 - - sha256:ef313c46d4c18dfb82a2431e3051ac8f112ccee1a34f29c263c583c568db63cd - - sha256:1f696ab352a2ddd63bd07430080dd598e6369152ea13a25ebcdd2f503a38f1ff - - sha256:13dcb914ed4347019fbec6697a01a0aec61019c1046c2b905410d197856326a6 - - sha256:5794e764ebcabf4ff08c555b31bd348c9025929371763b2183172ff4708152f0 - - sha256:3b92622e29d651c6b783e368ba7d6722b1634b8e70bd376fd7610fe1992e19de - - sha256:7873ca4dc60ab3287919881a7d4f88baee4a6e639aa6962de25a98ba6b193341 - - sha256:71b3322d949b4cc20776436a9c9ba0eeedcbc9c650daa536df63f0ff111bb920 - pywin32-ctypes: - version: "0.2.3" - hashes: - - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 - - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 pip_requirements_dev: any_os: From 23edcccfb158bf731b33374ccec0271c0839f916 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 10:25:08 +0100 Subject: [PATCH 176/276] Restore pywin32-ctypes and bump keyring version --- conandata.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 535a0f41dc7..e53390c4767 100644 --- a/conandata.yml +++ b/conandata.yml @@ -600,7 +600,7 @@ pip_requirements_core: - sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 keyring: - version: "23.0.1" + version: "25.5.0" hashes: - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 @@ -625,6 +625,11 @@ pip_requirements_core: - sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 + pywin32-ctypes: + version: "0.2.3" + hashes: + - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 + - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 pip_requirements_dev: any_os: From 00f599aac24e1a1c1b8cc295b337eb0c03338ddb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 10:37:50 +0100 Subject: [PATCH 177/276] Add hashes for dependencies of keyring --- conandata.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index e53390c4767..202eca9f8d1 100644 --- a/conandata.yml +++ b/conandata.yml @@ -602,8 +602,28 @@ pip_requirements_core: keyring: version: "25.5.0" hashes: - - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 + - sha256:e67f8ac32b04be4714b42fe84ce7dad9c40985b9ca827c592cc303e7c26d9741 + - sha256:4c753b3ec91717fe713c4edd522d625889d8973a349b0e582622f49766de58e6 + jaraco.classes: + version: "3.4.0" + hashes: + - sha256:f662826b6bed8cace05e7ff873ce0f9283b5c924470fe664fff1c2f00f581790 + - sha256:47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd + jaraco.functools: + version: "4.1.0" + hashes: + - sha256:ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649 + - sha256:70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d + jaraco.context: + version: "6.0.1" + hashes: + - sha256:f797fc481b490edb305122c9181830a3a5b76d84ef6d1aef2fb9b47ab956f9e4 + - sha256:9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3 + more_itertools: + version: "10.5.0" + hashes: + - sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef + - sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6 charset-normalizer: version: "2.1.0" hashes: From 67924d2e37a0a63594b8c87c344a96d327f5b774 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 12:50:33 +0100 Subject: [PATCH 178/276] Bump dependencies versions --- conandata.yml | 59 +++------------------------------------------------ 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/conandata.yml b/conandata.yml index 202eca9f8d1..4ae5da854cf 100644 --- a/conandata.yml +++ b/conandata.yml @@ -531,69 +531,16 @@ pip_requirements_core: hashes: - sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 - sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 - cffi: - version: "1.15.0" - hashes: - - sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962 - - sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0 - - sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14 - - sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27 - - sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023 - - sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474 - - sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6 - - sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 - - sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e - - sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7 - - sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 - - sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c - - sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962 - - sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382 - - sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55 - - sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 - - sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e - - sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39 - - sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc - - sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032 - - sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8 - - sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605 - - sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e - - sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc - - sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636 - - sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4 - - sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997 - - sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b - - sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2 - - sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7 - - sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66 - - sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029 - - sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880 - - sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20 - - sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024 - - sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e - - sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728 - - sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6 - - sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c - - sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443 - - sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a - - sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37 - - sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a - - sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e - - sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796 - - sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df - - sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8 - - sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a - - sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 - - sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 urllib3: version: "2.2.3" hashes: - sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac - sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9 jeepney: - version: "0.7.1" + version: "0.8.0" hashes: - - sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac - - sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f + - sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 + - sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 SecretStorage: version: "3.3.3" hashes: From 3ac81e54c05c9cec4359a8ce5bedf41c1177d9d0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 14:33:14 +0100 Subject: [PATCH 179/276] Require explicit arguments --- packaging/msi/create_windows_msi.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py index 268fc670a2a..e44a9a924be 100644 --- a/packaging/msi/create_windows_msi.py +++ b/packaging/msi/create_windows_msi.py @@ -7,6 +7,7 @@ import shutil import subprocess import uuid +import semver from datetime import datetime from pathlib import Path @@ -20,11 +21,12 @@ def work_path(filename: Path) -> Path: return filename.parent -def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: str): +def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: str, version: str): source_loc = Path(os.getcwd(), source_path) dist_loc = Path(os.getcwd(), dist_path) work_loc = work_path(filename) work_loc.mkdir(parents=True, exist_ok=True) + parsed_version = semver.Version.parse(version) jinja_template_path = Path(source_loc.joinpath("packaging", "msi", "UltiMaker-Cura.wxs.jinja")) with open(jinja_template_path, "r") as f: @@ -33,10 +35,10 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s wxs_content = template.render( app_name=f"{app_name}", main_app="UltiMaker-Cura.exe", - version=os.getenv('CURA_VERSION_FULL'), - version_major=os.environ.get("CURA_VERSION_MAJOR"), - version_minor=os.environ.get("CURA_VERSION_MINOR"), - version_patch=os.environ.get("CURA_VERSION_PATCH"), + version=version, + version_major=str(parsed_version.major), + version_minor=str(parsed_version.minor), + version_patch=str(parsed_version.patch), company="UltiMaker", web_site="https://ultimaker.com", year=datetime.now().year, @@ -111,12 +113,13 @@ def build(dist_path: Path, filename: Path): if __name__ == "__main__": parser = argparse.ArgumentParser(description="Create Windows msi installer of Cura.") - parser.add_argument("source_path", type=Path, help="Path to Conan install Cura folder.") - parser.add_argument("dist_path", type=Path, help="Path to Pyinstaller dist folder") - parser.add_argument("filename", type=Path, + parser.add_argument("--source_path", type=Path, help="Path to Conan install Cura folder.") + parser.add_argument("--dist_path", type=Path, help="Path to Pyinstaller dist folder") + parser.add_argument("--filename", type=Path, help="Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.msi')") - parser.add_argument("name", type=str, help="App name (e.g. 'UltiMaker Cura')") + parser.add_argument("--name", type=str, help="App name (e.g. 'UltiMaker Cura')") + parser.add_argument("--version", type=str, help="The full cura version, e.g. 5.9.0-beta.1+24132") args = parser.parse_args() - generate_wxs(args.source_path.resolve(), args.dist_path.resolve(), args.filename.resolve(), args.name) + generate_wxs(args.source_path.resolve(), args.dist_path.resolve(), args.filename.resolve(), args.name, args.version) cleanup_artifacts(args.dist_path.resolve()) build(args.dist_path.resolve(), args.filename) From 909efcb32807f385f2695bdd882ad25eeaf911d5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 14:57:17 +0100 Subject: [PATCH 180/276] Require explicit arguments --- packaging/NSIS/create_windows_installer.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py index 5ec31c8e354..3f0f651435b 100644 --- a/packaging/NSIS/create_windows_installer.py +++ b/packaging/NSIS/create_windows_installer.py @@ -5,6 +5,7 @@ import os import argparse # Command line arguments parsing and help. import subprocess +import semver import shutil from datetime import datetime @@ -14,11 +15,12 @@ from jinja2 import Template -def generate_nsi(source_path: str, dist_path: str, filename: str): +def generate_nsi(source_path: str, dist_path: str, filename: str, version: str): dist_loc = Path(os.getcwd(), dist_path) source_loc = Path(os.getcwd(), source_path) instdir = Path("$INSTDIR") dist_paths = [p.relative_to(dist_loc.joinpath("UltiMaker-Cura")) for p in sorted(dist_loc.joinpath("UltiMaker-Cura").rglob("*")) if p.is_file()] + parsed_version = semver.Version.parse(version) mapped_out_paths = {} for dist_path in dist_paths: if "__pycache__" not in dist_path.parts: @@ -44,10 +46,10 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): nsis_content = template.render( app_name = f"UltiMaker Cura {os.getenv('CURA_VERSION_FULL')}", main_app = "UltiMaker-Cura.exe", - version = os.getenv('CURA_VERSION_FULL'), - version_major = os.environ.get("CURA_VERSION_MAJOR"), - version_minor = os.environ.get("CURA_VERSION_MINOR"), - version_patch = os.environ.get("CURA_VERSION_PATCH"), + version = version, + version_major = str(parsed_version.major), + version_minor = str(parsed_version.minor), + version_patch = str(parsed_version.patch), company = "UltiMaker", web_site = "https://ultimaker.com", year = datetime.now().year, @@ -74,9 +76,10 @@ def build(dist_path: str): if __name__ == "__main__": parser = argparse.ArgumentParser(description = "Create Windows exe installer of Cura.") - parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.") - parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder") - parser.add_argument("filename", type = str, help = "Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.exe')") + parser.add_argument("--source_path", type=str, help="Path to Conan install Cura folder.") + parser.add_argument("--dist_path", type=str, help="Path to Pyinstaller dist folder") + parser.add_argument("--filename", type = str, help = "Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.exe')") + parser.add_argument("--version", type=str, help="The full cura version, e.g. 5.9.0-beta.1+24132") args = parser.parse_args() - generate_nsi(args.source_path, args.dist_path, args.filename) + generate_nsi(args.source_path, args.dist_path, args.filename, args.version) build(args.dist_path) From cb9a948e9d33ac432e5b8e797cd88cbeee21b4a3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 15:01:43 +0100 Subject: [PATCH 181/276] Fix installer name --- packaging/NSIS/create_windows_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py index 3f0f651435b..375ad25b012 100644 --- a/packaging/NSIS/create_windows_installer.py +++ b/packaging/NSIS/create_windows_installer.py @@ -44,7 +44,7 @@ def generate_nsi(source_path: str, dist_path: str, filename: str, version: str): nsis_content = template.render( - app_name = f"UltiMaker Cura {os.getenv('CURA_VERSION_FULL')}", + app_name = f"UltiMaker Cura {version}", main_app = "UltiMaker-Cura.exe", version = version, version_major = str(parsed_version.major), From e2487377cc1b3928c74bf6c89b0412cd2375cfa6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 16:21:12 +0100 Subject: [PATCH 182/276] Remove QtNetwork-Auth unused dependency --- conandata.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4ae5da854cf..b07b5b10783 100644 --- a/conandata.yml +++ b/conandata.yml @@ -259,20 +259,6 @@ pip_requirements_core: any_os: charon: url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" - PyQt6-NetworkAuth: - version: "6.6.0" - hashes: - - sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 - - sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 - - sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 - - sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb - PyQt6-NetworkAuth-Qt6: - version: "6.6.0" - hashes: - - sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 - - sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 - - sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 - - sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 certifi: version: "2023.5.7" hashes: From 41526bfe7018865a179d36e719ae67b676e9570f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 15:01:15 +0100 Subject: [PATCH 183/276] Prepare for merge CURA-11622 --- .github/workflows/conan-package-resources.yml | 3 +- .github/workflows/conan-package.yml | 3 +- .github/workflows/installers.yml | 7 ++-- .github/workflows/linux.yml | 3 +- .github/workflows/macos.yml | 3 +- .github/workflows/nightly-stable.yml | 6 ++-- .github/workflows/nightly-testing.yml | 6 ++-- .github/workflows/nightly.yml | 6 ++-- .../notify_on_print_profile_change.yml | 36 ------------------- .github/workflows/printer-linter-format.yml | 16 ++------- .../workflows/printer-linter-pr-diagnose.yml | 18 ++-------- .../release-process_feature-freeze.yml | 3 +- .../release-process_release-candidate.yml | 11 +++--- .github/workflows/unit-test.yml | 3 +- .github/workflows/update-translation.yml | 3 +- .github/workflows/windows.yml | 3 +- conandata.yml | 18 +++++----- resources/conanfile.py | 4 --- 18 files changed, 34 insertions(+), 118 deletions(-) delete mode 100644 .github/workflows/notify_on_print_profile_change.yml diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index dbc2558a43b..3a56e61a9c5 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -21,9 +21,8 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main with: conan_recipe_root: "./resources/" platform_windows: false diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 961052d69f7..55123dc3746 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -33,7 +33,6 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main secrets: inherit diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index f19af8a745a..3ce0aec312b 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -24,12 +24,11 @@ on: jobs: installers: -# FIXME: Use main once merged name: Create installers - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} secrets: inherit diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6d428a8cc92..f4d5052c0d5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,9 +34,8 @@ on: - self-hosted-Ubuntu22-X64 jobs: -# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 12f58616ae8..ffc9b27b8be 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,9 +43,8 @@ on: - macos-12 jobs: -# FIXME: Use main once merged macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index d8e1754fcfd..02cb71195d6 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -8,10 +8,8 @@ on: jobs: build-nightly: -# FIXME: Use main once merged - uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + uses: ./.github/workflows/nightly.yml with: -# FIXME: Use stable channel once merged - cura_conan_version: "cura/[*]@ultimaker/cura_11622" + cura_conan_version: "cura/[*]@ultimaker/stable" release_tag: "nightly" caller_workflow: "nightly-stable.yml" diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 0d66c17e204..207634d81cd 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -8,10 +8,8 @@ on: jobs: build-nightly: -# FIXME: Use main once merged - uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + uses: ./.github/workflows/nightly.yml with: -# FIXME: Use testing channel once merged - cura_conan_version: "cura/[*]@ultimaker/cura_11622" + cura_conan_version: "cura/[*]@ultimaker/testing" release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4b7403b7e94..933b7210b66 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,8 +19,7 @@ jobs: create-installers: name: Create installers id: create-installers -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} secrets: inherit @@ -31,8 +30,7 @@ jobs: needs: [ create-installers ] steps: - name: Setup the build environment -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - name: Download installers jobs artifacts uses: actions/download-artifact@v4 diff --git a/.github/workflows/notify_on_print_profile_change.yml b/.github/workflows/notify_on_print_profile_change.yml deleted file mode 100644 index c8747a9828e..00000000000 --- a/.github/workflows/notify_on_print_profile_change.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: notify_on_print_profile_change - -on: - push: - branches: [ "main" ] - paths: - - 'resources/definitions/fdmprinter.def.json' - - 'resources/definitions/ultimaker**' - - 'resources/extruders/ultimaker**' - - 'resources/intent/ultimaker**' - - 'resources/quality/ultimaker**' - - 'resources/variants/ultimaker**' - pull_request: - branches: [ "main" ] - paths: - - 'resources/definitions/fdmprinter.def.json' - - 'resources/definitions/ultimaker**' - - 'resources/extruders/ultimaker**' - - 'resources/intent/ultimaker**' - - 'resources/quality/ultimaker**' - - 'resources/variants/ultimaker**' -permissions: {} -jobs: - slackNotification: - name: Slack Notification - runs-on: ubuntu-latest - steps: - - name: Ultimaker Print Profile Changed - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_CHANNEL: profile-changes - SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: '#00FF00' - SLACK_TITLE: Print profiles changed - MSG_MINIMAL: commit - SLACK_WEBHOOK: ${{ secrets.SLACK_CURA_PPM_HOOK }} \ No newline at end of file diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 07ba8bb989c..9e208f46a47 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -15,8 +15,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - name: Setup the build environment + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - uses: greguintow/get-diff-action@v7 with: @@ -24,18 +24,6 @@ jobs: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Setup Python and pip - if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v5 - with: - python-version: 3.11.x - cache: 'pip' - cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Format file if: env.GIT_DIFF && !env.MATCHED_FILES run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 106c9123e6d..8feecdb3ee3 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -14,10 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 2 + - name: Setup the build environment + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - uses: greguintow/get-diff-action@v7 with: @@ -26,18 +24,6 @@ jobs: resources/+(extruders|definitions)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Setup Python and pip - if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v5 - with: - python-version: 3.11.x - cache: "pip" - cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Create results directory run: mkdir printer-linter-result diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 07242790ce0..de15d5c3104 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -25,8 +25,7 @@ jobs: feature-freeze: name: Process feature freeze -# FIXME: Use main once merged - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index caa132c8304..b4454d5fefd 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -32,8 +32,7 @@ jobs: freeze-packages-versions: name: Freeze packges versions -# FIXME: Use main once merged - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} @@ -103,8 +102,7 @@ jobs: create-packages: name: Create conan packages -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, freeze-packages-versions] strategy: matrix: @@ -114,15 +112,14 @@ jobs: - repository: Cura conan_recipe_root: "resources" with: - repository: Ultimaker/${{ matrix.repository }} + repository: ${{ matrix.repository }} branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit create-installers: name: Create installers -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index fb997464d17..4761a329070 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -40,7 +40,6 @@ on: jobs: testing: name: Run unit tests -# FIXME: use main once merged - uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main with: test_use_pytest: true diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml index aa897e5e2c1..189390410b3 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translation.yml @@ -10,7 +10,6 @@ on: jobs: update-translations: -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@main with: branch: ${{ inputs.branch }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2ff8dffe91b..bdfc92e5ab6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,8 +35,7 @@ on: jobs: windows-installer: - # FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/conandata.yml b/conandata.yml index b07b5b10783..02f044423f8 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,16 +1,16 @@ version: "5.10.0-alpha.0" requirements: - - "cura_resources/5.10.0-alpha.0@ultimaker/cura_11622" - - "uranium/5.10.0-alpha.0@ultimaker/cura_11622" - - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.1@ultimaker/cura_11622" - - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" + - "cura_resources/5.10.0-alpha.0@ultimaker/testing" + - "uranium/5.10.0-alpha.0@ultimaker/testing" + - "curaengine/5.10.0-alpha.0@ultimaker/testing" + - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@ultimaker/testing" + - "dulcificum/0.2.1@ultimaker/stable" + - "pysavitar/5.4.0-alpha.0@ultimaker/stable" + - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - "fdm_materials/5.8.1" - - "cura_private_data/5.10.0-alpha.0@internal/cura_11622" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/resources/conanfile.py b/resources/conanfile.py index 4f2e9af467b..aea89f4569f 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -36,10 +36,6 @@ def export_sources(self): copy(self, pattern="*", src=os.path.join(self.recipe_folder, shared_resources), dst=os.path.join(self.export_sources_folder, shared_resources)) - def validate(self): - if Version(self.version) <= Version("4"): - raise ConanInvalidConfiguration("Only versions 5+ are support") - def layout(self): self.cpp.source.resdirs = self._shared_resources self.cpp.package.resdirs = [f"res/{res}" for res in self._shared_resources] From 10633d4ffa05566e63039517ba870dc8dbccfdf2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 15:10:13 +0100 Subject: [PATCH 184/276] Remove now-useless script generation --- conanfile.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/conanfile.py b/conanfile.py index 0bd04d33636..5501b189a16 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,7 +28,7 @@ class CuraConan(ConanFile): tool_requires = "gettext/0.22.5" # FIXME: Remove specific branch once merged to main - python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" + python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable" options = { "enterprise": [True, False], @@ -455,27 +455,6 @@ def deploy(self): copy(self, "*", uranium.resdirs[1], str(self._share_dir.joinpath("uranium", "plugins")), keep_path = True) copy(self, "*", uranium.libdirs[0], str(self._site_packages.joinpath("UM")), keep_path = True) - # Generate the GitHub Action version info Environment - version = self.conf.get("user.cura:version", default = self.version, check_type = str) - cura_version = Version(version) - env_prefix = "Env:" if self.settings.os == "Windows" else "" - activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV - """).render(cura_version_major = cura_version.major, - cura_version_minor = cura_version.minor, - cura_version_patch = cura_version.patch, - cura_version_build = cura_version.build if cura_version.build != "" else "0", - cura_version_full = self.version, - cura_app_name = self._app_name, - env_prefix = env_prefix) - - ext = ".sh" if self.settings.os != "Windows" else ".ps1" - save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) - self._generate_cura_version(os.path.join(self._site_packages, "cura")) self._delete_unwanted_binaries(self._site_packages) From e01f97660594647494249c2d4ec7afb316dd466b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 5 Dec 2024 08:34:19 +0100 Subject: [PATCH 185/276] Fiux nightly workflow 'id' is not a valid attribute for jobs CURA-11622 --- .github/workflows/nightly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 933b7210b66..50932c87023 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,7 +18,6 @@ on: jobs: create-installers: name: Create installers - id: create-installers uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} From 6445cb05462ae13e1f8ea68c977409e94fe0e3c0 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 5 Dec 2024 20:13:17 +0100 Subject: [PATCH 186/276] (Win installer) PyInstaller missed this module, supposedly adding it as a hidden import helps. part of CURA-11622 --- conandata.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conandata.yml b/conandata.yml index 02f044423f8..910a7fa0f4c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -107,6 +107,7 @@ pyinstaller: - "fcntl" - "stl" - "serial" + - "win32timezone" collect_all: - "cura" - "UM" From e2e46cd75bcc2ce90244fef8e5365173e45bc6ab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 6 Dec 2024 10:22:40 +0100 Subject: [PATCH 187/276] Properly use the new common workflow --- .github/workflows/unit-test-post.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-test-post.yml b/.github/workflows/unit-test-post.yml index a8e9f26b8b6..7930765d7c3 100644 --- a/.github/workflows/unit-test-post.yml +++ b/.github/workflows/unit-test-post.yml @@ -9,6 +9,5 @@ jobs: publish-test-results: uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@main with: - event: ${{ github.event.workflow_run.event }} - conclusion: ${{ github.event.workflow_run.conclusion }} + workflow_run_json: ${{ toJSON(github.event.workflow_run) }} secrets: inherit From d50237f3922d7556548e17c3e757ef3eddff0c94 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 6 Dec 2024 16:39:59 +0100 Subject: [PATCH 188/276] Pass secrets to common nightly workflow --- .github/workflows/nightly-stable.yml | 1 + .github/workflows/nightly-testing.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index 02cb71195d6..f548b818751 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -13,3 +13,4 @@ jobs: cura_conan_version: "cura/[*]@ultimaker/stable" release_tag: "nightly" caller_workflow: "nightly-stable.yml" + secrets: inherit diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 207634d81cd..160ad5c46dd 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -13,3 +13,4 @@ jobs: cura_conan_version: "cura/[*]@ultimaker/testing" release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" + secrets: inherit From 30205e1c784bb1a2654d674c810f6e5d9d55f95a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 7 Dec 2024 16:10:42 +0100 Subject: [PATCH 189/276] Update description Add (restart required) --- resources/qml/Preferences/GeneralPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index a686fca8e54..62cab53a78d 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -669,12 +669,12 @@ UM.PreferencesPage { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?") + text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped? This will only affect model's Y coordinate, all other settings such as machine Printhead settings are unaffected and still behave as before.") UM.CheckBox { id: flipToolhandleYCheckbox - text: catalog.i18nc("@option:check", "Flip toolhandle Y axis") + text: catalog.i18nc("@option:check", "Flip model's toolhandle Y axis (restart required)") checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked) } From d8b3e773ab4cdae808352f5f3c734fefa297d6f2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 08:22:26 +0100 Subject: [PATCH 190/276] update label for clarity Greg's proposal: add details to clarify what the Y min & Y max refer to --- plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index c2238d2205c..d40efbee8a6 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -214,7 +214,7 @@ Item settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Y min") + labelText: catalog.i18nc("@label", "Y min ( '-' towards back)") labelFont: base.labelFont labelWidth: base.labelWidth controlWidth: base.controlWidth @@ -254,7 +254,7 @@ Item settingKey: "machine_head_with_fans_polygon" settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Y max") + labelText: catalog.i18nc("@label", "Y max ( '+' towards front)") labelFont: base.labelFont labelWidth: base.labelWidth controlWidth: base.controlWidth From 4c686afcb6acf1cd0e7dc3879f2027d2211dd1f0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 08:23:40 +0100 Subject: [PATCH 191/276] Update machine head & fan polygon description Greg's proposal: add details to clarify what the Y min & Y max refer to. Previous description was unclear and referred to front of print head as being a negative value which is not accurate. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..de47e3ff86d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -461,7 +461,7 @@ "machine_head_with_fans_polygon": { "label": "Machine Head & Fan Polygon", - "description": "The shape of the print head. These are coordinates relative to the position of the print head, which is usually the position of its first extruder. The dimensions left and in front of the print head must be negative coordinates.", + "description": "The dimensions of the print head used to determine 'Safe Model Distance' when printing 'One at a Time'. These numbers relate to the centerline of the first extruder nozzle. Left of the nozzle is 'X Min' and must be negative. Rear of the nozzle is 'Y Min' and must be negative. X Max (right) and Y Max (front) are positive numbers. Gantry height is the dimension from the build plate to the X gantry beam.", "type": "polygon", "default_value": [ [-20, 10], From d5cf5f66acc2e4d8cf56149f88913d862456f238 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 07:25:19 +0000 Subject: [PATCH 192/276] Applied printer-linter format --- Cura-workflows | 1 + pydir.txt | 1 + 2 files changed, 2 insertions(+) create mode 160000 Cura-workflows create mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 00000000000..a38e2d1e102 --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a diff --git a/pydir.txt b/pydir.txt new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/pydir.txt @@ -0,0 +1 @@ + From c6a2ccec1e82b566451fb55e78835a5015adade4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 08:27:11 +0100 Subject: [PATCH 193/276] Remove duplicated keychain entry. part of CURA-11622 --- conandata.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conandata.yml b/conandata.yml index 910a7fa0f4c..997bac3365d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -275,11 +275,6 @@ pip_requirements_core: hashes: - sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 - sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 - keyring: - version: "23.0.1" - hashes: - - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 trimesh: version: "3.9.36" hashes: From 23cc0b4d01e1b635c0d2ca87f386067b7f780153 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 08:27:43 +0100 Subject: [PATCH 194/276] Hopefully all of the hidden imports are OK now for keyring. part of CURA-11622 --- conandata.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conandata.yml b/conandata.yml index 997bac3365d..7b61e16ac3d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -107,7 +107,16 @@ pyinstaller: - "fcntl" - "stl" - "serial" + - "win32cred" - "win32timezone" + - "win32ctypes.core.ctypes" + - "win32ctypes.core.ctypes._common" + - "win32ctypes.core.ctypes._dll" + - "win32ctypes.core.ctypes._resource" + - "win32ctypes.core.ctypes._system_information" + - "win32ctypes.core.ctypes._time" + - "win32ctypes.core.ctypes._authentication" + - "pkgutil" collect_all: - "cura" - "UM" @@ -119,6 +128,7 @@ pyinstaller: - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" + - "keyrings.alt" icon: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" From ef02ab543e998d0544022af076e09ccf3e0152e3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 09:25:49 +0100 Subject: [PATCH 195/276] Try if we can get rid of this workaround. done part of CURA-11622 --- cura/OAuth2/KeyringAttribute.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/OAuth2/KeyringAttribute.py b/cura/OAuth2/KeyringAttribute.py index 58b45a67ef8..adaa01621cc 100644 --- a/cura/OAuth2/KeyringAttribute.py +++ b/cura/OAuth2/KeyringAttribute.py @@ -16,8 +16,6 @@ import sys from UM.Platform import Platform if Platform.isWindows(): - if hasattr(sys, "frozen"): - import win32timezone from keyring.backends.Windows import WinVaultKeyring keyring.set_keyring(WinVaultKeyring()) if Platform.isOSX(): From f9e138d4c590c922a82e92eba624d1500ccf9f4b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 10 Dec 2024 12:53:50 +0100 Subject: [PATCH 196/276] Add setting for multi-value overhang speed reduction CURA-11966 --- resources/definitions/fdmprinter.def.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..6b46fc645e0 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8412,6 +8412,15 @@ "minimum_value_warning": "25", "settable_per_mesh": true }, + "wall_overhang_speed_factors": + { + "label": "Overhanging Wall Speeds", + "description": "Overhanging walls will be printed at a percentage of their normal print speed. You can specify multiple values, so that even more overhanging walls will be printed even slower, e.g. by setting '[75, 50, 25]'.", + "unit": "%", + "type": "[int]", + "default_value": "[100]", + "settable_per_mesh": true + }, "bridge_settings_enabled": { "label": "Enable Bridge Settings", From e2c3dd62ce6b90a92306b293f66943bcd793cb61 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 13:16:29 +0100 Subject: [PATCH 197/276] Try to fix that not all pyqt dynamic libs are in the win-install. part of CURA-11622 --- conandata.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conandata.yml b/conandata.yml index 7b61e16ac3d..c125ed5082b 100644 --- a/conandata.yml +++ b/conandata.yml @@ -125,6 +125,7 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" + - "PyQt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 89287f829d4c580e407e4a97f06ff46290c9f5fc Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 14:33:16 +0100 Subject: [PATCH 198/276] (win-install) That pulled in too much pyqt, try more fine-grained. part of CURA-11622 --- conandata.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index c125ed5082b..c4474fe0322 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,6 +100,15 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" + - "PyQt6.QtQml" + - "PyQt6.QtQuick" + - "PyQt6.QtQuick.Widgets" + - "PyQt6.QtQuick.Controls" + - "PyQt6.QtQuick.Dialogs" + - "PyQt6.QtQuick.Layouts" + - "PyQt6.QtWidgets" + - "PyQt6.QtDBus" + - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -125,7 +134,15 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" - - "PyQt6" + - "PyQt6.QtQml" + - "PyQt6.QtQuick" + - "PyQt6.QtQuick.Widgets" + - "PyQt6.QtQuick.Controls" + - "PyQt6.QtQuick.Dialogs" + - "PyQt6.QtQuick.Layouts" + - "PyQt6.QtWidgets" + - "PyQt6.QtDBus" + - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 5e59458893fc46cbdeb64c8a8e4cddb595196759 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 16:35:28 +0100 Subject: [PATCH 199/276] More needed PyQt for Windows? part of CURA-11622 --- conandata.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conandata.yml b/conandata.yml index c4474fe0322..4426ffa3bc3 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,6 +100,8 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" + - "PyQt6.Qt" + - "PyQt6.Qt6" - "PyQt6.QtQml" - "PyQt6.QtQuick" - "PyQt6.QtQuick.Widgets" @@ -134,6 +136,8 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" + - "PyQt6.Qt" + - "PyQt6.Qt6" - "PyQt6.QtQml" - "PyQt6.QtQuick" - "PyQt6.QtQuick.Widgets" From 55f59b79712d4897bf1d459d68ac4313efc736b1 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 17:30:27 +0100 Subject: [PATCH 200/276] Better rid of 'forbidden modules' and related folders. part of CURA-11622 --- conandata.yml | 2 +- conanfile.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4426ffa3bc3..13bd7a74925 100644 --- a/conandata.yml +++ b/conandata.yml @@ -163,7 +163,7 @@ pyinstaller: - [ "qt", "lab", "animat" ] - [ "qt", "mqtt" ] - [ "qt", "net", "auth" ] - - [ "qt", "quick3d" ] + - [ "quick3d" ] - [ "qt", "timeline" ] - [ "qt", "virt", "key" ] - [ "qt", "wayland", "compos" ] diff --git a/conanfile.py b/conanfile.py index 5501b189a16..fa155771266 100644 --- a/conanfile.py +++ b/conanfile.py @@ -179,6 +179,7 @@ def _delete_unwanted_binaries(self, root): "qtmqtt", "qtnetworkauth", "qtquick3d", + "quick3d", "qtquick3dphysics", "qtquicktimeline", "qtvirtualkeyboard", @@ -207,7 +208,7 @@ def _delete_unwanted_binaries(self, root): to_remove_files.append(pathname) for dirname in dir_: for forbidden in prohibited: - if forbidden.lower() == str(dirname).lower(): + if forbidden.lower() in str(dirname).lower(): pathname = os.path.join(root, dirname) to_remove_dirs.append(pathname) break From cc93e8c8664be5b16a581b83105ba3b988c99b1c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 19:58:56 +0100 Subject: [PATCH 201/276] Prune included binaries. Hopefully get rid of Qt Quick 3D (as opposed to Qt Quick). part of CURA-11622 --- conandata.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/conandata.yml b/conandata.yml index 13bd7a74925..832670d43ea 100644 --- a/conandata.yml +++ b/conandata.yml @@ -103,14 +103,6 @@ pyinstaller: - "PyQt6.Qt" - "PyQt6.Qt6" - "PyQt6.QtQml" - - "PyQt6.QtQuick" - - "PyQt6.QtQuick.Widgets" - - "PyQt6.QtQuick.Controls" - - "PyQt6.QtQuick.Dialogs" - - "PyQt6.QtQuick.Layouts" - - "PyQt6.QtWidgets" - - "PyQt6.QtDBus" - - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -120,13 +112,6 @@ pyinstaller: - "serial" - "win32cred" - "win32timezone" - - "win32ctypes.core.ctypes" - - "win32ctypes.core.ctypes._common" - - "win32ctypes.core.ctypes._dll" - - "win32ctypes.core.ctypes._resource" - - "win32ctypes.core.ctypes._system_information" - - "win32ctypes.core.ctypes._time" - - "win32ctypes.core.ctypes._authentication" - "pkgutil" collect_all: - "cura" @@ -139,14 +124,6 @@ pyinstaller: - "PyQt6.Qt" - "PyQt6.Qt6" - "PyQt6.QtQml" - - "PyQt6.QtQuick" - - "PyQt6.QtQuick.Widgets" - - "PyQt6.QtQuick.Controls" - - "PyQt6.QtQuick.Dialogs" - - "PyQt6.QtQuick.Layouts" - - "PyQt6.QtWidgets" - - "PyQt6.QtDBus" - - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 66c1a08478d3bee614613ba56d771facfdff6493 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 09:03:14 +0100 Subject: [PATCH 202/276] Added the additional hooks folder now present in the cura-workflows repo. part of CURA-11622 --- UltiMaker-Cura.spec.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 2dce96282e6..d618ca3309c 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -28,7 +28,7 @@ a = Analysis( binaries=binaries, datas=datas, hiddenimports=hiddenimports, - hookspath=[], + hookspath=["Cura-workflows/runner_scripts/pyinstaller_hooks"], hooksconfig={}, runtime_hooks=[], excludes=[], From bec87b88dd99f50215591a8b687620dc6d238b86 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 10:20:49 +0100 Subject: [PATCH 203/276] (installer) Unwanted files are in there, try if it can start without. part of CURA-11622 --- conandata.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 832670d43ea..8fa90458b1d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -102,7 +102,6 @@ pyinstaller: - "PyQt6" - "PyQt6.Qt" - "PyQt6.Qt6" - - "PyQt6.QtQml" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -123,7 +122,6 @@ pyinstaller: - "win32ctypes" - "PyQt6.Qt" - "PyQt6.Qt6" - - "PyQt6.QtQml" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From cca70d83da6371c1ee9b44071206d07122b53046 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 16:17:18 +0100 Subject: [PATCH 204/276] Install: Fix MacOs; Previous Windows fixes caused Mac build to fail. part of CURA-11622 --- conandata.yml | 10 ++++++---- conanfile.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/conandata.yml b/conandata.yml index 8fa90458b1d..dd81e0dcf50 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,8 +100,6 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" - - "PyQt6.Qt" - - "PyQt6.Qt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -112,6 +110,9 @@ pyinstaller: - "win32cred" - "win32timezone" - "pkgutil" + hiddenimports_WINDOWS_ONLY: + - "PyQt6.Qt" + - "PyQt6.Qt6" collect_all: - "cura" - "UM" @@ -120,12 +121,13 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" - - "PyQt6.Qt" - - "PyQt6.Qt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" - "keyrings.alt" + collect_all_WINDOWS_ONLY: + - "PyQt6.Qt" + - "PyQt6.Qt6" icon: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" diff --git a/conanfile.py b/conanfile.py index fa155771266..01e2ffb579c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -310,6 +310,12 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e except Exception as ex: print(f"WARNING: Attempt to delete binary {unwanted_path} results in: {str(ex)}") + hiddenimports = pyinstaller_metadata["hiddenimports"] + collect_all = pyinstaller_metadata["collect_all"] + if self.settings.os == "Windows": + hiddenimports += pyinstaller_metadata["hiddenimports_WINDOWS_ONLY"] + collect_all += pyinstaller_metadata["collect_all_WINDOWS_ONLY"] + # Write the actual file: with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( @@ -319,8 +325,8 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e datas = datas, binaries = filtered_binaries, venv_script_path = str(self._script_dir), - hiddenimports = pyinstaller_metadata["hiddenimports"], - collect_all = pyinstaller_metadata["collect_all"], + hiddenimports = hiddenimports, + collect_all = collect_all, icon = icon_path, entitlements_file = entitlements_file, osx_bundle_identifier = "'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None", From f54eeede77944586d219aef976fbc36122dee656 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 14:42:32 +0100 Subject: [PATCH 205/276] Fix the rename script call path --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 50932c87023..1f548268938 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,7 +41,7 @@ jobs: - name: Rename the installers id: rename-installers working-directory: installers - run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT + run: python ../Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT - name: create the release notes shell: python From d5b4cad205b18cdb07ba7d4e6edad3376c0deb01 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 15:59:48 +0100 Subject: [PATCH 206/276] Improve setting description CURA-11966 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6b46fc645e0..1f3c3762759 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8415,7 +8415,7 @@ "wall_overhang_speed_factors": { "label": "Overhanging Wall Speeds", - "description": "Overhanging walls will be printed at a percentage of their normal print speed. You can specify multiple values, so that even more overhanging walls will be printed even slower, e.g. by setting '[75, 50, 25]'.", + "description": "Overhanging walls will be printed at a percentage of their normal print speed. You can specify multiple values, so that even more overhanging walls will be printed even slower, e.g. by setting [75, 50, 25]", "unit": "%", "type": "[int]", "default_value": "[100]", From dd4b9e80c142991a2c9bbb07ea08b00ef1e893ab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 17:11:02 +0100 Subject: [PATCH 207/276] Allow package overrides when building installers --- .github/workflows/installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 3ce0aec312b..1d9b057f67d 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,8 +8,12 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string + package_overrides: + description: 'Space-separated List of specific packages to be used' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' type: string enterprise: @@ -28,6 +32,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From a7ac441d0fd23a0b9c38fd870f5e33be3cc7341a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 10:22:40 +0100 Subject: [PATCH 208/276] Revert "Allow package overrides when building installers" This reverts commit dd4b9e80c142991a2c9bbb07ea08b00ef1e893ab. --- .github/workflows/installers.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 1d9b057f67d..3ce0aec312b 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,12 +8,8 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string - package_overrides: - description: 'Space-separated List of specific packages to be used' - default: '' - type: string conan_args: - description: 'Conan args' + description: 'Conan args, e.g. --requires' default: '' type: string enterprise: @@ -32,7 +28,6 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} - package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 5d08f8eeefe5e69019fddde7a05bfac7905a0a4c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 17:11:02 +0100 Subject: [PATCH 209/276] Allow package overrides when building installers --- .github/workflows/installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 3ce0aec312b..1d9b057f67d 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,8 +8,12 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string + package_overrides: + description: 'Space-separated List of specific packages to be used' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' type: string enterprise: @@ -28,6 +32,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 20b311f12e248ee6b150c467e40a87ac9a70cb0f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:14:50 +0100 Subject: [PATCH 210/276] Set proper default version value --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f4d5052c0d5..fc749b13c51 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ffc9b27b8be..2a9afda2110 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bdfc92e5ab6..f86815d3a9c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: From 0b661203e76f1c3d41ba6ebf2b5ae90723552e3a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:18:08 +0100 Subject: [PATCH 211/276] Allow specific installers to have package overrides --- .github/workflows/installers.yml | 2 +- .github/workflows/linux.yml | 7 ++++++- .github/workflows/macos.yml | 7 ++++++- .github/workflows/windows.yml | 7 ++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 1d9b057f67d..d63ed5bd6be 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -9,7 +9,7 @@ on: default: 'cura/[*]@ultimaker/testing' type: string package_overrides: - description: 'Space-separated List of specific packages to be used' + description: 'List of specific packages to be used (space-separated)' default: '' type: string conan_args: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fc749b13c51..66975ddf159 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' required: false type: string @@ -38,6 +42,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2a9afda2110..97ea2b25ad6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args' default: '' required: false type: string @@ -47,6 +51,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f86815d3a9c..c17d19fd724 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args: eq.: --requires' + description: 'Conan args' default: '' required: false type: string @@ -38,6 +42,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 9735bcf64bdba68bea15762b09573c517a336918 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:39:37 +0100 Subject: [PATCH 212/276] Remove previous single overhang angle --- resources/definitions/fdmprinter.def.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1f3c3762759..08bfe11d31d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8401,17 +8401,6 @@ "value": "support_angle", "settable_per_mesh": true }, - "wall_overhang_speed_factor": - { - "label": "Overhanging Wall Speed", - "description": "Overhanging walls will be printed at this percentage of their normal print speed.", - "unit": "%", - "type": "float", - "default_value": 100, - "minimum_value": "0.001", - "minimum_value_warning": "25", - "settable_per_mesh": true - }, "wall_overhang_speed_factors": { "label": "Overhanging Wall Speeds", From a758ebb020887920856e2a4945daa048f7a3d721 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Fri, 13 Dec 2024 10:40:54 +0000 Subject: [PATCH 213/276] Applied printer-linter format --- Cura-workflows | 1 + pydir.txt | 1 + 2 files changed, 2 insertions(+) create mode 160000 Cura-workflows create mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 00000000000..5f7ee07a49e --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit 5f7ee07a49ed3a08c1f2ad00c6150908f632b7e9 diff --git a/pydir.txt b/pydir.txt new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/pydir.txt @@ -0,0 +1 @@ + From 50470758b218136560e6a3e3d8ddb32b1df2fae3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 13:33:31 +0100 Subject: [PATCH 214/276] Use proper private materials data --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index dd81e0dcf50..9e4bd1e9c89 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,7 +9,7 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials/5.8.1" + - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" From 97c89edee9579999ead5f45b55a278dc4cd808e0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 15:34:19 +0100 Subject: [PATCH 215/276] Set empty package version for installers by default --- .github/workflows/installers.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index d63ed5bd6be..6dc2df99eb2 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 66975ddf159..e1dd2215322 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 97ea2b25ad6..b5de83128c5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c17d19fd724..af827ba5ea8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: From fb720c3a07f8af300540b21075319c2b1701bc31 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 15:40:15 +0100 Subject: [PATCH 216/276] Set version as not required --- .github/workflows/linux.yml | 1 - .github/workflows/macos.yml | 1 - .github/workflows/windows.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e1dd2215322..e4cb5232406 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b5de83128c5..02be9703ecb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index af827ba5ea8..fe96125dc96 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' From cd49eb3bffa86cec2fe840ed400b03f6041d4099 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 17:27:05 +0100 Subject: [PATCH 217/276] Use proper user for private data --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9e4bd1e9c89..56536e11766 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,7 +10,7 @@ requirements: - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: From 86e799e565ee2ae55eb08c389c42731a39107090 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:21:17 +0100 Subject: [PATCH 218/276] Use fdm_materials_private when appropriate --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 01e2ffb579c..659915b0baf 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ def generate(self): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources From ddb5aee0568bf14cd7c2c3790748e3cb49288ffa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:43:19 +0100 Subject: [PATCH 219/276] Use private data from internal conan-user --- conandata.yml | 4 ++-- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conandata.yml b/conandata.yml index 56536e11766..6bec3ee231e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,8 +9,8 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/conanfile.py b/conanfile.py index 659915b0baf..01e2ffb579c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ def generate(self): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources From 709367419befffdda610850a9905d617d137e082 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 08:44:49 +0100 Subject: [PATCH 220/276] Fix nightly release notes creation --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1f548268938..88352a64528 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -62,7 +62,7 @@ jobs: timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), caller_workflow=caller_workflow, branch="" if is_main else short_version, - branch_specific="" is_main else f"?branch={short_version}", + branch_specific="" if is_main else f"?branch={short_version}", )) - name: Update nightly release description and binaries From e0689f90628a0383a4f9dd7299a52827ea9bd0cb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 09:26:46 +0100 Subject: [PATCH 221/276] Remove scary warning for conan migration --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d3fa8f55ce8..37978a30f91 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@
    -# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️ - [![Badge Issues]][Issues]    [![Badge PullRequests]][PullRequests]    [![Badge Closed]][Closed] From 8fc93278dc304df84adfda9002c15466b44b90ef Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 13:18:48 +0100 Subject: [PATCH 222/276] Revert "Applied printer-linter format" This reverts commit a758ebb020887920856e2a4945daa048f7a3d721. --- Cura-workflows | 1 - pydir.txt | 1 - 2 files changed, 2 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index 5f7ee07a49e..00000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f7ee07a49ed3a08c1f2ad00c6150908f632b7e9 diff --git a/pydir.txt b/pydir.txt deleted file mode 100644 index 8b137891791..00000000000 --- a/pydir.txt +++ /dev/null @@ -1 +0,0 @@ - From 078fccc8393eb11f254948549312b17d8b2d32b3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 13:25:41 +0100 Subject: [PATCH 223/276] Add setting for minimum layer time with overhang CURA-12352 --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ resources/setting_visibility/expert.cfg | 1 + 2 files changed, 14 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 08bfe11d31d..098ab7ec583 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4699,6 +4699,19 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "cool_min_layer_time_overhang": + { + "label": "Minimum Layer Time with Overhang", + "description": "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated.", + "unit": "s", + "type": "float", + "default_value": 5, + "value": "cool_min_layer_time", + "minimum_value": "0", + "maximum_value_warning": "600", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "cool_min_speed": { "label": "Minimum Speed", diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index b13618e5c16..a070b28041a 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -248,6 +248,7 @@ cool_fan_speed_0 cool_fan_full_at_height cool_fan_full_layer cool_min_layer_time +cool_min_layer_time_overhang cool_min_speed cool_lift_head cool_during_extruder_switch From a8860017c7da7f87dfdb804a4ac94fed001ebdab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 15:43:13 +0100 Subject: [PATCH 224/276] Add setting for inner combing distance to walls CURA-12236 --- resources/definitions/fdmprinter.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..d998554b7aa 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4412,6 +4412,21 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "retraction_combing_avoid_distance": + { + "label": "Distance to Walls", + "description": "Preferred distance to outer walls when doing an inside combing travel move.", + "unit": "mm", + "type": "float", + "default_value": 0, + "value": "machine_nozzle_size * 1.5", + "minimum_value": "0", + "minimum_value_warning": "machine_nozzle_size * 0.5", + "maximum_value_warning": "machine_nozzle_size * 10", + "enabled": "resolveOrValue('retraction_combing') != 'off'", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "travel_retract_before_outer_wall": { "label": "Retract Before Outer Wall", From 0785e6f055258107785e7bd20df831d486157cc7 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Mon, 16 Dec 2024 14:44:57 +0000 Subject: [PATCH 225/276] Applied printer-linter format --- Cura-workflows | 1 + package_details.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 160000 Cura-workflows create mode 100644 package_details.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 00000000000..cabc2d7e3cb --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit cabc2d7e3cb6f5b64475de4947f1e0f68f9adf73 diff --git a/package_details.txt b/package_details.txt new file mode 100644 index 00000000000..e8b13f42500 --- /dev/null +++ b/package_details.txt @@ -0,0 +1,42 @@ +author: UltiMaker +build_policy: missing +default_options: + enterprise: False + staging: False + cloud_api_version: 1 + display_name: UltiMaker Cura + cura_debug_mode: False + internal: False + i18n_extract: False +description: 3D printer / slicing GUI built on top of the Uranium framework +generators: ['VirtualPythonEnv'] +label: +languages: [] +license: LGPL-3.0 +name: cura +options: + cloud_api_version: 1 + cura_debug_mode: False + display_name: UltiMaker Cura + enterprise: False + i18n_extract: False + internal: False + staging: False +options_definitions: + enterprise: ['True', 'False'] + staging: ['True', 'False'] + cloud_api_version: ['ANY'] + display_name: ['ANY'] + cura_debug_mode: ['True', 'False'] + internal: ['True', 'False'] + i18n_extract: ['True', 'False'] +package_type: None +python_requires: + translationextractor/2.3.0@ultimaker/stable#d504876a4742c1b92bcd6e1d5ba7509a: {'remote': 'cura-conan2', 'recipe': 'Downloaded', 'path': '/home/runner/.conan2/p/transe0e29f719efb7/e'} +requires: [{'ref': 'gettext/0.22.5', 'run': True, 'libs': False, 'skip': False, 'test': False, 'force': False, 'direct': True, 'build': True, 'transitive_headers': None, 'transitive_libs': None, 'headers': False, 'package_id_mode': None, 'visible': False}] +revision_mode: hash +settings: ['os', 'compiler', 'build_type', 'arch'] +topics: ['conan', 'python', 'pyqt6', 'qt', 'qml', '3d-printing', 'slicer'] +url: https://github.com/Ultimaker/cura +vendor: False +version: 5.10.0-alpha.0 From 0efa90a2c394765f5eba9167eb34b067829fca6a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 09:58:03 +0100 Subject: [PATCH 226/276] Fix release-notes file path --- .github/workflows/nightly.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 88352a64528..500e82c7dbc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -66,11 +66,10 @@ jobs: )) - name: Update nightly release description and binaries - working-directory: installers run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md - for file in "*"; do + for file in "installers/*"; do gh release upload ${{ inputs.release_tag }} $file --clobber done env: From f95d073b1bfc5aef03e095727c7e03cf597fff5b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 16:21:42 +0100 Subject: [PATCH 227/276] Use common linter workflow --- .github/workflows/printer-linter-format.yml | 43 +++++++-------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 9e208f46a47..2b9c592816e 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -1,34 +1,19 @@ name: printer-linter-format on: - push: - paths: - - 'resources/definitions/**' - - 'resources/extruders/**' - - 'resources/intent/**' - - 'resources/quality/**' - - 'resources/variants/**' + push: + paths: + - 'resources/definitions/**' + - 'resources/extruders/**' + - 'resources/intent/**' + - 'resources/quality/**' + - 'resources/variants/**' jobs: - printer-linter-format: - name: Printer linter auto format - - runs-on: ubuntu-latest - steps: - - name: Setup the build environment - uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - - - uses: greguintow/get-diff-action@v7 - with: - PATTERNS: | - resources/+(definitions|extruders)/*.def.json - resources/+(intent|quality|variants)/**/*.inst.cfg - - - name: Format file - if: env.GIT_DIFF && !env.MATCHED_FILES - run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} - - - uses: stefanzweifel/git-auto-commit-action@v4 - if: env.GIT_DIFF && !env.MATCHED_FILES - with: - commit_message: "Applied printer-linter format" + printer-linter-format: + name: Printer linter auto format + uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main + with: + file_patterns: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg + command: python printer-linter/src/terminal.py --format + commit_message: "Apply printer-linter format" From d1932b5bdb81d49da0231574095250758b9fa8a5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 16:32:24 +0100 Subject: [PATCH 228/276] Fix file patterns syntax, maybe --- .github/workflows/printer-linter-format.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 2b9c592816e..246170c1e4a 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -14,6 +14,8 @@ jobs: name: Printer linter auto format uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main with: - file_patterns: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg + file_patterns: | + resources/+(definitions|extruders)/*.def.json + resources/+(intent|quality|variants)/**/*.inst.cfg command: python printer-linter/src/terminal.py --format commit_message: "Apply printer-linter format" From 5ccb96e07bb9d97663f8be48d9a7224e11c82629 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 09:10:56 +0100 Subject: [PATCH 229/276] Adjust nightly builds tags --- .github/workflows/nightly-stable.yml | 2 +- .github/workflows/nightly-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index f548b818751..e166027dd8c 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -11,6 +11,6 @@ jobs: uses: ./.github/workflows/nightly.yml with: cura_conan_version: "cura/[*]@ultimaker/stable" - release_tag: "nightly" + release_tag: "nightly-stable" caller_workflow: "nightly-stable.yml" secrets: inherit diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 160ad5c46dd..c1ccb67f1cb 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -11,6 +11,6 @@ jobs: uses: ./.github/workflows/nightly.yml with: cura_conan_version: "cura/[*]@ultimaker/testing" - release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever + release_tag: "nightly-testing" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" secrets: inherit From 29cb2b121ccd7e69862a426835a77cdd5444028c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 10:24:29 +0100 Subject: [PATCH 230/276] Polish setting name and description CURA-12236 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d998554b7aa..8471c59f828 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4414,8 +4414,8 @@ }, "retraction_combing_avoid_distance": { - "label": "Distance to Walls", - "description": "Preferred distance to outer walls when doing an inside combing travel move.", + "label": "Inside Travel Avoid Distance", + "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.", "unit": "mm", "type": "float", "default_value": 0, From 02ab5dd0bef6098ec844d2e086d9ad174e844981 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Wed, 18 Dec 2024 09:25:46 +0000 Subject: [PATCH 231/276] Applied printer-linter format --- Cura-workflows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cura-workflows b/Cura-workflows index cabc2d7e3cb..7ee2e85d418 160000 --- a/Cura-workflows +++ b/Cura-workflows @@ -1 +1 @@ -Subproject commit cabc2d7e3cb6f5b64475de4947f1e0f68f9adf73 +Subproject commit 7ee2e85d4182f8489a2e6bbd25c0823ad1d69101 From 5f81ba3e018463758d1e708f62e0dbeb9dfe931c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 10:42:09 +0100 Subject: [PATCH 232/276] Remove unwanted files --- Cura-workflows | 1 - package_details.txt | 42 ------------------------------------------ 2 files changed, 43 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 package_details.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index 7ee2e85d418..00000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ee2e85d4182f8489a2e6bbd25c0823ad1d69101 diff --git a/package_details.txt b/package_details.txt deleted file mode 100644 index e8b13f42500..00000000000 --- a/package_details.txt +++ /dev/null @@ -1,42 +0,0 @@ -author: UltiMaker -build_policy: missing -default_options: - enterprise: False - staging: False - cloud_api_version: 1 - display_name: UltiMaker Cura - cura_debug_mode: False - internal: False - i18n_extract: False -description: 3D printer / slicing GUI built on top of the Uranium framework -generators: ['VirtualPythonEnv'] -label: -languages: [] -license: LGPL-3.0 -name: cura -options: - cloud_api_version: 1 - cura_debug_mode: False - display_name: UltiMaker Cura - enterprise: False - i18n_extract: False - internal: False - staging: False -options_definitions: - enterprise: ['True', 'False'] - staging: ['True', 'False'] - cloud_api_version: ['ANY'] - display_name: ['ANY'] - cura_debug_mode: ['True', 'False'] - internal: ['True', 'False'] - i18n_extract: ['True', 'False'] -package_type: None -python_requires: - translationextractor/2.3.0@ultimaker/stable#d504876a4742c1b92bcd6e1d5ba7509a: {'remote': 'cura-conan2', 'recipe': 'Downloaded', 'path': '/home/runner/.conan2/p/transe0e29f719efb7/e'} -requires: [{'ref': 'gettext/0.22.5', 'run': True, 'libs': False, 'skip': False, 'test': False, 'force': False, 'direct': True, 'build': True, 'transitive_headers': None, 'transitive_libs': None, 'headers': False, 'package_id_mode': None, 'visible': False}] -revision_mode: hash -settings: ['os', 'compiler', 'build_type', 'arch'] -topics: ['conan', 'python', 'pyqt6', 'qt', 'qml', '3d-printing', 'slicer'] -url: https://github.com/Ultimaker/cura -vendor: False -version: 5.10.0-alpha.0 From 2ad64e13db5807ee88f0517c54c3e99ca769ae8a Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 18 Dec 2024 18:21:00 +0100 Subject: [PATCH 233/276] Introduce Cheetah flavor --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..8a933838dae 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -384,6 +384,7 @@ "RepRap (RepRap)": "RepRap", "UltiGCode": "Ultimaker 2", "Griffin": "Griffin", + "Cheetah": "Griffin+Cheetah", "Makerbot": "Makerbot", "BFB": "Bits from Bytes", "MACH3": "Mach3", From 0917f10105fe35a3f71ffe1bffc13f716fb9453a Mon Sep 17 00:00:00 2001 From: Frederic98 <13856291+Frederic98@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:43:29 +0100 Subject: [PATCH 234/276] Fix cloud connection for Sketch Sprint and Large --- cura/PrinterOutput/FormatMaps.py | 4 +++- plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py | 2 +- plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 3a03da71fdf..3bb6263a289 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -13,7 +13,9 @@ class FormatMaps: "fire_e": "ultimaker_method", "lava_f": "ultimaker_methodx", "magma_10": "ultimaker_methodxl", - "sketch": "ultimaker_sketch" + "sketch": "ultimaker_sketch", + "sketch_large": "ultimaker_sketch_large", + "sketch_sprint": "ultimaker_sketch_sprint" } # A map from the extruder-name in their native file-formats to the internal name we use. diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 4ca83772f29..090355a3c05 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -331,7 +331,7 @@ def isMethod(self) -> bool: return False [printer, *_] = self._printers - return printer.type in ("MakerBot Method X", "MakerBot Method XL", "MakerBot Sketch") + return printer.type in ("MakerBot Method", "MakerBot Method X", "MakerBot Method XL", "MakerBot Sketch", "MakerBot Sketch Large", "MakerBot Sketch Sprint") @pyqtProperty(bool, notify=_cloudClusterPrintersChanged) def supportsPrintJobActions(self) -> bool: diff --git a/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json b/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json index 9d0db2a30d3..6b99f740620 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json +++ b/plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json @@ -3,5 +3,7 @@ "ultimaker_methodx": "MakerBot Method X", "ultimaker_methodxl": "MakerBot Method XL", "ultimaker_factor4": "Ultimaker Factor 4", - "ultimaker_sketch": "MakerBot Sketch" + "ultimaker_sketch": "MakerBot Sketch", + "ultimaker_sketch_large": "MakerBot Sketch Large", + "ultimaker_sketch_sprint": "MakerBot Sketch Sprint" } From 2951a6b0f79e247bd9fd943b444844a1ffe06704 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:25:16 +0100 Subject: [PATCH 235/276] Fix nightly release notes syntax --- .github/workflows/nightly_release_notes.md.jinja | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index 62edf164084..a3e7b96362b 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,8 +4,7 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }} -?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | +| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results From 345980026c92e1064d87dc4d7e79a2c5b3f5d7cc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:29:02 +0100 Subject: [PATCH 236/276] Display proper CuraEngine packaging action result --- .github/workflows/nightly_release_notes.md.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index a3e7b96362b..ccd807d23dd 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -23,7 +23,7 @@ | | | |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) | -| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml) | +| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | | **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) | | **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) | | **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) | From 07880cd590dfee1005927b92d3134b962487ace0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:33:41 +0100 Subject: [PATCH 237/276] Always display sub-packages main branch results --- .github/workflows/nightly.yml | 1 - .../workflows/nightly_release_notes.md.jinja | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 500e82c7dbc..d77cac79902 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -61,7 +61,6 @@ jobs: f.write(release_notes.render( timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), caller_workflow=caller_workflow, - branch="" if is_main else short_version, branch_specific="" if is_main else f"?branch={short_version}", )) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index ccd807d23dd..a14c8d76a08 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,17 +4,17 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | +| **Nightlies** | [![nightly](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results | | | |-------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **Cura {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) | -| **CuraEngine {{ branch }}** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) | -| **Uranium {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) | -| **CuraEngine GradualFlow 0.1** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) | -| **synsepalum-dulcificum 0.1** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) | +| **Cura** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) | +| **CuraEngine** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) | +| **Uranium** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) | +| **CuraEngine GradualFlow** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) | +| **synsepalum-dulcificum** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) | | **libSavitar** | [![unit-test](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml) | | **libnest2d** | [![unit-test](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml) | @@ -22,14 +22,14 @@ | | | |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) | -| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | -| **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) | -| **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) | -| **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) | -| **CuraEngine GradualFlow 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) | -| **synsepalum-dulcificum 0.1** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) | -| **CuraEngine gRPC definitions 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) | +| **Cura** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) | +| **CuraEngine** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | +| **Uranium** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) | +| **fdm_materials** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) | +| **cura-binary-data** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) | +| **CuraEngine GradualFlow** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) | +| **synsepalum-dulcificum** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) | +| **CuraEngine gRPC definitions** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) | | **libArcus** | [![conan-package](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml) | | **pyArcus** | [![conan-package](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml) | | **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml) | From f17872725ada7803bdf53027d4cf7b6117a06dd6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 14:42:53 +0100 Subject: [PATCH 238/276] Set proper method to define env variables --- resources/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/conanfile.py b/resources/conanfile.py index aea89f4569f..cebaea4345d 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -46,9 +46,9 @@ def package(self): def package_info(self): self.cpp_info.includedirs = [] - self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res")) - self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) - self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) + self.runenv_info.define("CURA_RESOURCES", os.path.join(self.package_folder, "res")) + self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) + self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) def package_id(self): self.info.clear() From 382b98e8b0c910fdf8b1509557ae8afab38f1817 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 15:19:24 +0100 Subject: [PATCH 239/276] Fix wrong setting version on profiles --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 120 files changed, 120 insertions(+), 120 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index d89894647cb..9819984b71a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index e3d0252d492..05d0a504e90 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index ab3e3e17ea2..e1111c1026b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index b9e9565c3c0..b4e2f497797 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 991ac5d1010..10f80e47852 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index e148d1c4b65..c84b36660ba 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 9b9a0ffee9f..c6eb62e1b6b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index d134c72fdb7..f2e5706e310 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index e7b6b714fb6..9324b9ba0e7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index a93e0bd832d..862586934ed 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index ee2404bc086..ee753c59cff 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 6931141a6fa..35054797742 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index 895ff9daf49..dcf9a6fe45c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index f10be46a983..b79bb0e0966 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 2b7356f1a55..0d85a07e9c3 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index 542b8d29869..734e32367ce 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 2ce1651a4c8..97c131f56ba 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index cac8e008e96..3da38499eed 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 616a9537c80..aaa65f6439f 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 75ed433d4cd..cd98f31944f 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 217caf56592..c8bfbf11a34 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index bd067c1827e..e14363b52db 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 05000e8e19e..c476909acf2 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index a9347074515..376ddc9f116 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index 49bdf430a35..dbac6990bff 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 531dcb8b391..990496f4d96 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 656d982e010..3a58e94bc17 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index 3b0eb953ba1..13b1d6c2f07 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 51128170f46..21843a75c97 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 00ba1c82677..9b982421ed7 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 57751118f94..633abd8caa0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 4016f5584e6..fe16e614b00 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index b7474b0cbd1..bb5a5abf6c3 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index de76119db32..8820ff968cb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 48191495900..917e90cf7f3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index 777d39748c5..1cb5221228c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index 294d9c66b8a..3a18c9f8c19 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index 53497d79238..b8865a8af84 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index 43a0ffa1add..983addb7075 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 8c737fbf042..80328cf24fb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 2d4595f38e7..a0e8fa9446b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 7b8ecd49579..27dccc84ed3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index cc323328b34..6b6e07d2526 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index fcdc58c5d03..1a9e191377c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 63d675bb68a..e467bdc3d33 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index e948b334dad..90e70de3195 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index 5b11b8a69a8..b4a86e68d86 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index ebb14aab785..4e97f5035e7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 0fc5fbe8d59..465abff92e2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index efcf6f0246d..872f7a33133 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index 670e236a79a..0e252d6c8d0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 878507ce990..29a9a6dcfc4 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index f4f6b4dfff2..9f25c84c7cb 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 7fa652d8551..a331f526c61 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 898a271b49c..a6a095226ff 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index b7aaa1f7a28..a5e7c741864 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index f05f6527836..08fee402c50 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index 4bb9372a9bc..67368a8f184 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index fbb74fb9ca4..d62d2bf669b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 3e8e8195bce..573dd89ea50 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 66b0fd971ce..ac210cfdc15 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 26bdebd1b25..1a0a40ba8a6 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index 4e5662790be..aab8ba5499f 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 5e053d8bc49..7438b747db3 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index d2b06a4d31e..9da50270b28 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index b6a752f140c..7dec53da68c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 51da4e343b7..186d2ad149e 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 77aebb66d9a..81d541a38ba 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index 9b99c0eef3c..78628ebbc47 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index a6b11d0f459..af96ecd40d3 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 6b74da6994c..1bb40fb822b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 431ecc57e97..34c27750dc5 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 94fa58ec41e..74e38683e2b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index ed6e3bbd967..8da78abc98a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 49e348299b9..3620d1c44c3 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 2d1e463704f..8593ee439eb 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 4a61f16bb9c..b5220d0a374 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 3906f5a5a31..7fd15f3ffb0 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 6316562eec0..f1446254a20 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 51f85f9d603..dd518500b3c 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index def6946bf15..94def9aa8f2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 13df7a17fef..4ba5c656f24 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index f7f4de0b259..ed1a9d44e85 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 0f7fdf0238e..c24f0543048 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index d41c1552341..62e5ac1d1e5 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 9c69b07258e..f74b6150740 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 5b35eec0b71..ac5377a9fad 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 470729ca7c1..78c4f59752c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index e2b949208e9..97cc5bd2882 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index e6309376564..98f7f15cb3c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index a026d13755a..bbc2b959f05 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 2551c5085d9..211c9317fe0 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 03d7a5de608..776d93e8573 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index bc372dae4bb..2ffba84452e 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 41af7ad5525..500999a45f7 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 990bb0d5187..9bd3bc46a3f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index 8a739087b3d..cad3c1ae889 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 7fae42c017e..ee3accfaba8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index 81f7a4affdb..a326841ab09 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index f8382a17f7d..7e9fd11c83a 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index a9c02df5d2c..29df645cce8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index f3920f61e85..a064df9b4bf 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 3be4231e8b7..daeb14d8632 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 7ac9945261d..214ebfcaa14 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 79e3d1d86a1..e4fb8078cb0 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index b48aadb0e4e..421af6a4b12 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index cabb3d90206..7b7d35e6b78 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 30d016cf2c6..455b0031c4c 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 57ddcf68f4b..5422b31737a 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 5de4dff5123..c74b5ec7f9d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 0fdf7be51cf..b37f33ef17f 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 374535d12f9..1b364cc93cf 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 9790b61217f..0ccc19d7797 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index a395749b1d5..ec266f9e8a9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index d5ca080c10d..34cfd8d7586 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 212b8b9ba5f..85031171264 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index 441cbb9d4f1..800f262b7c5 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d431a471c7e..fc11f589311 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index e611c83dd9d..9fc17ac4d67 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 041a037ed06..b8b4cb618d2 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm From 66402ff93c19d684d82c10a87b2a3a08f47b0630 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 9 Jan 2025 09:19:41 +0100 Subject: [PATCH 240/276] Use single extruder when exporting for Replicator+ CURA-12313 --- conandata.yml | 2 +- plugins/MakerbotWriter/MakerbotWriter.py | 9 +++++++++ plugins/MakerbotWriter/__init__.py | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 6bec3ee231e..36fd494356b 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/5.10.0-alpha.0@ultimaker/testing" - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing" - "fdm_materials/5.10.0-alpha.0@ultimaker/testing" - - "dulcificum/0.2.1@ultimaker/stable" + - "dulcificum/0.3.0@ultimaker/cura_12313" - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 5c655dc8cc3..f35b53a84d4 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -46,6 +46,13 @@ def __init__(self) -> None: suffixes=["makerbot"] ) ) + MimeTypeDatabase.addMimeType( + MimeType( + name="application/x-makerbot-replicator_plus", + comment="Makerbot Toolpath Package", + suffixes=["makerbot"] + ) + ) _PNG_FORMAT = [ {"prefix": "isometric_thumbnail", "width": 120, "height": 120}, @@ -114,6 +121,8 @@ def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode=MeshWriter. filename, filedata = "print.gcode", gcode_text_io.getvalue() case "application/x-makerbot": filename, filedata = "print.jsontoolpath", du.gcode_2_miracle_jtp(gcode_text_io.getvalue()) + case "application/x-makerbot-replicator_plus": + filename, filedata = "print.jsontoolpath", du.gcode_2_miracle_jtp(gcode_text_io.getvalue(), nb_extruders=1) case _: raise Exception("Unsupported Mime type") diff --git a/plugins/MakerbotWriter/__init__.py b/plugins/MakerbotWriter/__init__.py index 60f232fbc01..bd766add8e3 100644 --- a/plugins/MakerbotWriter/__init__.py +++ b/plugins/MakerbotWriter/__init__.py @@ -25,6 +25,12 @@ def getMetaData(): "description": catalog.i18nc("@item:inlistbox", "Makerbot Sketch Printfile"), "mime_type": "application/x-makerbot-sketch", "mode": MakerbotWriter.MakerbotWriter.OutputMode.BinaryMode, + }, + { + "extension": file_extension, + "description": catalog.i18nc("@item:inlistbox", "Makerbot Replicator+ Printfile"), + "mime_type": "application/x-makerbot-replicator_plus", + "mode": MakerbotWriter.MakerbotWriter.OutputMode.BinaryMode, } ] }, From 3276fc2eb6e00c1e258967fc0382451321dbd3d6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 9 Jan 2025 13:54:58 +0100 Subject: [PATCH 241/276] Add setting to filter out layers that have small overhanging faetures CURA-12352 --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 098ab7ec583..67e9a8439ad 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4712,6 +4712,18 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "cool_min_layer_time_overhang_min_segment_length": + { + "label": "Minimum Overhang Segment Length", + "description": "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value.", + "unit": "mm", + "type": "float", + "default_value": 5, + "minimum_value": "0", + "maximum_value_warning": "500", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "cool_min_speed": { "label": "Minimum Speed", From 87072cc0fedaa9d593d73895d1b5fb1c1008f8de Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 9 Jan 2025 17:51:33 -0500 Subject: [PATCH 242/276] Add metallic PLA quality files for Sketch printers Previously we used the PLA quality files to print Metallic PLA. There were drastic differences in surface quality (matte vs shiny). The temperature increase to 230 addresses the surface differences. We reduced the print speed to stay within the max flowrate of 12 mm^3/s. Additionally, the infill rotation was enabled for Metallic PLA (Similar to Sketch PLA infill). Some other speed adjustments were made (walls, roof, support interface, support bottom). These were paths that got slowed down too much when adjusting the global print speed. These adjustments were made to make up some of the lost speed without sacrificing print quality. The previous support material flow value was set to 90%. We increased it by 2% to limit under-extrusion, which is more pronounced at the higher nozzle temperature. PP-552 --- .../definitions/ultimaker_sketch.def.json | 1 - .../ultimaker_sketch_sprint.def.json | 3 +- ...h_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg | 15 ++++++++++ ...e_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg | 15 ++++++++++ ...t_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg | 28 +++++++++++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 2f96b52397f..1c316709681 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -52,7 +52,6 @@ "ultimaker_rapidrinse", "ultimaker_sr30", "ultimaker_petg", - "ultimaker_metallic_pla", "basf_", "jabil_", "polymaker_", diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index cde655e70f6..354808c580d 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -53,8 +53,7 @@ "ultimaker_pva", "ultimaker_rapidrinse", "ultimaker_sr30", - "ultimaker_petg", - "ultimaker_metallic_pla" + "ultimaker_petg" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg new file mode 100644 index 00000000000..7e3fa34166e --- /dev/null +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch +name = Fast +version = 4 + +[metadata] +material = ultimaker_metallic_pla_175 +quality_type = draft +setting_version = 24 +type = quality +variant = 0.4mm +weight = -2 + +[values] + diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg new file mode 100644 index 00000000000..b9ea5d2aecb --- /dev/null +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_large +name = Fast +version = 4 + +[metadata] +material = ultimaker_metallic_pla_175 +quality_type = draft +setting_version = 24 +type = quality +variant = 0.4mm +weight = -2 + +[values] + diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg new file mode 100644 index 00000000000..dd752baffa8 --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-metallic-pla-175_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_sketch_sprint +name = Fast +version = 4 + +[metadata] +material = ultimaker_metallic_pla_175 +quality_type = draft +setting_version = 24 +type = quality +variant = 0.4mm +weight = -2 + +[values] +cool_min_temperature = 230 +infill_angles = [45,45,45,45,45,135,135,135,135,135] +material_final_print_temperature = 230 +material_initial_print_temperature = 230 +speed_print = 125 +speed_roofing = 100 +speed_support_bottom = 100 +speed_support_interface = 125 +speed_topbottom = 100 +speed_wall = 75 +speed_wall_x = 100 +support_material_flow = 92 +wall_overhang_speed_factor = 23 + From 5ecfa59c9491b9533ab807d86d85c7b97d3ab742 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 10 Jan 2025 09:42:06 -0500 Subject: [PATCH 243/276] Removed metallic PLA from Sketch exclude list PP-552 --- resources/definitions/ultimaker_sketch.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 1c316709681..f746417e708 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -58,8 +58,7 @@ "ultimaker_rapidrinse", "ultimaker_sr30", "ultimaker_petg", - "ultimaker_pva", - "ultimaker_metallic_pla" + "ultimaker_pva" ], "has_machine_quality": true, "has_materials": true, From 2db4d16a80bb0b449871399b8d236205e58c09b9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 16 Jan 2025 13:26:08 +0100 Subject: [PATCH 244/276] Update altered overhang wall-speed setting to new version. part of CURA-12352 --- resources/definitions/ankermake_m5.def.json | 2 +- resources/definitions/ankermake_m5c.def.json | 2 +- resources/definitions/atmat_signal_pro_base.def.json | 2 +- resources/definitions/blocks_base.def.json | 2 +- resources/definitions/gutenberg_base.def.json | 2 +- resources/definitions/lotmaxx_sc60.def.json | 2 +- resources/definitions/snakeoil_standard_base.def.json | 2 +- resources/definitions/ultimaker_sketch_sprint.def.json | 4 ++-- resources/definitions/voron2_base.def.json | 2 +- resources/definitions/vzbot_base.def.json | 2 +- resources/quality/flsun_v400/flsun_v400_normal.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1c_um-abscf-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1c_um-absr-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1xa_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1xa_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1xa_um-asa-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-abscf-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-asa-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-asa-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-absr-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-asa-175_0.2mm.inst.cfg | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index 4a70851e33a..5e4d77cf396 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -120,7 +120,7 @@ "support_z_distance": { "value": "layer_height * 2" }, "top_bottom_thickness": { "value": "layer_height * 4" }, "wall_overhang_angle": { "value": 55 }, - "wall_overhang_speed_factor": { "value": 55 }, + "wall_overhang_speed_factors": { "value": [55] }, "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" } } } \ No newline at end of file diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json index 131bd6bd7a8..ade5c3f40c0 100644 --- a/resources/definitions/ankermake_m5c.def.json +++ b/resources/definitions/ankermake_m5c.def.json @@ -238,7 +238,7 @@ "wall_extruder_nr": { "value": -1 }, "wall_line_width_0": { "value": 0.44 }, "wall_overhang_angle": { "value": 45 }, - "wall_overhang_speed_factor": { "value": 40 }, + "wall_overhang_speed_factors": { "value": [40] }, "wall_thickness": { "value": 0.84 }, "wall_x_extruder_nr": { "value": -1 }, "zig_zaggify_infill": { "value": true } diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index cd59e1c1691..78eccf4a56d 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -167,7 +167,7 @@ "travel_avoid_supports": { "value": "True" }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "value": "75" }, - "wall_overhang_speed_factor": { "value": "50" }, + "wall_overhang_speed_factors": { "value": [50] }, "zig_zaggify_infill": { "value": "True" } } } \ No newline at end of file diff --git a/resources/definitions/blocks_base.def.json b/resources/definitions/blocks_base.def.json index fde5f912da1..64e4213d5f0 100644 --- a/resources/definitions/blocks_base.def.json +++ b/resources/definitions/blocks_base.def.json @@ -107,7 +107,7 @@ "travel_retract_before_outer_wall": { "value": true }, "wall_0_wipe_dist": { "value": 0.0 }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, + "wall_overhang_speed_factors": { "default_value": "[50]" }, "wall_thickness": { "value": "line_width * 2" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, "z_seam_type": { "value": "'back'" } diff --git a/resources/definitions/gutenberg_base.def.json b/resources/definitions/gutenberg_base.def.json index f0329bef6de..b1d0e766864 100644 --- a/resources/definitions/gutenberg_base.def.json +++ b/resources/definitions/gutenberg_base.def.json @@ -109,7 +109,7 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, + "wall_overhang_speed_factors": { "default_value": [50] }, "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/lotmaxx_sc60.def.json b/resources/definitions/lotmaxx_sc60.def.json index f4ce358be1e..f6deef13581 100644 --- a/resources/definitions/lotmaxx_sc60.def.json +++ b/resources/definitions/lotmaxx_sc60.def.json @@ -61,7 +61,7 @@ "support_pattern": { "default_value": "lines" }, "switch_extruder_retraction_amount": { "value": 100 }, "switch_extruder_retraction_speeds": { "value": 60 }, - "wall_overhang_speed_factor": { "value": 50 }, + "wall_overhang_speed_factors": { "value": [50] }, "z_seam_corner": { "default_value": "z_seam_corner_any" }, "z_seam_relative": { "value": true }, "z_seam_type": { "default_value": "sharpest_corner" }, diff --git a/resources/definitions/snakeoil_standard_base.def.json b/resources/definitions/snakeoil_standard_base.def.json index 700edf3d352..59faf27d3b7 100644 --- a/resources/definitions/snakeoil_standard_base.def.json +++ b/resources/definitions/snakeoil_standard_base.def.json @@ -109,7 +109,7 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, + "wall_overhang_speed_factors": { "default_value": [50] }, "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index cde655e70f6..66a4a442682 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -380,10 +380,10 @@ "wall_0_wipe_dist": { "value": 0.2 }, "wall_line_width_x": { "value": 0.58 }, "wall_overhang_angle": { "value": 35 }, - "wall_overhang_speed_factor": + "wall_overhang_speed_factors": { "minimum_value_warning": 15, - "value": 17.5 + "value": [18] }, "wall_thickness": { "value": 1 }, "wall_x_material_flow_layer_0": { "value": "material_flow" }, diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index dc6cd255bb1..a8cd73a3c59 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -119,7 +119,7 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, + "wall_overhang_speed_factors": { "default_value": [50] }, "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index 4efdbc2f66b..cc44dbc6c66 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -195,7 +195,7 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, + "wall_overhang_speed_factors": { "default_value": [50] }, "xy_offset_layer_0": { "value": -0.3 }, "z_seam_type": { "value": "'back'" }, "zig_zaggify_infill": { "value": true } diff --git a/resources/quality/flsun_v400/flsun_v400_normal.inst.cfg b/resources/quality/flsun_v400/flsun_v400_normal.inst.cfg index 50ed6266a08..d058a2d219c 100644 --- a/resources/quality/flsun_v400/flsun_v400_normal.inst.cfg +++ b/resources/quality/flsun_v400/flsun_v400_normal.inst.cfg @@ -115,7 +115,7 @@ travel_avoid_other_parts = True travel_avoid_supports = True travel_retract_before_outer_wall = False wall_overhang_angle = 35.0 -wall_overhang_speed_factor = 60.0 +wall_overhang_speed_factors = [60] wall_thickness = =line_width*2 z_seam_corner = z_seam_corner_inner z_seam_position = backright diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg index 4f5ae8282da..cf7eab6e73e 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg @@ -59,5 +59,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg index 0ff8f110910..f0eafdde7ed 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg @@ -52,5 +52,5 @@ support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 wall_overhang_angle = 30 -wall_overhang_speed_factor = 50 +wall_overhang_speed_factors = [50] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg index ff1861c6956..057ae522edd 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg @@ -58,5 +58,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg index fe6c6fa10c4..7e03bcd23ca 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg index 45e11f5e9d8..f2a60264b19 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg @@ -59,5 +59,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg index 18b44fda57a..e87533888b1 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg @@ -58,5 +58,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg index 774b8fb2a8c..1ad566527fe 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg index e9d09c2c34c..795235c75e3 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg @@ -54,5 +54,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.22 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg index a5f7d05d6ed..c4ab6ee1155 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg @@ -59,5 +59,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg index 56e2126cb2e..25dbd1868aa 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg @@ -52,5 +52,5 @@ support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 wall_overhang_angle = 30 -wall_overhang_speed_factor = 50 +wall_overhang_speed_factors = [50] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg index 7447dc5085d..8b19d722d4e 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg @@ -58,5 +58,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg index d2f64e3b656..c19ff979bfd 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg index caf364adc90..fe70d6d0c62 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg @@ -59,5 +59,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg index e4a889749a3..d4d053df9f9 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg @@ -54,5 +54,5 @@ support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 wall_overhang_angle = 30 -wall_overhang_speed_factor = 50 +wall_overhang_speed_factors = [50] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg index a08dd10302e..29b3de7eac4 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg index 420a7192352..a3b23179cb7 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg index 39b7d69230b..e31448572eb 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg @@ -59,5 +59,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg index 84086e1856d..3596d120959 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg index 155696925f4..5d3c07cde91 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg index a075d5ffe60..29433f83875 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg @@ -54,5 +54,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.22 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg index 3309bb6660e..627ff55215f 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg @@ -59,5 +59,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg index 6596cdd4df9..71bcca17c01 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg @@ -54,5 +54,5 @@ support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 wall_overhang_angle = 30 -wall_overhang_speed_factor = 50 +wall_overhang_speed_factors = [50] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg index e7a46cdcee2..fa7a1b5e56b 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg index 972840dde0c..d9f9ba645e0 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg @@ -57,5 +57,5 @@ support_xy_overrides_z = xy_overrides_z support_z_distance = 0.15 top_skin_expand_distance = 2.4 wall_overhang_angle = 30 -wall_overhang_speed_factor = 40 +wall_overhang_speed_factors = [40] From 2ca18cc2056c883b8a346446e3efd7e9ffd60c51 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 16 Jan 2025 13:27:28 +0100 Subject: [PATCH 245/276] Add version-upgrader to 5.10 Nescesary because of the updated overhang wall-speed setting. part of CURA-12352 --- .../VersionUpgrade59to510.py | 68 +++++++++++++++++++ .../VersionUpgrade59to510/__init__.py | 60 ++++++++++++++++ .../VersionUpgrade59to510/plugin.json | 8 +++ 3 files changed, 136 insertions(+) create mode 100644 plugins/VersionUpgrade/VersionUpgrade59to510/VersionUpgrade59to510.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade59to510/__init__.py create mode 100644 plugins/VersionUpgrade/VersionUpgrade59to510/plugin.json diff --git a/plugins/VersionUpgrade/VersionUpgrade59to510/VersionUpgrade59to510.py b/plugins/VersionUpgrade/VersionUpgrade59to510/VersionUpgrade59to510.py new file mode 100644 index 00000000000..70190b6e7ff --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade59to510/VersionUpgrade59to510.py @@ -0,0 +1,68 @@ +import configparser +import io +from typing import Dict, Tuple, List + +from UM.VersionUpgrade import VersionUpgrade + +_RENAMED_SETTINGS = { + "wall_overhang_speed_factor": "wall_overhang_speed_factors" +} # type: Dict[str, str] + +_NEW_SETTING_VERSION = "25" + + +class VersionUpgrade59to510(VersionUpgrade): + def upgradePreferences(self, serialized: str, filename: str): + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Fix 'renamed'(ish) settings for visibility + if "visible_settings" in parser["general"]: + all_setting_keys = parser["general"]["visible_settings"].strip().split(";") + if all_setting_keys: + for idx, key in enumerate(all_setting_keys): + if key in _RENAMED_SETTINGS: + all_setting_keys[idx] = _RENAMED_SETTINGS[key] + parser["general"]["visible_settings"] = ";".join(all_setting_keys) + + # Update version number. + parser["metadata"]["setting_version"] = _NEW_SETTING_VERSION + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ()) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = _NEW_SETTING_VERSION + + if "values" in parser: + for old_name, new_name in _RENAMED_SETTINGS.items(): + if old_name in parser["values"]: + parser["values"][new_name] = parser["values"][old_name] + del parser["values"][old_name] + if "wall_overhang_speed_factors" in parser["values"]: + old_value = float(parser["values"]["wall_overhang_speed_factors"]) + new_value = [max(1, int(round(old_value)))] + parser["values"]["wall_overhang_speed_factor"] = str(new_value) + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + if "metadata" not in parser: + parser["metadata"] = {} + + parser["metadata"]["setting_version"] = _NEW_SETTING_VERSION + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade59to510/__init__.py b/plugins/VersionUpgrade/VersionUpgrade59to510/__init__.py new file mode 100644 index 00000000000..4c2b2622b1b --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade59to510/__init__.py @@ -0,0 +1,60 @@ +# Copyright (c) 2024 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade59to510 + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade59to510.VersionUpgrade59to510() + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("preferences", 7000024): ("preferences", 7000025, upgrade.upgradePreferences), + ("machine_stack", 6000024): ("machine_stack", 6000025, upgrade.upgradeStack), + ("extruder_train", 6000024): ("extruder_train", 6000025, upgrade.upgradeStack), + ("definition_changes", 4000024): ("definition_changes", 4000025, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000024): ("quality_changes", 4000025, upgrade.upgradeInstanceContainer), + ("quality", 4000024): ("quality", 4000025, upgrade.upgradeInstanceContainer), + ("user", 4000024): ("user", 4000025, upgrade.upgradeInstanceContainer), + ("intent", 4000024): ("intent", 4000025, upgrade.upgradeInstanceContainer), + }, + "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "definition_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./definition_changes"} + }, + "quality_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality_changes"} + }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, + "user": { + "get_version": upgrade.getCfgVersion, + "location": {"./user"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade59to510/plugin.json b/plugins/VersionUpgrade/VersionUpgrade59to510/plugin.json new file mode 100644 index 00000000000..f06d6b31610 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade59to510/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 5.9 to 5.10", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 5.9 to Cura 5.10", + "api": 8, + "i18n-catalog": "cura" +} From fbe871778a84063414f300efaf422de279983b5b Mon Sep 17 00:00:00 2001 From: rburema <41987080+rburema@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:28:50 +0000 Subject: [PATCH 246/276] Apply printer-linter format --- resources/definitions/ankermake_m5.def.json | 7 ++++++- resources/definitions/ankermake_m5c.def.json | 7 ++++++- resources/definitions/atmat_signal_pro_base.def.json | 7 ++++++- resources/definitions/gutenberg_base.def.json | 7 ++++++- resources/definitions/lotmaxx_sc60.def.json | 7 ++++++- resources/definitions/snakeoil_standard_base.def.json | 7 ++++++- resources/definitions/ultimaker_sketch_sprint.def.json | 4 +++- resources/definitions/voron2_base.def.json | 7 ++++++- resources/definitions/vzbot_base.def.json | 7 ++++++- 9 files changed, 51 insertions(+), 9 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index 5e4d77cf396..a4bc967108c 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -120,7 +120,12 @@ "support_z_distance": { "value": "layer_height * 2" }, "top_bottom_thickness": { "value": "layer_height * 4" }, "wall_overhang_angle": { "value": 55 }, - "wall_overhang_speed_factors": { "value": [55] }, + "wall_overhang_speed_factors": + { + "value": [ + 55 + ] + }, "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" } } } \ No newline at end of file diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json index ade5c3f40c0..3e1d7db0a93 100644 --- a/resources/definitions/ankermake_m5c.def.json +++ b/resources/definitions/ankermake_m5c.def.json @@ -238,7 +238,12 @@ "wall_extruder_nr": { "value": -1 }, "wall_line_width_0": { "value": 0.44 }, "wall_overhang_angle": { "value": 45 }, - "wall_overhang_speed_factors": { "value": [40] }, + "wall_overhang_speed_factors": + { + "value": [ + 40 + ] + }, "wall_thickness": { "value": 0.84 }, "wall_x_extruder_nr": { "value": -1 }, "zig_zaggify_infill": { "value": true } diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 78eccf4a56d..01ecc1bdfec 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -167,7 +167,12 @@ "travel_avoid_supports": { "value": "True" }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "value": "75" }, - "wall_overhang_speed_factors": { "value": [50] }, + "wall_overhang_speed_factors": + { + "value": [ + 50 + ] + }, "zig_zaggify_infill": { "value": "True" } } } \ No newline at end of file diff --git a/resources/definitions/gutenberg_base.def.json b/resources/definitions/gutenberg_base.def.json index b1d0e766864..335718c21af 100644 --- a/resources/definitions/gutenberg_base.def.json +++ b/resources/definitions/gutenberg_base.def.json @@ -109,7 +109,12 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factors": { "default_value": [50] }, + "wall_overhang_speed_factors": + { + "default_value": [ + 50 + ] + }, "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/lotmaxx_sc60.def.json b/resources/definitions/lotmaxx_sc60.def.json index f6deef13581..f283e564423 100644 --- a/resources/definitions/lotmaxx_sc60.def.json +++ b/resources/definitions/lotmaxx_sc60.def.json @@ -61,7 +61,12 @@ "support_pattern": { "default_value": "lines" }, "switch_extruder_retraction_amount": { "value": 100 }, "switch_extruder_retraction_speeds": { "value": 60 }, - "wall_overhang_speed_factors": { "value": [50] }, + "wall_overhang_speed_factors": + { + "value": [ + 50 + ] + }, "z_seam_corner": { "default_value": "z_seam_corner_any" }, "z_seam_relative": { "value": true }, "z_seam_type": { "default_value": "sharpest_corner" }, diff --git a/resources/definitions/snakeoil_standard_base.def.json b/resources/definitions/snakeoil_standard_base.def.json index 59faf27d3b7..16bec696367 100644 --- a/resources/definitions/snakeoil_standard_base.def.json +++ b/resources/definitions/snakeoil_standard_base.def.json @@ -109,7 +109,12 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factors": { "default_value": [50] }, + "wall_overhang_speed_factors": + { + "default_value": [ + 50 + ] + }, "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 66a4a442682..dbe9171817d 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -383,7 +383,9 @@ "wall_overhang_speed_factors": { "minimum_value_warning": 15, - "value": [18] + "value": [ + 18 + ] }, "wall_thickness": { "value": 1 }, "wall_x_material_flow_layer_0": { "value": "material_flow" }, diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index a8cd73a3c59..d08166d60d2 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -119,7 +119,12 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factors": { "default_value": [50] }, + "wall_overhang_speed_factors": + { + "default_value": [ + 50 + ] + }, "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index cc44dbc6c66..a447f1acdbb 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -195,7 +195,12 @@ "travel_avoid_other_parts": { "default_value": false }, "wall_line_width": { "value": "machine_nozzle_size" }, "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factors": { "default_value": [50] }, + "wall_overhang_speed_factors": + { + "default_value": [ + 50 + ] + }, "xy_offset_layer_0": { "value": -0.3 }, "z_seam_type": { "value": "'back'" }, "zig_zaggify_infill": { "value": true } From 43b19c34457d3c861a7e9b0d9fd63475acdcf4ae Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 17 Jan 2025 17:57:58 -0500 Subject: [PATCH 247/276] PP-554 Kedge Visual Intents * The settings used in the Visual intent profile improve the roof quality * Settings include temp adjustments, line widths, small features, hole, roof accel & speed * These apply to PLA & TPLA * all of the visual intents are marked as experimental for Cura 5.10 PP-554 --- ...int_0.4mm_um-pla-175_0.2mm_visual.inst.cfg | 42 +++++++++++++++++++ ...4mm_um-tough-pla-175_0.2mm_visual.inst.cfg | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg create mode 100644 resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg diff --git a/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg new file mode 100644 index 00000000000..6a81905545a --- /dev/null +++ b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = ultimaker_sketch_sprint +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla_175 +quality_type = draft +setting_version = 24 +type = intent +variant = 0.4mm + +[values] +acceleration_roofing = 1500 +acceleration_wall_0_roofing = 1500 +acceleration_wall_x_roofing = 1500 +cool_min_temperature = 220.0 +hole_xy_offset = 0.2 +hole_xy_offset_max_diameter = 3 +inset_direction = inside_out +line_width = 0.4 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +min_bead_width = 0.34 +min_wall_line_width = 0.34 +roofing_line_width = 0.35 +roofing_monotonic = False +roofing_pattern = lines +skin_monotonic = False +skin_outline_count = 0 +skin_overlap = 25 +small_feature_max_length = 25 +small_feature_speed_factor = 40 +small_hole_max_size = 4.5 +small_skin_width = 4 +speed_roofing = 100 +wall_line_width_x = 0.4 +z_seam_type = back + diff --git a/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg new file mode 100644 index 00000000000..1635985b89f --- /dev/null +++ b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = ultimaker_sketch_sprint +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 24 +type = intent +variant = 0.4mm + +[values] +acceleration_roofing = 1500 +acceleration_wall_0_roofing = 1500 +acceleration_wall_x_roofing = 1500 +cool_min_temperature = 220.0 +hole_xy_offset = 0.2 +hole_xy_offset_max_diameter = 3 +inset_direction = inside_out +line_width = 0.4 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +min_bead_width = 0.34 +min_wall_line_width = 0.34 +roofing_line_width = 0.35 +roofing_monotonic = False +roofing_pattern = lines +skin_monotonic = False +skin_outline_count = 0 +skin_overlap = 25 +small_feature_max_length = 25 +small_feature_speed_factor = 40 +small_hole_max_size = 4.5 +small_skin_width = 4 +speed_roofing = 100 +wall_line_width_x = 0.4 +z_seam_type = back + From 73519a3cdc6569c9e8e5bf011514bb0c1cb369d9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 21 Jan 2025 10:08:01 +0100 Subject: [PATCH 248/276] Remove + character from bundle identifier CURA-12313 This character is not allowed and will make an invalid package, see https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleidentifier --- packaging/MacOS/build_macos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index a495a027695..a7063f688d7 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -154,7 +154,7 @@ def create_dmg(filename: str, dist_path: str, source_path: str, app_name: str) - parser.add_argument("--app_name", required = True, type = str, help = "Filename of the .app that will be contained within the dmg/pkg") args = parser.parse_args() - cura_version = args.cura_conan_version.split("/")[-1] + cura_version = args.cura_conan_version.replace("+","-") # + is not allowed for bundle identifier app_name = f"{args.app_name}.app" From a13726bba129afcb1f01eafdf2e2bcc9ba0b2521 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 22 Jan 2025 09:54:20 +0100 Subject: [PATCH 249/276] Move interlocking settings out of experimental CURA-12247 Also set interlocking_enable to basic settings because it is quite important and just enabling it doesn't require advanced knowledge/skills. --- resources/definitions/fdmprinter.def.json | 164 +++++++++++----------- resources/setting_visibility/advanced.cfg | 2 +- resources/setting_visibility/basic.cfg | 1 + resources/setting_visibility/expert.cfg | 12 +- 4 files changed, 90 insertions(+), 89 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8471c59f828..9ce93cd4eb1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7500,6 +7500,88 @@ "enabled": "retraction_enable and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": true + }, + "interlocking_enable": + { + "label": "Generate Interlocking Structure", + "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", + "type": "bool", + "enabled": "extruders_enabled_count > 1", + "default_value": false, + "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_width": + { + "label": "Interlocking Beam Width", + "description": "The width of the interlocking structure beams.", + "type": "float", + "unit": "mm", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 0.8, + "value": "2 * wall_line_width_0", + "minimum_value": "min_odd_wall_line_width", + "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", + "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", + "settable_per_mesh": true, + "settable_per_extruder": true + }, + "interlocking_orientation": + { + "label": "Interlocking Structure Orientation", + "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", + "unit": "\u00b0", + "type": "float", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 22.5, + "minimum_value": "0", + "maximum_value": "360", + "resolve": "min(extruderValues('interlocking_orientation'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_layer_count": + { + "label": "Interlocking Beam Layer Count", + "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "maximum_value_warning": "50", + "resolve": "max(extruderValues('interlocking_beam_layer_count'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_depth": + { + "label": "Interlocking Depth", + "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "maximum_value": "10", + "maximum_value_warning": "5", + "resolve": "max(extruderValues('interlocking_depth'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_boundary_avoidance": + { + "label": "Interlocking Boundary Avoidance", + "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "0", + "minimum_value_warning": "resolveOrValue('interlocking_depth')", + "maximum_value": "10", + "maximum_value_warning": "5", + "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, @@ -7922,88 +8004,6 @@ "settable_per_mesh": true, "settable_per_extruder": false }, - "interlocking_enable": - { - "label": "Generate Interlocking Structure", - "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", - "type": "bool", - "enabled": "extruders_enabled_count > 1", - "default_value": false, - "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_beam_width": - { - "label": "Interlocking Beam Width", - "description": "The width of the interlocking structure beams.", - "type": "float", - "unit": "mm", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 0.8, - "value": "2 * wall_line_width_0", - "minimum_value": "min_odd_wall_line_width", - "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", - "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", - "settable_per_mesh": true, - "settable_per_extruder": true - }, - "interlocking_orientation": - { - "label": "Interlocking Structure Orientation", - "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", - "unit": "\u00b0", - "type": "float", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 22.5, - "minimum_value": "0", - "maximum_value": "360", - "resolve": "min(extruderValues('interlocking_orientation'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_beam_layer_count": - { - "label": "Interlocking Beam Layer Count", - "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "1", - "maximum_value_warning": "50", - "resolve": "max(extruderValues('interlocking_beam_layer_count'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_depth": - { - "label": "Interlocking Depth", - "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "1", - "maximum_value": "10", - "maximum_value_warning": "5", - "resolve": "max(extruderValues('interlocking_depth'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_boundary_avoidance": - { - "label": "Interlocking Boundary Avoidance", - "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "0", - "minimum_value_warning": "resolveOrValue('interlocking_depth')", - "maximum_value": "10", - "maximum_value_warning": "5", - "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, "support_skip_some_zags": { "label": "Break Up Support In Chunks", diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 93c3dc91efd..8585a05eeca 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -133,6 +133,7 @@ prime_tower_mode prime_tower_position_x prime_tower_position_y prime_tower_brim_enable +interlocking_enable [meshfix] @@ -144,7 +145,6 @@ magic_spiralize smooth_spiralized_contours [experimental] -interlocking_enable conical_overhang_enabled support_conical_enabled adaptive_layer_height_enabled diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 0193eb26ba7..6c6124ab673 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -56,6 +56,7 @@ adhesion_extruder_nr prime_tower_enable prime_tower_position_x prime_tower_position_y +interlocking_enable [meshfix] diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index b13618e5c16..6c78e405036 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -378,6 +378,12 @@ prime_tower_min_shell_thickness ooze_shield_enabled ooze_shield_angle ooze_shield_dist +interlocking_enable +interlocking_beam_width +interlocking_orientation +interlocking_beam_layer_count +interlocking_dept +interlocking_boundary_avoidance [meshfix] meshfix_union_all @@ -428,12 +434,6 @@ roofing_monotonic roofing_angles infill_enable_travel_optimization material_flow_temp_graph -interlocking_enable -interlocking_beam_width -interlocking_orientation -interlocking_beam_layer_count -interlocking_dept -interlocking_boundary_avoidance support_skip_some_zags support_skip_zag_per_mm support_zag_skip_count From 038e8b77223fbe08d536681abcb7159c4c8f854e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 22 Jan 2025 21:16:56 +0100 Subject: [PATCH 250/276] Warn for mismatched cores on multi-config printers. Similar to the warning we already had for missing materials. CURA-12368 --- .../Models/PrinterConfigurationModel.py | 14 +++- .../ConfigurationMenu/ConfigurationItem.qml | 70 +++++++++++++++---- 2 files changed, 68 insertions(+), 16 deletions(-) diff --git a/cura/PrinterOutput/Models/PrinterConfigurationModel.py b/cura/PrinterOutput/Models/PrinterConfigurationModel.py index 85c69abcd3d..d42be47b41d 100644 --- a/cura/PrinterOutput/Models/PrinterConfigurationModel.py +++ b/cura/PrinterOutput/Models/PrinterConfigurationModel.py @@ -1,9 +1,12 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2025 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from PyQt6.QtCore import pyqtProperty, QObject, pyqtSignal from typing import List +from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.DefinitionContainer import DefinitionContainer + MYPY = False if MYPY: from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel @@ -68,6 +71,15 @@ def hasAnyMaterialLoaded(self) -> bool: return True return False + @pyqtProperty("QStringList", constant=True) + def validCoresForPrinterType(self) -> List[str]: + printers = ContainerRegistry.getInstance().findContainersMetadata( + ignore_case=True, type="machine", name=self._printer_type, container_type=DefinitionContainer) + id = printers[0]["id"] if len(printers) > 0 and "id" in printers[0] else "" + definitions = ContainerRegistry.getInstance().findContainersMetadata( + ignore_case=True, type="variant", definition=id+"*") + return [x["name"] for x in definitions] + def __str__(self): message_chunks = [] message_chunks.append("Printer type: " + self._printer_type) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index bcbb6d76799..7b4479cdc39 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2025 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -12,7 +12,7 @@ Button id: configurationItem property var configuration: null - hoverEnabled: isValidMaterial + hoverEnabled: isValidMaterial && isValidCore property bool isValidMaterial: { @@ -25,7 +25,6 @@ Button for (var index in extruderConfigurations) { var name = extruderConfigurations[index].material ? extruderConfigurations[index].material.name : "" - if (name == "" || name == "Unknown") { return false @@ -34,6 +33,25 @@ Button return true } + property bool isValidCore: + { + if (configuration === null) + { + return false + } + var extruderConfigurations = configuration.extruderConfigurations + var coresList = configuration.validCoresForPrinterType + for (var index in extruderConfigurations) + { + var name = extruderConfigurations[index].hotendID ? extruderConfigurations[index].hotendID : "" + if (name != "" && ! coresList.includes(name)) + { + return false + } + } + return true + } + background: Rectangle { color: parent.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button") @@ -72,11 +90,11 @@ Button { width: Math.round(parent.width / (configuration !== null ? configuration.extruderConfigurations.length : 1)) printCoreConfiguration: modelData - visible: configurationItem.isValidMaterial + visible: configurationItem.isValidMaterial && configurationItem.isValidCore } } - // Unknown material + // Unknown material or core ('variant') Item { id: unknownMaterial @@ -86,7 +104,7 @@ Button anchors.top: parent.top anchors.topMargin: UM.Theme.getSize("thin_margin").width / 2 - visible: !configurationItem.isValidMaterial + visible: ! (configurationItem.isValidMaterial && configurationItem.isValidCore) UM.ColorImage { @@ -102,13 +120,9 @@ Button UM.Label { id: unknownMaterialMessage - text: - { - if (configuration === null) - { - return "" - } + function whenUnknownMaterial() + { var extruderConfigurations = configuration.extruderConfigurations var unknownMaterials = [] for (var index in extruderConfigurations) @@ -135,9 +149,35 @@ Button unknownMaterials = "" + unknownMaterials + "" var draftResult = catalog.i18nc("@label", "This configuration is not available because %1 is not recognized. Please visit %2 to download the correct material profile."); - var result = draftResult.arg(unknownMaterials).arg("" + catalog.i18nc("@label","Marketplace") + " ") + return draftResult.arg(unknownMaterials).arg("" + catalog.i18nc("@label","Marketplace") + " ") + } + + function whenMismatchedCore() + { + var extruderConfigurations = configuration.extruderConfigurations + var coresList = configuration.validCoresForPrinterType + var mismatchedCores = [] + for (var index in extruderConfigurations) + { + var name = extruderConfigurations[index].hotendID ? extruderConfigurations[index].hotendID : "" + if (name != "" && ! coresList.includes(name)) + { + mismatchedCores.push(name) + } + } - return result + mismatchedCores = "" + mismatchedCores + "" + var draftResult = catalog.i18nc("@label", "This configuration is not available because %1 is either mismatched, or unrecognized. Please visit %2 to check with cores this printer-type supports."); + return draftResult.arg(mismatchedCores).arg("" + catalog.i18nc("@label","WEBSITE") + " ") + } + + text: + { + if (configuration === null) + { + return "" + } + return isValidMaterial ? whenMismatchedCore() : whenUnknownMaterial() } width: extruderRow.width @@ -225,7 +265,7 @@ Button onClicked: { - if(isValidMaterial) + if (isValidMaterial && isValidCore) { toggleContent() Cura.MachineManager.applyRemoteConfiguration(configuration) From 4a30660a5cc78a131d3b4afbbee2c01ee545d85e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 23 Jan 2025 10:19:57 +0100 Subject: [PATCH 251/276] Remove pydir and workflow folder --- Cura-workflows | 1 - pydir.txt | 1 - 2 files changed, 2 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index a38e2d1e102..00000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a diff --git a/pydir.txt b/pydir.txt deleted file mode 100644 index 8b137891791..00000000000 --- a/pydir.txt +++ /dev/null @@ -1 +0,0 @@ - From c63c697714e4f88496f34ed598ccc3134056a0cc Mon Sep 17 00:00:00 2001 From: casperlamboo <6638028+casperlamboo@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:23:55 +0000 Subject: [PATCH 252/276] Apply printer-linter format --- resources/definitions/ankermake_m5.def.json | 2 +- resources/definitions/ankermake_m5c.def.json | 2 +- .../definitions/dagoma_sigma_pro.def.json | 2 +- .../dagoma_sigma_pro_dual.def.json | 2 +- resources/definitions/eazao_m500.def.json | 2 +- resources/definitions/eazao_m600.def.json | 2 +- resources/definitions/eazao_m700.def.json | 2 +- resources/definitions/eazao_potter.def.json | 2 +- resources/definitions/eazao_zero.def.json | 2 +- resources/definitions/fdmprinter.def.json | 21 ++++++++++++------- .../definitions/flyingbear_ghost_4s.def.json | 2 +- .../definitions/flyingbear_ghost_5.def.json | 2 +- .../definitions/flyingbear_ghost_6.def.json | 2 +- resources/definitions/hellbot_adonis.def.json | 2 +- resources/definitions/hellbot_hidra.def.json | 2 +- .../definitions/hellbot_hidra_plus.def.json | 2 +- .../definitions/hellbot_magna_2_230.def.json | 2 +- .../hellbot_magna_2_230_dual.def.json | 2 +- .../definitions/hellbot_magna_2_300.def.json | 2 +- .../hellbot_magna_2_300_dual.def.json | 2 +- .../definitions/hellbot_magna_2_400.def.json | 2 +- .../hellbot_magna_2_400_dual.def.json | 2 +- .../definitions/hellbot_magna_2_500.def.json | 2 +- .../hellbot_magna_2_500_dual.def.json | 2 +- .../definitions/hellbot_magna_I.def.json | 2 +- .../definitions/hellbot_magna_SE.def.json | 2 +- .../definitions/hellbot_magna_SE_300.def.json | 2 +- .../definitions/hellbot_magna_SE_Pro.def.json | 2 +- .../definitions/hellbot_magna_dual.def.json | 2 +- resources/definitions/inat_base.def.json | 4 ++-- resources/definitions/koonovo_base.def.json | 2 +- resources/definitions/peopoly_moai.def.json | 2 +- ...tur3d_discov3ry1_complete_um2plus.def.json | 2 +- resources/definitions/ultimaker.def.json | 8 ++----- resources/definitions/ultimaker3.def.json | 4 ++-- .../definitions/ultimaker3_extended.def.json | 4 ++-- .../definitions/ultimaker_factor4.def.json | 4 ++-- .../definitions/ultimaker_method.def.json | 4 ++-- .../ultimaker_method_base.def.json | 20 ++++++++++-------- .../definitions/ultimaker_methodx.def.json | 4 ++-- .../definitions/ultimaker_methodxl.def.json | 4 ++-- .../definitions/ultimaker_original.def.json | 4 +--- resources/definitions/ultimaker_s3.def.json | 4 ++-- resources/definitions/ultimaker_s5.def.json | 4 ++-- resources/definitions/ultimaker_s7.def.json | 4 ++-- .../definitions/ultimaker_sketch.def.json | 4 ++-- .../ultimaker_sketch_large.def.json | 2 +- .../ultimaker_sketch_sprint.def.json | 6 +++--- resources/definitions/uni_200.def.json | 2 +- resources/definitions/uni_250.def.json | 2 +- resources/definitions/uni_300.def.json | 2 +- resources/definitions/uni_mini.def.json | 2 +- 52 files changed, 89 insertions(+), 86 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index edd31758b0e..4a70851e33a 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "ankermake_m5_platform.obj", "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, "platform_texture": "ankermake_m5.png", "preferred_material": "generic_pla", diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json index 631cb20f067..131bd6bd7a8 100644 --- a/resources/definitions/ankermake_m5c.def.json +++ b/resources/definitions/ankermake_m5c.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "ankermake_m5c_platform.obj", "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" }, "platform_texture": "ankermake_m5c.png", "preferred_material": "generic_pla", diff --git a/resources/definitions/dagoma_sigma_pro.def.json b/resources/definitions/dagoma_sigma_pro.def.json index 295fe496626..3f39c9f713f 100644 --- a/resources/definitions/dagoma_sigma_pro.def.json +++ b/resources/definitions/dagoma_sigma_pro.def.json @@ -11,7 +11,7 @@ "platform": "dagoma_sigma_pro.obj", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { "0": "dagoma_sigma_pro_extruder" }, "platform_texture": "dagoma_sigma_pro.png", diff --git a/resources/definitions/dagoma_sigma_pro_dual.def.json b/resources/definitions/dagoma_sigma_pro_dual.def.json index fccb9b56659..cd1702228cb 100644 --- a/resources/definitions/dagoma_sigma_pro_dual.def.json +++ b/resources/definitions/dagoma_sigma_pro_dual.def.json @@ -11,7 +11,7 @@ "platform": "dagoma_sigma_pro.obj", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index d8c20fb0219..f4ad1dd03e9 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 252acccdae1..e76d9239094 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 9b3ddcc01f1..98e35f46e1b 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 391358fce7b..110ea1efb50 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index b98507a101e..d4ae902fa6f 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index fc3b75ab885..c1392e57bac 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4413,7 +4413,8 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "retraction_combing_avoid_distance": { + "retraction_combing_avoid_distance": + { "label": "Inside Travel Avoid Distance", "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.", "unit": "mm", @@ -7501,7 +7502,8 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "interlocking_enable": { + "interlocking_enable": + { "label": "Generate Interlocking Structure", "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", "type": "bool", @@ -7511,7 +7513,8 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "interlocking_beam_width": { + "interlocking_beam_width": + { "label": "Interlocking Beam Width", "description": "The width of the interlocking structure beams.", "type": "float", @@ -7525,7 +7528,8 @@ "settable_per_mesh": true, "settable_per_extruder": true }, - "interlocking_orientation": { + "interlocking_orientation": + { "label": "Interlocking Structure Orientation", "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", "unit": "\u00b0", @@ -7538,7 +7542,8 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "interlocking_beam_layer_count": { + "interlocking_beam_layer_count": + { "label": "Interlocking Beam Layer Count", "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", "type": "int", @@ -7550,7 +7555,8 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "interlocking_depth": { + "interlocking_depth": + { "label": "Interlocking Depth", "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", "type": "int", @@ -7563,7 +7569,8 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "interlocking_boundary_avoidance": { + "interlocking_boundary_avoidance": + { "label": "Interlocking Boundary Avoidance", "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", "type": "int", diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index 164f1dc9420..807d0365237 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "oducceu", "platform": "flyingbear_platform.obj", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index 49381e5bb24..b72a3a18fd4 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "oducceu", "platform": "flyingbear_platform.obj", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, diff --git a/resources/definitions/flyingbear_ghost_6.def.json b/resources/definitions/flyingbear_ghost_6.def.json index ab9234aa6d6..8c5287cb4ee 100644 --- a/resources/definitions/flyingbear_ghost_6.def.json +++ b/resources/definitions/flyingbear_ghost_6.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "barrnet", "platform": "flyingbear_platform.obj", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json index e4bd1672b00..2a7022e7c13 100644 --- a/resources/definitions/hellbot_adonis.def.json +++ b/resources/definitions/hellbot_adonis.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_adonis.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_adonis_extruder" }, "platform_offset": [ 0, diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json index f999304e17a..fe1d580354a 100644 --- a/resources/definitions/hellbot_hidra.def.json +++ b/resources/definitions/hellbot_hidra.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_hidra.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_hidra_extruder_0", diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json index a8c2f0b0337..dc718dc5f26 100644 --- a/resources/definitions/hellbot_hidra_plus.def.json +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_hidra_plus.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_hidra_plus_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json index 46331973548..c2e200b1008 100644 --- a/resources/definitions/hellbot_magna_2_230.def.json +++ b/resources/definitions/hellbot_magna_2_230.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" }, "platform_texture": "Magna2_230.png" }, diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index 8c913f399d3..3ba073d89be 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json index cb98d2a209d..565119e31f7 100644 --- a/resources/definitions/hellbot_magna_2_300.def.json +++ b/resources/definitions/hellbot_magna_2_300.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" }, "platform_texture": "Magna2_300.png" }, diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index 4693ecd7116..9e0e72f1457 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_400.def.json b/resources/definitions/hellbot_magna_2_400.def.json index 376489ddd4f..8bc7c21811d 100644 --- a/resources/definitions/hellbot_magna_2_400.def.json +++ b/resources/definitions/hellbot_magna_2_400.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" }, "platform_texture": "Magna2_400.png" }, diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json index 0adf575bcaf..00f10c1117b 100644 --- a/resources/definitions/hellbot_magna_2_400_dual.def.json +++ b/resources/definitions/hellbot_magna_2_400_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_500.def.json b/resources/definitions/hellbot_magna_2_500.def.json index 6d3324bacdd..fe83fab70a3 100644 --- a/resources/definitions/hellbot_magna_2_500.def.json +++ b/resources/definitions/hellbot_magna_2_500.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" }, "platform_texture": "Magna2_500.png" }, diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json index 4f3a2d2c136..a8f6fc5b374 100644 --- a/resources/definitions/hellbot_magna_2_500_dual.def.json +++ b/resources/definitions/hellbot_magna_2_500_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index ec463b42f88..7425aa3db46 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_i_extruder" }, "platform_offset": [ 0, diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index 0b5fb5c8cfa..a449a60f019 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna_SE.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, "platform_texture": "hellbot_magna_SE.png" }, diff --git a/resources/definitions/hellbot_magna_SE_300.def.json b/resources/definitions/hellbot_magna_SE_300.def.json index efcb9b7f006..bb83df4a374 100644 --- a/resources/definitions/hellbot_magna_SE_300.def.json +++ b/resources/definitions/hellbot_magna_SE_300.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_SE_300.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_300_extruder" }, "platform_texture": "Hellbot_Magna_SE_300.png" }, diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index 8382e9bd32c..aa71aab37be 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_SE_Pro.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" }, "platform_texture": "Hellbot_magna_SE_Pro.png" }, diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index fda4b117949..9488ec2a435 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_dual_extruder_1", diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index d9ea444c4a0..5bd5258d5af 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -16,8 +16,8 @@ "preferred_material": "generic_pla", "preferred_quality_type": "standard", "preferred_variant_name": "0.4mm", - "variants_name": "Extruder", - "variants_name_has_translation": true + "variants_name": "Extruder", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index ca518d4b201..d194902e5c8 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -12,7 +12,7 @@ "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "koonovo_base_extruder_0" }, "platform_texture": "koonovo.png", "preferred_material": "generic_pla", diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index feb74c4c848..20d3bafa0a7 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -11,7 +11,7 @@ "platform": "moai.obj", "has_machine_quality": true, "has_materials": false, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" }, "platform_texture": "moai.jpg" }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 9bf68f76dc8..4876738f6e5 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -25,7 +25,7 @@ "preferred_quality_type": "extra_fast", "preferred_variant_name": "0.84mm (Green)", "supported_actions": [], - "variants_name": "Print Core" + "variants_name": "Print Core" }, "overrides": { diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97a8ee14004..65ceaf6f0fb 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -42,9 +42,7 @@ "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" }, "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" }, "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" }, - "extra_infill_lines_to_support_skins": { - "value": "'none'" - }, + "extra_infill_lines_to_support_skins": { "value": "'none'" }, "gradual_support_infill_step_height": { "value": "4 * layer_height" }, "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, @@ -112,9 +110,7 @@ "roofing_layer_count": { "value": "1" }, "roofing_material_flow": { "value": "material_flow" }, "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, - "skin_edge_support_thickness": { - "value": "4 * layer_height if infill_sparse_density < 30 else 0" - }, + "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" }, "skin_material_flow": { "value": "0.95 * material_flow" }, "skin_material_flow_layer_0": { "value": "95" }, "skin_monotonic": { "value": "roofing_layer_count == 0" }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 4547916df84..fb8b876fb5c 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -51,8 +51,8 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true + "variants_name": "Print Core", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 823e12a7a29..bdfd5f93a56 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -36,8 +36,8 @@ "preferred_variant_name": "AA 0.4", "quality_definition": "ultimaker3", "supported_actions": [ "DiscoverUM3Action" ], - "variants_name": "Print Core", - "variants_name_has_translation": true + "variants_name": "Print Core", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index f37e88e3af8..710ee29a409 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -43,8 +43,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 58876812b7f..5e78c3f6308 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -83,7 +83,7 @@ "supports_usb_connection": false, "variant_definition": "ultimaker_method", "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 1fc3699cd86..1e5eb952ed0 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -26,7 +26,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": @@ -142,10 +142,11 @@ "value": "min(extruderValues('extruder_nr'))" }, "adhesion_type": { "value": "'raft'" }, - "bottom_thickness": { - "minimum_value_warning": 0.3, - "value": "top_bottom_thickness" - }, + "bottom_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness" + }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, @@ -579,10 +580,11 @@ "minimum_value_warning": 0.3, "value": "4*layer_height" }, - "top_thickness": { - "minimum_value_warning": 0.3, - "value": "top_bottom_thickness * 1.5" - }, + "top_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness * 1.5" + }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index e8a98fde94d..37b11ad4eff 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -69,7 +69,7 @@ "supports_usb_connection": false, "variant_definition": "ultimaker_methodx", "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index ea56dc0cc06..d12fa8ac59d 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -67,7 +67,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 495af835dfb..826a612c6c6 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -68,9 +68,7 @@ "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 205 }, - "material_print_temp_wait": { - "value": true - }, + "material_print_temp_wait": { "value": true }, "speed_slowdown_layers": { "value": 2 } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 36a42ba6950..27957af727d 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -50,8 +50,8 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_material_export": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index a7e347ccbac..46d46d33eb4 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -54,8 +54,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -2 }, "overrides": diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 6fc57cfb379..14d9b211686 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -40,8 +40,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -2 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 65c003ea3ba..2f96b52397f 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -72,7 +72,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch_large.def.json b/resources/definitions/ultimaker_sketch_large.def.json index d962649d415..49ae05a6140 100644 --- a/resources/definitions/ultimaker_sketch_large.def.json +++ b/resources/definitions/ultimaker_sketch_large.def.json @@ -20,7 +20,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index ae9b08932d0..cde655e70f6 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -58,7 +58,7 @@ ], "has_machine_quality": true, "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { "0": "ultimaker_sketch_sprint_extruder" }, "platform_offset": [ @@ -74,7 +74,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index f68cef31c12..c58264e1ee2 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_200_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index 17ff3b6c0e2..ae2aad97147 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_250_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index de9f95618e9..6d801b68f83 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_300_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index 553d421207c..be327eef4ab 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_mini_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, From 7eb9b15dc7fb35313ad046f6a50c087bb4ab96bc Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Jan 2025 13:24:57 +0100 Subject: [PATCH 253/276] Pin cura package version CURA-12261 --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index bc7a3b61272..66154e37c76 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,6 +1,6 @@ version: "5.10.0-alpha.0" requirements: - - "cura_resources/5.10.0-alpha.0@ultimaker/cura_7435" + - "cura_resources/5.10.0-alpha.0@ultimaker/cura_12261" - "uranium/5.10.0-alpha.0@ultimaker/testing" - "curaengine/5.10.0-alpha.0@ultimaker/testing" - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing" From 539e627365168c01cc006c6a46c91f3743acf5bf Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Jan 2025 13:45:09 +0100 Subject: [PATCH 254/276] Move `pynavlib` dependency to `any_os` section CURA-12261 --- conandata.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/conandata.yml b/conandata.yml index 66154e37c76..322a3817f66 100644 --- a/conandata.yml +++ b/conandata.yml @@ -567,6 +567,11 @@ pip_requirements_core: hashes: - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 + pynavlib: + version: "0.9.3" + hashes: + --hash=sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 + --hash=sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 Windows: twisted-iocpsupport: version: "1.0.2" @@ -588,11 +593,7 @@ pip_requirements_core: hashes: - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 - pynavlib: - version: "0.9.3" - hashes: - --hash=sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 \ - --hash=sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 + pip_requirements_dev: any_os: pytest: { } From 6c9b33f6a76d09e9b4bd8d007cfce1b1f4ef8bf2 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Jan 2025 13:49:07 +0100 Subject: [PATCH 255/276] Fix syntax error in pynavlib dependency CURA-12261 --- conandata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 322a3817f66..62c1099499c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -570,8 +570,8 @@ pip_requirements_core: pynavlib: version: "0.9.3" hashes: - --hash=sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 - --hash=sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 + --sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 + --sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 Windows: twisted-iocpsupport: version: "1.0.2" From b2827122998f9ee9b4fae680ef497815e0a0581d Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Jan 2025 14:09:05 +0100 Subject: [PATCH 256/276] Fix syntax error in pynavlib dependency CURA-12261 --- conandata.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 62c1099499c..c54ddabcb2d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -567,11 +567,13 @@ pip_requirements_core: hashes: - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 + + Macos: pynavlib: version: "0.9.3" hashes: - --sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 - --sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 + - sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 + Windows: twisted-iocpsupport: version: "1.0.2" @@ -593,6 +595,10 @@ pip_requirements_core: hashes: - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 + pynavlib: + version: "0.9.3" + hashes: + - sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 pip_requirements_dev: any_os: From 983d0a43c3a6aff4438a81014aed2d82cd046ba8 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Jan 2025 14:18:18 +0100 Subject: [PATCH 257/276] combine hashes for pynavlib dependency CURA-12261 --- conandata.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/conandata.yml b/conandata.yml index c54ddabcb2d..3873ed1d33c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -567,12 +567,11 @@ pip_requirements_core: hashes: - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 - - Macos: pynavlib: version: "0.9.3" hashes: - sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 + - sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 Windows: twisted-iocpsupport: @@ -595,10 +594,6 @@ pip_requirements_core: hashes: - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 - pynavlib: - version: "0.9.3" - hashes: - - sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 pip_requirements_dev: any_os: From 04a6ecf7ca8ba3d52a7a3873c637697c214fb1aa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 27 Jan 2025 14:41:18 +0100 Subject: [PATCH 258/276] Add local setting to monitor use of USB writing CURA-12150 --- plugins/USBPrinting/USBPrinterOutputDevice.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 85b98e532b6..18d9466eb5c 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -97,6 +97,8 @@ def __init__(self, serial_port: str, baud_rate: Optional[int] = None) -> None: CuraApplication.getInstance().getOnExitCallbackManager().addCallback(self._checkActivePrintingUponAppExit) + CuraApplication.getInstance().getPreferences().addPreference("usb_printing/enabled", False) + # This is a callback function that checks if there is any printing in progress via USB when the application tries # to exit. If so, it will show a confirmation before def _checkActivePrintingUponAppExit(self) -> None: @@ -144,6 +146,8 @@ def requestWrite(self, nodes: List["SceneNode"], file_name: Optional[str] = None CuraApplication.getInstance().getController().setActiveStage("MonitorStage") + CuraApplication.getInstance().getPreferences().setValue("usb_printing/enabled", True) + #Find the g-code to print. gcode_textio = StringIO() gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter")) From 3b2d0fd8afe08c4e56d6d43e7b8b06984249241d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 27 Jan 2025 15:23:55 +0100 Subject: [PATCH 259/276] Slightly reduce the width of setting fields CURA-12224 This gives more space for the text, which can sometimes be very long --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 160799be6e9..1ae316f96c1 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -567,7 +567,7 @@ "section_icon_column": [2.5, 2.5], "setting": [25.0, 1.8], - "setting_control": [11.0, 2.0], + "setting_control": [9.0, 2.0], "setting_control_radius": [0.15, 0.15], "setting_control_depth_margin": [1.4, 0.0], "setting_unit_margin": [0.5, 0.5], From 2e59a0a00913da58b1238a122174bc6388883e0a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 27 Jan 2025 15:24:42 +0100 Subject: [PATCH 260/276] Give more space to text when required CURA-12224 This way, multi-lines setting names can be properly displayed --- resources/qml/Settings/SettingItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 1d8ad654e31..f46c59ff618 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -13,7 +13,7 @@ import "." Item { id: base - height: enabled ? UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height : 0 + height: enabled ? Math.max(UM.Theme.getSize("section").height, label.height) + UM.Theme.getSize("narrow_margin").height : 0 anchors.left: parent.left anchors.right: parent.right From 669c28e61827a4c53b68a047b3215e792a7e383a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 28 Jan 2025 09:20:47 +0100 Subject: [PATCH 261/276] Try to make unavailable configuration warnings less confusing. part of CURA-12368 --- .../ConfigurationMenu/ConfigurationItem.qml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index 7b4479cdc39..48d3874985b 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -167,7 +167,7 @@ Button } mismatchedCores = "" + mismatchedCores + "" - var draftResult = catalog.i18nc("@label", "This configuration is not available because %1 is either mismatched, or unrecognized. Please visit %2 to check with cores this printer-type supports."); + var draftResult = catalog.i18nc("@label", "This configuration is not available because there is a mismatch or other problem with core-type %1. Please visit %2 to check which cores this printer-type supports w.r.t. new slices."); return draftResult.arg(mismatchedCores).arg("" + catalog.i18nc("@label","WEBSITE") + " ") } @@ -177,7 +177,19 @@ Button { return "" } - return isValidMaterial ? whenMismatchedCore() : whenUnknownMaterial() + + var extruderConfigurations = configuration.extruderConfigurations + var perExtruder = [] + for (var index in extruderConfigurations) + { + var matName = extruderConfigurations[index].material ? extruderConfigurations[index].material.name : "" + var coreName = extruderConfigurations[index].hotendID ? extruderConfigurations[index].hotendID : "" + perExtruder.push(` [${coreName}/${matName}]`) + } + + var configsStr = "" + perExtruder + "" + var warnStr = isValidMaterial ? whenMismatchedCore() : whenUnknownMaterial() + return configsStr + "
    " + warnStr } width: extruderRow.width From c369a405b35844a5de7bbd84df2bbc50056d3db9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 28 Jan 2025 10:34:58 +0100 Subject: [PATCH 262/276] Set dynamic items size CURA-12368 --- resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index 48d3874985b..f76e1c6ef72 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -78,7 +78,7 @@ Button right: parent.right rightMargin: UM.Theme.getSize("wide_margin").width } - height: childrenRect.height + height: unknownMaterial.visible ? unknownMaterial.height : (repeater.count > 0 ? repeater.itemAt(0).height : 0) spacing: UM.Theme.getSize("default_margin").width Repeater @@ -98,11 +98,10 @@ Button Item { id: unknownMaterial - height: unknownMaterialMessage.height + UM.Theme.getSize("thin_margin").width / 2 + height: unknownMaterialMessage.height width: parent.width anchors.top: parent.top - anchors.topMargin: UM.Theme.getSize("thin_margin").width / 2 visible: ! (configurationItem.isValidMaterial && configurationItem.isValidCore) From eec90b5bdc10b88d2a5a3ac31c5483f21d29e74b Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:35:28 +0100 Subject: [PATCH 263/276] [PP-535] Add pressure advance setting --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c1392e57bac..e89595c1b1d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3232,6 +3232,19 @@ "minimum_value": 0.01, "settable_per_mesh": false, "settable_per_extruder": true + }, + "material_pressure_advance_factor": + { + "enabled": false, + "label": "Pressure advance factor", + "description": "Tuning factor for pressure advance, which is meant to synchronize extrusion with motion", + "default_value": 0.05, + "maximum_value_warning": 1.0, + "minimum_value": 0, + "type": "float", + "settable_per_mesh": false, + "settable_per_extruder": true, + "settable_per_meshgroup": false } } }, From 05f6afd93d89ec8f86f5e4f283b0c0e6d40c80e4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 29 Jan 2025 13:20:01 +0100 Subject: [PATCH 264/276] Round layer height to two decimals for display (profile) purposes. CURA-12020 --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 82b52d3dde5..4c16061074f 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1678,7 +1678,7 @@ def activeQualityDisplayNameMap(self) -> ActiveQuality: intent_category = self.activeIntentCategory, intent_name = IntentCategoryModel.translation(self.activeIntentCategory, "name", self.activeIntentCategory.title()), custom_profile = self.activeQualityOrQualityChangesName if global_stack.qualityChanges is not empty_quality_changes_container else None, - layer_height = self.activeQualityLayerHeight if self.isActiveQualitySupported else None, + layer_height = float("{:.2f}".format(self.activeQualityLayerHeight)) if self.isActiveQualitySupported else None, is_experimental = self.isActiveQualityExperimental and self.isActiveQualitySupported ) From 0680a216703fc5a473567a9b87e4df19220c2481 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 29 Jan 2025 13:48:59 +0100 Subject: [PATCH 265/276] apply review comment --- resources/definitions/sovol_base_bowden.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/sovol_base_bowden.def.json b/resources/definitions/sovol_base_bowden.def.json index ad03842a472..48e905a9b6b 100644 --- a/resources/definitions/sovol_base_bowden.def.json +++ b/resources/definitions/sovol_base_bowden.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Sovol Base Bowden Printer", "inherits": "sovol_base", "metadata": @@ -12,4 +12,4 @@ "retraction_amount": { "default_value": 5 }, "retraction_speed": { "value": "resolveOrValue('machine_max_feedrate_e')" } } -} \ No newline at end of file +} From 40f738f15fd4d5e86a36464f5c6e8f3be8f7c407 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 29 Jan 2025 12:49:58 +0000 Subject: [PATCH 266/276] Applied printer-linter format --- resources/definitions/sovol_base_bowden.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/sovol_base_bowden.def.json b/resources/definitions/sovol_base_bowden.def.json index 48e905a9b6b..0f389a25f83 100644 --- a/resources/definitions/sovol_base_bowden.def.json +++ b/resources/definitions/sovol_base_bowden.def.json @@ -12,4 +12,4 @@ "retraction_amount": { "default_value": 5 }, "retraction_speed": { "value": "resolveOrValue('machine_max_feedrate_e')" } } -} +} \ No newline at end of file From 150a267bb77c75af2de3526b07472671ec8d2d9b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 29 Jan 2025 14:05:14 +0100 Subject: [PATCH 267/276] switch from branch to stable in conandata for dulcificum --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 36fd494356b..de95766ed21 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/5.10.0-alpha.0@ultimaker/testing" - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing" - "fdm_materials/5.10.0-alpha.0@ultimaker/testing" - - "dulcificum/0.3.0@ultimaker/cura_12313" + - "dulcificum/0.3.0@ultimaker/stable" - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: From c72cb23466e34f5adcb31c1f18f0bb9032b202ce Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 31 Jan 2025 10:46:54 +0100 Subject: [PATCH 268/276] Update pynavlib dependency CURA-12261 --- conandata.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/conandata.yml b/conandata.yml index 3873ed1d33c..fc1af1212dc 100644 --- a/conandata.yml +++ b/conandata.yml @@ -568,10 +568,16 @@ pip_requirements_core: - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 pynavlib: - version: "0.9.3" - hashes: - - sha256:8b8ee65441730279d6540526b36196e47155b9eaf275dc0e5555b3526f62f121 - - sha256:87a2d58e8f77584364a31ebf792d0dab5550b9ad3c8d4c6a5c722aead530ff72 + version: "0.9.4" + hashes: + - sha256:567efd0af97f9014326898b209eea94d9f5cc58e9f589ccf8354584568fcb87d + - sha256:fdd5ab5b6e0a2c9bbcebb154ac7303daf845865a1649be04e1bd8e8e5889401f + - sha256:f0d7ce426e816788aa96b419fd7da263eafb99aca46ce3b6e5dbaf2bbf6b614a + - sha256:493c4b3cacc939b021a694d99723106dbd7ee5515ad4dfc1c7fc8219ef20cf3a + - sha256:33962a322033a78db05a8c2cc3d59e057fbea5b04879c3c54e2fe3041d691a12 + - sha256:332831553a70be05fe58c43a08109b42970cfedc6086ffb4306859142a0e9210 + - sha256:d06d94b1dee4ba024b4a121869e572f571673a3b8c15b4055f52236d43c19a02 + - sha256:9173f61ad83172c306b92bbe38f949889c158cd6dfdc924db01f257a437bf2a6 Windows: twisted-iocpsupport: From 0a936bec6ae500fb6cc3eb4710240fcc2ea0b44b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Feb 2025 11:39:07 +0100 Subject: [PATCH 269/276] Remove now-useless comment --- conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 01e2ffb579c..3a71d8bca28 100644 --- a/conanfile.py +++ b/conanfile.py @@ -27,7 +27,6 @@ class CuraConan(ConanFile): generators = "VirtualPythonEnv" tool_requires = "gettext/0.22.5" - # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable" options = { From f23e881478bb9d1598a1ef960cd7b578d60709ea Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Feb 2025 15:08:00 +0100 Subject: [PATCH 270/276] Use workflow from branch --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 02be9703ecb..0fdf335c1b3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -47,7 +47,8 @@ on: jobs: macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main +#FIXME Use workflow from main after merging + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-12261-3dconnectionmouse with: cura_conan_version: ${{ inputs.cura_conan_version }} package_overrides: ${{ inputs.package_overrides }} From 5cf52a5d852cf26d863fbc667cb387ef5b3546f3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Feb 2025 14:50:23 +0100 Subject: [PATCH 271/276] Define dummy 3DConnexion interface in case module is not available CURA-12404 --- cura/NavlibClient.py | 498 ++++++++++++++++++++++--------------------- 1 file changed, 257 insertions(+), 241 deletions(-) diff --git a/cura/NavlibClient.py b/cura/NavlibClient.py index f991a007d87..4a81a5d9c28 100644 --- a/cura/NavlibClient.py +++ b/cura/NavlibClient.py @@ -1,4 +1,3 @@ -import pynavlib.pynavlib_interface as pynav from UM.Math.Matrix import Matrix from UM.Math.Vector import Vector from UM.Math.AxisAlignedBox import AxisAlignedBox @@ -6,259 +5,276 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from cura.Scene.OverlayNode import OverlayNode, SceneNode from UM.Resources import Resources +from UM.Logger import Logger -class NavlibClient(pynav.NavlibNavigationModel): - - def __init__(self, scene, renderer) -> None: - super().__init__(False, pynav.NavlibOptions.RowMajorOrder) - self._scene = scene - self._renderer = renderer - self._pointer_pick = None - self._was_pick = False - self._hit_selection_only = False - self._picking_pass = None - self._pivot_node = OverlayNode(node=SceneNode(), image_path=Resources.getPath(Resources.Images, "3dx_pivot.png"), size=3.) - - def pick(self, x, y, check_selection = False, radius = 0.): - - if self._picking_pass is None or radius < 0.: - return None - - step = 0. - if radius == 0.: - grid_resolution = 0 - else: - grid_resolution = 5 - step = (2. * radius) / float(grid_resolution) - - min_depth = 99999. - result_position = None - - for i in range(grid_resolution + 1): - for j in range(grid_resolution + 1): - - coord_x = (x - radius) + i * step - coord_y = (y - radius) + j * step - - picked_depth = self._picking_pass.getPickedDepth(coord_x, coord_y) - max_depth = 16777.215 - - if 0. < picked_depth < max_depth: - - valid_hit = True - if check_selection: - selection_pass = self._renderer.getRenderPass("selection") - picked_object_id = selection_pass.getIdAtPosition(coord_x, coord_y) - picked_object = self._scene.findObject(picked_object_id) - - from UM.Scene.Selection import Selection - valid_hit = Selection.isSelected(picked_object) - - if not valid_hit and grid_resolution > 0.: - continue - elif not valid_hit and grid_resolution == 0.: - return None - - if picked_depth < min_depth: - min_depth = picked_depth - result_position = self._picking_pass.getPickedPosition(coord_x, coord_y) - - return result_position - - def get_pointer_position(self)->pynav.NavlibVector: - - from UM.Qt.QtApplication import QtApplication - main_window = QtApplication.getInstance().getMainWindow() - - x_n = 2. * main_window._mouse_x / self._scene.getActiveCamera().getViewportWidth() - 1. - y_n = 2. * main_window._mouse_y / self._scene.getActiveCamera().getViewportHeight() - 1. - - if self.get_is_view_perspective(): - self._was_pick = True - from cura.Utils.Threading import call_on_qt_thread - wrapped_pick = call_on_qt_thread(self.pick) - - self._pointer_pick = wrapped_pick(x_n, y_n) +try: + import pynavlib.pynavlib_interface as pynav - return pynav.NavlibVector(0., 0., 0.) - else: - ray = self._scene.getActiveCamera().getRay(x_n, y_n) - pointer_position = ray.origin + ray.direction + class NavlibClient(pynav.NavlibNavigationModel): - return pynav.NavlibVector(pointer_position.x, pointer_position.y, pointer_position.z) + def __init__(self, scene, renderer) -> None: + super().__init__(False, pynav.NavlibOptions.RowMajorOrder) + self._scene = scene + self._renderer = renderer + self._pointer_pick = None + self._was_pick = False + self._hit_selection_only = False + self._picking_pass = None + self._pivot_node = OverlayNode(node=SceneNode(), image_path=Resources.getPath(Resources.Images, "3dx_pivot.png"), size=3.) - def get_view_extents(self)->pynav.NavlibBox: + def pick(self, x, y, check_selection = False, radius = 0.): - view_width = self._scene.getActiveCamera().getViewportWidth() - view_height = self._scene.getActiveCamera().getViewportHeight() - horizontal_zoom = view_width * self._scene.getActiveCamera().getZoomFactor() - vertical_zoom = view_height * self._scene.getActiveCamera().getZoomFactor() + if self._picking_pass is None or radius < 0.: + return None - pt_min = pynav.NavlibVector(-view_width / 2 - horizontal_zoom, -view_height / 2 - vertical_zoom, -9001) - pt_max = pynav.NavlibVector(view_width / 2 + horizontal_zoom, view_height / 2 + vertical_zoom, 9001) + step = 0. + if radius == 0.: + grid_resolution = 0 + else: + grid_resolution = 5 + step = (2. * radius) / float(grid_resolution) - return pynav.NavlibBox(pt_min, pt_max) + min_depth = 99999. + result_position = None - def get_view_frustum(self)->pynav.NavlibFrustum: + for i in range(grid_resolution + 1): + for j in range(grid_resolution + 1): - projection_matrix = self._scene.getActiveCamera().getProjectionMatrix() - half_height = 2. / projection_matrix.getData()[1,1] - half_width = half_height * (projection_matrix.getData()[1,1] / projection_matrix.getData()[0,0]) + coord_x = (x - radius) + i * step + coord_y = (y - radius) + j * step - return pynav.NavlibFrustum(-half_width, half_width, -half_height, half_height, 1., 5000.) - - def get_is_view_perspective(self)->bool: - return self._scene.getActiveCamera().isPerspective() + picked_depth = self._picking_pass.getPickedDepth(coord_x, coord_y) + max_depth = 16777.215 - def get_selection_extents(self)->pynav.NavlibBox: + if 0. < picked_depth < max_depth: - from UM.Scene.Selection import Selection - bounding_box = Selection.getBoundingBox() + valid_hit = True + if check_selection: + selection_pass = self._renderer.getRenderPass("selection") + picked_object_id = selection_pass.getIdAtPosition(coord_x, coord_y) + picked_object = self._scene.findObject(picked_object_id) - if(bounding_box is not None) : - pt_min = pynav.NavlibVector(bounding_box.minimum.x, bounding_box.minimum.y, bounding_box.minimum.z) - pt_max = pynav.NavlibVector(bounding_box.maximum.x, bounding_box.maximum.y, bounding_box.maximum.z) - return pynav.NavlibBox(pt_min, pt_max) + from UM.Scene.Selection import Selection + valid_hit = Selection.isSelected(picked_object) + + if not valid_hit and grid_resolution > 0.: + continue + elif not valid_hit and grid_resolution == 0.: + return None + + if picked_depth < min_depth: + min_depth = picked_depth + result_position = self._picking_pass.getPickedPosition(coord_x, coord_y) + + return result_position + + def get_pointer_position(self)->pynav.NavlibVector: + + from UM.Qt.QtApplication import QtApplication + main_window = QtApplication.getInstance().getMainWindow() + + x_n = 2. * main_window._mouse_x / self._scene.getActiveCamera().getViewportWidth() - 1. + y_n = 2. * main_window._mouse_y / self._scene.getActiveCamera().getViewportHeight() - 1. + + if self.get_is_view_perspective(): + self._was_pick = True + from cura.Utils.Threading import call_on_qt_thread + wrapped_pick = call_on_qt_thread(self.pick) + + self._pointer_pick = wrapped_pick(x_n, y_n) + + return pynav.NavlibVector(0., 0., 0.) + else: + ray = self._scene.getActiveCamera().getRay(x_n, y_n) + pointer_position = ray.origin + ray.direction + + return pynav.NavlibVector(pointer_position.x, pointer_position.y, pointer_position.z) + + def get_view_extents(self)->pynav.NavlibBox: + + view_width = self._scene.getActiveCamera().getViewportWidth() + view_height = self._scene.getActiveCamera().getViewportHeight() + horizontal_zoom = view_width * self._scene.getActiveCamera().getZoomFactor() + vertical_zoom = view_height * self._scene.getActiveCamera().getZoomFactor() + + pt_min = pynav.NavlibVector(-view_width / 2 - horizontal_zoom, -view_height / 2 - vertical_zoom, -9001) + pt_max = pynav.NavlibVector(view_width / 2 + horizontal_zoom, view_height / 2 + vertical_zoom, 9001) - def get_selection_transform(self)->pynav.NavlibMatrix: - return pynav.NavlibMatrix() - - def get_is_selection_empty(self)->bool: - from UM.Scene.Selection import Selection - return not Selection.hasSelection() - - def get_pivot_visible(self)->bool: - return False - - def get_camera_matrix(self)->pynav.NavlibMatrix: - - transformation = self._scene.getActiveCamera().getLocalTransformation() - - return pynav.NavlibMatrix([[transformation.at(0, 0), transformation.at(0, 1), transformation.at(0, 2), transformation.at(0, 3)], - [transformation.at(1, 0), transformation.at(1, 1), transformation.at(1, 2), transformation.at(1, 3)], - [transformation.at(2, 0), transformation.at(2, 1), transformation.at(2, 2), transformation.at(2, 3)], - [transformation.at(3, 0), transformation.at(3, 1), transformation.at(3, 2), transformation.at(3, 3)]]) - - def get_coordinate_system(self)->pynav.NavlibMatrix: - return pynav.NavlibMatrix() - - def get_front_view(self)->pynav.NavlibMatrix: - return pynav.NavlibMatrix() - - def get_model_extents(self)->pynav.NavlibBox: - - result_bbox = AxisAlignedBox() - build_volume_bbox = None - - for node in DepthFirstIterator(self._scene.getRoot()): - node.setCalculateBoundingBox(True) - if node.__class__.__qualname__ == "CuraSceneNode" : - result_bbox = result_bbox + node.getBoundingBox() - elif node.__class__.__qualname__ == "BuildVolume": - build_volume_bbox = node.getBoundingBox() - - if not result_bbox.isValid(): - result_bbox = build_volume_bbox - - if result_bbox is not None: - pt_min = pynav.NavlibVector(result_bbox.minimum.x, result_bbox.minimum.y, result_bbox.minimum.z) - pt_max = pynav.NavlibVector(result_bbox.maximum.x, result_bbox.maximum.y, result_bbox.maximum.z) - self._scene_center = result_bbox.center - self._scene_radius = (result_bbox.maximum - self._scene_center).length() return pynav.NavlibBox(pt_min, pt_max) + + def get_view_frustum(self)->pynav.NavlibFrustum: + + projection_matrix = self._scene.getActiveCamera().getProjectionMatrix() + half_height = 2. / projection_matrix.getData()[1,1] + half_width = half_height * (projection_matrix.getData()[1,1] / projection_matrix.getData()[0,0]) + + return pynav.NavlibFrustum(-half_width, half_width, -half_height, half_height, 1., 5000.) + + def get_is_view_perspective(self)->bool: + return self._scene.getActiveCamera().isPerspective() + + def get_selection_extents(self)->pynav.NavlibBox: + + from UM.Scene.Selection import Selection + bounding_box = Selection.getBoundingBox() + + if(bounding_box is not None) : + pt_min = pynav.NavlibVector(bounding_box.minimum.x, bounding_box.minimum.y, bounding_box.minimum.z) + pt_max = pynav.NavlibVector(bounding_box.maximum.x, bounding_box.maximum.y, bounding_box.maximum.z) + return pynav.NavlibBox(pt_min, pt_max) + + def get_selection_transform(self)->pynav.NavlibMatrix: + return pynav.NavlibMatrix() + + def get_is_selection_empty(self)->bool: + from UM.Scene.Selection import Selection + return not Selection.hasSelection() + + def get_pivot_visible(self)->bool: + return False + + def get_camera_matrix(self)->pynav.NavlibMatrix: + + transformation = self._scene.getActiveCamera().getLocalTransformation() + + return pynav.NavlibMatrix([[transformation.at(0, 0), transformation.at(0, 1), transformation.at(0, 2), transformation.at(0, 3)], + [transformation.at(1, 0), transformation.at(1, 1), transformation.at(1, 2), transformation.at(1, 3)], + [transformation.at(2, 0), transformation.at(2, 1), transformation.at(2, 2), transformation.at(2, 3)], + [transformation.at(3, 0), transformation.at(3, 1), transformation.at(3, 2), transformation.at(3, 3)]]) + + def get_coordinate_system(self)->pynav.NavlibMatrix: + return pynav.NavlibMatrix() + + def get_front_view(self)->pynav.NavlibMatrix: + return pynav.NavlibMatrix() + + def get_model_extents(self)->pynav.NavlibBox: + + result_bbox = AxisAlignedBox() + build_volume_bbox = None + + for node in DepthFirstIterator(self._scene.getRoot()): + node.setCalculateBoundingBox(True) + if node.__class__.__qualname__ == "CuraSceneNode" : + result_bbox = result_bbox + node.getBoundingBox() + elif node.__class__.__qualname__ == "BuildVolume": + build_volume_bbox = node.getBoundingBox() + + if not result_bbox.isValid(): + result_bbox = build_volume_bbox + + if result_bbox is not None: + pt_min = pynav.NavlibVector(result_bbox.minimum.x, result_bbox.minimum.y, result_bbox.minimum.z) + pt_max = pynav.NavlibVector(result_bbox.maximum.x, result_bbox.maximum.y, result_bbox.maximum.z) + self._scene_center = result_bbox.center + self._scene_radius = (result_bbox.maximum - self._scene_center).length() + return pynav.NavlibBox(pt_min, pt_max) + + def get_pivot_position(self)->pynav.NavlibVector: + return pynav.NavlibVector() + + def get_hit_look_at(self)->pynav.NavlibVector: + + if self._was_pick and self._pointer_pick is not None: + return pynav.NavlibVector(self._pointer_pick.x, self._pointer_pick.y, self._pointer_pick.z) + elif self._was_pick and self._pointer_pick is None: + return None + + from cura.Utils.Threading import call_on_qt_thread + wrapped_pick = call_on_qt_thread(self.pick) + picked_position = wrapped_pick(0, 0, self._hit_selection_only, 0.5) + + if picked_position is not None: + return pynav.NavlibVector(picked_position.x, picked_position.y, picked_position.z) + + def get_units_to_meters(self)->float: + return 0.05 + + def is_user_pivot(self)->bool: + return False + + def set_camera_matrix(self, matrix : pynav.NavlibMatrix): + + # !!!!!! + # Hit testing in Orthographic view is not reliable + # Picking starts in camera position, not on near plane + # which results in wrong depth values (visible geometry + # cannot be picked properly) - Workaround needed (camera position offset) + # !!!!!! + if not self.get_is_view_perspective(): + affine = matrix._matrix + direction = Vector(-affine[0][2], -affine[1][2], -affine[2][2]) + distance = self._scene_center - Vector(affine[0][3], affine[1][3], affine[2][3]) + + cos_value = direction.dot(distance.normalized()) + + offset = 0. + + if (distance.length() < self._scene_radius) and (cos_value > 0.): + offset = self._scene_radius + elif (distance.length() < self._scene_radius) and (cos_value < 0.): + offset = 2. * self._scene_radius + elif (distance.length() > self._scene_radius) and (cos_value < 0.): + offset = 2. * distance.length() + + matrix._matrix[0][3] = matrix._matrix[0][3] - offset * direction.x + matrix._matrix[1][3] = matrix._matrix[1][3] - offset * direction.y + matrix._matrix[2][3] = matrix._matrix[2][3] - offset * direction.z + + transformation = Matrix(data = matrix._matrix) + self._scene.getActiveCamera().setTransformation(transformation) + + active_camera = self._scene.getActiveCamera() + if active_camera.isPerspective(): + camera_position = active_camera.getWorldPosition() + dist = (camera_position - self._pivot_node.getWorldPosition()).length() + scale = dist / 400. + if scale < 1.: + scale = scale * scale + else: + view_width = active_camera.getViewportWidth() + current_size = view_width + (2. * active_camera.getZoomFactor() * view_width) + scale = current_size / view_width * 5. + + self._pivot_node.scale(scale) + + def set_view_extents(self, extents: pynav.NavlibBox): + view_width = self._scene.getActiveCamera().getViewportWidth() + new_zoom = (extents._min._x + view_width / 2.) / - view_width + self._scene.getActiveCamera().setZoomFactor(new_zoom) + + def set_hit_selection_only(self, onlySelection : bool): + self._hit_selection_only = onlySelection + + def set_motion_flag(self, motion : bool): + if motion: + width = self._scene.getActiveCamera().getViewportWidth() + height = self._scene.getActiveCamera().getViewportHeight() + self._picking_pass = PickingPass(width, height) + self._renderer.addRenderPass(self._picking_pass) + else: + self._was_pick = False + self._renderer.removeRenderPass(self._picking_pass) + + def set_pivot_position(self, position): + self._pivot_node._target_node.setPosition(position=Vector(position._x, position._y, position._z), transform_space = SceneNode.TransformSpace.World) + + def set_pivot_visible(self, visible): + if visible: + self._scene.getRoot().addChild(self._pivot_node) + else: + self._scene.getRoot().removeChild(self._pivot_node) - def get_pivot_position(self)->pynav.NavlibVector: - return pynav.NavlibVector() - - def get_hit_look_at(self)->pynav.NavlibVector: - - if self._was_pick and self._pointer_pick is not None: - return pynav.NavlibVector(self._pointer_pick.x, self._pointer_pick.y, self._pointer_pick.z) - elif self._was_pick and self._pointer_pick is None: - return None - - from cura.Utils.Threading import call_on_qt_thread - wrapped_pick = call_on_qt_thread(self.pick) - picked_position = wrapped_pick(0, 0, self._hit_selection_only, 0.5) - - if picked_position is not None: - return pynav.NavlibVector(picked_position.x, picked_position.y, picked_position.z) - - def get_units_to_meters(self)->float: - return 0.05 - - def is_user_pivot(self)->bool: - return False - - def set_camera_matrix(self, matrix : pynav.NavlibMatrix): - - # !!!!!! - # Hit testing in Orthographic view is not reliable - # Picking starts in camera position, not on near plane - # which results in wrong depth values (visible geometry - # cannot be picked properly) - Workaround needed (camera position offset) - # !!!!!! - if not self.get_is_view_perspective(): - affine = matrix._matrix - direction = Vector(-affine[0][2], -affine[1][2], -affine[2][2]) - distance = self._scene_center - Vector(affine[0][3], affine[1][3], affine[2][3]) - - cos_value = direction.dot(distance.normalized()) - - offset = 0. - - if (distance.length() < self._scene_radius) and (cos_value > 0.): - offset = self._scene_radius - elif (distance.length() < self._scene_radius) and (cos_value < 0.): - offset = 2. * self._scene_radius - elif (distance.length() > self._scene_radius) and (cos_value < 0.): - offset = 2. * distance.length() - - matrix._matrix[0][3] = matrix._matrix[0][3] - offset * direction.x - matrix._matrix[1][3] = matrix._matrix[1][3] - offset * direction.y - matrix._matrix[2][3] = matrix._matrix[2][3] - offset * direction.z - - transformation = Matrix(data = matrix._matrix) - self._scene.getActiveCamera().setTransformation(transformation) - - active_camera = self._scene.getActiveCamera() - if active_camera.isPerspective(): - camera_position = active_camera.getWorldPosition() - dist = (camera_position - self._pivot_node.getWorldPosition()).length() - scale = dist / 400. - if scale < 1.: - scale = scale * scale - else: - view_width = active_camera.getViewportWidth() - current_size = view_width + (2. * active_camera.getZoomFactor() * view_width) - scale = current_size / view_width * 5. - - self._pivot_node.scale(scale) - - def set_view_extents(self, extents: pynav.NavlibBox): - view_width = self._scene.getActiveCamera().getViewportWidth() - new_zoom = (extents._min._x + view_width / 2.) / - view_width - self._scene.getActiveCamera().setZoomFactor(new_zoom) - - def set_hit_selection_only(self, onlySelection : bool): - self._hit_selection_only = onlySelection - - def set_motion_flag(self, motion : bool): - if motion: - width = self._scene.getActiveCamera().getViewportWidth() - height = self._scene.getActiveCamera().getViewportHeight() - self._picking_pass = PickingPass(width, height) - self._renderer.addRenderPass(self._picking_pass) - else: - self._was_pick = False - self._renderer.removeRenderPass(self._picking_pass) - - def set_pivot_position(self, position): - self._pivot_node._target_node.setPosition(position=Vector(position._x, position._y, position._z), transform_space = SceneNode.TransformSpace.World) - - def set_pivot_visible(self, visible): - if visible: - self._scene.getRoot().addChild(self._pivot_node) - else: - self._scene.getRoot().removeChild(self._pivot_node) - +except BaseException as exception: + Logger.warning(f"Unable to load 3DConnexion library: {exception}") + + # Define dummy class instead so that integration is transparent from outside + class NavlibClient: + def __init__(self, scene, renderer) -> None: + pass + + def put_profile_hint(self, hint) -> None: + pass + + def enable_navigation(self, enabled) -> None: + pass From b2bb7c6c3e7807f5082dd8a4642b361343f53310 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Feb 2025 15:08:25 +0100 Subject: [PATCH 272/276] Allow giving a specific OS when looking for pip package CURA-12404 --- scripts/get_pypi_hashes.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/get_pypi_hashes.py b/scripts/get_pypi_hashes.py index aabe9ece0a5..cd113129328 100755 --- a/scripts/get_pypi_hashes.py +++ b/scripts/get_pypi_hashes.py @@ -3,7 +3,7 @@ from pathlib import Path -def get_package_wheel_hashes(package, version): +def get_package_wheel_hashes(package, version, os): url = f"https://pypi.org/pypi/{package}/{version}/json" data = requests.get(url).json() @@ -12,7 +12,8 @@ def get_package_wheel_hashes(package, version): print(f" hashes:") for url in data["urls"]: - print(f" - sha256:{url['digests']['sha256']}") + if os is None or os in url["filename"]: + print(f" - sha256:{url['digests']['sha256']}") if __name__ == "__main__": @@ -20,5 +21,6 @@ def get_package_wheel_hashes(package, version): description="Display the hashes of the wheel files to be inserted in pip_requirements") parser.add_argument("package", type=Path, help="Name of the target package") parser.add_argument("version", type=Path, help="Version of the target package") + parser.add_argument('--os', type=str, help='Specific package OS', choices=['win', 'macosx', 'manylinux', 'musllinux']) args = parser.parse_args() - get_package_wheel_hashes(args.package, args.version) + get_package_wheel_hashes(args.package, args.version, args.os) From b338a370c05d5993415ad7e49d3c7f7de780ffd1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Feb 2025 15:09:00 +0100 Subject: [PATCH 273/276] Install pynavlib only on Windows and Mac CURA-12404 Because it is not available on Linux --- conandata.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/conandata.yml b/conandata.yml index dfe9eb2ea2a..20a961ef6e2 100644 --- a/conandata.yml +++ b/conandata.yml @@ -567,17 +567,6 @@ pip_requirements_core: hashes: - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 - pynavlib: - version: "0.9.4" - hashes: - - sha256:567efd0af97f9014326898b209eea94d9f5cc58e9f589ccf8354584568fcb87d - - sha256:fdd5ab5b6e0a2c9bbcebb154ac7303daf845865a1649be04e1bd8e8e5889401f - - sha256:f0d7ce426e816788aa96b419fd7da263eafb99aca46ce3b6e5dbaf2bbf6b614a - - sha256:493c4b3cacc939b021a694d99723106dbd7ee5515ad4dfc1c7fc8219ef20cf3a - - sha256:33962a322033a78db05a8c2cc3d59e057fbea5b04879c3c54e2fe3041d691a12 - - sha256:332831553a70be05fe58c43a08109b42970cfedc6086ffb4306859142a0e9210 - - sha256:d06d94b1dee4ba024b4a121869e572f571673a3b8c15b4055f52236d43c19a02 - - sha256:9173f61ad83172c306b92bbe38f949889c158cd6dfdc924db01f257a437bf2a6 Windows: twisted-iocpsupport: @@ -600,6 +589,22 @@ pip_requirements_core: hashes: - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 + pynavlib: + version: "0.9.4" + hashes: + - sha256:fdd5ab5b6e0a2c9bbcebb154ac7303daf845865a1649be04e1bd8e8e5889401f + - sha256:493c4b3cacc939b021a694d99723106dbd7ee5515ad4dfc1c7fc8219ef20cf3a + - sha256:332831553a70be05fe58c43a08109b42970cfedc6086ffb4306859142a0e9210 + - sha256:9173f61ad83172c306b92bbe38f949889c158cd6dfdc924db01f257a437bf2a6 + + Macos: + pynavlib: + version: "0.9.4" + hashes: + - sha256:567efd0af97f9014326898b209eea94d9f5cc58e9f589ccf8354584568fcb87d + - sha256:f0d7ce426e816788aa96b419fd7da263eafb99aca46ce3b6e5dbaf2bbf6b614a + - sha256:33962a322033a78db05a8c2cc3d59e057fbea5b04879c3c54e2fe3041d691a12 + - sha256:d06d94b1dee4ba024b4a121869e572f571673a3b8c15b4055f52236d43c19a02 pip_requirements_dev: any_os: From 9a92451f442bc9ce36a5768dc5f429192b1c3f34 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Feb 2025 16:15:25 +0100 Subject: [PATCH 274/276] Change the dynamic class definition to be more elegant CURA-12404 --- cura/NavlibClient.py | 436 ++++++++++++++++++++++--------------------- 1 file changed, 219 insertions(+), 217 deletions(-) diff --git a/cura/NavlibClient.py b/cura/NavlibClient.py index 4a81a5d9c28..68a07a55398 100644 --- a/cura/NavlibClient.py +++ b/cura/NavlibClient.py @@ -9,272 +9,274 @@ try: import pynavlib.pynavlib_interface as pynav + parent_class = pynav.NavlibNavigationModel +except BaseException as exception: + Logger.warning(f"Unable to load 3DConnexion library: {exception}") + pynav = None + parent_class = object - class NavlibClient(pynav.NavlibNavigationModel): - - def __init__(self, scene, renderer) -> None: - super().__init__(False, pynav.NavlibOptions.RowMajorOrder) - self._scene = scene - self._renderer = renderer - self._pointer_pick = None - self._was_pick = False - self._hit_selection_only = False - self._picking_pass = None - self._pivot_node = OverlayNode(node=SceneNode(), image_path=Resources.getPath(Resources.Images, "3dx_pivot.png"), size=3.) +class NavlibClient(parent_class): - def pick(self, x, y, check_selection = False, radius = 0.): + def __init__(self, scene, renderer) -> None: + if not pynav: + return - if self._picking_pass is None or radius < 0.: - return None + super().__init__(False, pynav.NavlibOptions.RowMajorOrder) + self._scene = scene + self._renderer = renderer + self._pointer_pick = None + self._was_pick = False + self._hit_selection_only = False + self._picking_pass = None + self._pivot_node = OverlayNode(node=SceneNode(), image_path=Resources.getPath(Resources.Images, "3dx_pivot.png"), size=3.) - step = 0. - if radius == 0.: - grid_resolution = 0 - else: - grid_resolution = 5 - step = (2. * radius) / float(grid_resolution) + def put_profile_hint(self, hint) -> None: + if pynav: + super().put_profile_hint(hint) - min_depth = 99999. - result_position = None + def enable_navigation(self, enabled) -> None: + if pynav: + super().enable_navigation(enabled) - for i in range(grid_resolution + 1): - for j in range(grid_resolution + 1): + def pick(self, x, y, check_selection = False, radius = 0.): - coord_x = (x - radius) + i * step - coord_y = (y - radius) + j * step + if self._picking_pass is None or radius < 0.: + return None - picked_depth = self._picking_pass.getPickedDepth(coord_x, coord_y) - max_depth = 16777.215 + step = 0. + if radius == 0.: + grid_resolution = 0 + else: + grid_resolution = 5 + step = (2. * radius) / float(grid_resolution) - if 0. < picked_depth < max_depth: + min_depth = 99999. + result_position = None - valid_hit = True - if check_selection: - selection_pass = self._renderer.getRenderPass("selection") - picked_object_id = selection_pass.getIdAtPosition(coord_x, coord_y) - picked_object = self._scene.findObject(picked_object_id) + for i in range(grid_resolution + 1): + for j in range(grid_resolution + 1): - from UM.Scene.Selection import Selection - valid_hit = Selection.isSelected(picked_object) + coord_x = (x - radius) + i * step + coord_y = (y - radius) + j * step - if not valid_hit and grid_resolution > 0.: - continue - elif not valid_hit and grid_resolution == 0.: - return None + picked_depth = self._picking_pass.getPickedDepth(coord_x, coord_y) + max_depth = 16777.215 - if picked_depth < min_depth: - min_depth = picked_depth - result_position = self._picking_pass.getPickedPosition(coord_x, coord_y) + if 0. < picked_depth < max_depth: - return result_position + valid_hit = True + if check_selection: + selection_pass = self._renderer.getRenderPass("selection") + picked_object_id = selection_pass.getIdAtPosition(coord_x, coord_y) + picked_object = self._scene.findObject(picked_object_id) - def get_pointer_position(self)->pynav.NavlibVector: + from UM.Scene.Selection import Selection + valid_hit = Selection.isSelected(picked_object) - from UM.Qt.QtApplication import QtApplication - main_window = QtApplication.getInstance().getMainWindow() + if not valid_hit and grid_resolution > 0.: + continue + elif not valid_hit and grid_resolution == 0.: + return None - x_n = 2. * main_window._mouse_x / self._scene.getActiveCamera().getViewportWidth() - 1. - y_n = 2. * main_window._mouse_y / self._scene.getActiveCamera().getViewportHeight() - 1. + if picked_depth < min_depth: + min_depth = picked_depth + result_position = self._picking_pass.getPickedPosition(coord_x, coord_y) - if self.get_is_view_perspective(): - self._was_pick = True - from cura.Utils.Threading import call_on_qt_thread - wrapped_pick = call_on_qt_thread(self.pick) + return result_position - self._pointer_pick = wrapped_pick(x_n, y_n) + def get_pointer_position(self) -> "pynav.NavlibVector": - return pynav.NavlibVector(0., 0., 0.) - else: - ray = self._scene.getActiveCamera().getRay(x_n, y_n) - pointer_position = ray.origin + ray.direction + from UM.Qt.QtApplication import QtApplication + main_window = QtApplication.getInstance().getMainWindow() - return pynav.NavlibVector(pointer_position.x, pointer_position.y, pointer_position.z) + x_n = 2. * main_window._mouse_x / self._scene.getActiveCamera().getViewportWidth() - 1. + y_n = 2. * main_window._mouse_y / self._scene.getActiveCamera().getViewportHeight() - 1. - def get_view_extents(self)->pynav.NavlibBox: + if self.get_is_view_perspective(): + self._was_pick = True + from cura.Utils.Threading import call_on_qt_thread + wrapped_pick = call_on_qt_thread(self.pick) - view_width = self._scene.getActiveCamera().getViewportWidth() - view_height = self._scene.getActiveCamera().getViewportHeight() - horizontal_zoom = view_width * self._scene.getActiveCamera().getZoomFactor() - vertical_zoom = view_height * self._scene.getActiveCamera().getZoomFactor() + self._pointer_pick = wrapped_pick(x_n, y_n) - pt_min = pynav.NavlibVector(-view_width / 2 - horizontal_zoom, -view_height / 2 - vertical_zoom, -9001) - pt_max = pynav.NavlibVector(view_width / 2 + horizontal_zoom, view_height / 2 + vertical_zoom, 9001) + return pynav.NavlibVector(0., 0., 0.) + else: + ray = self._scene.getActiveCamera().getRay(x_n, y_n) + pointer_position = ray.origin + ray.direction - return pynav.NavlibBox(pt_min, pt_max) + return pynav.NavlibVector(pointer_position.x, pointer_position.y, pointer_position.z) - def get_view_frustum(self)->pynav.NavlibFrustum: + def get_view_extents(self) -> "pynav.NavlibBox": - projection_matrix = self._scene.getActiveCamera().getProjectionMatrix() - half_height = 2. / projection_matrix.getData()[1,1] - half_width = half_height * (projection_matrix.getData()[1,1] / projection_matrix.getData()[0,0]) + view_width = self._scene.getActiveCamera().getViewportWidth() + view_height = self._scene.getActiveCamera().getViewportHeight() + horizontal_zoom = view_width * self._scene.getActiveCamera().getZoomFactor() + vertical_zoom = view_height * self._scene.getActiveCamera().getZoomFactor() - return pynav.NavlibFrustum(-half_width, half_width, -half_height, half_height, 1., 5000.) + pt_min = pynav.NavlibVector(-view_width / 2 - horizontal_zoom, -view_height / 2 - vertical_zoom, -9001) + pt_max = pynav.NavlibVector(view_width / 2 + horizontal_zoom, view_height / 2 + vertical_zoom, 9001) - def get_is_view_perspective(self)->bool: - return self._scene.getActiveCamera().isPerspective() + return pynav.NavlibBox(pt_min, pt_max) - def get_selection_extents(self)->pynav.NavlibBox: + def get_view_frustum(self) -> "pynav.NavlibFrustum": - from UM.Scene.Selection import Selection - bounding_box = Selection.getBoundingBox() + projection_matrix = self._scene.getActiveCamera().getProjectionMatrix() + half_height = 2. / projection_matrix.getData()[1,1] + half_width = half_height * (projection_matrix.getData()[1,1] / projection_matrix.getData()[0,0]) - if(bounding_box is not None) : - pt_min = pynav.NavlibVector(bounding_box.minimum.x, bounding_box.minimum.y, bounding_box.minimum.z) - pt_max = pynav.NavlibVector(bounding_box.maximum.x, bounding_box.maximum.y, bounding_box.maximum.z) - return pynav.NavlibBox(pt_min, pt_max) + return pynav.NavlibFrustum(-half_width, half_width, -half_height, half_height, 1., 5000.) - def get_selection_transform(self)->pynav.NavlibMatrix: - return pynav.NavlibMatrix() + def get_is_view_perspective(self) -> bool: + return self._scene.getActiveCamera().isPerspective() - def get_is_selection_empty(self)->bool: - from UM.Scene.Selection import Selection - return not Selection.hasSelection() + def get_selection_extents(self) -> "pynav.NavlibBox": - def get_pivot_visible(self)->bool: - return False + from UM.Scene.Selection import Selection + bounding_box = Selection.getBoundingBox() - def get_camera_matrix(self)->pynav.NavlibMatrix: + if(bounding_box is not None) : + pt_min = pynav.NavlibVector(bounding_box.minimum.x, bounding_box.minimum.y, bounding_box.minimum.z) + pt_max = pynav.NavlibVector(bounding_box.maximum.x, bounding_box.maximum.y, bounding_box.maximum.z) + return pynav.NavlibBox(pt_min, pt_max) - transformation = self._scene.getActiveCamera().getLocalTransformation() + def get_selection_transform(self) -> "pynav.NavlibMatrix": + return pynav.NavlibMatrix() - return pynav.NavlibMatrix([[transformation.at(0, 0), transformation.at(0, 1), transformation.at(0, 2), transformation.at(0, 3)], - [transformation.at(1, 0), transformation.at(1, 1), transformation.at(1, 2), transformation.at(1, 3)], - [transformation.at(2, 0), transformation.at(2, 1), transformation.at(2, 2), transformation.at(2, 3)], - [transformation.at(3, 0), transformation.at(3, 1), transformation.at(3, 2), transformation.at(3, 3)]]) + def get_is_selection_empty(self) -> bool: + from UM.Scene.Selection import Selection + return not Selection.hasSelection() - def get_coordinate_system(self)->pynav.NavlibMatrix: - return pynav.NavlibMatrix() + def get_pivot_visible(self) -> bool: + return False - def get_front_view(self)->pynav.NavlibMatrix: - return pynav.NavlibMatrix() + def get_camera_matrix(self) -> "pynav.NavlibMatrix": - def get_model_extents(self)->pynav.NavlibBox: + transformation = self._scene.getActiveCamera().getLocalTransformation() - result_bbox = AxisAlignedBox() - build_volume_bbox = None + return pynav.NavlibMatrix([[transformation.at(0, 0), transformation.at(0, 1), transformation.at(0, 2), transformation.at(0, 3)], + [transformation.at(1, 0), transformation.at(1, 1), transformation.at(1, 2), transformation.at(1, 3)], + [transformation.at(2, 0), transformation.at(2, 1), transformation.at(2, 2), transformation.at(2, 3)], + [transformation.at(3, 0), transformation.at(3, 1), transformation.at(3, 2), transformation.at(3, 3)]]) - for node in DepthFirstIterator(self._scene.getRoot()): - node.setCalculateBoundingBox(True) - if node.__class__.__qualname__ == "CuraSceneNode" : - result_bbox = result_bbox + node.getBoundingBox() - elif node.__class__.__qualname__ == "BuildVolume": - build_volume_bbox = node.getBoundingBox() + def get_coordinate_system(self) -> "pynav.NavlibMatrix": + return pynav.NavlibMatrix() - if not result_bbox.isValid(): - result_bbox = build_volume_bbox + def get_front_view(self) -> "pynav.NavlibMatrix": + return pynav.NavlibMatrix() - if result_bbox is not None: - pt_min = pynav.NavlibVector(result_bbox.minimum.x, result_bbox.minimum.y, result_bbox.minimum.z) - pt_max = pynav.NavlibVector(result_bbox.maximum.x, result_bbox.maximum.y, result_bbox.maximum.z) - self._scene_center = result_bbox.center - self._scene_radius = (result_bbox.maximum - self._scene_center).length() - return pynav.NavlibBox(pt_min, pt_max) + def get_model_extents(self) -> "pynav.NavlibBox": - def get_pivot_position(self)->pynav.NavlibVector: - return pynav.NavlibVector() + result_bbox = AxisAlignedBox() + build_volume_bbox = None - def get_hit_look_at(self)->pynav.NavlibVector: + for node in DepthFirstIterator(self._scene.getRoot()): + node.setCalculateBoundingBox(True) + if node.__class__.__qualname__ == "CuraSceneNode" : + result_bbox = result_bbox + node.getBoundingBox() + elif node.__class__.__qualname__ == "BuildVolume": + build_volume_bbox = node.getBoundingBox() - if self._was_pick and self._pointer_pick is not None: - return pynav.NavlibVector(self._pointer_pick.x, self._pointer_pick.y, self._pointer_pick.z) - elif self._was_pick and self._pointer_pick is None: - return None + if not result_bbox.isValid(): + result_bbox = build_volume_bbox - from cura.Utils.Threading import call_on_qt_thread - wrapped_pick = call_on_qt_thread(self.pick) - picked_position = wrapped_pick(0, 0, self._hit_selection_only, 0.5) - - if picked_position is not None: - return pynav.NavlibVector(picked_position.x, picked_position.y, picked_position.z) - - def get_units_to_meters(self)->float: - return 0.05 - - def is_user_pivot(self)->bool: - return False - - def set_camera_matrix(self, matrix : pynav.NavlibMatrix): - - # !!!!!! - # Hit testing in Orthographic view is not reliable - # Picking starts in camera position, not on near plane - # which results in wrong depth values (visible geometry - # cannot be picked properly) - Workaround needed (camera position offset) - # !!!!!! - if not self.get_is_view_perspective(): - affine = matrix._matrix - direction = Vector(-affine[0][2], -affine[1][2], -affine[2][2]) - distance = self._scene_center - Vector(affine[0][3], affine[1][3], affine[2][3]) - - cos_value = direction.dot(distance.normalized()) - - offset = 0. - - if (distance.length() < self._scene_radius) and (cos_value > 0.): - offset = self._scene_radius - elif (distance.length() < self._scene_radius) and (cos_value < 0.): - offset = 2. * self._scene_radius - elif (distance.length() > self._scene_radius) and (cos_value < 0.): - offset = 2. * distance.length() - - matrix._matrix[0][3] = matrix._matrix[0][3] - offset * direction.x - matrix._matrix[1][3] = matrix._matrix[1][3] - offset * direction.y - matrix._matrix[2][3] = matrix._matrix[2][3] - offset * direction.z - - transformation = Matrix(data = matrix._matrix) - self._scene.getActiveCamera().setTransformation(transformation) - - active_camera = self._scene.getActiveCamera() - if active_camera.isPerspective(): - camera_position = active_camera.getWorldPosition() - dist = (camera_position - self._pivot_node.getWorldPosition()).length() - scale = dist / 400. - if scale < 1.: - scale = scale * scale - else: - view_width = active_camera.getViewportWidth() - current_size = view_width + (2. * active_camera.getZoomFactor() * view_width) - scale = current_size / view_width * 5. - - self._pivot_node.scale(scale) - - def set_view_extents(self, extents: pynav.NavlibBox): - view_width = self._scene.getActiveCamera().getViewportWidth() - new_zoom = (extents._min._x + view_width / 2.) / - view_width - self._scene.getActiveCamera().setZoomFactor(new_zoom) - - def set_hit_selection_only(self, onlySelection : bool): - self._hit_selection_only = onlySelection - - def set_motion_flag(self, motion : bool): - if motion: - width = self._scene.getActiveCamera().getViewportWidth() - height = self._scene.getActiveCamera().getViewportHeight() - self._picking_pass = PickingPass(width, height) - self._renderer.addRenderPass(self._picking_pass) - else: - self._was_pick = False - self._renderer.removeRenderPass(self._picking_pass) - - def set_pivot_position(self, position): - self._pivot_node._target_node.setPosition(position=Vector(position._x, position._y, position._z), transform_space = SceneNode.TransformSpace.World) - - def set_pivot_visible(self, visible): - if visible: - self._scene.getRoot().addChild(self._pivot_node) - else: - self._scene.getRoot().removeChild(self._pivot_node) - -except BaseException as exception: - Logger.warning(f"Unable to load 3DConnexion library: {exception}") + if result_bbox is not None: + pt_min = pynav.NavlibVector(result_bbox.minimum.x, result_bbox.minimum.y, result_bbox.minimum.z) + pt_max = pynav.NavlibVector(result_bbox.maximum.x, result_bbox.maximum.y, result_bbox.maximum.z) + self._scene_center = result_bbox.center + self._scene_radius = (result_bbox.maximum - self._scene_center).length() + return pynav.NavlibBox(pt_min, pt_max) - # Define dummy class instead so that integration is transparent from outside - class NavlibClient: - def __init__(self, scene, renderer) -> None: - pass + def get_pivot_position(self) -> "pynav.NavlibVector": + return pynav.NavlibVector() + + def get_hit_look_at(self) -> "pynav.NavlibVector": + + if self._was_pick and self._pointer_pick is not None: + return pynav.NavlibVector(self._pointer_pick.x, self._pointer_pick.y, self._pointer_pick.z) + elif self._was_pick and self._pointer_pick is None: + return None + + from cura.Utils.Threading import call_on_qt_thread + wrapped_pick = call_on_qt_thread(self.pick) + picked_position = wrapped_pick(0, 0, self._hit_selection_only, 0.5) + + if picked_position is not None: + return pynav.NavlibVector(picked_position.x, picked_position.y, picked_position.z) + + def get_units_to_meters(self) -> float: + return 0.05 + + def is_user_pivot(self) -> bool: + return False + + def set_camera_matrix(self, matrix : "pynav.NavlibMatrix"): + + # !!!!!! + # Hit testing in Orthographic view is not reliable + # Picking starts in camera position, not on near plane + # which results in wrong depth values (visible geometry + # cannot be picked properly) - Workaround needed (camera position offset) + # !!!!!! + if not self.get_is_view_perspective(): + affine = matrix._matrix + direction = Vector(-affine[0][2], -affine[1][2], -affine[2][2]) + distance = self._scene_center - Vector(affine[0][3], affine[1][3], affine[2][3]) + + cos_value = direction.dot(distance.normalized()) + + offset = 0. + + if (distance.length() < self._scene_radius) and (cos_value > 0.): + offset = self._scene_radius + elif (distance.length() < self._scene_radius) and (cos_value < 0.): + offset = 2. * self._scene_radius + elif (distance.length() > self._scene_radius) and (cos_value < 0.): + offset = 2. * distance.length() + + matrix._matrix[0][3] = matrix._matrix[0][3] - offset * direction.x + matrix._matrix[1][3] = matrix._matrix[1][3] - offset * direction.y + matrix._matrix[2][3] = matrix._matrix[2][3] - offset * direction.z + + transformation = Matrix(data = matrix._matrix) + self._scene.getActiveCamera().setTransformation(transformation) + + active_camera = self._scene.getActiveCamera() + if active_camera.isPerspective(): + camera_position = active_camera.getWorldPosition() + dist = (camera_position - self._pivot_node.getWorldPosition()).length() + scale = dist / 400. + if scale < 1.: + scale = scale * scale + else: + view_width = active_camera.getViewportWidth() + current_size = view_width + (2. * active_camera.getZoomFactor() * view_width) + scale = current_size / view_width * 5. + + self._pivot_node.scale(scale) + + def set_view_extents(self, extents: "pynav.NavlibBox"): + view_width = self._scene.getActiveCamera().getViewportWidth() + new_zoom = (extents._min._x + view_width / 2.) / - view_width + self._scene.getActiveCamera().setZoomFactor(new_zoom) + + def set_hit_selection_only(self, onlySelection : bool): + self._hit_selection_only = onlySelection + + def set_motion_flag(self, motion : bool): + if motion: + width = self._scene.getActiveCamera().getViewportWidth() + height = self._scene.getActiveCamera().getViewportHeight() + self._picking_pass = PickingPass(width, height) + self._renderer.addRenderPass(self._picking_pass) + else: + self._was_pick = False + self._renderer.removeRenderPass(self._picking_pass) - def put_profile_hint(self, hint) -> None: - pass + def set_pivot_position(self, position): + self._pivot_node._target_node.setPosition(position=Vector(position._x, position._y, position._z), transform_space = SceneNode.TransformSpace.World) - def enable_navigation(self, enabled) -> None: - pass + def set_pivot_visible(self, visible): + if visible: + self._scene.getRoot().addChild(self._pivot_node) + else: + self._scene.getRoot().removeChild(self._pivot_node) From c072c1105274bda4860b11ae5e9cce2688d7e6f9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Feb 2025 08:56:42 +0100 Subject: [PATCH 275/276] Restore pynavlib path before bundle CURA-12261 This should allow us not to have to re-sign the file manually --- UltiMaker-Cura.spec.jinja | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 6d06ab7ff96..2ae5479e314 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -1,5 +1,6 @@ # -*- mode: python ; coding: utf-8 -*- import os +import subprocess from pathlib import Path from PyInstaller.utils.hooks import collect_all @@ -71,6 +72,9 @@ coll = COLLECT( ) {% if macos == true %} +# Restore the path from embedded pynavlib to system-wide-installed 3DconnexionNavlib +subprocess.run(['install_name_tool', '-change', '@rpath/3DconnexionNavlib', '/Library/Frameworks/3DconnexionNavlib.framework/3DconnexionNavlib', 'dist/UltiMaker Cura.app/Contents/Frameworks/pynavlib/_pynavlib.cpython-312-darwin.so'], check=True) + app = BUNDLE( coll, name='{{ display_name }}.app', From 451ad694e8625b4aa9e27296bbe78c63d5181873 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Feb 2025 10:07:02 +0100 Subject: [PATCH 276/276] Revert "Restore pynavlib path before bundle" This reverts commit c072c1105274bda4860b11ae5e9cce2688d7e6f9. --- UltiMaker-Cura.spec.jinja | 4 ---- 1 file changed, 4 deletions(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 2ae5479e314..6d06ab7ff96 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -1,6 +1,5 @@ # -*- mode: python ; coding: utf-8 -*- import os -import subprocess from pathlib import Path from PyInstaller.utils.hooks import collect_all @@ -72,9 +71,6 @@ coll = COLLECT( ) {% if macos == true %} -# Restore the path from embedded pynavlib to system-wide-installed 3DconnexionNavlib -subprocess.run(['install_name_tool', '-change', '@rpath/3DconnexionNavlib', '/Library/Frameworks/3DconnexionNavlib.framework/3DconnexionNavlib', 'dist/UltiMaker Cura.app/Contents/Frameworks/pynavlib/_pynavlib.cpython-312-darwin.so'], check=True) - app = BUNDLE( coll, name='{{ display_name }}.app',