From efaf2f8e34d48989d15a4ca5843f7904fa5c9aa7 Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Sun, 5 Nov 2023 21:42:50 +0800 Subject: [PATCH 01/47] Add orca bot --- .github/workflows/orca_bot.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/orca_bot.yml diff --git a/.github/workflows/orca_bot.yml b/.github/workflows/orca_bot.yml new file mode 100644 index 0000000000..220b00e894 --- /dev/null +++ b/.github/workflows/orca_bot.yml @@ -0,0 +1,22 @@ +name: Orca bot +on: + schedule: + - cron: "30 1 * * *" + +jobs: + close-issues: + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + steps: + - uses: actions/stale@v5 + with: + days-before-issue-stale: 90 + days-before-issue-close: 14 + stale-issue-label: "stale" + stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity." + close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 14 days since being marked as stale." + days-before-pr-stale: -1 + days-before-pr-close: -1 + repo-token: ${{ secrets.GITHUB_TOKEN }} From 7510eb6f7286e1295f54fa388748779724b2485c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 13:07:30 +0800 Subject: [PATCH 02/47] Update orca_bot.yml --- .github/workflows/orca_bot.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/orca_bot.yml b/.github/workflows/orca_bot.yml index 220b00e894..17b1712382 100644 --- a/.github/workflows/orca_bot.yml +++ b/.github/workflows/orca_bot.yml @@ -1,7 +1,7 @@ name: Orca bot on: schedule: - - cron: "30 1 * * *" + - cron: "*/5 * * * *" jobs: close-issues: @@ -14,9 +14,12 @@ jobs: with: days-before-issue-stale: 90 days-before-issue-close: 14 + operations-per-run: 200 stale-issue-label: "stale" stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity." close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 14 days since being marked as stale." days-before-pr-stale: -1 days-before-pr-close: -1 + remove-issue-stale-when-updated: true + remove-pr-stale-when-updated: true repo-token: ${{ secrets.GITHUB_TOKEN }} From e018e0ade0369db3d7c5a85de23635a352e72279 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 13:36:16 +0800 Subject: [PATCH 03/47] Update orca_bot.yml (#2625) increase operations-per-run to 3000 --- .github/workflows/orca_bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/orca_bot.yml b/.github/workflows/orca_bot.yml index 17b1712382..0bbc5f9fa8 100644 --- a/.github/workflows/orca_bot.yml +++ b/.github/workflows/orca_bot.yml @@ -14,7 +14,7 @@ jobs: with: days-before-issue-stale: 90 days-before-issue-close: 14 - operations-per-run: 200 + operations-per-run: 3000 stale-issue-label: "stale" stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity." close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 14 days since being marked as stale." From 129547f2ce6436bba2312932364c4f3de34b02ef Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 14:19:13 +0800 Subject: [PATCH 04/47] Update orca_bot.yml --- .github/workflows/orca_bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/orca_bot.yml b/.github/workflows/orca_bot.yml index 0bbc5f9fa8..949c61b297 100644 --- a/.github/workflows/orca_bot.yml +++ b/.github/workflows/orca_bot.yml @@ -14,7 +14,7 @@ jobs: with: days-before-issue-stale: 90 days-before-issue-close: 14 - operations-per-run: 3000 + operations-per-run: 1000 stale-issue-label: "stale" stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity." close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 14 days since being marked as stale." From c24648d470a9624e13554c1299b864e422ce25ce Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 14:20:04 +0800 Subject: [PATCH 05/47] Update orca_bot.yml --- .github/workflows/orca_bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/orca_bot.yml b/.github/workflows/orca_bot.yml index 949c61b297..a60a9b6205 100644 --- a/.github/workflows/orca_bot.yml +++ b/.github/workflows/orca_bot.yml @@ -1,7 +1,7 @@ name: Orca bot on: schedule: - - cron: "*/5 * * * *" + - cron: "0 0 * * *" jobs: close-issues: From fcc4b03054072fb5de444eb55317341b58d79199 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 18:31:31 +0800 Subject: [PATCH 06/47] small_perimeter_speed shouldn't be 0 --- .../process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json | 2 +- .../0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json | 2 +- .../process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json | 2 +- .../0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json index ad1801d0c8..02569cbfee 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json @@ -109,7 +109,7 @@ "print_flow_ratio": "0.98", "only_one_wall_top": "1", "slow_down_layers": "1", - "small_perimeter_speed": "0", + "small_perimeter_speed": "50%", "overhang_speed_classic": "1", "internal_bridge_speed": "50", "outer_wall_acceleration": "5000", diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json index e431269ad9..def1a6b7fc 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json @@ -109,7 +109,7 @@ "print_flow_ratio": "0.98", "only_one_wall_top": "1", "slow_down_layers": "1", - "small_perimeter_speed": "0", + "small_perimeter_speed": "50%", "overhang_speed_classic": "1", "internal_bridge_speed": "50", "outer_wall_acceleration": "5000", diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json index 6e3302aa17..439e2bd571 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json @@ -106,7 +106,7 @@ "exclude_object": "0", "wall_generator": "classic", "only_one_wall_top": "1", - "small_perimeter_speed": "0", + "small_perimeter_speed": "50%", "overhang_speed_classic": "1", "internal_bridge_speed": "50", "outer_wall_acceleration": "5000", diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json index 08a0518188..0006a92803 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json @@ -135,7 +135,7 @@ "slice_closing_radius": "0.049", "slicing_mode": "regular", "slow_down_layers": "1", - "small_perimeter_speed": "0", + "small_perimeter_speed": "50%", "small_perimeter_threshold": "0", "solid_infill_filament": "1", "sparse_infill_acceleration": "100%", From 4eae93080f54b5f6e5bf7d757060fd3665e0d039 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 18:32:19 +0800 Subject: [PATCH 07/47] Fix vector too long issues --- src/libslic3r/GCode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index a7531d46fc..fa565cbe21 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2187,7 +2187,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato bbox_wo_wt.merge(unscaled(objPtr->get_first_layer_bbox(data.area, data.layer_height, data.name))); } auto center = bbox_wo_wt.center(); - this->placeholder_parser().set("first_layer_center_no_wipe_tower", new ConfigOptionFloats(center.x(), center.y())); + this->placeholder_parser().set("first_layer_center_no_wipe_tower", new ConfigOptionFloats({center.x(), center.y()})); } bool activate_chamber_temp_control = false; auto max_chamber_temp = 0; From bea9b546892e393048cfa3a57f33f329631023e1 Mon Sep 17 00:00:00 2001 From: Hukete <100949318+Hukete@users.noreply.github.com> Date: Mon, 6 Nov 2023 21:57:24 +0800 Subject: [PATCH 08/47] Update profiles for Qidi printers (#2629) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 10-25 Add TPU-95A HF * 1030 Adding Introduction of Chamber Temperature Control Macros(M191) to Notes * 1102 Add ABS-GF10 profile， Remove a extra "s" from the "0.36mm Standard @Qidi XPlus3 0.6 nozzle.json" file * 1106 Add the PA value to some genetic filament profiles * Update fdm_process_qidi_x3_common.json The macro code cant add to the bottom of the printer.cfg --- .../Qidi/filament/Qidi Generic ABS.json | 6 ++++++ .../Qidi/filament/Qidi Generic PA-CF.json | 6 ++++++ .../Qidi/filament/Qidi Generic PA.json | 8 +++++++- .../Qidi/filament/Qidi Generic PC.json | 8 +++++++- .../Qidi/filament/Qidi Generic PETG.json | 6 ++++++ .../Qidi/filament/Qidi Generic PLA.json | 6 ++++++ .../Qidi/filament/fdm_filament_pc.json | 18 +++++++++--------- .../process/fdm_process_qidi_x3_common.json | 2 +- 8 files changed, 48 insertions(+), 12 deletions(-) diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Qidi Generic ABS.json index 3d6b21c174..4c403010f7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS.json @@ -11,6 +11,12 @@ ], "filament_max_volumetric_speed": [ "15" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json index e61722e25f..ae06eb1e20 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json @@ -36,6 +36,12 @@ "full_fan_speed_layer": [ "2" ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.01" + ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA.json b/resources/profiles/Qidi/filament/Qidi Generic PA.json index 3e39fa7152..7f7b60568b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA.json @@ -18,8 +18,14 @@ "filament_max_volumetric_speed": [ "16" ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.03" + ], "filament_start_gcode": [ - "; filament start gcode\nM141 S55\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC.json b/resources/profiles/Qidi/filament/Qidi Generic PC.json index a9540d821f..7fbf2480c6 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC.json @@ -7,13 +7,19 @@ "instantiation": "true", "inherits": "fdm_filament_pc", "filament_max_volumetric_speed": [ - "16" + "5" ], "filament_flow_ratio": [ "0.94" ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.04" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG.json b/resources/profiles/Qidi/filament/Qidi Generic PETG.json index 39d3c34e88..321112ec93 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG.json @@ -38,6 +38,12 @@ ], "filament_max_volumetric_speed": [ "9" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.042" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA.json b/resources/profiles/Qidi/filament/Qidi Generic PLA.json index 414a4a6557..7c31a1e2fc 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA.json @@ -14,6 +14,12 @@ ], "slow_down_layer_time": [ "5" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.032" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/fdm_filament_pc.json b/resources/profiles/Qidi/filament/fdm_filament_pc.json index daf96f0164..d0e54b9872 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_pc.json +++ b/resources/profiles/Qidi/filament/fdm_filament_pc.json @@ -8,25 +8,25 @@ "0" ], "eng_plate_temp" : [ - "110" + "100" ], "hot_plate_temp" : [ - "110" + "100" ], "textured_plate_temp" : [ - "110" + "100" ], "cool_plate_temp_initial_layer" : [ "0" ], "eng_plate_temp_initial_layer" : [ - "110" + "100" ], "hot_plate_temp_initial_layer" : [ - "110" + "100" ], "textured_plate_temp_initial_layer" : [ - "110" + "100" ], "slow_down_for_layer_cooling": [ "1" @@ -50,7 +50,7 @@ "20" ], "nozzle_temperature_initial_layer": [ - "270" + "250" ], "reduce_fan_stop_start_freq": [ "1" @@ -65,10 +65,10 @@ "25%" ], "overhang_fan_speed": [ - "60" + "80" ], "nozzle_temperature": [ - "280" + "250" ], "temperature_vitrification": [ "120" diff --git a/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json b/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json index a4c8fc9372..cd84825bc2 100644 --- a/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json +++ b/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json @@ -113,5 +113,5 @@ "internal_bridge_speed": "50", "internal_solid_infill_pattern": "monotonic", "initial_layer_travel_speed": "50%", - "notes": "If you want to use Orca's chamber temperature control feature, check that printer.cfg has added the following M191 macro.\nTo add it: go to Fluidd web interface--configuration, copy the following code to the bottom of the printer.cfg document, SAVE&RESATART \n\n[gcode_macro M191]\ngcode:\n #Parameters\n {% set s = params.S|float %}\n \n M141 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp\n {% if s != 0 %}\n TEMPERATURE_WAIT SENSOR=\"heater_generic hot\" MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree)\n {% endif %}" + "notes": "If you want to use Orca's chamber temperature control feature, check that printer.cfg has added the following M191 macro.\nTo add it: go to Fluidd web interface--configuration, copy the following code to the top of the printer.cfg document, SAVE&RESATART \n\n[gcode_macro M191]\ngcode:\n #Parameters\n {% set s = params.S|float %}\n \n M141 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp\n {% if s != 0 %}\n TEMPERATURE_WAIT SENSOR=\"heater_generic hot\" MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree)\n {% endif %}" } From 9f599cd51f128487824d10952b596d0584116167 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 6 Nov 2023 23:02:40 +0800 Subject: [PATCH 09/47] Fixed #2537: pa pattern issues on delta printers --- src/libslic3r/calib.cpp | 11 ++--------- src/libslic3r/calib.hpp | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index 93884f70f5..f392af9eb7 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -528,14 +528,14 @@ CalibPressureAdvancePattern::CalibPressureAdvancePattern( }; void CalibPressureAdvancePattern::generate_custom_gcodes(const DynamicPrintConfig &config, - bool is_bbl_machine, + bool is_bbl_machine, Model &model, const Vec3d &origin) { std::stringstream gcode; gcode << "; start pressure advance pattern for layer\n"; - refresh_setup(config, is_bbl_machine, model, origin); + refresh_setup(config, is_bbl_machine, model, origin); gcode << move_to(Vec2d(m_starting_point.x(), m_starting_point.y()), m_writer, "Move to start XY position"); gcode << m_writer.travel_to_z(height_first_layer(), "Move to start Z position"); @@ -686,8 +686,6 @@ void CalibPressureAdvancePattern::refresh_setup(const DynamicPrintConfig &config m_config.apply(model.objects.front()->config.get(), true); m_config.apply(model.objects.front()->volumes.front()->config.get(), true); - m_is_delta = (m_config.option("printable_area")->values.size() > 4); - _refresh_starting_point(model); _refresh_writer(is_bbl_machine, model, origin); } @@ -702,11 +700,6 @@ void CalibPressureAdvancePattern::_refresh_starting_point(const Model &model) m_starting_point = Vec3d(bbox.min.x(), bbox.max.y(), 0); m_starting_point.y() += m_handle_spacing; - - if (m_is_delta) { - m_starting_point.x() *= -1; - m_starting_point.y() -= (frame_size_y() / 2); - } } void CalibPressureAdvancePattern::_refresh_writer(bool is_bbl_machine, const Model &model, const Vec3d &origin) diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp index b05c502b28..fdabd47cc1 100644 --- a/src/libslic3r/calib.hpp +++ b/src/libslic3r/calib.hpp @@ -294,7 +294,6 @@ private: const Calib_Params &m_params; GCodeWriter m_writer; - bool m_is_delta; Vec3d m_starting_point; bool m_is_start_point_fixed = false; From c0a8f430f8278b337510951b5f932589ec827098 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Mon, 6 Nov 2023 23:21:07 +0800 Subject: [PATCH 10/47] Add back the option to disable `ensure vertical shell thickness` and `detect narrow internal solid infill` (#2626) * Add back the option to disable `ensure vertical shell thickness` (#2602) * Add back the option to disable `detect narrow internal solid infill` (#2623) --- src/libslic3r/Fill/Fill.cpp | 2 +- src/libslic3r/Preset.cpp | 3 +- src/libslic3r/PrintConfig.cpp | 21 ++- src/libslic3r/PrintConfig.hpp | 2 + src/libslic3r/PrintObject.cpp | 179 +++++++++++++++++++++++++- src/slic3r/GUI/ConfigManipulation.cpp | 4 +- src/slic3r/GUI/Tab.cpp | 2 + 7 files changed, 207 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 57832c65a6..71de24f436 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -645,7 +645,7 @@ std::vector group_fills(const Layer &layer) } // BBS: detect narrow internal solid infill area and use ipConcentricInternal pattern instead - /*if (layer.object()->config().detect_narrow_internal_solid_infill)*/ { + if (layer.object()->config().detect_narrow_internal_solid_infill) { size_t surface_fills_size = surface_fills.size(); for (size_t i = 0; i < surface_fills_size; i++) { if (surface_fills[i].surface.surface_type != stInternalSolid) diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index cf2d7f3e39..f09240129e 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -726,7 +726,7 @@ bool Preset::has_cali_lines(PresetBundle* preset_bundle) static std::vector s_Preset_print_options { "layer_height", "initial_layer_print_height", "wall_loops", "slice_closing_radius", "spiral_mode", "slicing_mode", "top_shell_layers", "top_shell_thickness", "bottom_shell_layers", "bottom_shell_thickness", - "extra_perimeters_on_overhangs", "reduce_crossing_wall", "detect_thin_wall", "detect_overhang_wall", "overhang_reverse", "overhang_reverse_threshold", + "extra_perimeters_on_overhangs", "ensure_vertical_shell_thickness", "reduce_crossing_wall", "detect_thin_wall", "detect_overhang_wall", "overhang_reverse", "overhang_reverse_threshold", "seam_position", "staggered_inner_seams", "wall_infill_order", "sparse_infill_density", "sparse_infill_pattern", "top_surface_pattern", "bottom_surface_pattern", "infill_direction", "minimum_sparse_infill_area", "reduce_infill_retraction","internal_solid_infill_pattern", @@ -756,6 +756,7 @@ static std::vector s_Preset_print_options { "flush_into_infill", "flush_into_objects", "flush_into_support", "tree_support_branch_angle", "tree_support_angle_slow", "tree_support_wall_count", "tree_support_top_rate", "tree_support_branch_distance", "tree_support_tip_diameter", "tree_support_branch_diameter", "tree_support_branch_diameter_angle", "tree_support_branch_diameter_double_wall", + "detect_narrow_internal_solid_infill", "gcode_add_line_number", "enable_arc_fitting", "infill_combination", /*"adaptive_layer_height",*/ "support_bottom_interface_spacing", "enable_overhang_speed", "slowdown_for_curled_perimeters", "overhang_1_4_speed", "overhang_2_4_speed", "overhang_3_4_speed", "overhang_4_4_speed", "initial_layer_infill_speed", "only_one_wall_top", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 6146c7cbc9..aa63e6bfd7 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1183,6 +1183,14 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionStrings { " " }); + def = this->add("ensure_vertical_shell_thickness", coBool); + def->label = L("Ensure vertical shell thickness"); + def->category = L("Strength"); + def->tooltip = L("Add solid infill near sloping surfaces to guarantee the vertical shell thickness " + "(top+bottom solid layers)"); + def->mode = comAdvanced; + def->set_default_value(new ConfigOptionBool(true)); + auto def_top_fill_pattern = def = this->add("top_surface_pattern", coEnum); def->label = L("Top surface pattern"); def->category = L("Strength"); @@ -4390,6 +4398,15 @@ def = this->add("filament_loading_speed", coFloats); default: assert(false); } } + + def = this->add("detect_narrow_internal_solid_infill", coBool); + def->label = L("Detect narrow internal solid infill"); + def->category = L("Strength"); + def->tooltip = L("This option will auto detect narrow internal solid infill area." + " If enabled, concentric pattern will be used for the area to speed printing up." + " Otherwise, rectilinear pattern is used defaultly."); + def->mode = comAdvanced; + def->set_default_value(new ConfigOptionBool(true)); } void PrintConfigDef::init_extruder_option_keys() @@ -5194,8 +5211,8 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va "support_transition_line_width", "support_transition_speed", "bed_temperature", "bed_temperature_initial_layer", "can_switch_nozzle_type", "can_add_auxiliary_fan", "extra_flush_volume", "spaghetti_detector", "adaptive_layer_height", "z_hop_type", "z_lift_type", "bed_temperature_difference", - "detect_narrow_internal_solid_infill", "ensure_vertical_shell_thickness","extruder_type", - "internal_bridge_support_thickness","ensure_vertical_shell_thickness","extruder_clearance_max_radius" + "extruder_type", + "internal_bridge_support_thickness","extruder_clearance_max_radius" }; if (ignore.find(opt_key) != ignore.end()) { diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index d34c992e21..fd853e1d0c 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -747,6 +747,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, tree_support_adaptive_layer_height)) ((ConfigOptionBool, tree_support_auto_brim)) ((ConfigOptionFloat, tree_support_brim_width)) + ((ConfigOptionBool, detect_narrow_internal_solid_infill)) // ((ConfigOptionBool, adaptive_layer_height)) ((ConfigOptionFloat, support_bottom_interface_spacing)) ((ConfigOptionEnum, wall_generator)) @@ -797,6 +798,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloat, bridge_flow)) ((ConfigOptionFloat, bridge_speed)) ((ConfigOptionFloatOrPercent, internal_bridge_speed)) + ((ConfigOptionBool, ensure_vertical_shell_thickness)) ((ConfigOptionEnum, top_surface_pattern)) ((ConfigOptionEnum, bottom_surface_pattern)) ((ConfigOptionEnum, internal_solid_infill_pattern)) diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index b1dba25c64..8d6175cc0a 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1057,6 +1057,7 @@ bool PrintObject::invalidate_state_by_config_options( || opt_key == "solid_infill_filament" || opt_key == "sparse_infill_line_width" || opt_key == "infill_direction" + || opt_key == "ensure_vertical_shell_thickness" || opt_key == "bridge_angle" //BBS || opt_key == "bridge_density") { @@ -1520,6 +1521,18 @@ void PrintObject::discover_vertical_shells() if (top_bottom_surfaces_all_regions) { // This is a multi-material print and interface_shells are disabled, meaning that the vertical shell thickness // is calculated over all materials. + // Is the "ensure vertical wall thickness" applicable to any region? + bool has_extra_layers = false; + for (size_t region_id = 0; region_id < this->num_printing_regions(); ++region_id) { + const PrintRegionConfig &config = this->printing_region(region_id).config(); + if (config.ensure_vertical_shell_thickness.value) { + has_extra_layers = true; + break; + } + } + if (! has_extra_layers) + // The "ensure vertical wall thickness" feature is not applicable to any of the regions. Quit. + return; BOOST_LOG_TRIVIAL(debug) << "Discovering vertical shells in parallel - start : cache top / bottom"; //FIXME Improve the heuristics for a grain size. size_t grain_size = std::max(num_layers / 16, size_t(1)); @@ -1589,6 +1602,11 @@ void PrintObject::discover_vertical_shells() } for (size_t region_id = 0; region_id < this->num_printing_regions(); ++ region_id) { + const PrintRegion ®ion = this->printing_region(region_id); + if (! region.config().ensure_vertical_shell_thickness.value) + // This region will be handled by discover_horizontal_shells(). + continue; + //FIXME Improve the heuristics for a grain size. size_t grain_size = std::max(num_layers / 16, size_t(1)); @@ -3109,7 +3127,166 @@ void PrintObject::discover_horizontal_shells() surface.surface_type = type; } #endif - // The rest has already been performed by discover_vertical_shells(). + + // If ensure_vertical_shell_thickness, then the rest has already been performed by discover_vertical_shells(). + if (region_config.ensure_vertical_shell_thickness.value) + continue; + + coordf_t print_z = layer->print_z; + coordf_t bottom_z = layer->bottom_z(); + for (size_t idx_surface_type = 0; idx_surface_type < 3; ++ idx_surface_type) { + m_print->throw_if_canceled(); + SurfaceType type = (idx_surface_type == 0) ? stTop : (idx_surface_type == 1) ? stBottom : stBottomBridge; + int num_solid_layers = (type == stTop) ? region_config.top_shell_layers.value : region_config.bottom_shell_layers.value; + if (num_solid_layers == 0) + continue; + // Find slices of current type for current layer. + // Use slices instead of fill_surfaces, because they also include the perimeter area, + // which needs to be propagated in shells; we need to grow slices like we did for + // fill_surfaces though. Using both ungrown slices and grown fill_surfaces will + // not work in some situations, as there won't be any grown region in the perimeter + // area (this was seen in a model where the top layer had one extra perimeter, thus + // its fill_surfaces were thinner than the lower layer's infill), however it's the best + // solution so far. Growing the external slices by EXTERNAL_INFILL_MARGIN will put + // too much solid infill inside nearly-vertical slopes. + + // Surfaces including the area of perimeters. Everything, that is visible from the top / bottom + // (not covered by a layer above / below). + // This does not contain the areas covered by perimeters! + Polygons solid; + for (const Surface &surface : layerm->slices.surfaces) + if (surface.surface_type == type) + polygons_append(solid, to_polygons(surface.expolygon)); + // Infill areas (slices without the perimeters). + for (const Surface &surface : layerm->fill_surfaces.surfaces) + if (surface.surface_type == type) + polygons_append(solid, to_polygons(surface.expolygon)); + if (solid.empty()) + continue; +// Slic3r::debugf "Layer %d has %s surfaces\n", $i, ($type == stTop) ? 'top' : 'bottom'; + + // Scatter top / bottom regions to other layers. Scattering process is inherently serial, it is difficult to parallelize without locking. + for (int n = (type == stTop) ? int(i) - 1 : int(i) + 1; + (type == stTop) ? + (n >= 0 && (int(i) - n < num_solid_layers || + print_z - m_layers[n]->print_z < region_config.top_shell_thickness.value - EPSILON)) : + (n < int(m_layers.size()) && (n - int(i) < num_solid_layers || + m_layers[n]->bottom_z() - bottom_z < region_config.bottom_shell_thickness.value - EPSILON)); + (type == stTop) ? -- n : ++ n) + { +// Slic3r::debugf " looking for neighbors on layer %d...\n", $n; + // Reference to the lower layer of a TOP surface, or an upper layer of a BOTTOM surface. + LayerRegion *neighbor_layerm = m_layers[n]->regions()[region_id]; + + // find intersection between neighbor and current layer's surfaces + // intersections have contours and holes + // we update $solid so that we limit the next neighbor layer to the areas that were + // found on this one - in other words, solid shells on one layer (for a given external surface) + // are always a subset of the shells found on the previous shell layer + // this approach allows for DWIM in hollow sloping vases, where we want bottom + // shells to be generated in the base but not in the walls (where there are many + // narrow bottom surfaces): reassigning $solid will consider the 'shadow' of the + // upper perimeter as an obstacle and shell will not be propagated to more upper layers + //FIXME How does it work for stInternalBRIDGE? This is set for sparse infill. Likely this does not work. + Polygons new_internal_solid; + { + Polygons internal; + for (const Surface &surface : neighbor_layerm->fill_surfaces.surfaces) + if (surface.surface_type == stInternal || surface.surface_type == stInternalSolid) + polygons_append(internal, to_polygons(surface.expolygon)); + new_internal_solid = intersection(solid, internal, ApplySafetyOffset::Yes); + } + if (new_internal_solid.empty()) { + // No internal solid needed on this layer. In order to decide whether to continue + // searching on the next neighbor (thus enforcing the configured number of solid + // layers, use different strategies according to configured infill density: + if (region_config.sparse_infill_density.value == 0) { + // If user expects the object to be void (for example a hollow sloping vase), + // don't continue the search. In this case, we only generate the external solid + // shell if the object would otherwise show a hole (gap between perimeters of + // the two layers), and internal solid shells are a subset of the shells found + // on each previous layer. + goto EXTERNAL; + } else { + // If we have internal infill, we can generate internal solid shells freely. + continue; + } + } + + if (region_config.sparse_infill_density.value == 0) { + // if we're printing a hollow object we discard any solid shell thinner + // than a perimeter width, since it's probably just crossing a sloping wall + // and it's not wanted in a hollow print even if it would make sense when + // obeying the solid shell count option strictly (DWIM!) + float margin = float(neighbor_layerm->flow(frExternalPerimeter).scaled_width()); + Polygons too_narrow = diff( + new_internal_solid, + opening(new_internal_solid, margin, margin + ClipperSafetyOffset, jtMiter, 5)); + // Trim the regularized region by the original region. + if (! too_narrow.empty()) + new_internal_solid = solid = diff(new_internal_solid, too_narrow); + } + + // make sure the new internal solid is wide enough, as it might get collapsed + // when spacing is added in Fill.pm + { + //FIXME Vojtech: Disable this and you will be sorry. + float margin = 3.f * layerm->flow(frSolidInfill).scaled_width(); // require at least this size + // we use a higher miterLimit here to handle areas with acute angles + // in those cases, the default miterLimit would cut the corner and we'd + // get a triangle in $too_narrow; if we grow it below then the shell + // would have a different shape from the external surface and we'd still + // have the same angle, so the next shell would be grown even more and so on. + Polygons too_narrow = diff( + new_internal_solid, + opening(new_internal_solid, margin, margin + ClipperSafetyOffset, ClipperLib::jtMiter, 5)); + if (! too_narrow.empty()) { + // grow the collapsing parts and add the extra area to the neighbor layer + // as well as to our original surfaces so that we support this + // additional area in the next shell too + // make sure our grown surfaces don't exceed the fill area + Polygons internal; + for (const Surface &surface : neighbor_layerm->fill_surfaces.surfaces) + if (surface.is_internal() && !surface.is_bridge()) + polygons_append(internal, to_polygons(surface.expolygon)); + polygons_append(new_internal_solid, + intersection( + expand(too_narrow, +margin), + // Discard bridges as they are grown for anchoring and we can't + // remove such anchors. (This may happen when a bridge is being + // anchored onto a wall where little space remains after the bridge + // is grown, and that little space is an internal solid shell so + // it triggers this too_narrow logic.) + internal)); + // solid = new_internal_solid; + } + } + + // internal-solid are the union of the existing internal-solid surfaces + // and new ones + SurfaceCollection backup = std::move(neighbor_layerm->fill_surfaces); + polygons_append(new_internal_solid, to_polygons(backup.filter_by_type(stInternalSolid))); + ExPolygons internal_solid = union_ex(new_internal_solid); + // assign new internal-solid surfaces to layer + neighbor_layerm->fill_surfaces.set(internal_solid, stInternalSolid); + // subtract intersections from layer surfaces to get resulting internal surfaces + Polygons polygons_internal = to_polygons(std::move(internal_solid)); + ExPolygons internal = diff_ex(backup.filter_by_type(stInternal), polygons_internal, ApplySafetyOffset::Yes); + // assign resulting internal surfaces to layer + neighbor_layerm->fill_surfaces.append(internal, stInternal); + polygons_append(polygons_internal, to_polygons(std::move(internal))); + // assign top and bottom surfaces to layer + backup.keep_types({ stTop, stBottom, stBottomBridge }); + std::vector top_bottom_groups; + backup.group(&top_bottom_groups); + for (SurfacesPtr &group : top_bottom_groups) + neighbor_layerm->fill_surfaces.append( + diff_ex(group, polygons_internal), + // Use an existing surface as a template, it carries the bridge angle etc. + *group.front()); + } + EXTERNAL:; + } // foreach type (stTop, stBottom, stBottomBridge) } // for each layer } // for each region diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 2377a73706..934ddb1019 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -277,6 +277,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con sparse_infill_density == 0 && ! config->opt_bool("enable_support") && config->opt_int("enforce_support_layers") == 0 && + config->opt_bool("ensure_vertical_shell_thickness") && ! config->opt_bool("detect_thin_wall") && ! config->opt_bool("overhang_reverse") && config->opt_enum("timelapse_type") == TimelapseType::tlTraditional)) @@ -304,6 +305,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con new_conf.set_key_value("sparse_infill_density", new ConfigOptionPercent(0)); new_conf.set_key_value("enable_support", new ConfigOptionBool(false)); new_conf.set_key_value("enforce_support_layers", new ConfigOptionInt(0)); + new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionBool(true)); new_conf.set_key_value("detect_thin_wall", new ConfigOptionBool(false)); new_conf.set_key_value("overhang_reverse", new ConfigOptionBool(false)); new_conf.set_key_value("timelapse_type", new ConfigOptionEnum(tlTraditional)); @@ -524,7 +526,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co } bool have_perimeters = config->opt_int("wall_loops") > 0; - for (auto el : { "extra_perimeters_on_overhangs", "detect_thin_wall", "detect_overhang_wall", + for (auto el : { "extra_perimeters_on_overhangs", "ensure_vertical_shell_thickness", "detect_thin_wall", "detect_overhang_wall", "seam_position", "staggered_inner_seams", "wall_infill_order", "outer_wall_line_width", "inner_wall_speed", "outer_wall_speed", "small_perimeter_speed", "small_perimeter_threshold" }) toggle_field(el, have_perimeters); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 3ad2c440c3..312944a524 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1941,6 +1941,8 @@ void TabPrint::build() optgroup->append_single_option_line("bridge_angle"); optgroup->append_single_option_line("minimum_sparse_infill_area"); optgroup->append_single_option_line("infill_combination"); + optgroup->append_single_option_line("detect_narrow_internal_solid_infill"); + optgroup->append_single_option_line("ensure_vertical_shell_thickness"); page = add_options_page(L("Speed"), "empty"); optgroup = page->new_optgroup(L("Initial layer speed"), L"param_speed_first", 15); From 5788fd30e7cdc029a1d3402ea9bbbe0d2650b9fa Mon Sep 17 00:00:00 2001 From: FlashforgeOfficial <144670305+FlashforgeOfficial@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:09:30 +0800 Subject: [PATCH 11/47] 1106 Flashforge: Update TPU, classic mode change etc. (#2627) Co-authored-by: SoftFever --- .../filament/Flashforge Generic HS PLA.json | 4 ++-- .../filament/Flashforge Generic PLA-CF10.json | 6 +++--- .../filament/Flashforge Generic PLA-Silk.json | 4 ++-- .../Flashforge/filament/Flashforge Generic PLA.json | 4 ++-- .../Flashforge/filament/Flashforge Generic TPU.json | 12 ++++++------ .../0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json | 4 ++-- ...0mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json | 4 ++-- .../0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json | 4 ++-- ...0mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json index b3694e490c..07658bcd9a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json @@ -187,10 +187,10 @@ "0" ], "hot_plate_temp_initial_layer": [ - "45" + "55" ], "hot_plate_temp": [ - "45" + "50" ], "nozzle_temperature": [ "220" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json index f2e8acbc59..d48b9bbe9e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json @@ -190,10 +190,10 @@ "full_fan_speed_layer": [ "0" ], - "hot_plate_temp": [ - "50" - ], "hot_plate_temp_initial_layer": [ + "55" + ], + "hot_plate_temp": [ "50" ], "nozzle_temperature": [ diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json index f260711725..340a685a19 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json @@ -13,10 +13,10 @@ "12" ], "hot_plate_temp_initial_layer": [ - "45" + "55" ], "hot_plate_temp": [ - "45" + "50" ], "slow_down_layer_time": [ "8" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json index c21879fb50..1f91f12947 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json @@ -13,10 +13,10 @@ "25" ], "hot_plate_temp_initial_layer": [ - "45" + "55" ], "hot_plate_temp": [ - "45" + "50" ], "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json index c73f0066ef..268e9c66bf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json @@ -71,13 +71,13 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ - "0.95" + "1" ], "filament_is_support": [ "0" ], "filament_max_volumetric_speed": [ - "5" + "3.5" ], "filament_minimal_purge_on_wipe_tower": [ "15" @@ -92,7 +92,7 @@ "nil" ], "filament_retraction_length": [ - "0.4" + "1.2" ], "filament_retraction_minimum_travel": [ "nil" @@ -140,7 +140,7 @@ "45" ], "nozzle_temperature": [ - "230" + "235" ], "nozzle_temperature_initial_layer": [ "235" @@ -158,7 +158,7 @@ "50%" ], "pressure_advance": [ - "0.025" + "0.035" ], "reduce_fan_stop_start_freq": [ "1" @@ -173,7 +173,7 @@ "8" ], "slow_down_min_speed": [ - "15" + "20" ], "support_material_interface_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json index 02569cbfee..96b5effc7d 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json @@ -87,7 +87,7 @@ "top_surface_pattern": "monotonicline", "top_surface_line_width": "0.42", "top_shell_layers": "3", - "top_shell_thickness": "0", + "top_shell_thickness": "0.6", "initial_layer_speed": "50", "initial_layer_infill_speed": "80", "outer_wall_speed": "200", @@ -110,7 +110,7 @@ "only_one_wall_top": "1", "slow_down_layers": "1", "small_perimeter_speed": "50%", - "overhang_speed_classic": "1", + "overhang_speed_classic": "0", "internal_bridge_speed": "50", "outer_wall_acceleration": "5000", "internal_solid_infill_acceleration": "7000", diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json index def1a6b7fc..445aa7fb96 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json @@ -87,7 +87,7 @@ "top_surface_pattern": "monotonicline", "top_surface_line_width": "0.42", "top_shell_layers": "3", - "top_shell_thickness": "0", + "top_shell_thickness": "0.6", "initial_layer_speed": "50", "initial_layer_infill_speed": "80", "outer_wall_speed": "200", @@ -110,7 +110,7 @@ "only_one_wall_top": "1", "slow_down_layers": "1", "small_perimeter_speed": "50%", - "overhang_speed_classic": "1", + "overhang_speed_classic": "0", "internal_bridge_speed": "50", "outer_wall_acceleration": "5000", "internal_solid_infill_acceleration": "7000", diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json index 439e2bd571..d6f30387fa 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json @@ -87,7 +87,7 @@ "top_surface_pattern": "monotonicline", "top_surface_line_width": "0.62", "top_shell_layers": "3", - "top_shell_thickness": "0", + "top_shell_thickness": "0.6", "initial_layer_speed": "45", "initial_layer_infill_speed": "65", "outer_wall_speed": "120", @@ -107,7 +107,7 @@ "wall_generator": "classic", "only_one_wall_top": "1", "small_perimeter_speed": "50%", - "overhang_speed_classic": "1", + "overhang_speed_classic": "0", "internal_bridge_speed": "50", "outer_wall_acceleration": "5000", "internal_solid_infill_acceleration": "7000", diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json index 0006a92803..2bb7eef4fb 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json @@ -107,7 +107,7 @@ "overhang_2_4_speed": "40", "overhang_3_4_speed": "20", "overhang_4_4_speed": "10", - "overhang_speed_classic": "1", + "overhang_speed_classic": "0", "post_process": [], "precise_outer_wall": "0", "prime_tower_brim_width": "3", @@ -174,7 +174,7 @@ "thick_bridges": "0", "timelapse_type": "0", "top_shell_layers": "3", - "top_shell_thickness": "0", + "top_shell_thickness": "0.6", "top_solid_infill_flow_ratio": "1", "top_surface_acceleration": "2000", "top_surface_jerk": "9", From 70f28ba3c1e18e8616a7ccb9b9f6cbfa595e4452 Mon Sep 17 00:00:00 2001 From: mariuske Date: Tue, 7 Nov 2023 06:10:16 +0100 Subject: [PATCH 12/47] Adjusted Flashforge machine profiles (#2632) * Added correct machine pause code for FlashForge printers Added machine pause code for Flashforge printers to support pause action in firmware 2.3.6-2.1.9-20231101 * Removed redundant gcodes for Flashforge profiles Removed redundant gcodes for Flashforge profiles as they are already added by Orca Slicer --- .../machine/Flashforge Adventurer 5M 0.4 Nozzle.json | 4 ++-- .../machine/Flashforge Adventurer 5M 0.6 Nozzle.json | 4 ++-- .../machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json | 4 ++-- .../machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json | 4 ++-- .../profiles/Flashforge/machine/fdm_flashforge_common.json | 2 +- resources/profiles/Flashforge/machine/fdm_klipper_common.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json index 357fcbd4df..a8fc89ada6 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json @@ -44,9 +44,9 @@ "z_hop": [ "0.4" ], "single_extruder_multi_material": "0", "change_filament_gcode": "", - "machine_pause_gcode": "", + "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disble motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json index 4b64972d17..8d4930ffe9 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json @@ -44,9 +44,9 @@ "z_hop": [ "0.4" ], "single_extruder_multi_material": "0", "change_filament_gcode": "", - "machine_pause_gcode": "", + "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disble motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json index 2fc9672f16..42fae97d73 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json @@ -44,9 +44,9 @@ "z_hop": [ "0.4" ], "single_extruder_multi_material": "0", "change_filament_gcode": "", - "machine_pause_gcode": "", + "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disble motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json index a46ee605d0..70e7e483b5 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json @@ -44,9 +44,9 @@ "z_hop": [ "0.4" ], "single_extruder_multi_material": "0", "change_filament_gcode": "", - "machine_pause_gcode": "", + "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disble motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/fdm_flashforge_common.json b/resources/profiles/Flashforge/machine/fdm_flashforge_common.json index 7c0d0c1045..c08d24493a 100644 --- a/resources/profiles/Flashforge/machine/fdm_flashforge_common.json +++ b/resources/profiles/Flashforge/machine/fdm_flashforge_common.json @@ -119,7 +119,7 @@ "silent_mode": "0", "single_extruder_multi_material": "1", "change_filament_gcode": "", - "machine_pause_gcode": "M25 ;pause print", + "machine_pause_gcode": "M25", "wipe": [ "1" ], diff --git a/resources/profiles/Flashforge/machine/fdm_klipper_common.json b/resources/profiles/Flashforge/machine/fdm_klipper_common.json index 33c193a267..843090ed1f 100644 --- a/resources/profiles/Flashforge/machine/fdm_klipper_common.json +++ b/resources/profiles/Flashforge/machine/fdm_klipper_common.json @@ -120,7 +120,7 @@ "silent_mode": "0", "single_extruder_multi_material": "1", "change_filament_gcode": "", - "machine_pause_gcode": "PAUSE\n", + "machine_pause_gcode": "M25", "wipe": [ "1" ], From 9c34a8c082160abee49cecd6436b8ede5ef09bf6 Mon Sep 17 00:00:00 2001 From: ablegods <85563455+ablegods@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:13:07 +0800 Subject: [PATCH 13/47] Update OrcaSlicer_zh_TW.po (#2630) * Update OrcaSlicer_zh_TW.po * update locale for 1.8 beta2 Following the version update of 1.8 beta2, new localizations will be added * Update OrcaSlicer_zh_TW.po * Update OrcaSlicer_zh_TW.po fixed some conflict --- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 1082 ++++++++++--------- 1 file changed, 570 insertions(+), 512 deletions(-) diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index 6b72982488..e734a8f8b3 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -1,9 +1,13 @@ +# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST Translator Jiang Yue , 2019. +# msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-29 10:45+0800\n" -"PO-Revision-Date: 2023-11-04 21:29+0800\n" +"POT-Creation-Date: 2023-11-04 19:51+0800\n" +"PO-Revision-Date: 2023-11-06 14:37+0800\n" "Last-Translator: ablegods \n" "Language-Team: \n" "Language: zh_TW\n" @@ -31,7 +35,7 @@ msgstr "Ctrl + 滑鼠滾輪" #, fuzzy msgid "Pen size" -msgstr "畫刷尺寸" +msgstr "筆刷尺寸" msgid "Left mouse button" msgstr "滑鼠左鍵" @@ -73,7 +77,7 @@ msgstr "間隙面積" #, fuzzy msgid "Tool type" -msgstr "畫刷類型" +msgstr "筆刷類型" msgid "Smart fill angle" msgstr "智慧填充角度" @@ -100,7 +104,7 @@ msgstr "縫隙填充" #, boost-format msgid "Allows painting only on facets selected by: \"%1%\"" -msgstr "僅允許在由以下條件選擇的面上進行繪製：%1%" +msgstr "僅允許在由以下條件選擇的平面上進行繪製：%1%" #, fuzzy msgid "Highlight faces according to overhang angle." @@ -188,7 +192,7 @@ msgstr "移除已繪製的顏色" #, fuzzy, boost-format msgid "Painted using: Filament %1%" -msgstr "繪製使用：線材 %1%" +msgstr "使用：線材 %1% 上色" msgid "Move" msgstr "移動" @@ -200,7 +204,7 @@ msgid "Optimize orientation" msgstr "最佳化方向" msgid "Apply" -msgstr "應用" +msgstr "套用" msgid "Scale" msgstr "縮放" @@ -237,7 +241,7 @@ msgid "Translate" msgstr "平移" msgid "Group Operations" -msgstr "組操作" +msgstr "群組操作" msgid "Set Position" msgstr "設定位置" @@ -272,13 +276,13 @@ msgid "uniform scale" msgstr "等比例縮放" msgid "Left click" -msgstr "左擊" +msgstr "滑鼠左鍵" msgid "Add connector" msgstr "新增連接件" msgid "Right click" -msgstr "右擊" +msgstr "滑鼠右鍵" msgid "Remove connector" msgstr "刪除連接件" @@ -392,7 +396,7 @@ msgid "Warning" msgstr "警告" msgid "Invalid connectors detected" -msgstr "檢測到無效連接件" +msgstr "偵測到無效連接件" msgid "connector is out of cut contour" msgstr "個連接件超出了切割面範圍" @@ -414,7 +418,7 @@ msgid "" "No one part is selected for keep after cut" msgstr "" "無效狀態。\n" -"切割後沒有選中要保留的部分" +"切割後沒有選取要保留的部分" msgid "Plug" msgstr "插銷" @@ -438,7 +442,7 @@ msgstr "簡化率" msgid "" "Processing model '%1%' with more than 1M triangles could be slow. It is " "highly recommended to simplify the model." -msgstr "處理超出 1M 個三角形面片的模型 '%1%' 可能會很慢。強烈建議簡化模型。" +msgstr "處理超過具有 1M 個三角形的模型 '%1%' 可能會很慢。強烈建議簡化模型。" msgid "Simplify model" msgstr "簡化模型" @@ -479,16 +483,16 @@ msgid "%1%" msgstr "%1%" msgid "Can't apply when proccess preview." -msgstr "處理預覽的過程中無法應用。" +msgstr "處理預覽的過程中無法套用。" msgid "Operation already cancelling. Please wait few seconds." -msgstr "操作已在取消中，請等待片刻。" +msgstr "操作已在取消中，請稍後。" msgid "Face recognition" -msgstr "外觀面檢測" +msgstr "外觀面偵測" msgid "Perform Recognition" -msgstr "執行檢測" +msgstr "執行偵測" #, fuzzy msgid "Brush size" @@ -553,7 +557,7 @@ msgid "Horizontal text" msgstr "水平文字" msgid "Ctrl+" -msgstr "Ctrl+" +msgstr "" msgid "Notice" msgstr "通知" @@ -567,10 +571,10 @@ msgstr "%1% 已被 %2% 替換" #, fuzzy msgid "The configuration may be generated by a newer version of OrcaSlicer." -msgstr "此配置可能由新版本的 Orca Slicer 產生" +msgstr "此設定可能由新版本的 Orca Slicer 產生" msgid "Some values have been replaced. Please check them:" -msgstr "部分數值已被替換，請檢查：" +msgstr "部分數值已被更換，請檢查：" msgid "Process" msgstr "列印參數" @@ -702,7 +706,7 @@ msgstr "選擇一個或多個檔案（3mf/step/stl/svg/obj/amf）：" #, fuzzy msgid "Choose one file (gcode/3mf):" -msgstr "選擇一個檔案（gcode/3mf）" +msgstr "選擇一個檔案（gcode/3mf）：" msgid "Some presets are modified." msgstr "部分預設已被修改。" @@ -752,7 +756,7 @@ msgid "The uploads are still ongoing" msgstr "正在上傳任務中" msgid "Stop them and continue anyway?" -msgstr "停止它們並且繼續？" +msgstr "停止並且繼續？" msgid "Ongoing uploads" msgstr "正在進行的上傳" @@ -784,7 +788,7 @@ msgstr " Orca Slicer 圖形界面初始化失敗" #, boost-format msgid "Fatal error, exception catched: %1%" -msgstr "致命錯誤，捕獲到異常：%1%" +msgstr "致命錯誤，遭遇到異常：%1%" #, fuzzy msgid "Quality" @@ -800,7 +804,7 @@ msgid "Support" msgstr "支撐" msgid "Flush options" -msgstr "多色列印換料選項" +msgstr "換料沖刷選項" #, fuzzy msgid "Speed" @@ -923,7 +927,7 @@ msgstr "鋪滿列印板" #, fuzzy msgid "Fill the remaining area of bed with copies of the selected object" -msgstr "用選定物件的副本鋪滿列印板的剩餘區域" +msgstr "用選取物件的副本鋪滿列印板的空白區域" msgid "Printable" msgstr "可列印的" @@ -971,16 +975,16 @@ msgstr "縮放物件以適應列印空間範圍大小" #, fuzzy msgid "Flush Options" -msgstr "多色列印換料選項" +msgstr "換料沖刷選項" msgid "Flush into objects' infill" -msgstr "將換色的廢料使用在物件的填充" +msgstr "將換料的廢料使用在物件的填充" msgid "Flush into this object" -msgstr "將換色的廢料使用在這個物件" +msgstr "將換料的廢料使用在這個物件" msgid "Flush into objects' support" -msgstr "將換色的廢料使用在物件的支撐" +msgstr "將換料的廢料使用在物件的支撐" msgid "Edit in Parameter Table" msgstr "在參數表格中編輯" @@ -1083,14 +1087,14 @@ msgstr "全選" #, fuzzy msgid "select all objects on current plate" -msgstr "全選列印板所有物件" +msgstr "全選列印板上所有物件" msgid "Delete All" msgstr "刪除所有" #, fuzzy msgid "delete all objects on current plate" -msgstr "刪除列印板所有物件" +msgstr "刪除列印板上所有物件" msgid "Arrange" msgstr "自動擺放" @@ -1212,22 +1216,22 @@ msgid "Error!" msgstr "錯誤！" msgid "Failed to get the model data in the current file." -msgstr "取得目前檔案中的模型資料失敗。" +msgstr "取得目前檔案中的模型數據失敗。" msgid "Generic" -msgstr "通用" +msgstr "一般" msgid "Add Modifier" msgstr "新增修改器" msgid "Switch to per-object setting mode to edit modifier settings." -msgstr "切換到每個物件設定模式以編輯修改器的設定參數。" +msgstr "切換到各個物件設定模式以編輯修改器的設定參數。" #, fuzzy msgid "" "Switch to per-object setting mode to edit process settings of selected " "objects." -msgstr "切換到每個物件設定模式以編輯所選物件的列印參數" +msgstr "切換到各個物件設定模式以編輯所選物件的列印參數" msgid "Delete connector from object which is a part of cut" msgstr "刪除的連接件屬於切割物件的一部分" @@ -1271,10 +1275,10 @@ msgid "Cut Connectors information" msgstr "切割連接件資訊" msgid "Object manipulation" -msgstr "操作物件" +msgstr "物件操作" msgid "Group manipulation" -msgstr "操作組" +msgstr "群組操作" msgid "Object Settings to modify" msgstr "要修改的物件設定" @@ -1361,7 +1365,7 @@ msgid "Repairing was canceled" msgstr "修復被取消" msgid "Additional process preset" -msgstr "附加參數預設" +msgstr "附加列印參數預設" msgid "Remove parameter" msgstr "刪除參數" @@ -1402,7 +1406,7 @@ msgid "Infill density(%)" msgstr "填充密度（%）" msgid "Auto Brim" -msgstr "自動Brim" +msgstr "自動Brim（裙邊）" msgid "Auto" msgstr "自動" @@ -1491,25 +1495,25 @@ msgid "Add Pause" msgstr "新增暫停列印" msgid "Insert a pause command at the beginning of this layer." -msgstr "在該層的起始位置插入暫停。" +msgstr "在該層的初始位置插入暫停。" msgid "Add Custom G-code" msgstr "新增自訂 G-code" msgid "Insert custom G-code at the beginning of this layer." -msgstr "在該層的起始位置插入自訂 G-code。" +msgstr "在該層的初始位置插入自訂 G-code。" msgid "Add Custom Template" msgstr "新增自訂模板" msgid "Insert template custom G-code at the beginning of this layer." -msgstr "在該層的起始位置插入模板自訂 G-code。" +msgstr "在該層的初始位置插入模板自訂 G-code。" msgid "Filament " msgstr "線材" msgid "Change filament at the beginning of this layer." -msgstr "在該層的起始位置更換線材。" +msgstr "在該層的初始位置更換線材。" msgid "Delete Pause" msgstr "刪除暫停列印" @@ -1541,7 +1545,7 @@ msgstr "檢查雲端服務狀態" #, fuzzy msgid "code" -msgstr "code" +msgstr "" msgid "Failed to connect to cloud service" msgstr "無法連接到雲端服務" @@ -1613,7 +1617,7 @@ msgid "Cancel calibration" msgstr "取消校準" msgid "Idling..." -msgstr "閒置" +msgstr "閒置..." msgid "Heat the nozzle" msgstr "加熱噴嘴" @@ -1631,10 +1635,10 @@ msgid "Purge old filament" msgstr "清除舊線材" msgid "Feed Filament" -msgstr "" +msgstr "進料" msgid "Confirm extruded" -msgstr "確認擠壓" +msgstr "確認擠出" msgid "Check filament location" msgstr "檢查線材位置" @@ -1659,7 +1663,7 @@ msgstr "" "無法對這些物件做自動擺放。" msgid "No arrangable objects are selected." -msgstr "未選擇可排列的物件象。" +msgstr "未選擇欲排列的物件象。" #, fuzzy msgid "" @@ -1683,7 +1687,7 @@ msgstr "已取消自動擺放。" #, fuzzy msgid "" "Arranging is done but there are unpacked items. Reduce spacing and try again." -msgstr "已完成自動擺放，但是有未被擺到列印板內的物件，可在減小間距後重試。" +msgstr "已完成自動擺放，但是有未被擺到列印板內的物件，可在減小物件間距後重試。" msgid "Arranging done." msgstr "已完成自動擺放。" @@ -1703,7 +1707,7 @@ msgid "" "We can not do auto-orient on these objects." msgstr "" "所有選中的物件都處於被鎖定的列印板上，\n" -"無法對這些物件做自動朝向。" +"無法對這些物件做自動定向。" #, fuzzy msgid "" @@ -1711,7 +1715,7 @@ msgid "" "We can not do auto-orient on this plate." msgstr "" "該列印板處於鎖定狀態，\n" -"無法對其進行自動朝向。" +"無法對其進行自動定向。" msgid "Orienting..." msgstr "自動旋轉方向..." @@ -1720,16 +1724,16 @@ msgid "Orienting" msgstr "自動旋轉方向..." msgid "Filling bed " -msgstr "填充熱床" +msgstr "填充自動朝向" msgid "Bed filling canceled." -msgstr "填充熱床已取消。" +msgstr "填充列印板已取消。" msgid "Bed filling done." -msgstr "填充熱床已完成。" +msgstr "填充列印板已完成。" msgid "Error! Unable to create thread!" -msgstr "發生錯誤，無法創建執行緒。" +msgstr "發生錯誤，無法建立執行緒。" msgid "Exception" msgstr "異常" @@ -1751,7 +1755,7 @@ msgid "Task canceled." msgstr "任務已取消。" msgid "Upload task timed out. Please check the network status and try again." -msgstr "上傳任務超時，請排查網路狀態後重試。" +msgstr "上傳任務逾時，請排查網路狀態後重試。" msgid "Cloud service connection failed. Please try again." msgstr "雲端服務連接失敗，請重試" @@ -1795,13 +1799,13 @@ msgid "Sending print job through cloud service" msgstr "正在通過雲端服務傳送列印作業" msgid "Service Unavailable" -msgstr "服務不可用" +msgstr "暫停服務" msgid "Unkown Error." msgstr "未知錯誤" msgid "Sending print configuration" -msgstr "正在傳送列印組態" +msgstr "正在傳送列印設定" #, c-format, boost-format msgid "Successfully sent. Will automatically jump to the device page in %ss" @@ -1809,16 +1813,16 @@ msgstr "已傳送完成，即將自動轉換到設備頁面（%s秒）" #, c-format, boost-format msgid "Successfully sent. Will automatically jump to the next page in %ss" -msgstr "已成功傳送。將自動轉換到%ss中的下一頁。" +msgstr "已成功傳送。將自動轉換到 %ss 中的下一頁。" msgid "An SD card needs to be inserted before printing via LAN." -msgstr "透過區域網路列印之前需要插入SD記憶卡。" +msgstr "透過區域網路列印之前需要插入 SD 記憶卡。" msgid "Sending gcode file over LAN" msgstr "透過區域網路傳送 gcode 檔案" msgid "Sending gcode file to sdcard" -msgstr "傳送 gcode 檔案到SD記憶卡" +msgstr "傳送 gcode 檔案到 SD 記憶卡" #, fuzzy, c-format, boost-format msgid "Successfully sent. Close current page in %s s" @@ -1844,10 +1848,10 @@ msgid "Import model only" msgstr "僅匯入模型" msgid "Accurate" -msgstr "精確的" +msgstr "準確的" msgid "Balanced" -msgstr "均衡的" +msgstr "平衡的" msgid "Quick" msgstr "快速的" @@ -1874,7 +1878,7 @@ msgid "" msgstr "匯入的 SLA 存檔不包含任何預設。目前的 SLA 預設被用作備用選項。" msgid "You cannot load SLA project with a multi-part object on the bed" -msgstr "您無法在床上載入包含多部分物件的 SLA 項目" +msgstr "您無法在列印板上載入包含多部分物件的 SLA 項目" msgid "Please check your object list before preset changing." msgstr "請在更改預設之前檢查您的物件清單。" @@ -2001,10 +2005,10 @@ msgid "PA Profile" msgstr "PA 配置檔" msgid "Factor K" -msgstr "係數K" +msgstr "係數 K" msgid "Factor N" -msgstr "係數N" +msgstr "係數 N" msgid "Setting Virtual slot information while printing is not supported" msgstr "不支援在列印時設定虛擬槽位資訊" @@ -2017,11 +2021,11 @@ msgstr "您需要先選擇線材類型和顏色。" #, fuzzy msgid "Please input a valid value (K in 0~0.5)" -msgstr "請輸入有效的數值（K值的範圍為0~0.5）" +msgstr "請輸入有效的數值（K 值的範圍為 0~0.5）" #, fuzzy msgid "Please input a valid value (K in 0~0.5, N in 0.6~2.0)" -msgstr "請輸入有效的數值（K值的範圍為0~0.5, N值的範圍為0.6~2.0）" +msgstr "請輸入有效的數值（K 值的範圍為 0~0.5, N 值的範圍為 0.6~2.0）" msgid "Other Color" msgstr "其他顏色" @@ -2078,7 +2082,7 @@ msgid "" "factor K input box." msgstr "" "校準完成。如下圖中的範例，請在您的熱床上找到最均勻完整的擠出線，並將其左側的" -"數值填入係數K欄位。" +"數值填入係數 K 欄位。" msgid "Save" msgstr "儲存" @@ -2147,7 +2151,7 @@ msgid "" "A desiccant status lower than two bars indicates that desiccant may be " "inactive. Please change the desiccant.(The bars: higher the better.)" msgstr "" -"乾燥劑狀態低於兩格表示乾燥劑可能不活躍。請更換乾燥劑。（槓：越高越好）。" +"乾燥劑狀態低於兩格表示乾燥劑可能是趨近無效。請更換乾燥劑。（指示格：越高越好）。" msgid "" "Note: When the lid is open or the desiccant pack is changed, it can take " @@ -2197,12 +2201,12 @@ msgstr "組" #, fuzzy msgid "The printer does not currently support auto refill." -msgstr "此列印設備目前不支援自動填充。" +msgstr "此列印設備目前不支援自動補給備用線材。" #, fuzzy msgid "" "AMS filament backup is not enabled, please enable it in the AMS settings." -msgstr "AMS 備用線材自動供應未啟用，請在 AMS 設定中啟用。" +msgstr "AMS 備用線材自動補給未啟用，請在 AMS 設定中啟用。" #, fuzzy msgid "" @@ -2211,7 +2215,7 @@ msgid "" "(Currently supporting automatic supply of consumables with the same brand, " "material type, and color)" msgstr "" -"如果 AMS 中有兩個相同的線材，則會啟用 AMS 備用線材自動供應功能。\n" +"如果 AMS 中有兩個相同的線材，則會啟用 AMS 備用線材自動補給功能。\n" "（目前支援同品牌、同材質、同顏色的耗材自動供應）" msgid "AMS Settings" @@ -2224,7 +2228,7 @@ msgid "" "The AMS will automatically read the filament information when inserting a " "new Bambu Lab filament. This takes about 20 seconds." msgstr "" -"當插入新的 Bambu Lab 線材的時候，AMS 會自動讀取線材資訊。這個過程大約需要20" +"當插入新的 Bambu Lab 官方線材的時候，AMS 會自動讀取線材資訊。這個過程大約需要20" "秒。" msgid "" @@ -2242,7 +2246,7 @@ msgstr "" "動輸入。" msgid "Power on update" -msgstr "開機時檢測" +msgstr "開機時偵測" #, fuzzy msgid "" @@ -2268,7 +2272,7 @@ msgid "" "info is updated. During printing, remaining capacity will be updated " "automatically." msgstr "" -"AMS 讀取 Bambu Lab 線材資訊同時預估線材卷的剩餘線材量。在列印過程中，剩餘線材" +"AMS 讀取 Bambu Lab 官方線材資訊同時預估線材卷的剩餘線材量。在列印過程中，剩餘線材" "量會自動更新。" #, fuzzy @@ -2290,7 +2294,7 @@ msgstr "校準" msgid "" "Failed to download the plug-in. Please check your firewall settings and vpn " "software, check and retry." -msgstr "套件下載失敗。請檢查您的防火牆設置和 VPN 軟體，檢查後重試。" +msgstr "套件下載失敗。請檢查您的防火牆設定和 VPN 軟體，檢查後重試。" #, fuzzy msgid "" @@ -2369,11 +2373,11 @@ msgid "Running post-processing scripts" msgstr "執行後處理腳本" msgid "Copying of the temporary G-code to the output G-code failed" -msgstr "將臨時 G-Code 複製到輸出 G-Code 碼失敗" +msgstr "將臨時 G-Code 複製到輸出 G-Code 失敗" #, boost-format msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue" -msgstr "計劃上傳到 `%1%`。請參閱視窗-> 列印主機上傳隊列" +msgstr "計劃上傳到 `%1%`。請參閱視窗-> 列印設備上傳隊列" msgid "Origin" msgstr "原點" @@ -2432,7 +2436,7 @@ msgid "Error! Invalid model" msgstr "錯誤！無效模型" msgid "The selected file contains no geometry." -msgstr "所選檔案不包含任何幾何圖形。" +msgstr "所選檔案不包含任何幾何數據。" msgid "" "The selected file contains several disjoint areas. This is not supported." @@ -2468,8 +2472,8 @@ msgid "" "Too small max volumetric speed.\n" "Reset to 0.5" msgstr "" -"最大體積流量設置過小\n" -"重設為0.5" +"最大體積速度設定過小\n" +"重設為 0.5" #, fuzzy, c-format, boost-format msgid "" @@ -2494,7 +2498,7 @@ msgid "" "Reset to 0.1" msgstr "" "熨燙線距過小。\n" -"將重設為0.1。" +"將重設為 0.1。" #, fuzzy msgid "" @@ -2503,7 +2507,6 @@ msgid "" "The first layer height will be reset to 0.2." msgstr "" "首層層高為無效的 0 值。\n" -"\n" "將被重設為0.2。" #, fuzzy @@ -2515,7 +2518,7 @@ msgid "" "\n" "The value will be reset to 0." msgstr "" -"這個設置僅用於在特定場景下微調模型尺寸。\n" +"這個設定僅用於在特定場景下微調模型尺寸。\n" "例如，當模型尺寸誤差較小，難以組裝。\n" "對於大尺寸的調整，請使用模型縮放功能。\n" "\n" @@ -2530,8 +2533,8 @@ msgid "" "The value will be reset to 0." msgstr "" "過大的象腳補償是不合理的。\n" -"如果確實有嚴重的象腳效應，請檢查其他設置。\n" -"例如，是否設置了過高的床溫。\n" +"如果確實有嚴重的象腳效應，請檢查其他設定。\n" +"例如，是否設定了過高的床溫。\n" "\n" "這個數值將被重設為 0。" @@ -2625,7 +2628,7 @@ msgid "M400 pause" msgstr "M400 暫停" msgid "Paused due to filament runout" -msgstr "線材斷料暫停" +msgstr "斷料暫停" msgid "Heating hotend" msgstr "加熱熱端" @@ -2644,7 +2647,7 @@ msgid "Identifying build plate type" msgstr "識別列印板類型" msgid "Calibrating Micro Lidar" -msgstr "校準微型雷達" +msgstr "校準微型雷射雷達" msgid "Homing toolhead" msgstr "工具頭回到起始點" @@ -2662,7 +2665,7 @@ msgid "Pause of front cover falling" msgstr "工具頭前蓋掉落暫停列印" msgid "Calibrating the micro lida" -msgstr "校準微型雷達" +msgstr "校準微型雷射雷達" msgid "Calibrating extrusion flow" msgstr "校準擠出流量" @@ -2675,19 +2678,19 @@ msgid "Paused due to heat bed temperature malfunction" msgstr "熱床溫度異常暫停" msgid "Filament unloading" -msgstr "退料" +msgstr "退料中" msgid "Skip step pause" -msgstr "" +msgstr "丟步暫停" msgid "Filament loading" -msgstr "進料" +msgstr "進料中" msgid "Motor noise calibration" -msgstr "馬達噪音校準" +msgstr "電機噪音校準" msgid "Paused due to AMS lost" -msgstr "" +msgstr "由於 AMS 遺失而暫停" #, fuzzy msgid "Paused due to low speed of the heat break fan" @@ -2804,7 +2807,7 @@ msgstr "潮濕的 PVA 會變得柔軟並黏在 AMS 內，請在使用前注意 msgid "" "CF/GF filaments are hard and brittle, It's easy to break or get stuck in " "AMS, please use with caution." -msgstr "CF/GF 線材絲又硬又脆，在 AMS 中很容易斷裂或卡住，請謹慎使用。" +msgstr "含 CF/GF 線材又硬又脆，在 AMS 中很容易斷裂或卡住，請謹慎使用。" msgid "default" msgstr "預設" @@ -2866,7 +2869,7 @@ msgstr "層時間" #, fuzzy msgid "Layer Time (log)" -msgstr "層時間（日誌）" +msgstr "層時間（對數）" #, fuzzy msgid "Height: " @@ -2890,7 +2893,7 @@ msgstr "層時間：" #, fuzzy msgid "Fan: " -msgstr "風扇：" +msgstr "風扇速度：" #, fuzzy msgid "Temperature: " @@ -2915,7 +2918,7 @@ msgstr "顯示" #, fuzzy msgid "Flushed" -msgstr "多色廢料" +msgstr "廢料" msgid "Total" msgstr "總計" @@ -3073,7 +3076,7 @@ msgid "Shift + Left mouse button:" msgstr "Shift + 滑鼠左鍵：" msgid "Reset to base" -msgstr "設置到基礎層高" +msgstr "設定到基礎層高" msgid "Shift + Right mouse button:" msgstr "Shift + 滑鼠右鍵：" @@ -3094,16 +3097,16 @@ msgid "Mirror Object" msgstr "鏡像物體" msgid "Tool Move" -msgstr "工具移動" +msgstr "工具 移動" msgid "Tool Rotate" -msgstr "工具旋轉" +msgstr "工具 旋轉" msgid "Move Object" msgstr "移動物件" msgid "Auto Orientation options" -msgstr "自動朝向選項" +msgstr "自動定向選項" msgid "Enable rotation" msgstr "開啟旋轉" @@ -3113,7 +3116,7 @@ msgstr "最佳化接觸面面積" # src/slic3r/GUI/GLCanvas3D.cpp:4767 msgid "Orient" -msgstr "調整朝向" +msgstr "調整定向" msgid "Arrange options" msgstr "自動擺放選項" @@ -3129,10 +3132,10 @@ msgid "Allow multiple materials on same plate" msgstr "允許同一列印板中包含多種材料" msgid "Avoid extrusion calibration region" -msgstr "避開擠出標定區域" +msgstr "避開擠出校準區域" msgid "Align to Y axis" -msgstr "與 Y軸對齊" +msgstr "與 Y 軸對齊" msgid "Add" msgstr "新增" @@ -3142,7 +3145,7 @@ msgid "Add plate" msgstr "新增列印板" msgid "Auto orient" -msgstr "自動朝向" +msgstr "自動定向" msgid "Arrange all objects" msgstr "全域整理" @@ -3158,20 +3161,20 @@ msgid "Split to parts" msgstr "拆分為零件" msgid "Assembly View" -msgstr "組裝視圖" +msgstr "組裝視角" #, fuzzy msgid "Select Plate" msgstr "選擇列印板" msgid "Assembly Return" -msgstr "退出組裝視圖" +msgstr "退出組裝視角" msgid "return" msgstr "返回" msgid "Paint Toolbar" -msgstr "繪畫工具列" +msgstr "上色工具列" msgid "Explosion Ratio" msgstr "爆炸比例" @@ -3180,7 +3183,7 @@ msgid "Section View" msgstr "剖面視圖" msgid "Assemble Control" -msgstr "拼裝視圖控制" +msgstr "拼裝視角控制" msgid "Total Volume:" msgstr "總體積：" @@ -3204,13 +3207,13 @@ msgstr "" #, fuzzy msgid "An object is layed over the boundary of plate." -msgstr "檢測到有物件放在列印板的邊界上。" +msgstr "偵測到有物件放在列印板的邊界上。" msgid "A G-code path goes beyond the max print height." -msgstr "檢測出超出列印高度的 G-code 路徑。" +msgstr "偵測到超出列印高度的 G-code 路徑。" msgid "A G-code path goes beyond the boundary of plate." -msgstr "檢測超出熱床邊界的 G-code 路徑。" +msgstr "偵測到超出熱床邊界的 G-code 路徑。" msgid "Only the object being edit is visible." msgstr "只有正在編輯的物件是可見的。" @@ -3221,14 +3224,13 @@ msgid "" "confirming that the height is within the build volume." msgstr "" "物件被放置在列印板的邊界上或超過高度限制。\n" -"請透過將其完全移動到列印板內或列印板外，並確認高度在列印空間範圍以內來解決問" -"題。" +"請將其完全移動到列印板內或列印板外，並確認高度在列印空間範圍以內來解決問題。" msgid "Calibration step selection" msgstr "校準步驟選擇" msgid "Micro lidar calibration" -msgstr "微型雷達校準" +msgstr "微型雷射雷達校準" msgid "Bed leveling" msgstr "熱床調平" @@ -3237,7 +3239,7 @@ msgid "Vibration compensation" msgstr "共振補償" msgid "Motor noise cancellation" -msgstr "馬達噪音消除" +msgstr "電機噪音消除" msgid "Calibration program" msgstr "校準程序" @@ -3247,7 +3249,7 @@ msgid "" "minimize deviation.\n" "It keeps the device performing optimally." msgstr "" -"校準程序會自動檢測設備以最小化設備誤差。\n" +"校準程序會自動偵測設備以最小化設備誤差。\n" "它可以讓設備保持最佳性能。" msgid "Calibration Flow" @@ -3275,7 +3277,7 @@ msgid "Resolution" msgstr "解析度" msgid "Show \"Live Video\" guide page." -msgstr "顯示\"直播影片\"指南" +msgstr "顯示\"直播影片\"引導" msgid "720p" msgstr "720p" @@ -3336,7 +3338,7 @@ msgid "No" msgstr "" msgid "will be closed before creating a new model. Do you want to continue?" -msgstr "將會被關閉以創建新模型，是否繼續?" +msgstr "將會被關閉以建立新模型，是否繼續?" #, fuzzy msgid "Slice plate" @@ -3376,13 +3378,13 @@ msgid "Keyboard Shortcuts" msgstr "快捷鍵" msgid "Show the list of the keyboard shortcuts" -msgstr "顯示快捷鍵列表" +msgstr "顯示快捷鍵清單" msgid "Setup Wizard" msgstr "設定精靈" msgid "Show Configuration Folder" -msgstr "打開組態檔的檔案夾" +msgstr "打開設定檔的資料夾" msgid "Show Tip of the Day" msgstr "顯示每日小提示" @@ -3538,13 +3540,13 @@ msgid "Redo" msgstr "重做" msgid "Cut selection to clipboard" -msgstr "剪下所選項到剪貼簿" +msgstr "剪下所選項目到剪貼簿" msgid "Copy" msgstr "複製" msgid "Copy selection to clipboard" -msgstr "複製所選項到剪貼簿" +msgstr "複製所選項目到剪貼簿" msgid "Paste" msgstr "貼上" @@ -3553,11 +3555,11 @@ msgid "Paste clipboard" msgstr "從剪貼簿貼上" msgid "Delete selected" -msgstr "刪除所選項" +msgstr "刪除所選項目" #, fuzzy msgid "Deletes the current selection" -msgstr "刪除目前所選項" +msgstr "刪除目前所選項目" msgid "Delete all" msgstr "全部刪除" @@ -3567,22 +3569,22 @@ msgid "Deletes all objects" msgstr "刪除所有物件" msgid "Clone selected" -msgstr "複製所選項" +msgstr "複製所選項目" msgid "Clone copies of selections" -msgstr "複製多份所選項" +msgstr "複製多份所選項目" msgid "Select all" -msgstr "選中所有" +msgstr "選取所有" msgid "Selects all objects" -msgstr "選中所有物件" +msgstr "選取所有物件" msgid "Deselect all" -msgstr "取消所有選中" +msgstr "取消所有選取" msgid "Deselects all objects" -msgstr "取消所有選中物件" +msgstr "取消所有選取物件" msgid "Use Perspective View" msgstr "使用透視視角" @@ -3597,16 +3599,16 @@ msgid "Show object labels in 3D scene" msgstr "在 3D 場景中顯示物件名稱" msgid "Show &Overhang" -msgstr "顯示懸空高亮" +msgstr "凸顯懸空" msgid "Show object overhang highlight in 3D scene" -msgstr "在 3D 場景中顯示懸空高亮" +msgstr "在 3D 場景中凸顯懸空" msgid "Preferences" msgstr "偏好設定" msgid "View" -msgstr "視圖" +msgstr "視角" msgid "Help" msgstr "幫助" @@ -3671,32 +3673,32 @@ msgid "Reload the plater from disk" msgstr "從磁碟重新載入" msgid "Export &Toolpaths as OBJ" -msgstr "" +msgstr "將工具路徑匯出為 OBJ 格式" msgid "Export toolpaths as OBJ" -msgstr "將工具路徑匯出為OBJ格式" +msgstr "將工具路徑匯出為 OBJ 格式" msgid "Open &Studio" -msgstr "" +msgstr "開啟 Studio" msgid "Open Studio" msgstr "開啟 Studio" msgid "&Quit" -msgstr "" +msgstr "離開" #, c-format, boost-format msgid "Quit %s" msgstr "離開 %s" msgid "&File" -msgstr "" +msgstr "檔案" msgid "&View" -msgstr "" +msgstr "視角" msgid "&Help" -msgstr "" +msgstr "幫助" #, fuzzy, c-format, boost-format msgid "A file exists with the same name: %s, do you want to override it." @@ -3747,7 +3749,7 @@ msgid "The project is no longer available." msgstr "此項目不可用。" msgid "Filament Settings" -msgstr "線材設置" +msgstr "線材設定" #, fuzzy msgid "" @@ -3767,10 +3769,10 @@ msgid "Synchronization" msgstr "同步" msgid "Initialize failed (No Device)!" -msgstr "初始化失敗（沒有設備）！" +msgstr "初始化失敗（沒有列印設備）！" msgid "Initialize failed (Device connection not ready)!" -msgstr "初始化失敗（設備未連接）" +msgstr "初始化失敗（未連接列印設備）" msgid "Initialize failed (No Camera Device)!" msgstr "初始化失敗（沒有攝影機）" @@ -3787,7 +3789,7 @@ msgid "Initialize failed (Not supported on the current printer version)!" msgstr "初始化失敗（目前列印設備的版本不支援）！" msgid "Initialize failed (Not accessible in LAN-only mode)!" -msgstr "初始化失敗（在區域網路模式中不可訪問）！" +msgstr "初始化失敗（在區域網路模式中不可存取）！" #, fuzzy msgid "Initialize failed (Missing LAN ip of printer)!" @@ -3801,7 +3803,7 @@ msgid "Initialize failed (%s)!" msgstr "初始化失敗（%s）!" msgid "Network unreachable" -msgstr "網路不可訪問" +msgstr "網路不可存取" #, c-format, boost-format msgid "Stopped [%d]!" @@ -3867,13 +3869,13 @@ msgid "Timelapse" msgstr "縮時攝影" msgid "Switch to timelapse files." -msgstr "切換到縮時攝影檔案列表" +msgstr "切換到縮時攝影檔案清單" msgid "Video" msgstr "錄影" msgid "Switch to video files." -msgstr "切換到影片檔案列表" +msgstr "切換到影片檔案清單" msgid "Switch to 3mf model files." msgstr "切換到 3MF 模型檔案。" @@ -3904,11 +3906,11 @@ msgid "Connect failed [%d]!" msgstr "連接失敗 [%d]！" msgid "Loading file list..." -msgstr "載入檔案列表..." +msgstr "載入檔案清單..." #, c-format, boost-format msgid "No files [%d]" -msgstr "檔案列表為空[%d]" +msgstr "檔案清單為空[%d]" #, c-format, boost-format msgid "Load failed [%d]" @@ -3918,14 +3920,14 @@ msgstr "載入失敗 [%d]" msgid "You are going to delete %u file from printer. Are you sure to continue?" msgid_plural "" "You are going to delete %u files from printer. Are you sure to continue?" -msgstr[0] "您將從列印設備中刪除 %u 個檔案。確定要繼續嗎？" +msgstr[0] "將從列印設備中刪除 %u 個檔案。確定要繼續嗎？" msgid "Delete files" msgstr "刪除檔案" #, fuzzy, c-format, boost-format msgid "Do you want to delete the file '%s' from printer?" -msgstr "你確定要從列印設備中刪除檔案 '%s' 嗎？" +msgstr "確定要從列印設備中刪除檔案 '%s' 嗎？" msgid "Delete file" msgstr "刪除檔案" @@ -3973,7 +3975,7 @@ msgstr "目前列印設備的版本不支援。" #, fuzzy msgid "Storage unavailable, insert SD card." -msgstr "儲存不可用，請插入 SD記憶卡。" +msgstr "儲存不可用，請插入 SD 記憶卡。" msgid "Speed:" msgstr "速度：" @@ -3992,7 +3994,7 @@ msgid "Translation/Zoom" msgstr "平移/縮放" msgid "3Dconnexion settings" -msgstr "3Dconnexion設置" +msgstr "3Dconnexion 設定" msgid "Swap Y/Z axes" msgstr "交換 Y/Z 軸" @@ -4007,13 +4009,13 @@ msgid "Invert Z axis" msgstr "反轉 Z 軸" msgid "Invert Yaw axis" -msgstr "" +msgstr "反轉偏航軸（垂直軸）" msgid "Invert Pitch axis" -msgstr "" +msgstr "反轉俯仰軸（橫軸）" msgid "Invert Roll axis" -msgstr "" +msgstr "反轉橫滾軸（縱軸）" msgid "Printing Progress" msgstr "列印進度" @@ -4036,7 +4038,7 @@ msgstr "清除" msgid "" "You have completed printing the mall model, \n" "but the synchronization of rating information has failed." -msgstr "" +msgstr "已經完成了 MakeWorld 模型的列印，但評論資料同步失敗。" msgid "How do you like this printing file?" msgstr "您覺得這個列印檔案怎麼樣？" @@ -4054,10 +4056,10 @@ msgid "Camera" msgstr "攝影機" msgid "SD Card" -msgstr "SD記憶卡" +msgstr "SD 記憶卡" msgid "Camera Setting" -msgstr "攝影機設置" +msgstr "攝影機設定" msgid "Control" msgstr "控制" @@ -4069,7 +4071,7 @@ msgid "100%" msgstr "100%" msgid "Lamp" -msgstr "LED燈" +msgstr "LED 燈" msgid "Aux" msgstr "輔助" @@ -4088,16 +4090,16 @@ msgstr "除錯資訊" #, fuzzy msgid "No SD Card" -msgstr "無 SD記憶卡" +msgstr "無 SD 記憶卡" msgid "SD Card Abnormal" -msgstr "SD記憶卡異常" +msgstr "SD 記憶卡異常" msgid "Cancel print" msgstr "取消列印" msgid "Are you sure you want to cancel this print?" -msgstr "你確定要取消這次列印嗎？" +msgstr "確定要取消這次列印嗎？" msgid "Downloading..." msgstr "下載中..." @@ -4118,7 +4120,7 @@ msgid "Layer: %d/%d" msgstr "%d/%d 層" msgid "Please heat the nozzle to above 170 degree before loading filament." -msgstr "請在進料前把噴嘴升溫到170℃" +msgstr "請在進料前把噴嘴升溫到 170℃" msgid "Still unload" msgstr "繼續退料" @@ -4155,7 +4157,7 @@ msgstr "狂暴模式（150%）" #, fuzzy msgid "Can't start this without SD card." -msgstr "沒有 SD記憶卡無法開始任務" +msgstr "沒有 SD 記憶卡無法開始任務" msgid "Rate the Print Profile" msgstr "評價列印設定檔" @@ -4198,7 +4200,7 @@ msgid " upload config prase failed\n" msgstr "上傳設定檔失敗\n" msgid " No corresponding storage bucket\n" -msgstr "" +msgstr "沒有對應的儲存區\n" msgid " can not be opened\n" msgstr "無法開啟\n" @@ -4209,7 +4211,6 @@ msgid "" "\n" msgstr "" "在上傳圖片的過程中出現了以下問題。要忽略此問題嗎？\n" -"\n" msgid "info" msgstr "資訊" @@ -4230,7 +4231,7 @@ msgid "" msgstr "" "由於某些原因，您的評論結果無法上傳。如下：\n" "\n" -" 錯誤代碼： " +"錯誤代碼： " #, fuzzy msgid "error message: " @@ -4248,7 +4249,7 @@ msgstr "" msgid "" "Some of your images failed to upload. Would you like to redirect to the " "webpage for rating?" -msgstr "您的部分圖片上傳失敗。 您想重定導向評價網頁嗎？" +msgstr "您的部分圖片上傳失敗。 要重定導向評價網頁嗎？" msgid "You can select up to 16 images." msgstr "您最多可以選擇 16 張圖片。" @@ -4308,7 +4309,7 @@ msgid "Configuration can update now." msgstr "設定檔現在可以升級。" msgid "Detail." -msgstr "詳情。" +msgstr "詳細。" msgid "Integration was successful." msgstr "整合成功。" @@ -4324,7 +4325,7 @@ msgid "New network plug-in available." msgstr "新的網路套件可用。" msgid "Details" -msgstr "細節" +msgstr "詳細" msgid "Undo integration failed." msgstr "整合取消失敗。" @@ -4403,7 +4404,7 @@ msgid "WARNING:" msgstr "警告：" msgid "Your model needs support ! Please make support material enable." -msgstr "你的模型需要支撐才能列印。請開啟材料支撐選項。" +msgstr "你的模型需要支撐才能列印。請開啟支撐選項。" msgid "Gcode path overlap" msgstr "Gcode 路徑有重疊" @@ -4459,12 +4460,12 @@ msgid "Sensitivity of pausing is" msgstr "暫停的靈敏度為" msgid "Enable detection of build plate position" -msgstr "啟用列印板位置檢測" +msgstr "啟用列印板位置偵測" msgid "" "The localization tag of build plate is detected, and printing is paused if " "the tag is not in predefined range." -msgstr "檢測列印板的定位標記，如果標記不在預定義範圍內時暫停列印。" +msgstr "偵測列印板的定位標記，如果標記不在預定義範圍內時暫停列印。" #, fuzzy msgid "First Layer Inspection" @@ -4490,10 +4491,10 @@ msgid "Compare presets" msgstr "比較預設檔" msgid "View all object's settings" -msgstr "查看所有物件的配置" +msgstr "查看所有物件的設定" msgid "Filament settings" -msgstr "線材設置" +msgstr "線材設定" #, fuzzy msgid "Printer settings" @@ -4569,7 +4570,7 @@ msgid "Bed type" msgstr "列印板類型" msgid "Flushing volumes" -msgstr "換色廢料體積" +msgstr "廢料體積" msgid "Add one filament" msgstr "增加一個線材" @@ -4578,7 +4579,7 @@ msgid "Remove last filament" msgstr "刪除最後一個線材" msgid "Synchronize filament list from AMS" -msgstr "從 AMS 同步線材列表" +msgstr "從 AMS 同步線材清單" #, fuzzy msgid "Set filaments to use" @@ -4590,14 +4591,14 @@ msgid "" msgstr "沒有發現 AMS 線材。請在“設備”頁面選擇列印設備，將載入 AMS 資訊" msgid "Sync filaments with AMS" -msgstr "同步到 AMS 的線材列表" +msgstr "同步到 AMS 的線材清單" #, fuzzy msgid "" "Sync filaments with AMS will drop all current selected filament presets and " "colors. Do you want to continue?" msgstr "" -"同步到 AMS 的線材列表將刪除所有目前設定的線材預設檔、顏色。確定要繼續嗎？" +"同步到 AMS 的線材清單將刪除所有目前設定的線材預設檔、顏色。確定要繼續嗎？" msgid "" "Already did a synchronization, do you want to sync only changes or resync " @@ -4605,13 +4606,13 @@ msgid "" msgstr "已經同步過，你希望僅同步改變的線材還是重新同步所有線材？" msgid "Sync" -msgstr "同步" +msgstr "僅同步改變的" msgid "Resync" -msgstr "重新同步" +msgstr "重新同步所有" msgid "There are no compatible filaments, and sync is not performed." -msgstr "沒有如任何相容的線材，同步操作未執行。" +msgstr "沒有任何相容的線材，同步操作未執行。" #, fuzzy msgid "" @@ -4620,7 +4621,7 @@ msgid "" "presets." msgstr "" "有一些未知型號的線材，映射到通用預設檔。請更新或者重啟 Orca Slicer，以檢查系" -"統預設有沒有更新。" +"統預設檔有沒有更新。" #, fuzzy, boost-format msgid "Do you want to save changes to \"%1%\"?" @@ -4638,7 +4639,7 @@ msgstr "退出設備 %s（%s） 失敗。" #, fuzzy msgid "Previous unsaved project detected, do you want to restore it?" -msgstr "檢測到有未儲存的專案項目，是否恢復此專案項目？" +msgstr "偵測到有未儲存的專案項目，是否恢復此專案項目？" msgid "Restore" msgstr "恢復" @@ -4648,7 +4649,7 @@ msgid "" "clogged when printing this filament in a closed enclosure. Please open the " "front door and/or remove the upper glass." msgstr "" -"目前熱床溫度比較高。在封閉的機艙中列印該線材時，噴嘴可能會堵塞。請打開前門和/" +"目前熱床溫度比較高。在封閉的列印設備中列印該線材時，噴嘴可能會堵塞。請打開前門和/" "或拆下上部玻璃。" #, fuzzy @@ -4657,7 +4658,7 @@ msgid "" "nozzle hardness of the printer. Please replace the hardened nozzle or " "filament, otherwise, the nozzle will be attrited or damaged." msgstr "" -"線材所要求的噴嘴硬度高於列印設備預設的噴嘴硬度。請更換硬化的噴嘴或列印絲，否" +"線材所要求的噴嘴硬度高於列印設備預設的噴嘴硬度。請更換硬化的噴嘴或線材，否" "則噴嘴可能被磨損或損壞。" msgid "" @@ -4751,13 +4752,13 @@ msgstr "" "是否將檔案載入為一個由多個零件組合而成的物件，而非多個單零件的物件？" msgid "Multi-part object detected" -msgstr "檢測到多部分物件" +msgstr "偵測到多部分物件" msgid "Load these files as a single object with multiple parts?\n" msgstr "將這些檔案載入為一個多零件物件？\n" msgid "Object with multiple parts was detected" -msgstr "檢測到多零件物件" +msgstr "偵測到多零件物件" msgid "The file does not contain any geometry data." msgstr "此檔案不包含任何幾何數據。" @@ -4765,7 +4766,7 @@ msgstr "此檔案不包含任何幾何數據。" msgid "" "Your object appears to be too large, Do you want to scale it down to fit the " "heat bed automatically?" -msgstr "物件看起來太大，希望將物件自動縮小以適應熱床嗎？" +msgstr "物件看起來太大，希望將物件自動縮小以適應列印板嗎？" msgid "Object too large" msgstr "物件太大" @@ -4794,7 +4795,7 @@ msgstr "" "型的一致性。" msgid "The selected object couldn't be split." -msgstr "選中的模型不可分裂。" +msgstr "選中的模型不可分割。" msgid "Another export job is running." msgstr "有其他匯出任務正在進行中。" @@ -4818,7 +4819,7 @@ msgid "Please select a file" msgstr "請選擇一個檔案" msgid "Do you want to replace it" -msgstr "你要更換它嗎" +msgstr "確定要更換它嗎" msgid "Message" msgstr "訊息" @@ -4858,7 +4859,7 @@ msgstr "請解決切片錯誤後再重新發布。" #, fuzzy msgid "" "Network Plug-in is not detected. Network related features are unavailable." -msgstr "未檢測到網路套件。網路相關功能不可用。" +msgstr "未偵測到網路套件。網路相關功能不可用。" msgid "" "Preview only mode:\n" @@ -4989,7 +4990,8 @@ msgstr "無法對模型網格執行布林運算。只有正面部分將被導出 #, fuzzy msgid "Is the printer ready? Is the print sheet in place, empty and clean?" -msgstr "列印設備是否準備完成?" +msgstr "列印設備是否準備完成？列印平台是否在正確的位置、有沒有異物、是否乾淨？" + msgid "Upload and Print" msgstr "上傳並列印" @@ -5003,7 +5005,7 @@ msgstr "" "建議使用自動擺放避免列印時發生碰撞。" msgid "Send G-code" -msgstr "傳送 G-Code" +msgstr "傳送 G-code" #, fuzzy msgid "Send to printer" @@ -5018,7 +5020,7 @@ msgstr "無效數字" #, fuzzy msgid "Plate Settings" -msgstr "列印板參數設置" +msgstr "列印板參數設定" #, fuzzy, boost-format msgid "Number of currently selected parts: %1%\n" @@ -5073,7 +5075,7 @@ msgid "" "still want to do this printing, please set this filament's bed temperature " "to non zero." msgstr "" -"列印板 % d：%s 不建議被用於列印 %s（%s）線材。如果你依然想列印，請設置線材對" +"列印板 %d：%s 不建議被用於列印 %s（%s）線材。如果你依然想列印，請設定線材對" "應的熱床溫度為非零值。" msgid "Switching the language requires application restart.\n" @@ -5140,6 +5142,15 @@ msgstr "英製" msgid "Units" msgstr "單位" +msgid "Home" +msgstr "首頁" + +msgid "Default Page" +msgstr "預設頁面" + +msgid "Set the page opened on startup." +msgstr "設定為啟動頁面。" + msgid "Zoom to mouse position" msgstr "放大到滑鼠位置" @@ -5154,6 +5165,12 @@ msgstr "使用自由鏡頭" msgid "If enabled, use free camera. If not enabled, use constrained camera." msgstr "如果啟用，則使用自由鏡頭。若未啟用，則使用受限鏡頭。" +msgid "Show splash screen" +msgstr "顯示啟動動畫" + +msgid "Show the splash screen during startup." +msgstr "啟動時顯示啟動動畫。" + #, fuzzy msgid "Show \"Tip of the day\" notification after start" msgstr "啟動後顯示\"每日小提示\"通知" @@ -5174,7 +5191,7 @@ msgstr "預設" #, fuzzy msgid "Auto sync user presets(Printer/Filament/Process)" -msgstr "同步使用者預設（列印設備/線材/列印品質）" +msgstr "同步使用者預設（列印設備/線材/列印品質參數）" msgid "User Sync" msgstr "使用者同步" @@ -5282,7 +5299,7 @@ msgid "Preferences sync" msgstr "偏好設定同步" msgid "View control settings" -msgstr "視圖控制設置" +msgstr "視角控制設定" #, fuzzy msgid "Rotate of view" @@ -5372,7 +5389,7 @@ msgid "AMS filaments" msgstr "AMS 線材" msgid "Click to pick filament color" -msgstr "點擊設置線材顏色" +msgstr "點擊設定線材顏色" msgid "Please choose the filament colour" msgstr "請選擇線材顏色" @@ -5587,18 +5604,18 @@ msgstr "PLA 列印板" #, fuzzy msgid "Bambu Engineering Plate" -msgstr "高溫工程列印板" +msgstr "Bambu 高溫工程列印板" #, fuzzy msgid "Bambu Smooth PEI Plate" -msgstr "光滑面列印板" +msgstr "Bambu 光滑面列印板" #, fuzzy msgid "High temperature Plate" msgstr "高溫列印板" msgid "Bambu Textured PEI Plate" -msgstr "金屬紋理列印板" +msgstr "Bambu 金屬紋理列印板" msgid "Send print job to" msgstr "傳送列印作業至" @@ -5613,7 +5630,7 @@ msgid "Flow Dynamics Calibration" msgstr "動態流量校準" msgid "Click here if you can't connect to the printer" -msgstr "如果無法連接到印表機，請按一下此處" +msgstr "如果無法連接到列印設備，請按一下此處" msgid "send completed" msgstr "傳送完成" @@ -5640,7 +5657,7 @@ msgid "Synchronizing device information" msgstr "正在同步設備資訊" msgid "Synchronizing device information time out" -msgstr "同步設備資訊超時" +msgstr "同步設備資訊逾時" msgid "Cannot send the print job when the printer is updating firmware" msgstr "設備升級中，無法傳送列印作業" @@ -5648,7 +5665,7 @@ msgstr "設備升級中，無法傳送列印作業" #, fuzzy msgid "" "The printer is executing instructions. Please restart printing after it ends" -msgstr "列印設備正在執行指令，請在指令結束後重新列印" +msgstr "列印設備正在執行指令，請在指令結束後重新開始列印" #, fuzzy msgid "The printer is busy on other print job" @@ -5672,7 +5689,7 @@ msgid "" "Filaments to AMS slots mappings have been established. You can click a " "filament above to change its mapping AMS slot" msgstr "" -"已自動建立 \"線材列表=>AMS 槽位\" 的映射關係。 可點擊上方的線材來手動設置其所" +"已自動建立 \"線材清單=>AMS 槽位\" 的映射關係。 可點擊上方的線材來手動設定其所" "對應的 AMS 槽位" msgid "" @@ -5701,7 +5718,7 @@ msgid "" "The printer firmware only supports sequential mapping of filament => AMS " "slot." msgstr "" -"已自動建立 \"線材列表=>AMS 槽位\" 的映射關係。 可點擊上方的線材來手動設置其所" +"已自動建立 \"線材清單=>AMS 槽位\" 的映射關係。 可點擊上方的線材來手動設定其所" "對應的 AMS 槽位" #, fuzzy @@ -5714,7 +5731,7 @@ msgstr "所選列印設備與選擇的列印設備預設檔不相容。" #, fuzzy msgid "An SD card needs to be inserted to record timelapse." -msgstr "使用縮時攝影功能需要插入SD記憶卡" +msgstr "使用縮時攝影功能需要插入 SD 記憶卡" #, fuzzy msgid "" @@ -5754,7 +5771,7 @@ msgid "" "currently selected printer. It is recommended that you use the same printer " "type for slicing." msgstr "" -"產生 G-Code 時選擇的列印設備類型與目前選擇的列印設備不一致。建議您使用相同的" +"產生 G-code 時選擇的列印設備類型與目前選擇的列印設備不一致。建議您使用相同的" "列印設備類型進行切片。" #, c-format, boost-format @@ -5772,7 +5789,7 @@ msgstr "" msgid "" "Please click the confirm button if you still want to proceed with printing." -msgstr "如果您仍然想繼續列印，請滑鼠左鍵單擊“確定”按鈕。" +msgstr "如果您仍然想繼續列印，請滑鼠左鍵點擊 確定 按鈕。" #, fuzzy msgid "" @@ -5792,10 +5809,10 @@ msgstr "名稱長度超過限制。" msgid "" "Caution to use! Flow calibration on Textured PEI Plate may fail due to the " "scattered surface." -msgstr "小心使用！金屬紋理PEI板 上的流量校準可能會因表面散射而失敗。" +msgstr "小心使用！金屬紋理 PEI 板 上的流量校準可能會因表面光線散射而失敗。" msgid "Automatic flow calibration using Micro Lidar" -msgstr "使用微型雷達進行自動流量校準" +msgstr "使用微型雷射雷達進行自動流量校準" #, fuzzy msgid "Modifying the device name" @@ -5860,7 +5877,7 @@ msgid "Check the reason" msgstr "查看原因" msgid "Read and accept" -msgstr "我已閱讀並接受" +msgstr "閱讀並接受" msgid "Terms and Conditions" msgstr "使用者協議" @@ -5872,9 +5889,9 @@ msgid "" "Use(collectively, the \"Terms\"). If you do not comply with or agree to the " "Bambu Lab Privacy Policy, please do not use Bambu Lab equipment and services." msgstr "" -"感謝您購買 Bambu Lab 設備，使用 Bambu Lab 設備前，請閱讀一下條款，單擊同意使" -"用您的 Bambu Lab 設備即表示您同意遵守隱私政策以及使用條款（統稱為“條款”）。如" -"果您不遵守或不同意 Bambu Lab 隱私政策，請不要使用 Bambu Lab 設備和服務。" +"感謝您購買 Bambu Lab 設備，使用 Bambu Lab 設備前，請閱讀一下條款，點擊同意使" +"用您的 Bambu Lab 設備即表示您同意遵守隱私政策以及使用條款（統稱為 條款 ）。如" +"果您不願遵守或不同意 Bambu Lab 隱私政策，請不要使用 Bambu Lab 設備和服務。" msgid "and" msgstr "" @@ -5903,7 +5920,7 @@ msgid "" "payment information, or phone numbers. By enabling this service, you agree " "to these terms and the statement about Privacy Policy." msgstr "" -"在3D列印社區，我們從彼此的成功和失敗中學習調整自己的切片參數和設定。%s 遵循同" +"在 3D 列印社區，我們從彼此的成功和失敗中學習調整自己的切片參數和設定。%s 遵循同" "樣的原則，透過機器學習的方式從大量使用者列印的成功和失敗中獲取經驗，從而改善" "列印性能。我們正在透過向 %s 提供真實世界的資料來訓練他們變得更聰明。如果您願" "意，此服務將訪問您的錯誤日誌和使用日誌中的資訊，其中可能包括隱私政策中描述的" @@ -5929,7 +5946,7 @@ msgstr "請先登入。" #, fuzzy msgid "There was a problem connecting to the printer. Please try again." -msgstr "連接列印設備時發生錯誤。 請重試。" +msgstr "連接列印設備時發生錯誤。 重新連接。" msgid "Failed to log out." msgstr "登出失敗。" @@ -5954,7 +5971,7 @@ msgid "" "Prime tower is required for smooth timeplase. There may be flaws on the " "model without prime tower. Are you sure you want to disable prime tower?" msgstr "" -"平滑模式的縮時錄影需要擦拭塔，否則列印物件上可能會有瑕疵。您確定要關閉擦拭塔" +"平滑模式的縮時錄影需要擦拭塔，否則列印物件上可能會有瑕疵。確定要關閉擦拭塔" "嗎？" #, fuzzy @@ -5962,7 +5979,7 @@ msgid "" "Prime tower is required for smooth timelapse. There may be flaws on the " "model without prime tower. Do you want to enable prime tower?" msgstr "" -"平滑模式的縮時錄影需要擦拭塔，否則列印物件上可能會有瑕疵。您想打開擦拭塔嗎？" +"平滑模式的縮時錄影需要擦拭塔，否則列印物件上可能會有瑕疵。要打開擦拭塔嗎？" #, fuzzy msgid "" @@ -5970,8 +5987,7 @@ msgid "" "support volume but weaker strength.\n" "We recommend using it with: 0 interface layers, 0 top distance, 2 walls." msgstr "" -"我們增加了一種實驗性的支撐樣式 \"苗條樹\"，它的特點是支撐體積較小，但強度較" -"弱。\n" +"我們增加了一種實驗性的支撐樣式 \"苗條樹\"，它的特點是支撐體積較小，但強度較弱。\n" "因此我們推薦以下參數：接觸層數為 0，頂部Z距離為 0，牆層數為 2。" #, fuzzy @@ -5991,7 +6007,7 @@ msgid "" "using support materials on interface." msgstr "" "對於 \"強壯樹 \"和 \"混合樹 \"的支撐樣式，我們推薦以下設定：至少 2 層界面層，" -"至少 0.1 毫米的頂部z距離或在使用專用支撐線材。" +"至少 0.1 毫米的頂部z距離或使用專用的支撐線材。" #, fuzzy msgid "" @@ -6000,7 +6016,7 @@ msgid "" "0 top z distance, 0 interface spacing, concentric pattern and disable " "independent support layer height" msgstr "" -"當使用專用支撐線材時，我們推薦以下設定：\n" +"當使用專用的支撐線材時，我們推薦以下設定：\n" "0 頂層z距離，0 接觸層間距，同心圖案，並且禁用獨立支撐層高" #, fuzzy @@ -6047,8 +6063,8 @@ msgid "" "expressed as a percentage of line width. 0 speed means no slowing down for " "the overhang degree range and wall speed is used" msgstr "" -"不同懸垂程度的列印速度。懸垂程度使用相對於線寬的百分表示。速度為 0 代表這個懸" -"垂程度範圍內不降速，直接使用牆的速度" +"不同懸空程度的列印速度。懸空程度使用相對於線寬的百分比表示。速度為 0 代表這個懸" +"空程度範圍內不降速，直接使用牆的速度" msgid "Bridge" msgstr "橋接" @@ -6105,11 +6121,11 @@ msgid_plural "" "Please remove them, or will beat G-code visualization and printing time " "estimation." msgstr[0] "" -"以下行 % s包含保留關鍵字。\n" +"以下行 %s 包含保留關鍵字。\n" "請將其移除，否則將影響 G-code 視覺化和列印時間估計。" msgid "Reserved keywords found" -msgstr "檢測到保留的關鍵字" +msgstr "偵測到保留的關鍵字" msgid "Setting Overrides" msgstr "參數覆蓋" @@ -6149,7 +6165,7 @@ msgstr "低溫列印板" msgid "" "Bed temperature when cool plate is installed. Value 0 means the filament " "does not support to print on the Cool Plate" -msgstr "安裝低溫列印板時的熱床溫度。0 值表示這個線材不支援低溫列印板" +msgstr "使用低溫列印板時的熱床溫度。0 值表示這個線材不支援低溫列印板" #, fuzzy msgid "Engineering plate" @@ -6159,11 +6175,11 @@ msgstr "工程高溫列印板" msgid "" "Bed temperature when engineering plate is installed. Value 0 means the " "filament does not support to print on the Engineering Plate" -msgstr "安裝工程高溫列印板時的熱床溫度。0 值表示這個線材不支援工程高溫列印板" +msgstr "使用工程高溫列印板時的熱床溫度。0 值表示這個線材不支援工程高溫列印板" #, fuzzy msgid "Smooth PEI Plate / High Temp Plate" -msgstr "光滑面列印板/高溫列印板" +msgstr "光滑面 PEI 列印板/高溫列印板" #, fuzzy msgid "" @@ -6171,22 +6187,22 @@ msgid "" "Value 0 means the filament does not support to print on the Smooth PEI Plate/" "High Temp Plate" msgstr "" -"安裝光滑面列印板/高溫列印板時的熱床溫度。0 值表示這個線材不支援光滑面列印板/" +"使用光滑面 PEI 列印板/高溫列印板時的熱床溫度。0 值表示這個線材不支援光滑面列印板/" "高溫列印板" #, fuzzy msgid "Textured PEI Plate" -msgstr "金屬紋理PEI列印板" +msgstr "金屬紋理 PEI 列印板" #, fuzzy msgid "" "Bed temperature when Textured PEI Plate is installed. Value 0 means the " "filament does not support to print on the Textured PEI Plate" msgstr "" -"安裝金屬紋理PEI列印板時的熱床溫度。0 值表示這個線材不支援金屬紋理PEI列印板" +"使用金屬紋理 PEI 列印板時的熱床溫度。0 值表示這個線材不支援金屬紋理 PEI 列印板" msgid "Volumetric speed limitation" -msgstr "體積速度限制" +msgstr "體積流量速度限制" msgid "Cooling" msgstr "冷卻" @@ -6208,7 +6224,7 @@ msgid "" "shorter than threshold, fan speed is interpolated between the minimum and " "maximum fan speed according to layer printing time" msgstr "" -"當預計的層時間不大於設定的層時間時，部件冷卻風扇速度將開始以最小速度運轉。 當" +"當預計的層時間不大於設定的層時間時，部件冷卻風扇速度將開始以最小速度運轉。當" "層時間小於設定值時，風扇速度將根據該層列印時間在最小和最大風扇速度之間自動調" "整" @@ -6249,15 +6265,15 @@ msgstr "色塔參數" #, fuzzy msgid "Toolchange parameters with single extruder MM printers" -msgstr "單擠出機 MM 列印設備換刀參數" +msgstr "單擠出機多線材列印設備換色參數" #, fuzzy msgid "Ramming settings" -msgstr "擠出設定" +msgstr "尖端成型設定" #, fuzzy msgid "Toolchange parameters with multi extruder MM printers" -msgstr "多擠出機 ＭＭ列印設備換刀參數" +msgstr "多擠出機多線材列印設備換色參數" msgid "Printable space" msgstr "可列印區域" @@ -6336,16 +6352,15 @@ msgid "Lift Z Enforcement" msgstr "強化抬Z策略" msgid "Retraction when switching material" -msgstr "切換材料時的回抽量" +msgstr "切換線材時的回抽量" msgid "" "The Wipe option is not available when using the Firmware Retraction mode.\n" "\n" "Shall I disable it in order to enable Firmware Retraction?" msgstr "" -"使用韌體回抽模式時，擦除選項不可用。\n" -"\n" -"是否禁用擦除選項來啟用韌體回抽？" +"使用韌體回抽模式時，擦拭選項不可用。\n" +"是否禁用擦拭選項來啟用韌體回抽？" msgid "Firmware Retraction" msgstr "韌體回抽" @@ -6418,13 +6433,13 @@ msgid "All changes will be discarded." msgstr "所有的修改都將被丟棄。" msgid "Save the selected options." -msgstr "儲存所選項。" +msgstr "儲存所選項目。" msgid "Keep the selected options." -msgstr "保持所選項。" +msgstr "保留所選項目。" msgid "Transfer the selected options to the newly selected preset." -msgstr "將所選項遷移到新的預設中。" +msgstr "將所選項目遷移到新的預設中。" #, fuzzy, boost-format msgid "" @@ -6577,7 +6592,7 @@ msgstr "目前設定檔已經是最新版本。" #, fuzzy msgid "Ramming customization" -msgstr "自訂擠料" +msgstr "自訂尖端成型" #, fuzzy msgid "" @@ -6591,31 +6606,31 @@ msgid "" "This is an expert-level setting, incorrect adjustment will likely lead to " "jams, extruder wheel grinding into filament etc." msgstr "" -"擠料是指在單擠出機 MM列印設備中更換工具之前的快速擠出。其目的是正確退料線材的" -"末端，使其不會妨礙新線材的插入，並且可以在以後重新插入。此階段很重要，不同的" -"材料可能需要不同的擠出速度才能獲得良好的形狀。因此，擠壓過程中的擠壓速率是可" -"調的。\n" -"\n" -"這是專業的設定，不正確的調整可能會導致卡紙、擠出機損壞等。" +"尖端成型是指在單擠出機多線材印表機中換色之前的快速抽插。\n" +"其目的是使退出的線材末端正確成形，這樣就不會妨礙新線材的插入，並可以重新插" +"入。\n" +"這個階段很重要，不同的線材可能需要不同的擠出速度才能獲得良好的形狀。因此尖端" +"成型過程中的擠壓率是需要可調整的。\n" +"這是一個專業的設定，不正確的調整可能會導致堵塞、擠出機齒輪刨料等。" #, fuzzy msgid "Total ramming time" -msgstr "總擠料時間" +msgstr "尖端成型總時間" msgid "s" msgstr "秒" #, fuzzy msgid "Total rammed volume" -msgstr "總擠料量" +msgstr "尖端成型總體積" #, fuzzy msgid "Ramming line width" -msgstr "擠料線寬" +msgstr "尖端成型線寬" #, fuzzy msgid "Ramming line spacing" -msgstr "擠料線間距" +msgstr "尖端成型線間距" msgid "Auto-Calc" msgstr "自動計算" @@ -6658,7 +6673,7 @@ msgstr "登入" #, fuzzy msgid "The configuration package is changed in previous Config Guide" -msgstr "在設定引導過程中設定檔以改變" +msgstr "設定檔在之前的設定引導過程中以改變" #, fuzzy msgid "Configuration package changed" @@ -6668,7 +6683,7 @@ msgid "Toolbar" msgstr "工具欄" msgid "Objects list" -msgstr "物件列表" +msgstr "物件清單" #, fuzzy msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" @@ -6691,7 +6706,7 @@ msgid "Show/Hide 3Dconnexion devices settings dialog" msgstr "顯示/隱藏 3Dconnexion 設備的設定對話框" msgid "Show keyboard shortcuts list" -msgstr "顯示鍵盤快捷鍵列表" +msgstr "顯示鍵盤快捷鍵清單" #, fuzzy msgid "Global shortcuts" @@ -6721,8 +6736,8 @@ msgid "" "objects, it just orientates the selected ones.Otherwise, it will orientates " "all objects in the current disk." msgstr "" -"自動調整選定零件/所有零件的方向，\n" -"有選定零件時調整選定零件的朝向，沒有選擇零件時調整目前列印板所有零件的朝向" +"自動調整選取零件/所有零件的方向，\n" +"有選取零件時調整選取零件的方向，沒有選取零件時調整目前列印板所有零件的方向" msgid "Shift+Tab" msgstr "" @@ -6742,7 +6757,7 @@ msgid "⌥+Left mouse button" msgstr "⌥+滑鼠左鍵" msgid "Select a part" -msgstr "選擇單個零件" +msgstr "選擇單一零件" msgid "⌘+Left mouse button" msgstr "⌘+滑鼠左鍵" @@ -6842,7 +6857,7 @@ msgid "Gizmo rotate" msgstr "旋轉物件" msgid "Gizmo cut" -msgstr "剪切物件" +msgstr "切割物件" msgid "Gizmo Place face on bed" msgstr "選擇底面" @@ -6867,13 +6882,13 @@ msgid "⌘+Mouse wheel" msgstr "⌘+滑鼠滾輪" msgid "Support/Color Painting: adjust pen radius" -msgstr "支撐/顏色繪製：調節畫筆半徑" +msgstr "支撐/顏色繪製：調整筆刷半徑" msgid "⌥+Mouse wheel" msgstr "⌥+滑鼠滾輪" msgid "Support/Color Painting: adjust section position" -msgstr "支撐/色彩繪製：調節剖面位置" +msgstr "支撐/色彩繪製：調整剖面位置" msgid "Ctrl+Mouse wheel" msgstr "Ctrl+滑鼠滾輪" @@ -6895,16 +6910,16 @@ msgid "Space" msgstr "空格鍵" msgid "Select the object/part and press space to change the name" -msgstr "選中物件、零件，按空格可修改名稱" +msgstr "選取物件、零件，按空格可修改名稱" msgid "Mouse click" msgstr "滑鼠點擊" msgid "Select the object/part and mouse click to change the name" -msgstr "選中物件或零件，雙擊可修改名稱" +msgstr "選取物件或零件，雙擊可修改名稱" msgid "Objects List" -msgstr "物件列表" +msgstr "物件清單" msgid "Vertical slider - Move active thumb Up" msgstr "垂直滑動條 - 向上移動一層" @@ -6926,7 +6941,7 @@ msgid "On/Off g-code window" msgstr "開啟/關閉 G-code 視窗" msgid "Move slider 5x faster" -msgstr "5倍速移動滑動條" +msgstr "5 倍速移動滑動條" msgid "Shift+Mouse wheel" msgstr "Shift+滑鼠滾輪" @@ -7006,7 +7021,7 @@ msgid "Printing" msgstr "列印中" msgid "Idle" -msgstr "空閒" +msgstr "閒置" msgid "Latest version" msgstr "最新版本" @@ -7030,7 +7045,7 @@ msgid "" "continue. Do you want to update now? You can also update later from 'Upgrade " "firmware'." msgstr "" -"檢測到重要更新，需要升級後才可進行列印。你想現在就開始升級嗎？你也可以稍後點" +"偵測到重要更新，需要升級後才可進行列印。你想現在就開始升級嗎？你也可以稍後點" "擊‘升級韌體’完成升級。" #, fuzzy @@ -7050,7 +7065,7 @@ msgstr "將物件儲存到 3mf 失敗。" #, fuzzy msgid "Only Windows 10 is supported." -msgstr "僅支援 Windows 10 系統。" +msgstr "僅支援 Windows 10 作業系統。" msgid "Failed to initialize the WinRT library." msgstr "無法初始化 WinRT 函式庫。。" @@ -7126,7 +7141,7 @@ msgstr "模型：%1%" msgid "" "Maybe parts of the object at these height are too thin, or the object has " "faulty mesh" -msgstr "部分模型在這些高度可能過薄，或者模型存在面片錯誤" +msgstr "部分模型在這些高度可能過薄，或者模型存在缺陷" msgid "No object can be printed. Maybe too small" msgstr "沒有可列印的物件。可能是因為尺寸過小。" @@ -7214,7 +7229,7 @@ msgid "unsupported feature" msgstr "不支援的功能" msgid "failed finding central directory" -msgstr "找不到核心目錄" +msgstr "找不到主目錄" msgid "not a ZIP archive" msgstr "不是一個 zip 壓縮檔" @@ -7223,7 +7238,7 @@ msgid "invalid header or corrupted" msgstr "無效檔案頭或檔案已損壞" msgid "unsupported multidisk" -msgstr "不支援多磁碟存檔" +msgstr "不支援多磁碟儲存" msgid "decompression failed" msgstr "解壓縮失敗或存檔已損壞" @@ -7238,7 +7253,7 @@ msgid "CRC check failed" msgstr "CRC 檢查失敗" msgid "unsupported central directory size" -msgstr "不支援的核心目錄大小" +msgstr "不支援的主目錄容量" msgid "allocation failed" msgstr "分配記憶體失敗" @@ -7259,7 +7274,7 @@ msgid "file close failed" msgstr "檔案關閉失敗" msgid "file seek failed" -msgstr "檔案隨機訪問失敗" +msgstr "檔案隨機存取失敗" msgid "file stat failed" msgstr "檔案統計資訊失敗" @@ -7324,7 +7339,7 @@ msgstr "" "不能將溫度差異過大的線材一起列印。否則擠出機和噴嘴在列印中可能被堵塞或損壞" msgid "No extrusions under current settings." -msgstr "根據目前設定，不會產生任何列印。" +msgstr "根據目前設定，不會進行任何列印。" msgid "" "Smooth mode of timelapse is not supported when \"by object\" sequence is " @@ -7371,7 +7386,7 @@ msgid "" msgstr "可變層高開啟時無法使用擦拭塔。它要求所有物件擁有相同的層高。" msgid "The prime tower requires \"support gap\" to be multiple of layer height" -msgstr "擦拭塔要求”支撐間隙“為層高的整數倍。" +msgstr "擦拭塔要求”支撐間隙“為層高的整數倍數。" msgid "The prime tower requires that all objects have the same layer heights" msgstr "擦拭塔要求各個物件擁有同樣的層高。" @@ -7496,7 +7511,7 @@ msgid "" msgstr "將首層收縮用於補償象腳效應" msgid "Elephant foot compensation layers" -msgstr "象腳補償層" +msgstr "象腳補償層數" msgid "" "The number of layers on which the elephant foot compensation will be active. " @@ -7592,7 +7607,7 @@ msgid "" "distribution points. One may want to enable this option for self signed " "certificates if connection fails." msgstr "" -"在缺少或離線分發點的情況下忽略 HTTPS憑證 吊銷檢查。如果連接失敗，可以啟用此選" +"在缺少或離線的情況下忽略 HTTPS憑證 吊銷檢查。如果連接失敗，可以啟用此選" "項來處理自簽名憑證。" #, fuzzy @@ -7612,7 +7627,7 @@ msgid "Avoid crossing wall" msgstr "避免跨越外牆" msgid "Detour and avoid to travel across wall which may cause blob on surface" -msgstr "空駛時繞過外牆以避免在模型外觀面產生斑點" +msgstr "空駛時繞過外牆以避免在模型外觀表面產生斑點" msgid "Avoid crossing wall - Max detour length" msgstr "避免跨越外牆-最大繞行長度" @@ -7658,7 +7673,7 @@ msgstr "除首層外的熱床溫度。0 值表示這個線材不支援高溫列 msgid "" "Bed temperature for layers except the initial one. Value 0 means the " "filament does not support to print on the Textured PEI Plate" -msgstr "除首層外的熱床溫度。0 值表示這個線材不支援金屬紋理PEI列印板" +msgstr "除首層外的熱床溫度。0 值表示這個線材不支援金屬紋理 PEI 列印板" msgid "Initial layer" msgstr "首層" @@ -7688,7 +7703,7 @@ msgstr "首層熱床溫度。0 值表示這個線材不支援高溫列印板" msgid "" "Bed temperature of the initial layer. Value 0 means the filament does not " "support to print on the Textured PEI Plate" -msgstr "首層熱床溫度。0 值表示這個線材不支援金屬紋理PEI列印板" +msgstr "首層熱床溫度。0 值表示這個線材不支援金屬紋理 PEI 列印板" #, fuzzy msgid "Bed types supported by the printer" @@ -7790,7 +7805,7 @@ msgstr "橋接密度" #, fuzzy msgid "Density of external bridges. 100% means solid bridge. Default is 100%." -msgstr "外表橋接的密度。 100%意味著堅固的橋樑。 預設值為 100%。" +msgstr "外部橋接的密度。 100% 意味著堅固的橋樑。 預設值為 100%。" msgid "Bridge flow" msgstr "橋接流量" @@ -7836,7 +7851,8 @@ msgid "" msgstr "頂面只使用單層牆，從而更多的空間能夠使用頂部填充圖案" msgid "One wall threshold" -msgstr "" +msgstr "單層牆臨界值" + #, fuzzy msgid "" @@ -7849,11 +7865,11 @@ msgid "" "on the next layer, like letters. Set this setting to 0 to remove these " "artifacts." msgstr "" -"如果列印的頂部表面其部分被另一層覆蓋，則不會將其視為寬度低於此值的頂層。這對" -"於不讓「頂部一個周界」在僅應被周界覆蓋的表面上觸發非常有用。 該值可以是周邊擠" -"出寬度的 mm 或 %。\n" -"警告：如果啟用，如果您在下一層上有一些薄特徵（例如字母），則可以建立工件。 將" -"此設定設為 0 以消除這些偽影。" +"如果頂面需要列印，但是它的一部分被其它層覆蓋，那麼當它的寬度小於這個值時，它" +"不會被認為是頂層。這個設定可以用於避免在狹窄頂面上觸發“頂面單層牆”。這個值可" +"以是 mm 或線寬的 %。\n" +"警告：如果啟用該選項，可能會在下一層上產生一些薄的特徵，比如字母。將此設定設" +"為 0 可以消除這些偽影。" msgid "Only one wall on first layer" msgstr "首層僅單層牆" @@ -7864,42 +7880,42 @@ msgid "" msgstr "首層只使用單層牆，從而更多的空間能夠使用底部填充圖案" msgid "Extra perimeters on overhangs" -msgstr "懸空的額外週長" +msgstr "懸空上的額外周長" msgid "" "Create additional perimeter paths over steep overhangs and areas where " "bridges cannot be anchored. " -msgstr "在陡峭的懸空和橋接無法錨定的區域中增加額外的周邊路徑。" +msgstr "在陡峭的懸空和無法固定橋接的區域中增加額外的周長路徑。" #, fuzzy msgid "Reverse on odd" -msgstr "奇數層反向" +msgstr "反轉奇數層懸空方向" #, fuzzy msgid "Overhang reversal" -msgstr "懸空反向" +msgstr "懸空反轉" msgid "" "Extrude perimeters that have a part over an overhang in the reverse " "direction on odd layers. This alternating pattern can drastically improve " "steep overhang." msgstr "" -"在奇數層上以相反方向擠出有一部分位於懸空之上的周邊。 這種交替模式可以大大改善" -"陡峭的懸空。" +"在奇數層上以相反方向列印懸空部位。 這種交替模式的可以大大改善陡峭的懸空列印品" +"質。" msgid "Reverse threshold" -msgstr "反向臨界值" +msgstr "反轉臨界值" msgid "Overhang reversal threshold" -msgstr "懸空反向臨界值" +msgstr "懸空反轉臨界值" msgid "" "Number of mm the overhang need to be for the reversal to be considered " "useful. Can be a % of the perimeter width.\n" "Value 0 enables reversal on every odd layers regardless." msgstr "" -"啟用反向需要的值單位為 mm。可以是周長寬度的 %。\n" -" 0 值則會在每個奇數層上啟用反轉。" +"判定懸空反轉需要的值（mm），可以是線寬的百分比。\n" +" 0 值則會在每個奇數層上啟用反向。" msgid "Classic mode" msgstr "經典模式" @@ -7916,19 +7932,19 @@ msgstr "打開這個選項將降低不同懸垂程度的走線的列印速度" #, fuzzy msgid "Slow down for curled perimeters" -msgstr "捲曲區域放慢速度" +msgstr "翹邊降速" msgid "" "Enable this option to slow printing down in areas where potential curled " "perimeters may exist" -msgstr "啟用此選項降低可能存在潛在捲曲週邊區域的列印速度" +msgstr "啟用此選項降低可能存在潛在翹邊區域的列印速度" msgid "mm/s or %" msgstr "mm/s 或 %" #, fuzzy msgid "External" -msgstr "外橋" +msgstr "外部" msgid "Speed of bridge and completely overhang wall" msgstr "橋接和完全懸空的外牆的列印速度" @@ -7938,13 +7954,13 @@ msgstr "mm/s" #, fuzzy msgid "Internal" -msgstr "內橋" +msgstr "內部" msgid "" "Speed of internal bridge. If the value is expressed as a percentage, it will " "be calculated based on the bridge_speed. Default value is 150%." msgstr "" -"內橋速度。 如果該值以百分比表示，則會根據 bridge_speed 進行計算。 預設值為 " +"內部橋接速度。 如果該值以百分比表示，則會根據 橋接速度 進行計算。 預設值為 " "150%" #, fuzzy @@ -7994,19 +8010,19 @@ msgid "" "If set to ~180, brim will be created on everything but straight sections." msgstr "" "讓圓盤出現的最大角度。\n" -"如果設定為 0，則不會創建圓盤。\n" -"設定越趨近 180，除直線部分外，其他部分都會創建圓盤。" +"如果設定為 0，則不會建立圓盤。\n" +"設定越趨近 180，除直線部分外，其他部分都會建立圓盤。" msgid "Brim ear detection radius" -msgstr "圓盤檢測半徑" +msgstr "圓盤偵測半徑" msgid "" "The geometry will be decimated before dectecting sharp angles. This " "parameter indicates the minimum length of the deviation for the decimation.\n" "0 to deactivate" msgstr "" -"在檢測尖銳角度之前，幾何形狀將被簡化。此參數表示簡化的最小偏差長度。\n" -"設為0以停用" +"在偵測尖銳角度之前，幾何形狀將被簡化。此參數表示簡化的最小偏差長度。\n" +"設為 0 以停用" #, fuzzy msgid "Compatible machine" @@ -8079,11 +8095,12 @@ msgstr "切換設備自動更換預設切片設定檔" #, fuzzy msgid "Activate air filtration" -msgstr "開啟機箱過濾器" +msgstr "開啟空氣過濾器/排風扇" #, fuzzy msgid "Activate for better air filtration. G-code command: M106 P3 S(0-255)" -msgstr "啟動以獲得更好的空氣過濾。 G碼指令：M106 P3 S（0-255）" +msgstr "啟動空氣過濾器/排風扇。 G-code 指令：M106 P3 S（0-255）" + msgid "Fan speed" msgstr "風扇速度" @@ -8099,14 +8116,14 @@ msgstr "列印完成後排風扇的轉速" #, fuzzy msgid "No cooling for the first" -msgstr "前N層關閉部件風扇" +msgstr "對前Ｎ層關閉部件風扇" #, fuzzy msgid "" "Close all cooling fan for the first certain layers. Cooling fan of the first " "layer used to be closed to get better build plate adhesion" msgstr "" -"對開始的一些層關閉所有的部件冷卻風扇。通常關閉首層冷卻用來獲得更好的首層黏接" +"對開始的一些層關閉所有的部件冷卻風扇。通常關閉首層冷卻用來獲得更好的首層黏附" msgid "Don't support bridges" msgstr "不支撐橋接" @@ -8197,13 +8214,13 @@ msgid "" "Line pattern of internal solid infill. if the detect nattow internal solid " "infill be enabled, the concentric pattern will be used for the small area." msgstr "" -"內部實心填充的線型圖案。如果啟用了檢測狹窄的內部實心填充，將使用同心圓圖案來" +"內部實心填充的線型圖案。如果啟用了偵測狹窄的內部實心填充，將使用同心圓圖案來" "填充小區域。" msgid "" "Line width of outer wall. If expressed as a %, it will be computed over the " "nozzle diameter." -msgstr "外牆的線寬。如果以%表示，它將基於噴嘴直徑來計算" +msgstr "外牆的線寬。如果以 % 表示，將以噴嘴直徑為基準來計算" #, fuzzy msgid "" @@ -8220,7 +8237,7 @@ msgid "" "example: 80%) it will be calculated on the outer wall speed setting above. " "Set to zero for auto." msgstr "" -"這個單獨的設定將影響半徑<=small_perimeter_threshold（通常是孔）的周長的速" +"這個單獨的設定將影響半徑 <= small_perimeter_threshold（通常是圓孔）的周長的速" "度。 如果以百分比表示（例如：80%），它將根據上面的外牆速度設定進行計算。 自動" "設定為零。" @@ -8229,7 +8246,7 @@ msgstr "微小部位周長臨界值" msgid "" "This sets the threshold for small perimeter length. Default threshold is 0mm" -msgstr "這設定了微小部位週長的臨界值。 預設臨界值是 0mm" +msgstr "這設定了微小部位周長的臨界值。 預設臨界值是 0mm" msgid "Order of inner wall/outer wall/infil" msgstr "內牆/外牆/填充的順序" @@ -8304,7 +8321,7 @@ msgstr "啟用壓力提前" msgid "" "Enable pressure advance, auto calibration result will be overwriten once " "enabled." -msgstr "啟用壓力提前，一旦啟用會覆蓋自動檢測的結果" +msgstr "啟用壓力提前，一旦啟用會覆蓋自動校準的結果" #, fuzzy msgid "Pressure advance(Klipper) AKA Linear advance factor(Marlin)" @@ -8314,10 +8331,10 @@ msgstr "壓力提前（Klipper）或者線性提前（Marlin）" msgid "" "Default line width if other line widths are set to 0. If expressed as a %, " "it will be computed over the nozzle diameter." -msgstr "當線寬設定為 0 時走線的默認線寬。如果以 % 表示，將使用噴嘴直徑來計算。" +msgstr "當線寬設定為 0 時走線的默認線寬。如果以 % 表示，將以噴嘴直徑為基準來計算。" msgid "Keep fan always on" -msgstr "保持風扇常開" +msgstr "保持風扇永遠開啟" #, fuzzy msgid "" @@ -8368,23 +8385,23 @@ msgid "" "extruded per second. Printing speed is limited by max volumetric speed, in " "case of too high and unreasonable speed setting. Can't be zero" msgstr "" -"這個設定表示在1秒內能夠融化和擠出的線材體積。列印速度會受到最大體積速度的限" +"這個設定表示在 1 秒內能夠融化和擠出的線材體積。列印速度會受到最大體積速度的限" "制，防止設定過高和不合理的速度。不允許設定為 0。" msgid "mm³/s" msgstr "mm³/s" msgid "Filament load time" -msgstr "載入線材的時間" +msgstr "進料的時間" msgid "Time to load new filament when switch filament. For statistics only" -msgstr "切換線材時，載入新線材所需的時間。只用於統計資訊。" +msgstr "切換線材時，進料所需的時間。只用於統計資訊。" msgid "Filament unload time" -msgstr "卸載線材的時間" +msgstr "退料的時間" msgid "Time to unload old filament when switch filament. For statistics only" -msgstr "切換線材時，卸載舊的線材所需時間。只用於統計資訊。" +msgstr "切換線材時，退料所需時間。只用於統計資訊。" msgid "" "Filament diameter is used to calculate extrusion in gcode, so it's important " @@ -8428,15 +8445,17 @@ msgstr "退料速度" msgid "" "Speed used for unloading the filament on the wipe tower (does not affect " "initial part of unloading just after ramming)." -msgstr "從擦拭塔上退料的速度（這個不會影響初始退料）。" +msgstr "使用於擦拭塔上退料的速度（不影響尖端成型之後初始部分的速度）。" msgid "Unloading speed at the start" -msgstr "初始退料速度" +msgstr "退料初始速度" + #, fuzzy msgid "" "Speed used for unloading the tip of the filament immediately after ramming." -msgstr "擠壓後立即將線材末端退出的速度。" +msgstr "線材尖端成型後立即退料的速度。" + msgid "Delay after unloading" msgstr "退料後延遲" @@ -8445,21 +8464,23 @@ msgid "" "Time to wait after the filament is unloaded. May help to get reliable " "toolchanges with flexible materials that may need more time to shrink to " "original dimensions." -msgstr "退料後等待的時間。可能有助於使用柔性線材。" +msgstr "" +"退料後等待的時間。有助於使用柔性線材（收縮到原始尺寸需更多的時間）以獲得可" +"靠的换色。" msgid "Number of cooling moves" -msgstr "冷卻動作次數" +msgstr "冷卻移動次數" msgid "" "Filament is cooled by being moved back and forth in the cooling tubes. " "Specify desired number of these moves." -msgstr "藉由在冷卻管中來回移動以冷卻線材。指定移動所需的次數。" +msgstr "藉由在喉管中來回移動以冷卻線材。指定移動所需的次數。" msgid "Speed of the first cooling move" -msgstr "第一次冷卻動作速度" +msgstr "第一次冷卻移動的速度" msgid "Cooling moves are gradually accelerating beginning at this speed." -msgstr "冷卻動作以這個速度開始逐漸加速。" +msgstr "從這個速度開始冷卻移動逐漸加速。" msgid "Minimal purge on wipe tower" msgstr "擦拭塔上的最小清理量" @@ -8471,37 +8492,44 @@ msgid "" "object, Slic3r will always prime this amount of material into the wipe tower " "to produce successive infill or sacrificial object extrusions reliably." msgstr "" -"更換工具後，新加載的線材在噴嘴內的確切位置可能未知，在此之前線材壓力可能還不" -"穩定。因此在列印之前，將先打列印在擦拭塔，以取得更可靠擠壓壓力。" +"換色後，新載入的線材在噴嘴內的確切位置可能未知，耗材壓力可能還不穩定。在沖刷" +"列印頭到填充或作為擠出廢料之前，將始終將這些的線材沖刷到擦拭塔中以產生連續" +"的填充或穩定的擠出廢料。" + msgid "Speed of the last cooling move" -msgstr "" +msgstr "最後一次冷卻移動的速度" msgid "Cooling moves are gradually accelerating towards this speed." -msgstr "" +msgstr "冷卻移動向這個速度逐漸加速。" msgid "" "Time for the printer firmware (or the Multi Material Unit 2.0) to load a new " "filament during a tool change (when executing the T code). This time is " "added to the total print time by the G-code time estimator." msgstr "" +"在換色時（執行 T-code ，如 T1，T2），列印設備韌體（或 Multi Material Unit " +"2.0）載入新線材的所需時間。該時間將會被 G-code 時間評估功能加到總列印時間上" +"去。" msgid "Ramming parameters" -msgstr "" +msgstr "尖端成型參數" msgid "" "This string is edited by RammingDialog and contains ramming specific " "parameters." -msgstr "" +msgstr "此內容由尖端成型欄位編輯，包含尖端成型的特定參數。" msgid "" "Time for the printer firmware (or the Multi Material Unit 2.0) to unload a " "filament during a tool change (when executing the T code). This time is " "added to the total print time by the G-code time estimator." msgstr "" +"換色期間（執行T-cide 時如 T1，T2），列印設備韌體（或 Multi Material Unit " +"2.0）退出線材所需時間。該時間將會被 G-code 時間評估功能加到總列印時間上去。" msgid "Enable ramming for multitool setups" -msgstr "" +msgstr "使用多色尖端成形設定" msgid "" "Perform ramming when using multitool printer (i.e. when the 'Single Extruder " @@ -8509,18 +8537,21 @@ msgid "" "amount of filament is rapidly extruded on the wipe tower just before the " "toolchange. This option is only used when the wipe tower is enabled." msgstr "" +"多色列印設備執行尖端成型時（即，當列印設備設定中的單擠出機多材料未選取時）。" +"選取時，在換色之前，會迅速擠出少量線材絲到擦拭塔上。此選項僅在啟用擦拭塔時使" +"用。" msgid "Multitool ramming volume" -msgstr "" +msgstr "多色尖端成型體積" msgid "The volume to be rammed before the toolchange." -msgstr "" +msgstr "換色前尖端成型的體積" msgid "Multitool ramming flow" -msgstr "" +msgstr "多色尖端成型流量" msgid "Flow used for ramming the filament before the toolchange." -msgstr "" +msgstr "換色前線材尖端成型的流量" msgid "Density" msgstr "密度" @@ -8567,13 +8598,13 @@ msgstr "線材的價格。只用於統計資訊。" #, fuzzy msgid "money/kg" -msgstr "金額/公斤" +msgstr "元/公斤" msgid "Vendor" msgstr "供應商" msgid "Vendor of filament. For show only" -msgstr "列印耗材的供應商。僅用於展示。" +msgstr "列印線材的供應商。僅用於展示。" msgid "(Undefined)" msgstr "（未定義）" @@ -8678,7 +8709,7 @@ msgstr "" "線段的長度僅限於 infl_anchor，但不超過此參數。將此參數設定為零以禁用錨點。" msgid "0 (Simple connect)" -msgstr "" +msgstr "0（簡單連接）" #, fuzzy msgid "Acceleration of outer walls" @@ -8698,7 +8729,7 @@ msgid "" msgstr "頂面填充的加速度。使用較低值可能會改善頂面列印品質" msgid "Acceleration of outer wall. Using a lower value can improve quality" -msgstr "外牆加速度。使用較小的值可以提高品質。" +msgstr "外牆加速度。使用較小的值可以提高列印品質。" #, fuzzy msgid "" @@ -8714,7 +8745,7 @@ msgid "" "Acceleration of sparse infill. If the value is expressed as a percentage (e." "g. 100%), it will be calculated based on the default acceleration." msgstr "" -"稀疏填充的加速度。如果該值表示為百分比（例如100%），則將根據默認加速度進行計" +"稀疏填充的加速度。如果該值表示為百分比（例如 100%），則將根據預設加速度進行計" "算。" msgid "" @@ -8722,13 +8753,13 @@ msgid "" "percentage (e.g. 100%), it will be calculated based on the default " "acceleration." msgstr "" -"內部實心填充加速度。 如果該值以百分比表示（例如100%），則將根據預設加速度進行" +"內部實心填充加速度。 如果該值以百分比表示（例如 100%），則將根據預設加速度進行" "計算。" msgid "" "Acceleration of initial layer. Using a lower value can improve build plate " "adhesive" -msgstr "首層加速度。使用較低值可以改善和列印板的黏接。" +msgstr "首層加速度。使用較低值可以改善和列印板的黏附。" msgid "Enable accel_to_decel" msgstr "啟用煞車速度" @@ -8769,7 +8800,7 @@ msgstr "空駛抖動值" msgid "" "Line width of initial layer. If expressed as a %, it will be computed over " "the nozzle diameter." -msgstr "首層的線寬。如果以%表示，它將基於噴嘴直徑來計算。" +msgstr "首層的線寬。如果以 % 表示，它將以噴嘴直徑為基準來計算。" msgid "Initial layer height" msgstr "首層層高" @@ -8878,7 +8909,7 @@ msgid "Layers and Perimeters" msgstr "層和牆" msgid "Filter out gaps smaller than the threshold specified" -msgstr "" +msgstr "忽略小於指定數值的間隙" msgid "" "Speed of gap infill. Gap usually has irregular line width and should be " @@ -8903,7 +8934,7 @@ msgid "Enable this to add line number(Nx) at the beginning of each G-Code line" msgstr "打開這個設定，G-code 的每一行的開頭會增加Nx標註行號。" msgid "Scan first layer" -msgstr "首層掃描" +msgstr "首層檢查" #, fuzzy msgid "" @@ -9021,7 +9052,7 @@ msgid "The printer cost per hour" msgstr "列印設備每小時成本" msgid "money/h" -msgstr "金額/小時" +msgstr "元/小時" #, fuzzy msgid "Support control chamber temperature" @@ -9102,7 +9133,7 @@ msgstr "列印內部稀疏填充的線材" msgid "" "Line width of internal sparse infill. If expressed as a %, it will be " "computed over the nozzle diameter." -msgstr "內部稀疏填充的線寬。如果以%表示，它將基於噴嘴直徑來計算。" +msgstr "內部稀疏填充的線寬。如果以%表示，它將以噴嘴直徑為基準來計算。" msgid "Infill/Wall overlap" msgstr "填充/牆 重疊" @@ -9330,7 +9361,7 @@ msgid "" msgstr "擠出頭最大可列印的層高。用於限制開啟自適應層高時的最大層高。" msgid "Extrusion rate smoothing" -msgstr "平滑的擠出速率" +msgstr "平滑擠出率" #, fuzzy msgid "" @@ -9361,21 +9392,20 @@ msgid "" "\n" "Note: this parameter disables arc fitting." msgstr "" -"此參數可以將列印設備從列印高流量（高速/較大寬度）擠出轉換到較低流量（較低速" -"度/較小寬度）擠出時發生的突然擠出速率變化平滑化，反之亦然。\n" -"\n" -"它定義了擠出體積流量隨時間變化的最大速率（以 mm3/秒為單位）。 數值越高意味著" -"允許的擠出速率變化越​​大，從而實現更快的速度轉換。\n" +"此參數是列印設備從列印高流量（高速/較大寬度）擠出轉換到較低流量（較低速度/較" +"小寬度）擠出時，用於突然變化擠出速率的平滑，反之亦然。\n" +"它定義了擠出體積流量（以 mm3/秒為單位）隨時間變化的最大速率。數值越高意味著允" +"許更高的擠出速率變化，從而實現更快的速度轉換。\n" "\n" "值為 0 會停用該功能。\n" "\n" -"對於高速、高流量的機型（如 Bambu lab 或 Voron），通常不需要此值。 然而，在某" -"些功能速度差異很大的情況下，它可以提供一些邊際效益。 例如，當由於過剩而出現嚴" -"重減速時。 在這些情況下，建議使用大約 300-350mm3/s2 的高值，因為這樣可以實現" -"足夠的平滑，以幫助壓力前進實現更平滑的流量過渡。\n" -"\n" -"對於速度較慢且沒有壓力提前的機種，該值應設定得低得多。 \n" +"對於高速、高流量的機型（如 Bambu lab 或 Voron），通常不需要此值。但是，在某些" +"功能速度差異很大的情況下，它可以提供一些邊際效益。 例如，當懸空而出現嚴重的減" +"速時。 在這些情況下，建議使用大約 300－350　mm3/s2，因為這樣剛好允許足夠的平" +"滑，以幫助壓力提前實現更平滑的流量過渡。\n" "\n" +"對於速度較慢且沒有壓力提前的機種，該值應設定的非常低。對於近程擠出機來說\n" +"10－15 mm3/s2 是一個相對好的起點，而對於遠程擠出機來說是　5－10 mm3/s2。\n" "此功能在 Prusa 切片機中稱為壓力均衡器。\n" "\n" "注意：此參數會停用圓弧擬合。" @@ -9384,7 +9414,7 @@ msgid "mm³/s²" msgstr "" msgid "Smoothing segment length" -msgstr "" +msgstr "平滑段長度" msgid "" "A lower value results in smoother extrusion rate transitions. However, this " @@ -9408,10 +9438,9 @@ msgid "" "Please enable auxiliary_fan in printer settings to use this feature. G-code " "command: M106 P2 S(0-255)" msgstr "" -"輔助冷卻風扇的轉速。 列印期間，輔助風扇將以該速度運行，但前幾層除外（沒有冷卻" -"層）。\n" -"請在列印設備設定中啟用 auxiliary_fan 才能使用此功能。 G碼指令：M106 P2 S" -"（0-255）" +"輔助冷卻風扇的轉速。 列印期間，輔助風扇將以該速度運行，除了設定無須冷卻的前幾層除外" +"\n" +"請在列印設備設定中啟用輔助風扇才能使用此功能。 G碼指令：M106 P2 S（0-255）" msgid "Min" msgstr "最小" @@ -9439,7 +9468,7 @@ msgid "Diameter of nozzle" msgstr "噴嘴直徑" msgid "Configuration notes" -msgstr "設定注意事項" +msgstr "設定備註" msgid "" "You can put here your personal notes. This text will be added to the G-code " @@ -9462,36 +9491,39 @@ msgid "Volume of nozzle between the cutter and the end of nozzle" msgstr "從切刀位置到噴嘴尖端的內腔體積" msgid "Cooling tube position" -msgstr "" +msgstr "喉管位置" msgid "Distance of the center-point of the cooling tube from the extruder tip." -msgstr "" +msgstr "喉管的中心點與擠出機齒尖的距離。" msgid "Cooling tube length" -msgstr "" +msgstr "喉管長度" msgid "Length of the cooling tube to limit space for cooling moves inside it." -msgstr "" +msgstr "喉管的長度，用於限制冷卻內部移動的空間。" msgid "High extruder current on filament swap" -msgstr "" +msgstr "更換線材擠出機大電流" msgid "" "It may be beneficial to increase the extruder motor current during the " "filament exchange sequence to allow for rapid ramming feed rates and to " "overcome resistance when loading a filament with an ugly shaped tip." msgstr "" +"可能有益於更換線材過程中增加擠出機電流，克服進料時的阻力以加快尖端成型進料速" +"率而避免產生難看形狀的尖端。" msgid "Filament parking position" -msgstr "" +msgstr "線材停放位置" msgid "" "Distance of the extruder tip from the position where the filament is parked " "when unloaded. This should match the value in printer firmware." msgstr "" +"退料時，擠出機齒尖與線材停放位置的距離。這應該與列印設備韌體中的值相符合。" msgid "Extra loading distance" -msgstr "" +msgstr "額外進料距離" msgid "" "When set to zero, the distance the filament is moved from parking position " @@ -9499,6 +9531,8 @@ msgid "" "positive, it is loaded further, if negative, the loading move is shorter " "than unloading." msgstr "" +"當設定為零時，線材的進料移動與退料移動的距離相同。如果為正，進料比退料長。如" +"果為負，進料比退料短。" msgid "Start end points" msgstr "起始終止點" @@ -9544,8 +9578,8 @@ msgid "" "printable.90° will not change the model at all and allow any overhang, while " "0 will replace all overhangs with conical material." msgstr "" -"在使懸垂可列印化後，允許的懸垂最大角度。90°將完全不改變模型並允許任何懸垂，而" -"0°將用圓錐形材料替換所有懸垂部分。" +"開啟使懸空可列印後，允許的懸空最大角度。90° 將完全不改變模型並允許任何懸空，而" +"0° 將用圓錐形材料替換所有懸空部分。" msgid "Make overhang printable hole area" msgstr "最大孔洞面積" @@ -9554,7 +9588,7 @@ msgid "" "Maximum area of a hole in the base of the model before it's filled by " "conical material.A value of 0 will fill all the holes in the model base." msgstr "" -"模型底部的孔洞在被圓錐形材料填充前所允許的最大面積。值為0將填充模型底部的所有" +"模型底部的孔洞在被圓錐形材料填充前所允許的最大面積。值為 0 將填充模型底部的所有" "孔洞。" msgid "mm²" @@ -9568,12 +9602,12 @@ msgid "" "Detect the overhang percentage relative to line width and use different " "speed to print. For 100%% overhang, bridge speed is used." msgstr "" -"檢測懸空相對於線寬的百分比，並應用不同的速度列印。100%%的懸空將使用橋接速度。" +"偵測懸空相對於線寬的百分比，並應用不同的速度列印。100%% 的懸空將使用橋接速度。" msgid "" "Line width of inner wall. If expressed as a %, it will be computed over the " "nozzle diameter." -msgstr "內牆的線寬。如果以%表示，它將基於噴嘴直徑來計算。" +msgstr "內牆的線寬。如果以 % 表示，它將以噴嘴直徑為基準來計算。" msgid "Speed of inner wall" msgstr "內圈牆列印速度" @@ -9593,10 +9627,10 @@ msgstr "" "以透過讀取環境變數來讀取 Orca Slicer 設定。" msgid "Printer notes" -msgstr "" +msgstr "列印設備備註" msgid "You can put your notes regarding the printer here." -msgstr "" +msgstr "可以將列印設備的備註填寫在此處" msgid "Raft contact Z distance" msgstr "筏層Z間距" @@ -9608,7 +9642,7 @@ msgid "Raft expansion" msgstr "筏層擴展" msgid "Expand all raft layers in XY plane" -msgstr "在XY平面擴展所有筏層" +msgstr "在 XY 平面擴展所有筏層" msgid "Initial layer density" msgstr "首層密度" @@ -9620,7 +9654,7 @@ msgid "Initial layer expansion" msgstr "首層擴展" msgid "Expand the first raft or support layer to improve bed plate adhesion" -msgstr "擴展筏和支撐的首層可以改善和熱床的黏接。" +msgstr "擴展筏和支撐的首層可以改善和熱床的黏附。" msgid "Raft layers" msgstr "筏層" @@ -9716,7 +9750,7 @@ msgstr "僅在高度以上抬Z" msgid "" "If you set this to a positive value, Z lift will only take place above the " "specified absolute Z." -msgstr "" +msgstr "如果設定為正值，則 Z 抬升僅在指定的絕對 Z 之上發生" msgid "Only lift Z below" msgstr "僅在高度以下抬Z" @@ -9724,7 +9758,7 @@ msgstr "僅在高度以下抬Z" msgid "" "If you set this to a positive value, Z lift will only take place below the " "specified absolute Z." -msgstr "" +msgstr "如果設定為正值，則 Z 抬升僅在指定的絕對 Z 以下發生。" msgid "On surfaces" msgstr "僅表面抬Z" @@ -9733,6 +9767,7 @@ msgid "" "Enforce Z Hop behavior. This setting is impacted by the above settings (Only " "lift Z above/below)." msgstr "" +"強制 Z 抬升行為。此設定受上述設定的影響（僅在高度以下抬Z/僅在高度以上抬Z）。" msgid "All Surfaces" msgstr "所有表面" @@ -9752,12 +9787,12 @@ msgstr "額外回填長度" msgid "" "When the retraction is compensated after the travel move, the extruder will " "push this additional amount of filament. This setting is rarely needed." -msgstr "" +msgstr "每當空駛後回抽被補償時，擠出機將推入額外長度的線材。很少需要此設定。" msgid "" "When the retraction is compensated after changing tool, the extruder will " "push this additional amount of filament." -msgstr "" +msgstr "當換色後回抽被補償時，擠出機將推入額外長度的線材。" msgid "Retraction Speed" msgstr "回抽速度" @@ -9771,7 +9806,7 @@ msgstr "裝填速度" msgid "" "Speed for reloading filament into extruder. Zero means same speed with " "retraction" -msgstr "線材裝填的速度，0表示和回抽速度一致。" +msgstr "線材裝填的速度，0 表示和回抽速度一致。" msgid "Use firmware retraction" msgstr "使用韌體回抽" @@ -9780,6 +9815,8 @@ msgid "" "This experimental setting uses G10 and G11 commands to have the firmware " "handle the retraction. This is only supported in recent Marlin." msgstr "" +"（實驗設定）使用 G10 和 G11 命令讓韌體處理回抽。該功能僅支持最近版本的 " +"Marlin 固件。" msgid "Show auto-calibration marks" msgstr "顯示雷達校準線" @@ -9788,7 +9825,7 @@ msgid "Seam position" msgstr "接縫位置" msgid "The start position to print each part of outer wall" -msgstr "開始列印外牆的位置" +msgstr "Z縫(外牆銜接)的位置" msgid "Nearest" msgstr "最近" @@ -9836,6 +9873,8 @@ msgid "" "To minimize the visibility of the seam in a closed loop extrusion, a small " "inward movement is executed before the extruder leaves the loop." msgstr "" +"為了最大限度地減少閉環擠出中接縫的可見性，在擠出機離開環之前，會向內執行一個" +"小小的移動。" msgid "Wipe speed" msgstr "擦拭速度" @@ -9854,25 +9893,25 @@ msgid "Skirt distance" msgstr "Skirt距離" msgid "Distance from skirt to brim or object" -msgstr "從skirt到模型或者brim的距離" +msgstr "從 skirt 到模型或者 brim（裙邊）的距離" msgid "Skirt height" -msgstr "Skirt高度" +msgstr "Skirt 高度" msgid "How many layers of skirt. Usually only one layer" -msgstr "skirt有多少層。通常只有一層" +msgstr "skirt 有多少層。通常只有一層" msgid "Skirt loops" -msgstr "Skirt圈數" +msgstr "Skirt 圈數" msgid "Number of loops for the skirt. Zero means disabling skirt" -msgstr "skirt的圈數。0表示關閉skirt。" +msgstr "skirt 的圈數。0 表示關閉 skirt。" msgid "Skirt speed" msgstr "Skirt 速度" msgid "Speed of skirt, in mm/s. Zero means use default layer extrusion speed." -msgstr "Skirt 速度，單位為 mm/秒。 零表示使用預設層擠出速度。" +msgstr "Skirt 速度，單位為 mm/秒。 0 表示使用預設層擠出速度。" msgid "" "The printing speed in exported gcode will be slowed down, when the estimated " @@ -9891,7 +9930,7 @@ msgstr "小於這個臨界值的稀疏填充區域將會被內部實心填充替 msgid "" "Line width of internal solid infill. If expressed as a %, it will be " "computed over the nozzle diameter." -msgstr "內部實心填充的線寬。如果以%表示，它將基於噴嘴直徑來計算。" +msgstr "內部實心填充的線寬。如果以%表示，它將以噴嘴直徑為基準來計算。" msgid "Speed of internal solid infill, not the top and bottom surface" msgstr "內部實心填充的速度，不是頂面和底面。" @@ -9921,7 +9960,7 @@ msgstr "" "如果啟用平滑模式或者傳統模式，將在每次列印時產生縮時錄影影片。列印完每層後，" "將用內建相機拍攝快照。列印完成後，所有這些快照會組合成一個延時影片。如果啟用" "平滑模式，列印完每層後，工具頭將移動到吐料槽，然後拍攝快照。由於平滑模式在拍" -"攝快照的過程中熔絲可能會從噴嘴中洩漏，因此需要使用擦拭塔進行噴嘴擦拭。" +"攝快照的過程中熔融的線材可能會從噴嘴中洩漏，因此需要使用擦拭塔進行噴嘴擦拭。" msgid "Traditional" msgstr "傳統模式" @@ -9930,22 +9969,22 @@ msgid "Temperature variation" msgstr "軟化溫度" msgid "Start G-code" -msgstr "起始G-code" +msgstr "起始 G-code" msgid "Start G-code when start the whole printing" -msgstr "整個列印開始前的起始G-code" +msgstr "整個列印開始前的起始 G-code" msgid "Start G-code when start the printing of this filament" -msgstr "開始使用這個線材列印的起始G-code" +msgstr "開始使用這個線材列印的起始 G-code" msgid "Single Extruder Multi Material" -msgstr "單擠出機多材料" +msgstr "單擠出機多線材" msgid "Use single nozzle to print multi filament" -msgstr "使用單噴嘴列印多耗材" +msgstr "使用單噴嘴列印多線材" msgid "Manual Filament Change" -msgstr "" +msgstr "手動更換線材" msgid "" "Enable this option to omit the custom Change filament G-code only at the " @@ -9956,16 +9995,16 @@ msgid "" msgstr "" msgid "Purge in prime tower" -msgstr "" +msgstr "沖刷進擦拭塔" msgid "Purge remaining filament into prime tower" -msgstr "" +msgstr "沖刷剩餘的線材進入擦拭塔" msgid "Enable filament ramming" -msgstr "" +msgstr "啟用線材尖端成型" msgid "No sparse layers (EXPERIMENTAL)" -msgstr "" +msgstr "無稀疏層（实验性功能）" msgid "" "If enabled, the wipe tower will not be printed on layers with no " @@ -9973,14 +10012,16 @@ msgid "" "print the wipe tower. User is responsible for ensuring there is no collision " "with the print." msgstr "" +"如果啟用，將不會在沒有換色的層列印擦拭塔。存在換色的層時，擠出機將降低高度打" +"印擦拭塔。使用者應該確保不會與列印物件發生衝突。" msgid "Prime all printing extruders" -msgstr "" +msgstr "所有擠出機畫線" msgid "" "If enabled, all printing extruders will be primed at the front edge of the " "print bed at the start of the print." -msgstr "" +msgstr "如果啟用，所有擠出機將在列印開始時在列印板前方畫線" msgid "Slice gap closing radius" msgstr "切片間隙閉合半徑" @@ -10000,7 +10041,7 @@ msgid "" "Use \"Even-odd\" for 3DLabPrint airplane models. Use \"Close holes\" to " "close all holes in the model." msgstr "" -"對3DLabPrint的飛機模型使用 \"奇偶\"。使用 \"閉孔 \"來關閉模型上的所有孔。" +"對 3DLabPrint 的飛機模型使用 \"奇偶\"。使用 \"閉孔 \"來關閉模型上的所有孔。" msgid "Regular" msgstr "常規" @@ -10056,10 +10097,10 @@ msgid "tree(manual)" msgstr "樹狀（手動）" msgid "Support/object xy distance" -msgstr "支撐/模型xy間距" +msgstr "支撐/模型 xy 間距" msgid "XY separation between an object and its support" -msgstr "模型和支撐之間XY分離距離" +msgstr "模型和支撐之間 XY 分離距離" msgid "Pattern angle" msgstr "模式角度" @@ -10072,7 +10113,7 @@ msgid "On build plate only" msgstr "僅在列印板產生" msgid "Don't create support on model surface, only on build plate" -msgstr "不在模型表面上產生支撐，只在熱床上產生。" +msgstr "不在模型表面上產生支撐，只在列印板上產生。" msgid "Support critical regions only" msgstr "僅支撐關鍵區域" @@ -10107,19 +10148,20 @@ msgstr "支撐/筏層主體" msgid "" "Filament to print support base and raft. \"Default\" means no specific " "filament for support and current filament is used" -msgstr "列印支撐主體和筏層的線材。\"預設\"代表不指定特定的線材，並使用目前線材" +msgstr "" +"列印支撐主體和筏層的線材。\"預設\"代表不指定特定的線材，並使用目前線材" msgid "" "Line width of support. If expressed as a %, it will be computed over the " "nozzle diameter." -msgstr "支撐的線寬。如果以%表示，它將基於噴嘴直徑來計算。" +msgstr "支撐的線寬。如果以 % 表示，它將以噴嘴直徑為基準來計算。" msgid "Interface use loop pattern" msgstr "接觸面採用圈形走線。" msgid "" "Cover the top contact layer of the supports with loops. Disabled by default." -msgstr "使用圈形走線覆蓋頂部接觸面。默認關閉。" +msgstr "使用圈形走線覆蓋頂部接觸面。預設關閉。" msgid "Support/raft interface" msgstr "支撐/筏層界面" @@ -10143,13 +10185,13 @@ msgid "Top interface spacing" msgstr "頂部接觸面線距" msgid "Spacing of interface lines. Zero means solid interface" -msgstr "接觸面的線距。0代表實心接觸面。" +msgstr "接觸面的線距。0 代表實心接觸面。" msgid "Bottom interface spacing" msgstr "底部接觸面線距" msgid "Spacing of bottom interface lines. Zero means solid interface" -msgstr "底部接觸面走線的線距。0表示實心接觸面。" +msgstr "底部接觸面走線的線距。0 表示實心接觸面。" msgid "Speed of support interface" msgstr "支撐面速度" @@ -10187,10 +10229,10 @@ msgid "Spacing between support lines" msgstr "支撐線距" msgid "Normal Support expansion" -msgstr "普通支撐拓展" +msgstr "普通支撐延伸" msgid "Expand (+) or shrink (-) the horizontal span of normal support" -msgstr "在水平方向對普通支撐進行拓展（+）或收縮（-）" +msgstr "在水平方向對普通支撐進行延伸（+）或收縮（-）" msgid "Speed of support" msgstr "支撐列印速度" @@ -10299,10 +10341,10 @@ msgstr "自適應層高" msgid "" "Enabling this option means the height of tree support layer except the " "first will be automatically calculated " -msgstr "" +msgstr "啟用此選項將自動計算（除第一層外）樹狀支撐的層高。" msgid "Auto brim width" -msgstr "自動裙邊寬度" +msgstr "自動 brim（裙邊）寬度" msgid "" "Enabling this option means the width of the brim for tree support will be " @@ -10310,10 +10352,10 @@ msgid "" msgstr "啟用此選項意味著樹狀支撐的裙邊寬度將自動計算自動計算" msgid "Tree support brim width" -msgstr "樹狀支撐裙邊寬度" +msgstr "樹狀支撐brim（裙邊）寬度" msgid "Distance from tree branch to the outermost brim line" -msgstr "從樹狀支撐分支到最外層裙邊線的距離" +msgstr "從樹狀支撐分支到最外層brim（裙邊）線的距離" msgid "Tip Diameter" msgstr "末端直徑" @@ -10345,7 +10387,7 @@ msgstr "" #, fuzzy msgid "Branch Diameter with double walls" -msgstr "雙層牆體分支直徑" +msgstr "分支直徑雙層牆" #. TRN PrintSettings: "Organic supports" > "Branch Diameter" msgid "" @@ -10353,8 +10395,8 @@ msgid "" "printed with double walls for stability. Set this value to zero for no " "double walls." msgstr "" -"面積大於該直徑圓面積的樹枝將被列印為雙層牆體以確保穩定性。 如果沒有雙層牆體，" -"請將此值設為零。" +"該數值大於以分支直徑得到的圓形面積時，將列印雙層牆以確保穩定性。 如果不使用雙層牆體，" +"請將此值設為 0。" msgid "Tree support wall loops" msgstr "樹狀支撐外牆層數" @@ -10418,7 +10460,7 @@ msgstr "換料時插入的G-code，包括T命令。" msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." -msgstr "頂面的線寬。如果以%表示，它將基於噴嘴直徑來計算。" +msgstr "頂面的線寬。如果以%表示，它將以噴嘴直徑為基準來計算。" msgid "Speed of top surface infill which is solid" msgstr "頂面實心填充的速度" @@ -10530,7 +10572,8 @@ msgid "" "The extruder to use when printing perimeter of the wipe tower. Set to 0 to " "use the one that is available (non-soluble would be preferred)." msgstr "" -"列印擦拭塔週邊時所使用的擠出機。 設定為 0 以使用可用的（預設為不可溶的）。" +"列印擦拭塔周長時使用的擠出機。設置為 0 將使用唯一的擠出機（盡量使用不可溶的材" +"料）。" #, fuzzy msgid "Purging volumes - load/unload volumes" @@ -10540,7 +10583,9 @@ msgid "" "This vector saves required volumes to change from/to each tool used on the " "wipe tower. These values are used to simplify creation of the full purging " "volumes below." -msgstr "這個數值節省了擦拭塔上使用的每個工具更換所需的體積。" +msgstr "" +"可保存所需的體積，用於更改每個擦拭塔上工具所使用的 from/to 體積 。這些值用於" +"簡化完全沖刷體積的建立。" #, fuzzy msgid "" @@ -10601,7 +10646,7 @@ msgstr "" "功能通常在模型有裝配問題時微調尺寸" msgid "Convert holes to polyholes" -msgstr "轉換孔洞為多點孔洞" +msgstr "將圓孔轉換為多邊形孔" msgid "" "Search for almost-circular holes that span more than one layer and convert " @@ -10609,11 +10654,14 @@ msgid "" "compute the polyhole.\n" "See http://hydraraptor.blogspot.com/2011/02/polyholes.html" msgstr "" +"搜索跨越多層的近似圓形孔，並將幾何形狀轉換為多邊形孔。使用噴嘴尺寸和（最大）" +"直徑來計算多邊形孔。\n" +"參見http://hydraraptor.blogspot.com/2011/02/polyholes.html" msgid "Polyhole detection margin" -msgstr "" +msgstr "偵測多邊形孔邊緣" -#, c-format, boost-format +#, fuzzy, c-format, boost-format msgid "" "Maximum defection of a point to the estimated radius of the circle.\n" "As cylinders are often exported as triangles of varying size, points may not " @@ -10621,12 +10669,16 @@ msgid "" "broaden the detection.\n" "In mm or in % of the radius." msgstr "" +"點到圓半徑的最大偏差。\n" +"由於圓柱體通常被導出為大小不同的三角形，因此點可能不在圓周上。\n" +"此設定允許有一些餘地來擴大偵測範圍。\n" +"以 mm 或半徑的百分比 ％％ 表示。" msgid "Polyhole twist" -msgstr "" +msgstr "扭曲多邊形孔" msgid "Rotate the polyhole every layer." -msgstr "" +msgstr "依層旋轉多邊形孔" #, fuzzy msgid "G-code thumbnails" @@ -10636,6 +10688,7 @@ msgid "" "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the " "following format: \"XxY, XxY, ...\"" msgstr "" +"將被儲存到 .gcode 和 .sl1/.sl1s 檔案中圖片尺寸，格式如下：\"XxY, XxY, ...\"" msgid "Format of G-code thumbnails" msgstr "G-code 縮圖的格式" @@ -10646,7 +10699,7 @@ msgid "" msgstr "" msgid "Use relative E distances" -msgstr "使用相對E距離" +msgstr "使用相對 E 距離" msgid "" "Relative extrusion is recommended when using \"label_objects\" option.Some " @@ -10660,7 +10713,7 @@ msgid "" "very thin areas is used gap-fill. Arachne engine produces walls with " "variable extrusion width" msgstr "" -"經典牆產生器產生的牆走線具有一致的擠出寬度，對狹窄區域使用填縫。Arachne引擎則" +"經典牆產生器產生的牆走線具有一致的擠出寬度，對狹窄區域使用填縫。Arachne 引擎則" "產生變線寬的牆走線" msgid "Classic" @@ -10734,13 +10787,14 @@ msgstr "" "征將被加寬到牆最小寬度。參數值表示為相對噴嘴直徑的百分比" msgid "First layer minimum wall width" -msgstr "" +msgstr "首層牆最小線寬" msgid "" "The minimum wall width that should be used for the first layer is " "recommended to be set to the same size as the nozzle. This adjustment is " "expected to enhance adhesion." msgstr "" +"應用於首層的牆最小線寬，建議設定與噴嘴尺寸相同。這種調整有助於增強附著力。" msgid "Minimum wall width" msgstr "牆最小線寬" @@ -10786,7 +10840,7 @@ msgstr "匯出切片資料" #, fuzzy msgid "Export slicing data to a folder." -msgstr "匯出切片資料到目錄" +msgstr "匯出切片資料到資料夾" #, fuzzy msgid "Load slicing data" @@ -10849,7 +10903,7 @@ msgid "max slicing time per plate in seconds." msgstr "每個列印板的最大切片時間（秒）。" msgid "No check" -msgstr "不要檢查" +msgstr "不檢查" #, fuzzy msgid "Do not run any validity checks, such as gcode path conflicts check." @@ -10873,7 +10927,7 @@ msgstr "匯出設定" #, fuzzy msgid "Export settings to a file." -msgstr "匯出設定到檔案。" +msgstr "匯出設定檔到檔案。" msgid "Send progress to pipe" msgstr "將進度傳送到管道" @@ -10894,11 +10948,11 @@ msgid "Repetions count of the whole model" msgstr "整個模型的重複次數" msgid "Ensure on bed" -msgstr "" +msgstr "確認在列印板上" msgid "" "Lift the object above the bed when it is partially below. Disabled by default" -msgstr "" +msgstr "當物件部分位於列印板的下方時，將其提升到列印板的上方。預設情況下禁用" msgid "Convert Unit" msgstr "轉換單位" @@ -10913,19 +10967,19 @@ msgid "Orient options: 0-disable, 1-enable, others-auto" msgstr "" msgid "Rotation angle around the Z axis in degrees." -msgstr "" +msgstr "繞 Z 軸的旋轉角度（以度為單位）。" msgid "Rotate around X" -msgstr "" +msgstr "繞 X 旋轉" msgid "Rotation angle around the X axis in degrees." -msgstr "" +msgstr "繞 X 軸的旋轉角度（以度為單位）。" msgid "Rotate around Y" -msgstr "" +msgstr "繞 Y 旋轉" msgid "Rotation angle around the Y axis in degrees." -msgstr "" +msgstr "繞 Y 軸的旋轉角度（以度為單位）" msgid "Scale the model by a float factor" msgstr "根據因子縮放模型" @@ -11012,7 +11066,7 @@ msgid "Generating infill toolpath" msgstr "正在產生填充走線" msgid "Detect overhangs for auto-lift" -msgstr "探測懸空區域為自動抬升做準備" +msgstr "偵測懸空區域為自動抬升做準備" msgid "Generating support" msgstr "正在產生支撐" @@ -11046,7 +11100,7 @@ msgid "" "No layers were detected. You might want to repair your STL file(s) or check " "their size or thickness and retry.\n" msgstr "" -"沒有檢測到層。您可能需要修復 STL 檔案，或檢查模型尺寸、厚度等，之後再重試。\n" +"沒有偵測到層。您可能需要修復 STL 檔案，或檢查模型尺寸、厚度等，之後再重試。\n" #, fuzzy msgid "" @@ -11062,7 +11116,7 @@ msgid "Support: generate toolpath at layer %d" msgstr "支撐：正在產生 %d 層的走線路徑" msgid "Support: detect overhangs" -msgstr "支撐：正在檢測懸空面" +msgstr "支撐：正在偵測懸空面" msgid "Support: generate contact points" msgstr "支撐：正在產生接觸點" @@ -11145,7 +11199,7 @@ msgstr "自動校準" #, fuzzy msgid "We would use Lidar to read the calibration result" -msgstr "將使用雷射雷達來讀取校準結果。" +msgstr "將使用微型雷射雷達來讀取校準結果。" msgid "Prev" msgstr "上一個" @@ -11187,7 +11241,7 @@ msgid "Flow Rate" msgstr "流量比例" msgid "Max Volumetric Speed" -msgstr "最大容積速度" +msgstr "最大體積速度" #, fuzzy msgid "Please enter the name you want to save to printer." @@ -11291,7 +11345,7 @@ msgstr "" "果將儲存在列印設備中以供將來使用。您只需要在以下有限情況下進行校準：\n" "1. 如果您引入了不同品牌/型號的新列印線材，或者列印線材受潮；\n" "2. 如果噴嘴磨損或更換了新的噴嘴；\n" -"3. 如果您在列印線材設置中更改了最大體積速度或列印溫度。" +"3. 如果您在列印線材設定中更改了最大體積速度或列印溫度。" msgid "About this calibration" msgstr "關於此校準" @@ -11439,7 +11493,7 @@ msgstr "失敗" msgid "" "Only one of the results with the same name will be saved. Are you sure you " "want to overrides the other results?" -msgstr "相同名稱的結果只會儲存一個。您確定要覆蓋其他結果嗎？" +msgstr "相同名稱的結果只會儲存一個。確定要覆蓋其他結果嗎？" #, fuzzy, c-format, boost-format msgid "" @@ -11447,7 +11501,7 @@ msgid "" "Only one of the results with the same name is saved. Are you sure you want " "to overrides the historical result?" msgstr "" -"已經存在一個具有相同名稱的校準結果：%s。相同名稱的結果只會儲存一個。您確定要" +"已經存在一個具有相同名稱的校準結果：%s。相同名稱的結果只會儲存一個。確定要" "覆蓋嗎？" msgid "Please find the best line on your plate" @@ -11485,10 +11539,10 @@ msgid "Please enter the name of the preset you want to save." msgstr "請輸入要儲存的預設值的名稱。" msgid "Calibration1" -msgstr "校準1" +msgstr "校準 1" msgid "Calibration2" -msgstr "校準2" +msgstr "校準 2" #, fuzzy msgid "Please find the best object on your plate" @@ -11511,7 +11565,7 @@ msgid "Please choose a block with smoothest top surface." msgstr "請選擇頂部表面最光滑的塊。" msgid "Please input a valid value (0 <= Max Volumetric Speed <= 60)" -msgstr "請輸入一個有效值（0<=最大容積速度<=60）" +msgstr "請輸入一個有效值（0<=最大體積速度<=60）" msgid "Calibration Type" msgstr "校準類型" @@ -11550,15 +11604,15 @@ msgid "External Spool" msgstr "外部線軸" msgid "Filament For Calibration" -msgstr "校準用耗材" +msgstr "校準用線材" msgid "" "Tips for calibration material: \n" "- Materials that can share same hot bed temperature\n" "- Different filament brand and family(Brand = Bambu, Family = Basic, Matte)" msgstr "" -"校準材料提示：\n" -"-可以共享相同熱床溫度的材料\n" +"校準線材提示：\n" +"-可以共享相同熱床溫度的線材\n" "-不同的線材品牌和系列（Brand = Bambu, Family = Basic, Matte）" msgid "Error desc" @@ -11578,7 +11632,7 @@ msgid "%s is not compatible with %s" msgstr "%s 與 %s 不相容" msgid "TPU is not supported for Flow Dynamics Auto-Calibration." -msgstr "不支援TPU進行流量動態自動校準。" +msgstr "不支援 TPU 進行流量動態自動校準。" #, fuzzy msgid "Connecting to printer" @@ -11619,7 +11673,7 @@ msgid "Success to get history result" msgstr "成功獲取歷史結果" msgid "Refreshing the historical Flow Dynamics Calibration records" -msgstr "刷新歷史流量動態校準記錄" +msgstr "重整歷史流量動態校準記錄" msgid "Action" msgstr "操作" @@ -11628,22 +11682,22 @@ msgid "Edit Flow Dynamics Calibration" msgstr "編輯動態流量校準" msgid "Network lookup" -msgstr "" +msgstr "搜尋網路" msgid "Address" -msgstr "" +msgstr "地址" msgid "Hostname" -msgstr "" +msgstr "主機名" msgid "Service name" -msgstr "" +msgstr "服務名" msgid "OctoPrint version" -msgstr "" +msgstr "OctoPrint版本" msgid "Searching for devices" -msgstr "" +msgstr "正在尋找設備" msgid "Finished" msgstr "完成" @@ -11687,7 +11741,7 @@ msgid "Subtract with" msgstr "與之相減" msgid "selected" -msgstr "已選中" +msgstr "已選取" msgid "Part 1" msgstr "零件 1" @@ -11703,13 +11757,13 @@ msgid "Send G-Code to printer host" msgstr "傳送 G-code 到列印設備" msgid "Upload to Printer Host with the following filename:" -msgstr "" +msgstr "使用下列檔案名上傳到列印設備：" msgid "Use forward slashes ( / ) as a directory separator if needed." -msgstr "" +msgstr "如有需要，請使用正斜槓（ / ）作為目錄分隔符號。" msgid "Upload to storage" -msgstr "" +msgstr "上傳到儲存單位" #, fuzzy, c-format, boost-format msgid "Upload filename doesn't end with \"%s\". Do you wish to continue?" @@ -11738,7 +11792,7 @@ msgid "Filename" msgstr "檔案名" msgid "Cancel selected" -msgstr "取消選中" +msgstr "取消選取" msgid "Show error message" msgstr "顯示錯誤資訊" @@ -11795,9 +11849,13 @@ msgid "" "End PA: > Start PA\n" "PA step: >= 0.001)" msgstr "" +"請輸入有效值：\n" +"起始PA：>= 0.0\n" +"結束PA：> 起始PA\n" +"PA步距：>= 0.001）" msgid "Temperature calibration" -msgstr "" +msgstr "溫度校準" msgid "PLA" msgstr "" @@ -11818,7 +11876,7 @@ msgid "PET-CF" msgstr "" msgid "Filament type" -msgstr "耗材類型" +msgstr "線材類型" #, fuzzy msgid "Start temp: " @@ -11843,7 +11901,7 @@ msgstr "" "開始溫度 > 結束溫度 + 5）" msgid "Max volumetric speed test" -msgstr "最大體積流量速度測試" +msgstr "最大體積速度測試" msgid "Start volumetric speed: " msgstr "起始流量" @@ -11903,7 +11961,7 @@ msgid "Print Host upload" msgstr "" msgid "Test" -msgstr "" +msgstr "測試" msgid "Could not get a valid Printer Host reference" msgstr "" @@ -11927,7 +11985,7 @@ msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*" msgstr "憑證檔（*.crt, *.pem）|*.crt;*.pem|All files|*.*" msgid "Open CA certificate file" -msgstr "開啟CA憑證檔" +msgstr "開啟 CA憑證檔" #, fuzzy, c-format, boost-format msgid "" @@ -11999,7 +12057,7 @@ msgid "" "Did you know that you can auto-arrange all objects in your project?" msgstr "" "自動擺放\n" -"您知道嗎？您可以自動排列項目中的所有物件。" +"您知道嗎？您可以自動擺放專案項目中的所有物件。" #: resources/data/hints.ini: [hint:Auto-Orient] #, fuzzy @@ -12008,7 +12066,7 @@ msgid "" "Did you know that you can rotate objects to an optimal orientation for " "printing by a simple click?" msgstr "" -"自動朝向\n" +"自動定向\n" "您知道嗎，您只需單擊滑鼠，即可將物件旋轉到適合的列印方向。" #: resources/data/hints.ini: [hint:Lay on Face] @@ -12030,8 +12088,8 @@ msgid "" "Did you know that you can view all objects/parts in a list and change " "settings for each object/part?" msgstr "" -"物件列表\n" -"您知道物件列表嗎？您可以在其中的查看所有物件/零件，並更改每個物件/零件的設" +"物件清單\n" +"您知道物件清單嗎？您可以在其中的查看所有物件/零件，並更改每個物件/零件的設" "定。" #: resources/data/hints.ini: [hint:Simplify Model] @@ -12053,7 +12111,7 @@ msgid "" "settings for each object/part?" msgstr "" "參數表格\n" -"您知道嗎？您可以參數表格上的所有物件/零件，並更改每個物件/零件的設置。" +"您知道嗎？您可以參數表格上的所有物件/零件，並更改每個物件/零件的設定。" #: resources/data/hints.ini: [hint:Split to Objects/Parts] #, fuzzy @@ -12075,7 +12133,7 @@ msgid "" msgstr "" "減去部分幾何體\n" "您知道嗎，您可以使用負零件從另一個幾何體中減去另一個幾何體。例如，可以直接在 " -"Orca Slicer 中創建可輕鬆調整大小的孔。" +"Orca Slicer 中建立可輕鬆調整大小的孔。" #: resources/data/hints.ini: [hint:STEP] #, fuzzy @@ -12087,8 +12145,8 @@ msgid "" "lower resolution STL. Give it a try!" msgstr "" "STEP檔案\n" -"您知道嗎，通過切片STEP檔案而不是STL檔案可以提高列印品質。\n" -" Orca Slicer 支援切片STEP檔案，提供比低解析度STL更平滑的結果。試試看！" +"您知道嗎，通過切片 STEP 檔案而不是 STL 檔案可以提高列印品質。\n" +" Orca Slicer 支援切片 STEP 檔案，提供比低解析度 STL 更平滑的結果。試試看！" #: resources/data/hints.ini: [hint:Z seam location] msgid "" @@ -12109,7 +12167,7 @@ msgid "" "printed model by doing some fine-tuning." msgstr "" "流量微調\n" -"你知道嗎，您可以微調流量，以獲得更好看的列印效果。根據材料的不同，可以通過進" +"你知道嗎，您可以微調流量，以獲得更好看的列印效果。根據線材的不同，可以通過進" "行一些微調來提高列印模型的整體光潔度。" #: resources/data/hints.ini: [hint:Split your prints into plates] @@ -12120,7 +12178,7 @@ msgid "" "individual plates ready to print? This will simplify the process of keeping " "track of all the parts." msgstr "" -"分散列印板列印\n" +"分類列印\n" "您知道嗎，您可以把一個有很多零件的模型安排到多個獨立的列印板，然後列印出來，" "這將簡化對所有零件的管理。" @@ -12141,7 +12199,7 @@ msgid "" "makes it easy to place the support material only on the sections of the " "model that actually need it." msgstr "" -"繪製支撐\n" +"自訂支撐\n" "您知道嗎，您可以手動繪製增加/隱藏支撐的位置，此功能使僅將支撐材料放置在實際需" "要的模型截面上變得容易。" @@ -12163,7 +12221,7 @@ msgid "" "successfully? Higher temperature and lower speed are always recommended for " "the best results." msgstr "" -"列印絲綢耗材\n" +"列印絲綢線材\n" "你知道嗎，絲綢耗材需要特別考慮才能成功列印。為了獲得最佳效果，通常建議使用較" "高的溫度和較低的速度。" @@ -12173,8 +12231,8 @@ msgid "" "Did you know that when printing models have a small contact interface with " "the printing surface, it's recommended to use a brim?" msgstr "" -"使用Brim\n" -"您知道嗎？當模型與熱床表面的接觸面積較小時，建議使用brim以提高列印成功率。" +"使用 Brim（裙邊）\n" +"您知道嗎？當模型與熱床表面的接觸面積較小時，建議使用 brim（裙邊）以提高列印成功率。" #: resources/data/hints.ini: [hint:Set parameters for multiple objects] #, fuzzy @@ -12183,8 +12241,8 @@ msgid "" "Did you know that you can set slicing parameters for all selected objects at " "one time?" msgstr "" -"為多個物件設置參數\n" -"您知道嗎，可以同時為所有選定物件設置切片參數。" +"為多個物件設定參數\n" +"您知道嗎，可以同時為所有選取的物件設定切片參數。" #: resources/data/hints.ini: [hint:Stack objects] #, fuzzy @@ -12202,8 +12260,8 @@ msgid "" "Did you know that you can save the wasted filament by flushing them into " "support/objects/infill during filament change?" msgstr "" -"沖刷到支援/物件/填充中\n" -"你知道嗎？你可以在換料時將它們沖入支撐/物件/填充，以節省浪費的料絲。" +"廢料運用到支撐/物件/填充中\n" +"你知道嗎？你可以在換料時將廢料運用到支撐/物件/填充，以節省浪費的線材。" #: resources/data/hints.ini: [hint:Improve strength] msgid "" From 472821922a3092cc587700aae6711937e3c26572 Mon Sep 17 00:00:00 2001 From: Geoffrey Ward Date: Tue, 7 Nov 2023 02:13:38 -0800 Subject: [PATCH 14/47] Update AnkerMake printers to make use of Marlin 2 gcode (#2639) --- resources/profiles/Anker/machine/fdm_machine_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles/Anker/machine/fdm_machine_common.json b/resources/profiles/Anker/machine/fdm_machine_common.json index ab862da581..2b6ebdd240 100644 --- a/resources/profiles/Anker/machine/fdm_machine_common.json +++ b/resources/profiles/Anker/machine/fdm_machine_common.json @@ -3,7 +3,7 @@ "name": "fdm_machine_common", "from": "system", "instantiation": "false", - "gcode_flavor": "marlin", + "gcode_flavor": "marlin2", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n", "machine_start_gcode": "M4899 T3 ; Enable v3 jerk and S-curve acceleration \nM104 Sfirst_layer_temperature[0] ; Set hotend temp\nM190 S{first_layer_bed_temperature[0]} ; set and wait for bed temp to stabilize\nM109 S{first_layer_temperature[0]} ; set final nozzle temp to stabilize\nG28 ;Home", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84", From 94e35737e616ea33907f67497b1634f15c05a771 Mon Sep 17 00:00:00 2001 From: Geoffrey Ward Date: Tue, 7 Nov 2023 02:14:21 -0800 Subject: [PATCH 15/47] Update the retraction defaults to account for the M5c (#2640) * Remove retraction_length from common M5c should never retract more then 0.8mm or it will clog * Preserve M5 retraction length Moved previous retraction length from core to M5 * Update Anker M5C retraction length to prevent clogs Anything beyond a 0.8mm retraction length will clog the printer over time. --- resources/profiles/Anker/machine/Anker M5.json | 5 ++++- resources/profiles/Anker/machine/Anker M5C.json | 5 ++++- resources/profiles/Anker/machine/fdm_machine_common.json | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/profiles/Anker/machine/Anker M5.json b/resources/profiles/Anker/machine/Anker M5.json index 399b8c75a9..9c2d6354fd 100644 --- a/resources/profiles/Anker/machine/Anker M5.json +++ b/resources/profiles/Anker/machine/Anker M5.json @@ -8,5 +8,8 @@ "bed_model": "M5-CE-bed.stl", "bed_texture": "M5-CE-texture.svg", "hotend_model": "", - "default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA" + "default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA", + "retraction_length": [ + "1.5" + ] } diff --git a/resources/profiles/Anker/machine/Anker M5C.json b/resources/profiles/Anker/machine/Anker M5C.json index bb15d19684..cfe83f6a91 100644 --- a/resources/profiles/Anker/machine/Anker M5C.json +++ b/resources/profiles/Anker/machine/Anker M5C.json @@ -8,5 +8,8 @@ "bed_model": "M5C-CE-bed.stl", "bed_texture": "M5-CE-texture.svg", "hotend_model": "", - "default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA;Anker Generic PC;Anker Generic PA;Anker Generic PA-CF" + "default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA;Anker Generic PC;Anker Generic PA;Anker Generic PA-CF", + "retraction_length": [ + "0.8" + ] } diff --git a/resources/profiles/Anker/machine/fdm_machine_common.json b/resources/profiles/Anker/machine/fdm_machine_common.json index 2b6ebdd240..cc3c93c3ad 100644 --- a/resources/profiles/Anker/machine/fdm_machine_common.json +++ b/resources/profiles/Anker/machine/fdm_machine_common.json @@ -88,9 +88,6 @@ "retract_when_changing_layer": [ "0" ], - "retraction_length": [ - "1.5" - ], "retract_length_toolchange": [ "2" ], From 132e531fb8fe259394203d711e3079cff5bd5330 Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:34:09 +0800 Subject: [PATCH 16/47] Misc profiles fixes fixed #2636 --- resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json | 4 ++-- resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json | 4 ++-- resources/profiles/Voron/filament/Voron Generic ABS.json | 3 ++- resources/profiles/Voron/filament/Voron Generic ASA.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PA-CF.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PA.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PC.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PETG.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PLA-CF.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PLA.json | 3 ++- resources/profiles/Voron/filament/Voron Generic PVA.json | 3 ++- resources/profiles/Voron/filament/Voron Generic TPU.json | 3 ++- .../profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json | 4 ++-- 13 files changed, 26 insertions(+), 16 deletions(-) diff --git a/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json b/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json index 52653b3b8f..5576b9c0ac 100644 --- a/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json +++ b/resources/profiles/BIQU/machine/BIQU B1 (0.4 nozzle).json @@ -81,6 +81,6 @@ "retraction_speed": [ "70" ], -"machine_start_gcode": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0}; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0}; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S{material_print_temperature_layer_0}; Set Extruder temperature\nG92 E0; Reset Extruder\nM117 Homing axes\nG28; Home all axes\nM109 S{material_print_temperature_layer_0}; Wait for Extruder temperature\nG1 Z2.0 F3000; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30; Draw the second line\nG92 E0; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0; Move over to prevent blob squish", -"machine_end_gcode": ";BIQU B1 Default End Gcode\nG91;Relative positioning\nG1 E-2 F2700;Retract a bit\nG1 E-2 Z0.2 F2400;Retract a bit more and raise Z\nG1 X5 Y5 F3000;Wipe out\nG1 Z10;Raise Z by 10mm\nG90;Return to absolute positioning\nG1 X0 Y{machine_depth};\nM106 S0;Turn-off fan\nM104 S0;Turn-off hotend\nM140 S0;Turn-off bed\nM84 X Y E;Disable all steppers but Z" +"machine_start_gcode": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S[first_layer_bed_temperature]; Set Heat Bed temperature\nM190 S[first_layer_bed_temperature]; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S[first_layer_temperature]; Set Extruder temperature\nG92 E0; Reset Extruder\nM117 Homing axes\nG28; Home all axes\nM109 S[first_layer_temperature]; Wait for Extruder temperature\nG1 Z2.0 F3000; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30; Draw the second line\nG92 E0; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0; Move over to prevent blob squish", +"machine_end_gcode": ";BIQU B1 Default End Gcode\nG91;Relative positioning\nG1 E-2 F2700;Retract a bit\nG1 E-2 Z0.2 F2400;Retract a bit more and raise Z\nG1 X5 Y5 F3000;Wipe out\nG1 Z10;Raise Z by 10mm\nG90;Return to absolute positioning\nG1 X0 Y{print_bed_max[1]};\nM106 S0;Turn-off fan\nM104 S0;Turn-off hotend\nM140 S0;Turn-off bed\nM84 X Y E;Disable all steppers but Z" } \ No newline at end of file diff --git a/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json b/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json index 29250444d1..07bee80911 100644 --- a/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json +++ b/resources/profiles/BIQU/machine/BIQU BX (0.4 nozzle).json @@ -81,6 +81,6 @@ "retraction_speed": [ "40" ], -"machine_start_gcode": "; BIQU BX Start G-code\n;M117 Initial homing sequence; Home so that the probe is positioned to heat\nG28\nM117 Probe heating position\nG0 X65 Y5 Z1; Move the probe to the heating position.\nM117 Getting the heaters up to temp!\nM104 S140; Set Extruder temperature, no wait\nM140 S60; Set Heat Bed temperature\nM190 S60; Wait for Heat Bed temperature\nM117 Waiting for probe to warm; Wait another 90s for the probe to absorb heat.\nG4 S90\nM117 Post warming re-home\nG28; Home all axes again after warming\nM117 Z-Dance of my people\nG34\nM117 ABL Probing\nG29\nM900 K0 L0 T0;Edit the K and L values if you have calibrated a k factor for your filament\nM900 T0 S0\nG1 Z2.0 F3000; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y10 Z0.3 F5000.0; Move to start position\nM117 Getting the extruder up to temp\nM140 S{material_bed_temperature_layer_0}; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0}; Set Extruder temperature\nM109 S{material_print_temperature_layer_0}; Wait for Extruder temperature\nM190 S{material_bed_temperature_layer_0}; Wait for Heat Bed temperature\nG92 E0; Reset Extruder\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30; Draw the second line\nG92 E0; Reset Extruder\nM117 Lets make\nG1 X8 Y20 Z0.3 F5000.0; Move over to prevent blob squish", -"machine_end_gcode": "; BIQU BX Default End Gcode\nG91;Relative positioning\nG1 E-2 F2700;Retract a bit\nG1 E-2 Z0.2 F2400;Retract a bit more and raise Z\nG1 X5 Y5 F3000;Wipe out\nG1 Z10;Raise Z by 10mm\nG90;Return to absolute positioning\nG1 X0 Y{machine_depth};TaDaaaa\nM106 S0;Turn-off fan\nM104 S0;Turn-off hotend\nM140 S0;Turn-off bed\nM84 X Y E;Disable all steppers but Z" +"machine_start_gcode": "; BIQU BX Start G-code\n;M117 Initial homing sequence; Home so that the probe is positioned to heat\nG28\nM117 Probe heating position\nG0 X65 Y5 Z1; Move the probe to the heating position.\nM117 Getting the heaters up to temp!\nM104 S140; Set Extruder temperature, no wait\nM140 S60; Set Heat Bed temperature\nM190 S60; Wait for Heat Bed temperature\nM117 Waiting for probe to warm; Wait another 90s for the probe to absorb heat.\nG4 S90\nM117 Post warming re-home\nG28; Home all axes again after warming\nM117 Z-Dance of my people\nG34\nM117 ABL Probing\nG29\nM900 K0 L0 T0;Edit the K and L values if you have calibrated a k factor for your filament\nM900 T0 S0\nG1 Z2.0 F3000; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y10 Z0.3 F5000.0; Move to start position\nM117 Getting the extruder up to temp\nM140 S[first_layer_bed_temperature]; Set Heat Bed temperature\nM104 S[first_layer_temperature]; Set Extruder temperature\nM109 S[first_layer_temperature]; Wait for Extruder temperature\nM190 S[first_layer_bed_temperature]; Wait for Heat Bed temperature\nG92 E0; Reset Extruder\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30; Draw the second line\nG92 E0; Reset Extruder\nM117 Lets make\nG1 X8 Y20 Z0.3 F5000.0; Move over to prevent blob squish", +"machine_end_gcode": "; BIQU BX Default End Gcode\nG91;Relative positioning\nG1 E-2 F2700;Retract a bit\nG1 E-2 Z0.2 F2400;Retract a bit more and raise Z\nG1 X5 Y5 F3000;Wipe out\nG1 Z10;Raise Z by 10mm\nG90;Return to absolute positioning\nG1 X0 Y{print_bed_max[1]};TaDaaaa\nM106 S0;Turn-off fan\nM104 S0;Turn-off hotend\nM140 S0;Turn-off bed\nM84 X Y E;Disable all steppers but Z" } \ No newline at end of file diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json index 5d308f5bc5..1f5696967c 100644 --- a/resources/profiles/Voron/filament/Voron Generic ABS.json +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -37,6 +37,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json index fcc3af4a86..bb187c3ce7 100644 --- a/resources/profiles/Voron/filament/Voron Generic ASA.json +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -37,6 +37,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json index 6e9f90de45..03f9edf575 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -43,6 +43,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json index 9366885c62..5f09eba565 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA.json +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -40,6 +40,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json index 19c8cec0d5..ddd8caa980 100644 --- a/resources/profiles/Voron/filament/Voron Generic PC.json +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -37,6 +37,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json index 37137c8f0a..1317388057 100644 --- a/resources/profiles/Voron/filament/Voron Generic PETG.json +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -67,6 +67,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json index 66f5786526..ab11d41694 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -43,6 +43,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json index b70327eca6..69781e7e6c 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -40,6 +40,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json index f1d705e4e0..f61e4db45c 100644 --- a/resources/profiles/Voron/filament/Voron Generic PVA.json +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -43,6 +43,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json index 19b76b3afb..15e42d9f0c 100644 --- a/resources/profiles/Voron/filament/Voron Generic TPU.json +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -34,6 +34,7 @@ "Voron Trident 250 0.4 nozzle", "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "Voron 0.1 0.4 nozzle", + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json index 5c85331c73..b8ba06ee87 100644 --- a/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json +++ b/resources/profiles/Wanhao/machine/Wanhao D12-300 0.4 nozzle.json @@ -81,6 +81,6 @@ "40" ], "default_print_profile": "0.15mm Optimal @Wanhao D12-300", -"machine_start_gcode": "; Wanhao D12-300 Start G-code\n; M117 Initial homing sequence. ; Home so that the probe is positioned to heat\nG28\nM117 Probe heating position\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\nM117 Getting the heaters up to temp!\nM104 S140 ; Set Extruder temperature, no wait\nM140 S60 ; Set Heat Bed temperature\nM190 S60 ; Wait for Heat Bed temperature\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\nG4 S90\nM117 Post warming re-home\nG28 ; Home all axes again after warming\nM117 Z-Dance of my people\nG34\nM117 ABL Probing\nG29\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\nM900 T0 S0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\nM117 Getting the extruder up to temp\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nG92 E0 ; Reset Extruder\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish", -"machine_end_gcode": "; Wanhao D12-300 Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positioning\nG1 X0 Y{machine_depth} ;TaDaaaa\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" +"machine_start_gcode": "; Wanhao D12-300 Start G-code\n; M117 Initial homing sequence. ; Home so that the probe is positioned to heat\nG28\nM117 Probe heating position\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\nM117 Getting the heaters up to temp!\nM104 S140 ; Set Extruder temperature, no wait\nM140 S60 ; Set Heat Bed temperature\nM190 S60 ; Wait for Heat Bed temperature\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\nG4 S90\nM117 Post warming re-home\nG28 ; Home all axes again after warming\nM117 Z-Dance of my people\nG34\nM117 ABL Probing\nG29\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\nM900 T0 S0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\nM117 Getting the extruder up to temp\nM140 S[first_layer_bed_temperature] ; Set Heat Bed temperature\nM104 S[first_layer_temperature] ; Set Extruder temperature\nM109 S[first_layer_temperature] ; Wait for Extruder temperature\nM190 S[first_layer_bed_temperature] ; Wait for Heat Bed temperature\nG92 E0 ; Reset Extruder\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish", +"machine_end_gcode": "; Wanhao D12-300 Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positioning\nG1 X0 Y{print_bed_max[1]} ;TaDaaaa\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" } \ No newline at end of file From e001b66192c3f838e2451f9cd45a87dfab36d78e Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:34:09 +0800 Subject: [PATCH 17/47] Fixed a regression that bed type was not remembered and switched when switching bed types --- src/slic3r/GUI/Plater.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 8bd8923d24..44b44801a9 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1057,6 +1057,13 @@ void Sidebar::update_all_preset_comboboxes() m_bed_type_list->SelectAndNotify((int)bed_type - 1); } m_bed_type_list->Enable(); + auto str_bed_type = wxGetApp().app_config->get_printer_setting(wxGetApp().preset_bundle->printers.get_selected_preset_name(), "curr_bed_type"); + if(!str_bed_type.empty()){ + int bed_type_value = atoi(str_bed_type.c_str()); + if(bed_type_value == 0) + bed_type_value = 1; + m_bed_type_list->SelectAndNotify(bed_type_value - 1); + } } else { connection_btn->Show(); ams_btn->Hide(); From 42f8efc0d8fd8c27cabb956b6536426afbb857f9 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 7 Nov 2023 21:32:36 +0800 Subject: [PATCH 18/47] Fixed a regression that checking new version didn't work Fixed #2622 --- src/slic3r/GUI/GUI_App.cpp | 55 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index dcbf17321a..b49dda3fbd 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2477,7 +2477,6 @@ bool GUI_App::on_init_inner() #endif // __WXMSW__ preset_updater = new PresetUpdater(); -#if orca_todo Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent& evt) { if (this->plater_ != nullptr) { // this->plater_->get_notification_manager()->push_notification(NotificationType::NewAppAvailable); @@ -2566,7 +2565,6 @@ bool GUI_App::on_init_inner() }); dlg.ShowModal(); }); -#endif } else { #ifdef __WXMSW__ @@ -4266,7 +4264,7 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) error); }) .timeout_connect(1) - .on_complete([&](std::string body, unsigned http_status) { + .on_complete([this,by_user](std::string body, unsigned http_status) { // Http response OK if (http_status != 200) return; @@ -4292,30 +4290,28 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) std::string best_release_content; std::string best_pre_content; const std::regex reg_num("([0-9]+)"); - for (auto json_version : root) { - std::string tag = json_version.second.get("tag_name"); - if (tag[0] == 'v') - tag.erase(0, 1); - for (std::regex_iterator it = std::sregex_iterator(tag.begin(), tag.end(), reg_num); - it != std::sregex_iterator(); ++it) { - } - Semver tag_version = get_version(tag, matcher); - if (current_version == tag_version) - i_am_pre = json_version.second.get("prerelease"); - if (json_version.second.get("prerelease")) { - if (best_pre < tag_version) { - best_pre = tag_version; - best_pre_url = json_version.second.get("html_url"); - best_pre_content = json_version.second.get("body"); - best_pre.set_prerelease("Preview"); - } - } else { - if (best_release < tag_version) { - best_release = tag_version; - best_release_url = json_version.second.get("html_url"); - best_release_content = json_version.second.get("body"); - } - } + std::string tag = root.get("tag_name"); + if (tag[0] == 'v') + tag.erase(0, 1); + for (std::regex_iterator it = std::sregex_iterator(tag.begin(), tag.end(), reg_num); + it != std::sregex_iterator(); ++it) { + } + Semver tag_version = get_version(tag, matcher); + if (current_version == tag_version) + i_am_pre = root.get("prerelease"); + if (root.get("prerelease")) { + if (best_pre < tag_version) { + best_pre = tag_version; + best_pre_url = root.get("html_url"); + best_pre_content = root.get("body"); + best_pre.set_prerelease("Preview"); + } + } else { + if (best_release < tag_version) { + best_release = tag_version; + best_release_url = root.get("html_url"); + best_release_content = root.get("body"); + } } // if release is more recent than beta, use release anyway @@ -4325,8 +4321,11 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) best_pre_content = best_release_content; } // if we're the most recent, don't do anything - if ((i_am_pre ? best_pre : best_release) <= current_version) + if ((i_am_pre ? best_pre : best_release) <= current_version) { + if (by_user != 0) + this->no_new_version(); return; + } // BOOST_LOG_TRIVIAL(info) << format("Got %1% online version: `%2%`. Sending to GUI thread...", // SLIC3R_APP_NAME, i_am_pre ? best_pre.to_string(): best_release.to_string()); From 2d849fec6c3f46252b8c9e39eb300c6bc5aff171 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 7 Nov 2023 21:37:07 +0800 Subject: [PATCH 19/47] update locale --- localization/i18n/OrcaSlicer.pot | 19 +- localization/i18n/cs/OrcaSlicer_cs.po | 46 +- localization/i18n/de/OrcaSlicer_de.po | 48 +- localization/i18n/en/OrcaSlicer_en.po | 46 +- localization/i18n/es/OrcaSlicer_es.po | 48 +- localization/i18n/fr/OrcaSlicer_fr.po | 48 +- localization/i18n/hu/OrcaSlicer_hu.po | 48 +- localization/i18n/it/OrcaSlicer_it.po | 48 +- localization/i18n/ja/OrcaSlicer_ja.po | 42 +- localization/i18n/ko/OrcaSlicer_ko.po | 46 +- localization/i18n/nl/OrcaSlicer_nl.po | 48 +- localization/i18n/ru/OrcaSlicer_ru.po | 45 +- localization/i18n/sv/OrcaSlicer_sv.po | 48 +- localization/i18n/tr/OrcaSlicer_tr.po | 47 +- localization/i18n/uk/OrcaSlicer_uk.po | 48 +- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 40 +- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 466 ++++++++++---------- 17 files changed, 599 insertions(+), 582 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index bdb7af1c23..5469754119 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -7408,6 +7408,14 @@ msgstr "" msgid "End G-code when finish the printing of this filament" msgstr "" +msgid "Ensure vertical shell thickness" +msgstr "" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" + msgid "Top surface pattern" msgstr "" @@ -9727,6 +9735,15 @@ msgid "" "itself. It's expressed as a percentage over nozzle diameter" msgstr "" +msgid "Detect narrow internal solid infill" +msgstr "" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" + msgid "invalid value " msgstr "" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 6bbe3f8ffa..b4ece6ed9c 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-09-30 15:15+0200\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -8059,6 +8059,16 @@ msgstr "Konec G-kód po dokončení celého tisku" msgid "End G-code when finish the printing of this filament" msgstr "Konec G-kód po dokončení tisku tohoto filamentu" +msgid "Ensure vertical shell thickness" +msgstr "Zajistit tloušťku svislých stěn" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Přidá plnou výplň u šikmých ploch pro garanci tloušťky svislých stěn " +"(vrchních a spodních plných vrstev)" + msgid "Top surface pattern" msgstr "Vzor horního povrchu" @@ -10879,6 +10889,18 @@ msgstr "" "stejně tlustá jako prvek samotný. Vyjadřuje se jako procento nad průměr " "trysky" +msgid "Detect narrow internal solid infill" +msgstr "Detekovat úzkou vnitřní plnou výplň" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Tato možnost automaticky rozpozná úzkou vnitřní plnou výplňovou oblast. Je-" +"li povolena, bude pro oblast použit soustředný vzor, aby se urychlil tisk. V " +"opačném případě se ve výchozím nastavení použije přímočarý vzor." + msgid "invalid value " msgstr "neplatná hodnota " @@ -12396,16 +12418,6 @@ msgstr "" #~ "Teplota podložky překračuje teplotu vitrifikace filamentu. Prosím. Před " #~ "tiskem otevřete přední dvířka tiskárny, aby nedošlo k ucpání trysky." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Zajistit tloušťku svislých stěn" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Přidá plnou výplň u šikmých ploch pro garanci tloušťky svislých stěn " -#~ "(vrchních a spodních plných vrstev)" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Teplota vitrifikace" @@ -12436,18 +12448,6 @@ msgstr "" #~ "touto rychlostí během tisku kromě prvních několika vrstev, které nejsou " #~ "definovány žádnými chladicími vrstvami" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Detekovat úzkou vnitřní plnou výplň" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Tato možnost automaticky rozpozná úzkou vnitřní plnou výplňovou oblast. " -#~ "Je-li povolena, bude pro oblast použit soustředný vzor, aby se urychlil " -#~ "tisk. V opačném případě se ve výchozím nastavení použije přímočarý vzor." - #~ msgid "" #~ "Filter out gaps smaller than the threshold specified. This setting won't " #~ "affect top/bottom layers" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index c09fb66db5..171270cfeb 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -8267,6 +8267,16 @@ msgstr "End G-Code nach dem fertigstellen des Drucks hinzufügen." msgid "End G-code when finish the printing of this filament" msgstr "End-G-Code hinzufügen, wenn der Druck dieses Filaments beenden ist." +msgid "Ensure vertical shell thickness" +msgstr "Sicherstellung der vertikalen Wanddicke" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"In der Nähe von schrägen Flächen massive Füllungen hinzufügen, um die " +"vertikale Wanddicke zu gewährleisten (obere + untere massive Schichten)." + msgid "Top surface pattern" msgstr "Muster der Oberfläche" @@ -11194,6 +11204,19 @@ msgstr "" "Dicke des Features, wird die Wand so dick wie das Feature selbst. Wird als " "Prozentsatz des Düsendurchmessers angegeben." +msgid "Detect narrow internal solid infill" +msgstr "Erkennen einer schmalen internen soliden Füllung" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Mit dieser Option wird ein schmaler innerer Füllbereich automatisch erkannt. " +"Wenn diese Option aktiviert ist, wird ein konzentrisches Muster für den " +"Bereich verwendet, um den Druck zu beschleunigen. Andernfalls wird " +"standardmäßig ein geradliniges Muster verwendet." + msgid "invalid value " msgstr "Ungültiger Wert" @@ -12757,16 +12780,6 @@ msgstr "" #~ msgid "Activate for better air filtration" #~ msgstr "Aktivieren Sie die Luftfilterung für eine bessere Luftfiltration" -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Sicherstellung der vertikalen Wanddicke" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "In der Nähe von schrägen Flächen massive Füllungen hinzufügen, um die " -#~ "vertikale Wanddicke zu gewährleisten (obere + untere massive Schichten)." - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Verglasungstemperatur" @@ -12802,19 +12815,6 @@ msgstr "" #~ "läuft während des Drucks mit dieser Geschwindigkeit, mit Ausnahme der " #~ "ersten Schichten, für die keine Kühlung vorgesehen ist." -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Erkennen einer schmalen internen soliden Füllung" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Mit dieser Option wird ein schmaler innerer Füllbereich automatisch " -#~ "erkannt. Wenn diese Option aktiviert ist, wird ein konzentrisches Muster " -#~ "für den Bereich verwendet, um den Druck zu beschleunigen. Andernfalls " -#~ "wird standardmäßig ein geradliniges Muster verwendet." - #~ msgid "" #~ "Filter out gaps smaller than the threshold specified. This setting won't " #~ "affect top/bottom layers" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 36b65eb2d9..6edffd9b85 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -7882,6 +7882,16 @@ msgstr "Add end G-Code when finishing the entire print." msgid "End G-code when finish the printing of this filament" msgstr "Add end G-code when finishing the printing of this filament." +msgid "Ensure vertical shell thickness" +msgstr "Ensure vertical shell thickness" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)." + msgid "Top surface pattern" msgstr "Top surface pattern" @@ -10432,6 +10442,18 @@ msgstr "" "thickness of the feature, the wall will become as thick as the feature " "itself. It's expressed as a percentage over nozzle diameter" +msgid "Detect narrow internal solid infill" +msgstr "Detect narrow internal solid infill" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"This option will auto-detect narrow internal solid infill areas. If enabled, " +"the concentric pattern will be used for the area to speed up printing. " +"Otherwise, the rectilinear pattern will be used by default." + msgid "invalid value " msgstr "invalid value " @@ -11707,16 +11729,6 @@ msgstr "" #~ "The bed temperature exceeds filament's vitrification temperature. Please " #~ "open the front door of printer before printing to avoid nozzle clogs." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Ensure vertical shell thickness" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)." - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Temperature of vitrification" @@ -11739,18 +11751,6 @@ msgstr "" #~ "run at this speed during printing except for during the first several " #~ "layers which may be set to have no part cooling." -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Detect narrow internal solid infill" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "This option will auto-detect narrow internal solid infill areas. If " -#~ "enabled, the concentric pattern will be used for the area to speed up " -#~ "printing. Otherwise, the rectilinear pattern will be used by default." - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "Empty layers around bottom are replaced by nearest normal layers." diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 98a71bc4dc..86eb370cd5 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: \n" "Last-Translator: Carlos Fco. Caruncho Serrano \n" "Language-Team: \n" @@ -8205,6 +8205,16 @@ msgstr "Finalizar el G-Code cuando termine la impresión completa" msgid "End G-code when finish the printing of this filament" msgstr "Terminar el G-Code cuando se termine de imprimir este filamento" +msgid "Ensure vertical shell thickness" +msgstr "Detección de paredes delgadas" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Añadir relleno sólido al lado de capas inclinadas para garantizar el grosor " +"de carcasa vertical (capas sólidas superior+inferior)" + msgid "Top surface pattern" msgstr "Patrón de relleno superior" @@ -11135,6 +11145,19 @@ msgstr "" "propia característica. Se expresa en porcentaje sobre el diámetro de la " "boquilla" +msgid "Detect narrow internal solid infill" +msgstr "Detección de pequeños rellenos sólidos" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Esta opción detectará automáticamente el área de relleno sólido interno " +"estrecho. Si se activa, se utilizará un patrón concéntrico para el área para " +"acelerar la impresión. De lo contrario, se utilizará por defecto un patrón " +"rectilíneo." + msgid "invalid value " msgstr "valor inválido " @@ -12725,16 +12748,6 @@ msgstr "" #~ "filamento. Por favor, abra la puerta frontal de la impresora antes de " #~ "imprimir para evitar atascos en la boquilla." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Detección de paredes delgadas" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Añadir relleno sólido al lado de capas inclinadas para garantizar el " -#~ "grosor de carcasa vertical (capas sólidas superior+inferior)" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Temperatura de vitrificación" @@ -12759,19 +12772,6 @@ msgstr "" #~ "funcionará a esta velocidad durante la impresión, excepto en las primeras " #~ "capas, que se define por la ausencia de capas de refrigeración" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Detección de pequeños rellenos sólidos" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Esta opción detectará automáticamente el área de relleno sólido interno " -#~ "estrecho. Si se activa, se utilizará un patrón concéntrico para el área " -#~ "para acelerar la impresión. De lo contrario, se utilizará por defecto un " -#~ "patrón rectilíneo." - #~ msgid "Cali" #~ msgstr "Cali" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index c1aea0683e..8e2750643d 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Guislain Cyril\n" @@ -8187,6 +8187,16 @@ msgstr "G-code lorsque l'ensemble de l'impression est terminée" msgid "End G-code when finish the printing of this filament" msgstr "G-code lorsque l'impression de ce filament est terminée" +msgid "Ensure vertical shell thickness" +msgstr "Veiller à l'épaisseur verticale de la coque" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Ajouter un remplissage solide près des surfaces en pente pour garantir " +"l'épaisseur verticale de la coque (couches solides supérieures + inférieures)" + msgid "Top surface pattern" msgstr "Motif des surfaces supérieures" @@ -10932,6 +10942,18 @@ msgstr "" "aussi épaisse que celle du modèle. Elle est exprimée en pourcentage sur le " "diamètre de la buse" +msgid "Detect narrow internal solid infill" +msgstr "Détecter un remplissage solide étroit" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Cette option détectera automatiquement les zones de remplissage solides " +"étroits. Si activé, un motif concentrique sera utilisé pour les zones afin " +"d'accélérer l'impression. Sinon, le motif rectiligne est utilisé par défaut." + msgid "invalid value " msgstr "valeur invalide " @@ -12337,17 +12359,6 @@ msgstr "" #~ "filament. Veuillez ouvrir la porte avant de l'imprimante avant d'imprimer " #~ "pour éviter que la buse ne se bouche." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Veiller à l'épaisseur verticale de la coque" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Ajouter un remplissage solide près des surfaces en pente pour garantir " -#~ "l'épaisseur verticale de la coque (couches solides supérieures + " -#~ "inférieures)" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Température de vitrification" @@ -12372,19 +12383,6 @@ msgstr "" #~ "auxiliaire fonctionnera à cette vitesse pendant l'impression, à " #~ "l'exception des premières couches définies sans refroidissement" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Détecter un remplissage solide étroit" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Cette option détectera automatiquement les zones de remplissage solides " -#~ "étroits. Si activé, un motif concentrique sera utilisé pour les zones " -#~ "afin d'accélérer l'impression. Sinon, le motif rectiligne est utilisé par " -#~ "défaut." - #~ msgid "" #~ "Bed temperature for layers except the initial one. Value 0 means the " #~ "filament does not support to print on the High Temp" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index 1833a40fa8..f7ae4777c4 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7953,6 +7953,16 @@ msgstr "Befejező G-kód az egész nyomtatás befejezésekor" msgid "End G-code when finish the printing of this filament" msgstr "Befejező G-kód a filament nyomtatásának befejezésekor" +msgid "Ensure vertical shell thickness" +msgstr "Függőleges héjvastagság biztosítása" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"A függőleges héjvastagság biztosítása érdekében szilárd kitöltést alkalmaz a " +"lejtős felületek közelében." + msgid "Top surface pattern" msgstr "Felső felület mintázata" @@ -10524,6 +10534,19 @@ msgstr "" "mint a nyomtatandó elem vastagsága, akkor a fal olyan vastag lesz, mint maga " "a nyomtatott elem. A fúvóka átmérőjének százalékában van kifejezve" +msgid "Detect narrow internal solid infill" +msgstr "Keskeny belső szilárd kitöltés felismerése" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Ez a beállítás automatikusan felismeri a keskeny belső tömör kitöltési " +"területeket. Ha engedélyezve van, a nyomtatás felgyorsítása érdekében ezen a " +"területen a koncentrikus mintát fogja használni. Ellenkező esetben " +"alapértelmezés szerint az egyenes vonalú mintát használja." + msgid "invalid value " msgstr "invalid value " @@ -11873,16 +11896,6 @@ msgstr "" #~ "Kérjük, hogy a nyomtatás során tartsd nyitva a nyomtatót, vagy csökkentsd " #~ "az asztalhőmérsékletet." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Függőleges héjvastagság biztosítása" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "A függőleges héjvastagság biztosítása érdekében szilárd kitöltést " -#~ "alkalmaz a lejtős felületek közelében." - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Üvegesedési hőmérséklet" @@ -11907,19 +11920,6 @@ msgstr "" #~ "ezen a fordulatszámon fog működni a nyomtatás során, kivéve az első " #~ "néhány réteget, amelynél kikapcsolt hűtés van megadva" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Keskeny belső szilárd kitöltés felismerése" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Ez a beállítás automatikusan felismeri a keskeny belső tömör kitöltési " -#~ "területeket. Ha engedélyezve van, a nyomtatás felgyorsítása érdekében " -#~ "ezen a területen a koncentrikus mintát fogja használni. Ellenkező esetben " -#~ "alapértelmezés szerint az egyenes vonalú mintát használja." - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "Az alsó üres rétegeket a legközelebbi normál rétegek váltják fel." diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 17ddfd4c37..31efcbdc60 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7931,6 +7931,17 @@ msgstr "Add end G-Code when finishing the entire print." msgid "End G-code when finish the printing of this filament" msgstr "Add end G-code when finishing the printing of this filament." +msgid "Ensure vertical shell thickness" +msgstr "Garantisci spessore verticale del guscio" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Aggiunge un riempimento solido in prossimità delle superfici inclinate per " +"garantire lo spessore verticale del guscio (layers solidi superiori e " +"inferiori)." + msgid "Top surface pattern" msgstr "Top surface pattern" @@ -10499,6 +10510,18 @@ msgstr "" "spessa quanto l'elemento stesso. È espresso in percentuale rispetto al " "diametro del nozzle" +msgid "Detect narrow internal solid infill" +msgstr "Detect narrow internal solid infill" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"This option will auto-detect narrow internal solid infill areas. If enabled, " +"the concentric pattern will be used for the area to speed up printing. " +"Otherwise, the rectilinear pattern will be used by default." + msgid "invalid value " msgstr "Valore non valido" @@ -11854,17 +11877,6 @@ msgstr "" #~ "filamento. Aprire lo sportello anteriore della stampante prima di " #~ "stampare per evitare l'intasamento del nozzle." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Garantisci spessore verticale del guscio" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Aggiunge un riempimento solido in prossimità delle superfici inclinate " -#~ "per garantire lo spessore verticale del guscio (layers solidi superiori e " -#~ "inferiori)." - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Temperature of vitrification" @@ -11887,18 +11899,6 @@ msgstr "" #~ "run at this speed during printing except for during the first several " #~ "layers which may be set to have no part cooling." -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Detect narrow internal solid infill" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "This option will auto-detect narrow internal solid infill areas. If " -#~ "enabled, the concentric pattern will be used for the area to speed up " -#~ "printing. Otherwise, the rectilinear pattern will be used by default." - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "Empty layers around bottom are replaced by nearest normal layers." diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index e0423b3907..6574b75a4e 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -7702,6 +7702,14 @@ msgstr "造形完了時のG-codeを追加" msgid "End G-code when finish the printing of this filament" msgstr "このフィラメントを使用終わった時のG-codeを追加" +msgid "Ensure vertical shell thickness" +msgstr "壁の厚さを確保" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "傾斜面にソリッドインフィルを追加" + msgid "Top surface pattern" msgstr "トップ面パターン" @@ -10153,6 +10161,18 @@ msgstr "" "thickness of the feature, the wall will become as thick as the feature " "itself. It's expressed as a percentage over nozzle diameter" +msgid "Detect narrow internal solid infill" +msgstr "薄いソリッド インフィル検出" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"ソリッド インフィル領域に狭い部分があるか検出します。その設定を有効にする場" +"合、狭い領域は同心パターンを使用し、それ以外の領域は、直線パターンを使用しま" +"す。" + msgid "invalid value " msgstr "invalid value " @@ -11477,14 +11497,6 @@ msgstr "" #~ "ベッド温度がフィラメントの軟化温度より高いです、ノズル詰まりが発生する可能" #~ "性があります。ベッド温度を下げるか、プリンタのドアを開けてください。" -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "壁の厚さを確保" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "傾斜面にソリッドインフィルを追加" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "軟化温度" @@ -11504,18 +11516,6 @@ msgstr "" #~ "cooling layers" #~ msgstr "補助パーツ冷却ファンの回転速度です。" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "薄いソリッド インフィル検出" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "ソリッド インフィル領域に狭い部分があるか検出します。その設定を有効にする" -#~ "場合、狭い領域は同心パターンを使用し、それ以外の領域は、直線パターンを使用" -#~ "します。" - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "底面との隙間があります、レイヤーを入れ替えました" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 9b17212fe8..ddfcd761ac 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-10-26 16:47+0900\n" "Last-Translator: Hotsolidinfill\n" "Language-Team: \n" @@ -7916,6 +7916,16 @@ msgstr "전체 출력이 끝날때의 End G-code" msgid "End G-code when finish the printing of this filament" msgstr "이 필라멘트의 출력이 끝날때의 End G-code" +msgid "Ensure vertical shell thickness" +msgstr "수직 쉘 두께 확보" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"경사진 표면 근처에 꽉찬 내부 채움을 추가하여 수직 쉘 두께를 보장합니다(상단" +"+하단 꽉찬 레이어)" + msgid "Top surface pattern" msgstr "상단 표면 패턴" @@ -10646,6 +10656,18 @@ msgstr "" "비가 형상의 두께보다 얇은 경우 벽은 형상 자체만큼 두꺼워집니다. 노즐 직경에 " "대한 백분율로 표시됩니다" +msgid "Detect narrow internal solid infill" +msgstr "좁은 내부 꽉찬 내부 채움 감지" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"이 옵션은 좁은 내부 꽉찬 내부 채움 영역을 자동으로 감지합니다. 활성화하면 출" +"력 속도를 높이기 위해 해당 영역에 동심 패턴이 사용됩니다. 그렇지 않으면 직선 " +"패턴이 기본적으로 사용됩니다." + msgid "invalid value " msgstr "잘못된 값 " @@ -12140,16 +12162,6 @@ msgstr "" #~ msgid "Activate for better air filtration" #~ msgstr "더 나은 공기 여과를 위해 활성화하세요" -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "수직 쉘 두께 확보" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "경사진 표면 근처에 꽉찬 내부 채움을 추가하여 수직 쉘 두께를 보장합니다(상" -#~ "단+하단 꽉찬 레이어)" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "유리 전이 온도" @@ -12178,18 +12190,6 @@ msgstr "" #~ "보조 출력 냉각 팬의 속도입니다. 냉각 중지 레이어로 정의된 처음 몇 개의 레" #~ "이어를 제외하고 출력 중에 보조 팬이 이 속도로 작동됩니다" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "좁은 내부 꽉찬 내부 채움 감지" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "이 옵션은 좁은 내부 꽉찬 내부 채움 영역을 자동으로 감지합니다. 활성화하면 " -#~ "출력 속도를 높이기 위해 해당 영역에 동심 패턴이 사용됩니다. 그렇지 않으면 " -#~ "직선 패턴이 기본적으로 사용됩니다." - #~ msgid "" #~ "Filter out gaps smaller than the threshold specified. This setting won't " #~ "affect top/bottom layers" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index f7aa405efc..d313e8c3e9 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8045,6 +8045,16 @@ msgid "End G-code when finish the printing of this filament" msgstr "" "Voeg een eind G-code toe bij het afronden van het printen van dit filament." +msgid "Ensure vertical shell thickness" +msgstr "Zorg voor een verticale schaaldikte" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Voeg dichte vulling toe in de buurt van hellende oppervlakken om de " +"verticale schaaldikte te garanderen (boven+onder vaste lagen)." + msgid "Top surface pattern" msgstr "Patroon bovenvlak" @@ -10645,6 +10655,19 @@ msgstr "" "van het element, wordt de muur net zo dik als het object zelf. Dit wordt " "uitgedrukt als een percentage ten opzichte van de diameter van de nozzle" +msgid "Detect narrow internal solid infill" +msgstr "Detecteer dichte interne solide vulling (infill)" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Deze optie detecteert automatisch smalle interne solide opvul (infill) " +"gebieden. Indien ingeschakeld, wordt het concentrische patroon gebruikt voor " +"het gebied om het afdrukken te versnellen. Anders wordt standaard het " +"rechtlijnige patroon gebruikt." + msgid "invalid value " msgstr "invalid value " @@ -11994,16 +12017,6 @@ msgstr "" #~ "filament. Open de voorkdeur van de printer voor het printen om " #~ "verstopping van de nozzles te voorkomen." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Zorg voor een verticale schaaldikte" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Voeg dichte vulling toe in de buurt van hellende oppervlakken om de " -#~ "verticale schaaldikte te garanderen (boven+onder vaste lagen)." - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Temperatuur van verglazing" @@ -12028,19 +12041,6 @@ msgstr "" #~ "op deze snelheid tijdens het afdrukken, behalve de eerste paar lagen, die " #~ "worden gedefinieerd door geen koellagen" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Detecteer dichte interne solide vulling (infill)" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Deze optie detecteert automatisch smalle interne solide opvul (infill) " -#~ "gebieden. Indien ingeschakeld, wordt het concentrische patroon gebruikt " -#~ "voor het gebied om het afdrukken te versnellen. Anders wordt standaard " -#~ "het rechtlijnige patroon gebruikt." - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "" #~ "Lege lagen in de buurt van de bodem worden vervangen door de " diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 4603c39575..6c1850cdcb 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer V1.8.0 beta1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-10-31 14:13+0700\n" "Last-Translator: Andylg \n" "Language-Team: \n" @@ -8217,6 +8217,16 @@ msgstr "Завершающий G-код при окончании всей пе msgid "End G-code when finish the printing of this filament" msgstr "Завершающий G-код при окончании печати этой пластиковой нитью." +msgid "Ensure vertical shell thickness" +msgstr "" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Добавление сплошного заполнения вблизи наклонных поверхностей для " +"обеспечения вертикальной толщины оболочки (верхний+нижний сплошные слои)." + msgid "Top surface pattern" msgstr "Шаблон заполнения верхней поверхности" @@ -11155,6 +11165,19 @@ msgstr "" "элемента. Если задано в процентах, то значение вычисляться относительно " "диаметра сопла." +msgid "Detect narrow internal solid infill" +msgstr "Обнаруживать узкую область сплошного заполнения" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Этот параметр автоматически определяет узкую внутреннюю область сплошного " +"заполнения. Если включено, для ускорения печати будет использоваться " +"концентрический шаблон. В противном случае по умолчанию используется " +"прямолинейный шаблон." + msgid "invalid value " msgstr "недопустимое значение " @@ -12883,13 +12906,6 @@ msgstr "" #~ "Шаг 1. Пожалуйста, убедитесь, что Bambu Studio и ваш принтер находятся в " #~ "одной локальной сети." -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Добавление сплошного заполнения вблизи наклонных поверхностей для " -#~ "обеспечения вертикальной толщины оболочки (верхний+нижний сплошные слои)." - #~ msgid "Internal bridge support thickness" #~ msgstr "Толщина поддержки внутреннего моста" @@ -12992,19 +13008,6 @@ msgstr "" #~ "низкая температура последующих слоёв может привести к отрыву модели от " #~ "стола." -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Обнаруживать узкую область сплошного заполнения" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Этот параметр автоматически определяет узкую внутреннюю область сплошного " -#~ "заполнения. Если включено, для ускорения печати будет использоваться " -#~ "концентрический шаблон. В противном случае по умолчанию используется " -#~ "прямолинейный шаблон." - #~ msgid "Orient the model" #~ msgstr "Ориентация модели" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 2806744bc4..600695a9ac 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7895,6 +7895,16 @@ msgstr "Lägg till slut G-kod när utskriften har avslutas" msgid "End G-code when finish the printing of this filament" msgstr "Lägg till slut G-kod när utskriften har avslutas med detta filament" +msgid "Ensure vertical shell thickness" +msgstr "Säkerställ vertikal skaltjocklek" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Lägg till massiv fyllning nära sluttande ytor för att garantera den " +"vertikala skal tjockleken (topp+bottenfasta lager)." + msgid "Top surface pattern" msgstr "Topp ytans mönster" @@ -10447,6 +10457,19 @@ msgstr "" "elementet blir väggen lika tjock som själva elementet. Den uttrycks i " "procent av nozzel diametern." +msgid "Detect narrow internal solid infill" +msgstr "Upptäck tight inre solid ifyllnad" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Detta val kommer att auto upptäcka tight inre solid ifyllnads område. Om " +"aktiverat kommer det koncentriska mönstret att användas för området för att " +"påskynda utskriften. Annars kommer mönstret med räta linjer att användas som " +"standard." + msgid "invalid value " msgstr "ogiltigt värde " @@ -11798,16 +11821,6 @@ msgstr "" #~ "Öppna skrivarens främre dörr innan du skriver ut för att undvika att " #~ "nozzeln täpps till." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Säkerställ vertikal skaltjocklek" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Lägg till massiv fyllning nära sluttande ytor för att garantera den " -#~ "vertikala skal tjockleken (topp+bottenfasta lager)." - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Kristalliserings temperatur" @@ -11830,19 +11843,6 @@ msgstr "" #~ "denna hastighet under utskrift förutom de lager som definieras som inga " #~ "kyl lager" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Upptäck tight inre solid ifyllnad" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Detta val kommer att auto upptäcka tight inre solid ifyllnads område. Om " -#~ "aktiverat kommer det koncentriska mönstret att användas för området för " -#~ "att påskynda utskriften. Annars kommer mönstret med räta linjer att " -#~ "användas som standard." - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "Tomma lager runt botten ersätts med närmast normala lager." diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index e800a5aa76..9f44e71ff4 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-10-07 12:57+0300\n" "Last-Translator: Sadri Ercan\n" "Language-Team: Türkçe\n" @@ -8047,6 +8047,16 @@ msgstr "Tüm yazdırmayı tamamladığında çalışacak olan G Kodu" msgid "End G-code when finish the printing of this filament" msgstr "Bu filament ile baskı bittiğinde çalışacak G kodu" +msgid "Ensure vertical shell thickness" +msgstr "Dikey kabuk kalınlığını onayla" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Dikey kabuk kalınlığını garanti etmek için eğimli yüzeylerin yakınına katı " +"dolgu ekleyin (üst + alt katı katmanlar)" + msgid "Top surface pattern" msgstr "Üst katman deseni" @@ -10848,6 +10858,18 @@ msgstr "" "duvar, özelliğin kendisi kadar kalın olacaktır. Nozul çapına göre yüzde " "olarak ifade edilir" +msgid "Detect narrow internal solid infill" +msgstr "Dar iç katı dolguyu tespit et" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Bu seçenek dar dahili katı dolgu alanını otomatik olarak algılayacaktır. " +"Etkinleştirilirse, yazdırmayı hızlandırmak amacıyla alanda eşmerkezli desen " +"kullanılacaktır. Aksi takdirde varsayılan olarak doğrusal desen kullanılır." + msgid "invalid value " msgstr "geçersiz değer " @@ -12363,16 +12385,6 @@ msgstr "" #~ msgid "Activate for better air filtration" #~ msgstr "Daha iyi hava filtrelemesi için etkinleştirin" -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Dikey kabuk kalınlığını onayla" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Dikey kabuk kalınlığını garanti etmek için eğimli yüzeylerin yakınına " -#~ "katı dolgu ekleyin (üst + alt katı katmanlar)" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Yumuşama sıcaklığı" @@ -12405,19 +12417,6 @@ msgstr "" #~ "bulunmadığı ilk birkaç katman dışında, yazdırma sırasında bu hızda " #~ "çalışacaktır" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Dar iç katı dolguyu tespit et" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Bu seçenek dar dahili katı dolgu alanını otomatik olarak algılayacaktır. " -#~ "Etkinleştirilirse, yazdırmayı hızlandırmak amacıyla alanda eşmerkezli " -#~ "desen kullanılacaktır. Aksi takdirde varsayılan olarak doğrusal desen " -#~ "kullanılır." - #~ msgid "" #~ "Filter out gaps smaller than the threshold specified. This setting won't " #~ "affect top/bottom layers" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 84714f87a5..b63671fd9a 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-08-10 20:25-0400\n" "Last-Translator: \n" "Language-Team: \n" @@ -7964,6 +7964,16 @@ msgstr "Завершальний G-code, коли закінчити весь д msgid "End G-code when finish the printing of this filament" msgstr "Завершальний G-code, коли закінчите друк цієї нитки" +msgid "Ensure vertical shell thickness" +msgstr "Забезпечення вертикальної товщини оболонки" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "" +"Додавання заповнення твердого тіла поблизу похилих поверхонь для Гарантії " +"товщини вертикальної оболонки (верхній + нижній шари твердого тіла)" + msgid "Top surface pattern" msgstr "Малюнок верхньої поверхні" @@ -10621,6 +10631,19 @@ msgstr "" "елемента, то товщина периметра дорівнюватиме товщині самого елемента. Він " "виражається у відсотках від діаметра сопла" +msgid "Detect narrow internal solid infill" +msgstr "Виявлення вузького внутрішнього заповнення твердим тілом" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"Ця опція автоматично визначає вузьку внутрішню область заповненнятвердого " +"тіла. Якщо цей параметр увімкнено, для прискорення друку області " +"використовуватиметься концентричний візерунок. Інакше за умовчанням " +"Використовується прямолінійний малюнок." + msgid "invalid value " msgstr "неправильне значення " @@ -11981,16 +12004,6 @@ msgstr "" #~ "відчиняйте передні дверцята принтера перед печаткою, щоб уникнути " #~ "засмічення сопла." -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "Забезпечення вертикальної товщини оболонки" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "" -#~ "Додавання заповнення твердого тіла поблизу похилих поверхонь для Гарантії " -#~ "товщини вертикальної оболонки (верхній + нижній шари твердого тіла)" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "Температура склування" @@ -12015,19 +12028,6 @@ msgstr "" #~ "ДопоміжнийВентилятор буде працювати з такою швидкістю під час друку, за " #~ "винятком перших кількох шарів, які не визначаються шарами охолодження" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "Виявлення вузького внутрішнього заповнення твердим тілом" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "Ця опція автоматично визначає вузьку внутрішню область заповненнятвердого " -#~ "тіла. Якщо цей параметр увімкнено, для прискорення друку області " -#~ "використовуватиметься концентричний візерунок. Інакше за умовчанням " -#~ "Використовується прямолінійний малюнок." - #~ msgid "Empty layers around bottom are replaced by nearest normal layers." #~ msgstr "" #~ "Порожні шари навколо дна замінюються найближчими нормальними шарами." diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 68e8b333d6..80f510ad0c 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 14:18+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-04-01 13:21+0800\n" "Last-Translator: SoftFever \n" "Language-Team: \n" @@ -7636,6 +7636,14 @@ msgstr "所有打印结束时的结尾G-code" msgid "End G-code when finish the printing of this filament" msgstr "结束使用该耗材打印时的结尾G-code" +msgid "Ensure vertical shell thickness" +msgstr "确保垂直外壳厚度" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "在斜面表面附近添加实心填充，以保证垂直外壳厚度（顶部+底部实心层）" + msgid "Top surface pattern" msgstr "顶面图案" @@ -10141,6 +10149,17 @@ msgstr "" "用于替换模型细小特征（根据最小特征尺寸）的墙线宽。如果墙最小线宽小于最小特征" "的厚度，则墙将变得和特征本身一样厚。参数值表示为相对喷嘴直径的百分比" +msgid "Detect narrow internal solid infill" +msgstr "识别狭窄内部实心填充" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"此选项用于自动识别内部狭窄的实心填充。开启后，将对狭窄实心区域使用同心填充加" +"快打印速度。否则使用默认的直线填充。" + msgid "invalid value " msgstr "非法的值 " @@ -11567,14 +11586,6 @@ msgstr "" #~ msgid "Activate for better air filtration" #~ msgstr "激活以获得更好的空气过滤" -#~ msgid "Ensure vertical shell thickness" -#~ msgstr "确保垂直外壳厚度" - -#~ msgid "" -#~ "Add solid infill near sloping surfaces to guarantee the vertical shell " -#~ "thickness (top+bottom solid layers)" -#~ msgstr "在斜面表面附近添加实心填充，以保证垂直外壳厚度（顶部+底部实心层）" - #~ msgid "Temperature of vitrificaiton" #~ msgstr "软化温度" @@ -11601,17 +11612,6 @@ msgstr "" #~ "辅助部件冷却风扇的转速。辅助部件冷却风扇将一直运行在该速度，除了设置的无需" #~ "冷却的前若干层" -#~ msgid "Detect narrow internal solid infill" -#~ msgstr "识别狭窄内部实心填充" - -#~ msgid "" -#~ "This option will auto detect narrow internal solid infill area. If " -#~ "enabled, concentric pattern will be used for the area to speed printing " -#~ "up. Otherwise, rectilinear pattern is used defaultly." -#~ msgstr "" -#~ "此选项用于自动识别内部狭窄的实心填充。开启后，将对狭窄实心区域使用同心填充" -#~ "加快打印速度。否则使用默认的直线填充。" - #~ msgid "" #~ "Filter out gaps smaller than the threshold specified. This setting won't " #~ "affect top/bottom layers" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index e734a8f8b3..a9665558e4 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-04 19:51+0800\n" +"POT-Creation-Date: 2023-11-07 21:36+0800\n" "PO-Revision-Date: 2023-11-06 14:37+0800\n" "Last-Translator: ablegods \n" "Language-Team: \n" @@ -649,10 +649,9 @@ msgid "WebView2 Runtime" msgstr "WebView2 Runtime" msgid "" -"Orca Slicer configuration file may be corrupted and is not abled to be " -"parsed.Please delete the file and try again." +"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." +"Please delete the file and try again." msgstr "" -"Orca Slicer 設定檔可能已損壞而無法解析。請刪除此檔案並重新啟動 Orca Slicer。" #, fuzzy, c-format, boost-format msgid "" @@ -1543,7 +1542,6 @@ msgstr "無法連接伺服器" msgid "Check cloud service status" msgstr "檢查雲端服務狀態" -#, fuzzy msgid "code" msgstr "" @@ -2151,7 +2149,8 @@ msgid "" "A desiccant status lower than two bars indicates that desiccant may be " "inactive. Please change the desiccant.(The bars: higher the better.)" msgstr "" -"乾燥劑狀態低於兩格表示乾燥劑可能是趨近無效。請更換乾燥劑。（指示格：越高越好）。" +"乾燥劑狀態低於兩格表示乾燥劑可能是趨近無效。請更換乾燥劑。（指示格：越高越" +"好）。" msgid "" "Note: When the lid is open or the desiccant pack is changed, it can take " @@ -2228,8 +2227,8 @@ msgid "" "The AMS will automatically read the filament information when inserting a " "new Bambu Lab filament. This takes about 20 seconds." msgstr "" -"當插入新的 Bambu Lab 官方線材的時候，AMS 會自動讀取線材資訊。這個過程大約需要20" -"秒。" +"當插入新的 Bambu Lab 官方線材的時候，AMS 會自動讀取線材資訊。這個過程大約需要" +"20秒。" msgid "" "Note: if new filament is inserted during printing, the AMS will not " @@ -2272,8 +2271,8 @@ msgid "" "info is updated. During printing, remaining capacity will be updated " "automatically." msgstr "" -"AMS 讀取 Bambu Lab 官方線材資訊同時預估線材卷的剩餘線材量。在列印過程中，剩餘線材" -"量會自動更新。" +"AMS 讀取 Bambu Lab 官方線材資訊同時預估線材卷的剩餘線材量。在列印過程中，剩餘" +"線材量會自動更新。" #, fuzzy msgid "AMS filament backup" @@ -4209,8 +4208,7 @@ msgid "" "The following issues occurred during the process of uploading images. Do you " "want to ignore them?\n" "\n" -msgstr "" -"在上傳圖片的過程中出現了以下問題。要忽略此問題嗎？\n" +msgstr "在上傳圖片的過程中出現了以下問題。要忽略此問題嗎？\n" msgid "info" msgstr "資訊" @@ -4649,8 +4647,8 @@ msgid "" "clogged when printing this filament in a closed enclosure. Please open the " "front door and/or remove the upper glass." msgstr "" -"目前熱床溫度比較高。在封閉的列印設備中列印該線材時，噴嘴可能會堵塞。請打開前門和/" -"或拆下上部玻璃。" +"目前熱床溫度比較高。在封閉的列印設備中列印該線材時，噴嘴可能會堵塞。請打開前" +"門和/或拆下上部玻璃。" #, fuzzy msgid "" @@ -4658,8 +4656,8 @@ msgid "" "nozzle hardness of the printer. Please replace the hardened nozzle or " "filament, otherwise, the nozzle will be attrited or damaged." msgstr "" -"線材所要求的噴嘴硬度高於列印設備預設的噴嘴硬度。請更換硬化的噴嘴或線材，否" -"則噴嘴可能被磨損或損壞。" +"線材所要求的噴嘴硬度高於列印設備預設的噴嘴硬度。請更換硬化的噴嘴或線材，否則" +"噴嘴可能被磨損或損壞。" msgid "" "Enabling traditional timelapse photography may cause surface imperfections. " @@ -4992,7 +4990,6 @@ msgstr "無法對模型網格執行布林運算。只有正面部分將被導出 msgid "Is the printer ready? Is the print sheet in place, empty and clean?" msgstr "列印設備是否準備完成？列印平台是否在正確的位置、有沒有異物、是否乾淨？" - msgid "Upload and Print" msgstr "上傳並列印" @@ -5075,8 +5072,8 @@ msgid "" "still want to do this printing, please set this filament's bed temperature " "to non zero." msgstr "" -"列印板 %d：%s 不建議被用於列印 %s（%s）線材。如果你依然想列印，請設定線材對" -"應的熱床溫度為非零值。" +"列印板 %d：%s 不建議被用於列印 %s（%s）線材。如果你依然想列印，請設定線材對應" +"的熱床溫度為非零值。" msgid "Switching the language requires application restart.\n" msgstr "切換語言要求重啟應用程式。\n" @@ -5233,13 +5230,6 @@ msgstr "使用 Orca Slicer 打開 .step/.stp 檔案" msgid "If enabled, sets OrcaSlicer as default application to open .step files" msgstr "開啟後，將預設使用 Orca Slicer 打開 .step 檔案" -msgid "Online Models" -msgstr "線上模型" - -#, fuzzy -msgid "Show online staff-picked models on the home page" -msgstr "在首頁上顯示工作人員推薦的線上模型" - msgid "Maximum recent projects" msgstr "最近專案項目的最大數量" @@ -5920,12 +5910,13 @@ msgid "" "payment information, or phone numbers. By enabling this service, you agree " "to these terms and the statement about Privacy Policy." msgstr "" -"在 3D 列印社區，我們從彼此的成功和失敗中學習調整自己的切片參數和設定。%s 遵循同" -"樣的原則，透過機器學習的方式從大量使用者列印的成功和失敗中獲取經驗，從而改善" -"列印性能。我們正在透過向 %s 提供真實世界的資料來訓練他們變得更聰明。如果您願" -"意，此服務將訪問您的錯誤日誌和使用日誌中的資訊，其中可能包括隱私政策中描述的" -"資料。我們不會收集任何可以直接或間接識別個人的個人資料，包括但不限於姓名、地" -"址、支付資訊或電話號碼。啟用此服務即表示您同意這些條款和有關隱私政策的聲明。" +"在 3D 列印社區，我們從彼此的成功和失敗中學習調整自己的切片參數和設定。%s 遵循" +"同樣的原則，透過機器學習的方式從大量使用者列印的成功和失敗中獲取經驗，從而改" +"善列印性能。我們正在透過向 %s 提供真實世界的資料來訓練他們變得更聰明。如果您" +"願意，此服務將訪問您的錯誤日誌和使用日誌中的資訊，其中可能包括隱私政策中描述" +"的資料。我們不會收集任何可以直接或間接識別個人的個人資料，包括但不限於姓名、" +"地址、支付資訊或電話號碼。啟用此服務即表示您同意這些條款和有關隱私政策的聲" +"明。" msgid "Statement on User Experience Improvement Plan" msgstr "關於使用者體驗改善計劃的聲明" @@ -5987,7 +5978,8 @@ msgid "" "support volume but weaker strength.\n" "We recommend using it with: 0 interface layers, 0 top distance, 2 walls." msgstr "" -"我們增加了一種實驗性的支撐樣式 \"苗條樹\"，它的特點是支撐體積較小，但強度較弱。\n" +"我們增加了一種實驗性的支撐樣式 \"苗條樹\"，它的特點是支撐體積較小，但強度較" +"弱。\n" "因此我們推薦以下參數：接觸層數為 0，頂部Z距離為 0，牆層數為 2。" #, fuzzy @@ -6023,8 +6015,8 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add " -"Primitive\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add Primitive" +"\"->\"Timelapse Wipe Tower\"." msgstr "" "在錄製無工具頭縮時錄影影片時，建議增加“縮時錄影擦拭塔”\n" "右鍵單擊列印板的空白位置，選擇“新增標準模型”->“縮時錄影擦拭塔”。" @@ -6063,8 +6055,8 @@ msgid "" "expressed as a percentage of line width. 0 speed means no slowing down for " "the overhang degree range and wall speed is used" msgstr "" -"不同懸空程度的列印速度。懸空程度使用相對於線寬的百分比表示。速度為 0 代表這個懸" -"空程度範圍內不降速，直接使用牆的速度" +"不同懸空程度的列印速度。懸空程度使用相對於線寬的百分比表示。速度為 0 代表這個" +"懸空程度範圍內不降速，直接使用牆的速度" msgid "Bridge" msgstr "橋接" @@ -6187,8 +6179,8 @@ msgid "" "Value 0 means the filament does not support to print on the Smooth PEI Plate/" "High Temp Plate" msgstr "" -"使用光滑面 PEI 列印板/高溫列印板時的熱床溫度。0 值表示這個線材不支援光滑面列印板/" -"高溫列印板" +"使用光滑面 PEI 列印板/高溫列印板時的熱床溫度。0 值表示這個線材不支援光滑面列" +"印板/高溫列印板" #, fuzzy msgid "Textured PEI Plate" @@ -6199,7 +6191,8 @@ msgid "" "Bed temperature when Textured PEI Plate is installed. Value 0 means the " "filament does not support to print on the Textured PEI Plate" msgstr "" -"使用金屬紋理 PEI 列印板時的熱床溫度。0 值表示這個線材不支援金屬紋理 PEI 列印板" +"使用金屬紋理 PEI 列印板時的熱床溫度。0 值表示這個線材不支援金屬紋理 PEI 列印" +"板" msgid "Volumetric speed limitation" msgstr "體積流量速度限制" @@ -7607,8 +7600,8 @@ msgid "" "distribution points. One may want to enable this option for self signed " "certificates if connection fails." msgstr "" -"在缺少或離線的情況下忽略 HTTPS憑證 吊銷檢查。如果連接失敗，可以啟用此選" -"項來處理自簽名憑證。" +"在缺少或離線的情況下忽略 HTTPS憑證 吊銷檢查。如果連接失敗，可以啟用此選項來處" +"理自簽名憑證。" #, fuzzy msgid "Names of presets related to the physical printer" @@ -7779,12 +7772,9 @@ msgstr "冷卻懸空臨界值" msgid "" "Force cooling fan to be specific speed when overhang degree of printed part " "exceeds this value. Expressed as percentage which indicides how much width " -"of the line without support from lower layer. 0%% means forcing cooling for " +"of the line without support from lower layer. 0% means forcing cooling for " "all outer wall no matter how much overhang degree" msgstr "" -"當列印物件的懸空程度超過此值時，強制冷卻風扇達到特定速度。\n" -"用百分比表示，表明沒有下層支撐的線的寬度是多少。0%% 意味著無論懸空程度如何，" -"都要對所有外壁強制冷卻。" #, fuzzy msgid "Bridge infill direction" @@ -7853,8 +7843,7 @@ msgstr "頂面只使用單層牆，從而更多的空間能夠使用頂部填充 msgid "One wall threshold" msgstr "單層牆臨界值" - -#, fuzzy +#, fuzzy, c-format, boost-format msgid "" "If a top surface has to be printed and it's partially covered by another " "layer, it won't be considered at a top layer where its width is below this " @@ -7909,6 +7898,7 @@ msgstr "反轉臨界值" msgid "Overhang reversal threshold" msgstr "懸空反轉臨界值" +#, fuzzy, c-format, boost-format msgid "" "Number of mm the overhang need to be for the reversal to be considered " "useful. Can be a % of the perimeter width.\n" @@ -8101,7 +8091,6 @@ msgstr "開啟空氣過濾器/排風扇" msgid "Activate for better air filtration. G-code command: M106 P3 S(0-255)" msgstr "啟動空氣過濾器/排風扇。 G-code 指令：M106 P3 S（0-255）" - msgid "Fan speed" msgstr "風扇速度" @@ -8171,6 +8160,14 @@ msgstr "所有列印結束時的結尾 G-code" msgid "End G-code when finish the printing of this filament" msgstr "結束使用該耗材列印時的結尾 G-code" +msgid "Ensure vertical shell thickness" +msgstr "確保垂直外殼厚度" + +msgid "" +"Add solid infill near sloping surfaces to guarantee the vertical shell " +"thickness (top+bottom solid layers)" +msgstr "在斜面表面附近增加實心填充，以保證垂直外殼厚度（頂部+底部實心層）" + msgid "Top surface pattern" msgstr "頂面圖案" @@ -8331,7 +8328,8 @@ msgstr "壓力提前（Klipper）或者線性提前（Marlin）" msgid "" "Default line width if other line widths are set to 0. If expressed as a %, " "it will be computed over the nozzle diameter." -msgstr "當線寬設定為 0 時走線的默認線寬。如果以 % 表示，將以噴嘴直徑為基準來計算。" +msgstr "" +"當線寬設定為 0 時走線的默認線寬。如果以 % 表示，將以噴嘴直徑為基準來計算。" msgid "Keep fan always on" msgstr "保持風扇永遠開啟" @@ -8411,9 +8409,10 @@ msgstr "線材直徑被用於計算 G-code 檔案中的擠出量。因此很重 msgid "Shrinkage" msgstr "耗材收縮率" +#, fuzzy, c-format, boost-format msgid "" -"Enter the shrinkage percentage that the filament will get after cooling (94% " -"if you measure 94mm instead of 100mm). The part will be scaled in xy to " +"Enter the shrinkage percentage that the filament will get after cooling " +"(94% if you measure 94mm instead of 100mm). The part will be scaled in xy to " "compensate. Only the filament used for the perimeter is taken into account.\n" "Be sure to allow enough space between objects, as this compensation is done " "after the checks." @@ -8450,13 +8449,11 @@ msgstr "使用於擦拭塔上退料的速度（不影響尖端成型之後初始 msgid "Unloading speed at the start" msgstr "退料初始速度" - #, fuzzy msgid "" "Speed used for unloading the tip of the filament immediately after ramming." msgstr "線材尖端成型後立即退料的速度。" - msgid "Delay after unloading" msgstr "退料後延遲" @@ -8465,8 +8462,8 @@ msgid "" "toolchanges with flexible materials that may need more time to shrink to " "original dimensions." msgstr "" -"退料後等待的時間。有助於使用柔性線材（收縮到原始尺寸需更多的時間）以獲得可" -"靠的换色。" +"退料後等待的時間。有助於使用柔性線材（收縮到原始尺寸需更多的時間）以獲得可靠" +"的换色。" msgid "Number of cooling moves" msgstr "冷卻移動次數" @@ -8493,9 +8490,8 @@ msgid "" "to produce successive infill or sacrificial object extrusions reliably." msgstr "" "換色後，新載入的線材在噴嘴內的確切位置可能未知，耗材壓力可能還不穩定。在沖刷" -"列印頭到填充或作為擠出廢料之前，將始終將這些的線材沖刷到擦拭塔中以產生連續" -"的填充或穩定的擠出廢料。" - +"列印頭到填充或作為擠出廢料之前，將始終將這些的線材沖刷到擦拭塔中以產生連續的" +"填充或穩定的擠出廢料。" msgid "Speed of the last cooling move" msgstr "最後一次冷卻移動的速度" @@ -8753,8 +8749,8 @@ msgid "" "percentage (e.g. 100%), it will be calculated based on the default " "acceleration." msgstr "" -"內部實心填充加速度。 如果該值以百分比表示（例如 100%），則將根據預設加速度進行" -"計算。" +"內部實心填充加速度。 如果該值以百分比表示（例如 100%），則將根據預設加速度進" +"行計算。" msgid "" "Acceleration of initial layer. Using a lower value can improve build plate " @@ -8844,10 +8840,10 @@ msgstr "滿速風扇在" msgid "" "Fan speed will be ramped up linearly from zero at layer " -"\"close_fan_the_first_x_layers\" to maximum at layer " -"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower " -"than \"close_fan_the_first_x_layers\", in which case the fan will be running " -"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer" +"\". \"full_fan_speed_layer\" will be ignored if lower than " +"\"close_fan_the_first_x_layers\", in which case the fan will be running at " +"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." msgstr "" "風扇速度將從“禁用第一層”的零線性上升到“全風扇速度層”的最大。如果低於“禁用風扇" "第一層”，則“全風扇速度第一層”將被忽略，在這種情況下，風扇將在“禁用風扇第一" @@ -9438,8 +9434,8 @@ msgid "" "Please enable auxiliary_fan in printer settings to use this feature. G-code " "command: M106 P2 S(0-255)" msgstr "" -"輔助冷卻風扇的轉速。 列印期間，輔助風扇將以該速度運行，除了設定無須冷卻的前幾層除外" -"\n" +"輔助冷卻風扇的轉速。 列印期間，輔助風扇將以該速度運行，除了設定無須冷卻的前幾" +"層除外\n" "請在列印設備設定中啟用輔助風扇才能使用此功能。 G碼指令：M106 P2 S（0-255）" msgid "Min" @@ -9578,8 +9574,8 @@ msgid "" "printable.90° will not change the model at all and allow any overhang, while " "0 will replace all overhangs with conical material." msgstr "" -"開啟使懸空可列印後，允許的懸空最大角度。90° 將完全不改變模型並允許任何懸空，而" -"0° 將用圓錐形材料替換所有懸空部分。" +"開啟使懸空可列印後，允許的懸空最大角度。90° 將完全不改變模型並允許任何懸空，" +"而0° 將用圓錐形材料替換所有懸空部分。" msgid "Make overhang printable hole area" msgstr "最大孔洞面積" @@ -9588,8 +9584,8 @@ msgid "" "Maximum area of a hole in the base of the model before it's filled by " "conical material.A value of 0 will fill all the holes in the model base." msgstr "" -"模型底部的孔洞在被圓錐形材料填充前所允許的最大面積。值為 0 將填充模型底部的所有" -"孔洞。" +"模型底部的孔洞在被圓錐形材料填充前所允許的最大面積。值為 0 將填充模型底部的所" +"有孔洞。" msgid "mm²" msgstr "mm²" @@ -9602,7 +9598,8 @@ msgid "" "Detect the overhang percentage relative to line width and use different " "speed to print. For 100%% overhang, bridge speed is used." msgstr "" -"偵測懸空相對於線寬的百分比，並應用不同的速度列印。100%% 的懸空將使用橋接速度。" +"偵測懸空相對於線寬的百分比，並應用不同的速度列印。100%% 的懸空將使用橋接速" +"度。" msgid "" "Line width of inner wall. If expressed as a %, it will be computed over the " @@ -9719,22 +9716,6 @@ msgstr "" "回抽完成之後，噴嘴輕微抬升，和列印物件之間產生一定間隙。這能夠避免空駛時噴嘴" "和列印物件剮蹭和碰撞。使用螺旋線抬升z能夠減少拉絲。" -msgid "Z hop lower boundary" -msgstr "" - -msgid "" -"Z hop will only come into effect when Z is above this value and is below the " -"parameter: \"Z hop upper boundary\"" -msgstr "" - -msgid "Z hop upper boundary" -msgstr "" - -msgid "" -"If this value is positive, Z hop will only come into effect when Z is above " -"the parameter: \"Z hop lower boundary\" and is below this value" -msgstr "" - msgid "Z hop type" msgstr "抬Z類型" @@ -10148,8 +10129,7 @@ msgstr "支撐/筏層主體" msgid "" "Filament to print support base and raft. \"Default\" means no specific " "filament for support and current filament is used" -msgstr "" -"列印支撐主體和筏層的線材。\"預設\"代表不指定特定的線材，並使用目前線材" +msgstr "列印支撐主體和筏層的線材。\"預設\"代表不指定特定的線材，並使用目前線材" msgid "" "Line width of support. If expressed as a %, it will be computed over the " @@ -10395,8 +10375,8 @@ msgid "" "printed with double walls for stability. Set this value to zero for no " "double walls." msgstr "" -"該數值大於以分支直徑得到的圓形面積時，將列印雙層牆以確保穩定性。 如果不使用雙層牆體，" -"請將此值設為 0。" +"該數值大於以分支直徑得到的圓形面積時，將列印雙層牆以確保穩定性。 如果不使用雙" +"層牆體，請將此值設為 0。" msgid "Tree support wall loops" msgstr "樹狀支撐外牆層數" @@ -10713,8 +10693,8 @@ msgid "" "very thin areas is used gap-fill. Arachne engine produces walls with " "variable extrusion width" msgstr "" -"經典牆產生器產生的牆走線具有一致的擠出寬度，對狹窄區域使用填縫。Arachne 引擎則" -"產生變線寬的牆走線" +"經典牆產生器產生的牆走線具有一致的擠出寬度，對狹窄區域使用填縫。Arachne 引擎" +"則產生變線寬的牆走線" msgid "Classic" msgstr "經典" @@ -10808,6 +10788,17 @@ msgstr "" "用於替換模型細小特徵（根據最小特徵尺寸）的牆線寬。如果牆最小線寬小於最小特徵" "的厚度，則牆將變得和特徵本身一樣厚。參數值表示為相對噴嘴直徑的百分比" +msgid "Detect narrow internal solid infill" +msgstr "識別狹窄內部實心填充" + +msgid "" +"This option will auto detect narrow internal solid infill area. If enabled, " +"concentric pattern will be used for the area to speed printing up. " +"Otherwise, rectilinear pattern is used defaultly." +msgstr "" +"此選項用於自動識別內部狹窄的實心填充。開啟後，將對狹窄實心區域使用同心填充加" +"快列印速度。否則使用預設的直線填充。" + #, fuzzy msgid "invalid value " msgstr "無效值" @@ -11501,8 +11492,8 @@ msgid "" "Only one of the results with the same name is saved. Are you sure you want " "to overrides the historical result?" msgstr "" -"已經存在一個具有相同名稱的校準結果：%s。相同名稱的結果只會儲存一個。確定要" -"覆蓋嗎？" +"已經存在一個具有相同名稱的校準結果：%s。相同名稱的結果只會儲存一個。確定要覆" +"蓋嗎？" msgid "Please find the best line on your plate" msgstr "請在您的列印板上找到最佳線條" @@ -12232,7 +12223,8 @@ msgid "" "the printing surface, it's recommended to use a brim?" msgstr "" "使用 Brim（裙邊）\n" -"您知道嗎？當模型與熱床表面的接觸面積較小時，建議使用 brim（裙邊）以提高列印成功率。" +"您知道嗎？當模型與熱床表面的接觸面積較小時，建議使用 brim（裙邊）以提高列印成" +"功率。" #: resources/data/hints.ini: [hint:Set parameters for multiple objects] #, fuzzy @@ -12285,177 +12277,185 @@ msgstr "" "當列印較低溫度的耗材時，打開印表機門可以減少擠出機或熱端堵塞的可能性。 有關此" "內容的更多信息，請參見 Wiki。" -msgid "The minimum printing speed when slow down for cooling" -msgstr "自動冷卻降速的最小列印速度" +#~ msgid "" +#~ "Orca Slicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "Orca Slicer 設定檔可能已損壞而無法解析。請刪除此檔案並重新啟動 Orca " +#~ "Slicer。" -msgid "" -"There are currently no identical spare consumables available, and automatic " -"replenishment is currently not possible. \n" -"(Currently supporting automatic supply of consumables with the same brand, " -"material type, and color)" -msgstr "" -"目前無相同的備用線材，暫時無法自動補充線材。\n" -"（目前支援品牌、線材種類、顏色相同的線材的自動補給）" +#~ msgid "Online Models" +#~ msgstr "線上模型" -msgid "Invalid nozzle diameter" -msgstr "無效的噴嘴口徑" +#, fuzzy +#~ msgid "Show online staff-picked models on the home page" +#~ msgstr "在首頁上顯示工作人員推薦的線上模型" -msgid "" -"The bed temperature exceeds filament's vitrification temperature. Please " -"open the front door of printer before printing to avoid nozzle clog." -msgstr "熱床溫度超過了線材的軟化溫度。請在列印前打開３Ｄ列印機前門以防堵頭。" +#, c-format +#~ msgid "" +#~ "Force cooling fan to be specific speed when overhang degree of printed " +#~ "part exceeds this value. Expressed as percentage which indicides how much " +#~ "width of the line without support from lower layer. 0%% means forcing " +#~ "cooling for all outer wall no matter how much overhang degree" +#~ msgstr "" +#~ "當列印物件的懸空程度超過此值時，強制冷卻風扇達到特定速度。\n" +#~ "用百分比表示，表明沒有下層支撐的線的寬度是多少。0%% 意味著無論懸空程度如" +#~ "何，都要對所有外壁強制冷卻。" -msgid "Ensure vertical shell thickness" -msgstr "確保垂直外殼厚度" +#~ msgid "The minimum printing speed when slow down for cooling" +#~ msgstr "自動冷卻降速的最小列印速度" -msgid "" -"Add solid infill near sloping surfaces to guarantee the vertical shell " -"thickness (top+bottom solid layers)" -msgstr "在斜面表面附近增加實心填充，以保證垂直外殼厚度（頂部+底部實心層）" +#~ msgid "" +#~ "There are currently no identical spare consumables available, and " +#~ "automatic replenishment is currently not possible. \n" +#~ "(Currently supporting automatic supply of consumables with the same " +#~ "brand, material type, and color)" +#~ msgstr "" +#~ "目前無相同的備用線材，暫時無法自動補充線材。\n" +#~ "（目前支援品牌、線材種類、顏色相同的線材的自動補給）" -msgid "Temperature of vitrificaiton" -msgstr "軟化溫度" +#~ msgid "Invalid nozzle diameter" +#~ msgstr "無效的噴嘴口徑" -msgid "" -"Material becomes soft at this temperature. Thus the heatbed cannot be hotter " -"than this tempature" -msgstr "材料在這個溫度開始變軟。因此熱床溫度不能超過這個溫度。" +#~ msgid "" +#~ "The bed temperature exceeds filament's vitrification temperature. Please " +#~ "open the front door of printer before printing to avoid nozzle clog." +#~ msgstr "" +#~ "熱床溫度超過了線材的軟化溫度。請在列印前打開３Ｄ列印機前門以防堵頭。" -msgid "Enable this option if machine has auxiliary part cooling fan" -msgstr "如果機器有輔助部件冷卻風扇，勾選該選項" +#~ msgid "Temperature of vitrificaiton" +#~ msgstr "軟化溫度" -msgid "" -"Speed of auxiliary part cooling fan. Auxiliary fan will run at this speed " -"during printing except the first several layers which is defined by no " -"cooling layers" -msgstr "" -"輔助部件冷卻風扇的轉速。輔助部件冷卻風扇將一直運行在該速度，除了設置的無需冷" -"卻的前若干層" +#~ msgid "" +#~ "Material becomes soft at this temperature. Thus the heatbed cannot be " +#~ "hotter than this tempature" +#~ msgstr "材料在這個溫度開始變軟。因此熱床溫度不能超過這個溫度。" -msgid "Detect narrow internal solid infill" -msgstr "識別狹窄內部實心填充" +#~ msgid "Enable this option if machine has auxiliary part cooling fan" +#~ msgstr "如果機器有輔助部件冷卻風扇，勾選該選項" -msgid "" -"This option will auto detect narrow internal solid infill area. If enabled, " -"concentric pattern will be used for the area to speed printing up. " -"Otherwise, rectilinear pattern is used defaultly." -msgstr "" -"此選項用於自動識別內部狹窄的實心填充。開啟後，將對狹窄實心區域使用同心填充加" -"快列印速度。否則使用預設的直線填充。" +#~ msgid "" +#~ "Speed of auxiliary part cooling fan. Auxiliary fan will run at this speed " +#~ "during printing except the first several layers which is defined by no " +#~ "cooling layers" +#~ msgstr "" +#~ "輔助部件冷卻風扇的轉速。輔助部件冷卻風扇將一直運行在該速度，除了設置的無需" +#~ "冷卻的前若干層" -msgid "" -"Filter out gaps smaller than the threshold specified. This setting won't " -"affect top/bottom layers" -msgstr "小於指定臨界值的微小間隙不填充。本設置不會對頂/底層起作用" +#~ msgid "" +#~ "Filter out gaps smaller than the threshold specified. This setting won't " +#~ "affect top/bottom layers" +#~ msgstr "小於指定臨界值的微小間隙不填充。本設置不會對頂/底層起作用" -msgid "Empty layers around bottom are replaced by nearest normal layers." -msgstr "底部出現空層，已被最近的正常層替換。" +#~ msgid "Empty layers around bottom are replaced by nearest normal layers." +#~ msgstr "底部出現空層，已被最近的正常層替換。" -msgid "The model has too many empty layers." -msgstr "模型有太多空層。" +#~ msgid "The model has too many empty layers." +#~ msgstr "模型有太多空層。" -msgid "Cali" -msgstr "校準" +#~ msgid "Cali" +#~ msgstr "校準" -msgid "Calibration of extrusion" -msgstr "擠出校準" +#~ msgid "Calibration of extrusion" +#~ msgstr "擠出校準" -msgid "Push new filament into the extruder" -msgstr "將新的線材推入擠出機" +#~ msgid "Push new filament into the extruder" +#~ msgstr "將新的線材推入擠出機" #, c-format, boost-format -msgid "" -"Bed temperature of other layer is lower than bed temperature of initial " -"layer for more than %d degree centigrade.\n" -"This may cause model broken free from build plate during printing" -msgstr "" -"其它層的熱床溫度比首層熱床溫度低太多，超過了攝氏 %d 度。\n" -"這可能導致列印中模型從熱床脫落" +#~ msgid "" +#~ "Bed temperature of other layer is lower than bed temperature of initial " +#~ "layer for more than %d degree centigrade.\n" +#~ "This may cause model broken free from build plate during printing" +#~ msgstr "" +#~ "其它層的熱床溫度比首層熱床溫度低太多，超過了攝氏 %d 度。\n" +#~ "這可能導致列印中模型從熱床脫落" -msgid "" -"Bed temperature is higher than vitrification temperature of this filament.\n" -"This may cause nozzle blocked and printing failure\n" -"Please keep the printer open during the printing process to ensure air " -"circulation or reduce the temperature of the hot bed" -msgstr "" -"熱床溫度超過了線材的軟化溫度，線材軟化可能造成噴頭堵塞。\n" -"請保持３Ｄ列印機在列印過程中敞開，保證空氣流通或降低熱床溫度" +#~ msgid "" +#~ "Bed temperature is higher than vitrification temperature of this " +#~ "filament.\n" +#~ "This may cause nozzle blocked and printing failure\n" +#~ "Please keep the printer open during the printing process to ensure air " +#~ "circulation or reduce the temperature of the hot bed" +#~ msgstr "" +#~ "熱床溫度超過了線材的軟化溫度，線材軟化可能造成噴頭堵塞。\n" +#~ "請保持３Ｄ列印機在列印過程中敞開，保證空氣流通或降低熱床溫度" -msgid "Total Time Estimation" -msgstr "總時間預估" +#~ msgid "Total Time Estimation" +#~ msgstr "總時間預估" -msgid "Resonance frequency identification" -msgstr "共振頻率辨識" +#~ msgid "Resonance frequency identification" +#~ msgstr "共振頻率辨識" -msgid "Immediately score" -msgstr "立即打分" +#~ msgid "Immediately score" +#~ msgstr "立即打分" -msgid "Please give a score for your favorite Bambu Market model." -msgstr "請為您喜歡的 Bambu 商城模型打分。" +#~ msgid "Please give a score for your favorite Bambu Market model." +#~ msgstr "請為您喜歡的 Bambu 商城模型打分。" -msgid "Score" -msgstr "打分" +#~ msgid "Score" +#~ msgstr "打分" -msgid "Bamabu Engineering Plate" -msgstr "工程列印熱床" +#~ msgid "Bamabu Engineering Plate" +#~ msgstr "工程列印熱床" -msgid "Bamabu High Temperature Plate" -msgstr "高溫列印熱床" +#~ msgid "Bamabu High Temperature Plate" +#~ msgstr "高溫列印熱床" -msgid "Can't connect to the printer" -msgstr "無法連接３Ｄ列印機" +#~ msgid "Can't connect to the printer" +#~ msgstr "無法連接３Ｄ列印機" -msgid "Recommended temperature range" -msgstr "建議溫度範圍" +#~ msgid "Recommended temperature range" +#~ msgstr "建議溫度範圍" -msgid "High Temp Plate" -msgstr "高溫列印熱床" +#~ msgid "High Temp Plate" +#~ msgstr "高溫列印熱床" -msgid "" -"Bed temperature when high temperature plate is installed. Value 0 means the " -"filament does not support to print on the High Temp Plate" -msgstr "安裝高溫列印熱床時的熱床溫度。0值表示這個線材不支援高溫列印熱床" +#~ msgid "" +#~ "Bed temperature when high temperature plate is installed. Value 0 means " +#~ "the filament does not support to print on the High Temp Plate" +#~ msgstr "安裝高溫列印熱床時的熱床溫度。0值表示這個線材不支援高溫列印熱床" -msgid "Internal bridge support thickness" -msgstr "內部橋接支撐厚度" +#~ msgid "Internal bridge support thickness" +#~ msgstr "內部橋接支撐厚度" -msgid "" -"If enabled, support loops will be generated under the contours of internal " -"bridges.These support loops could prevent internal bridges from extruding " -"over the air and improve the top surface quality, especially when the sparse " -"infill density is low.This value determines the thickness of the support " -"loops. 0 means disable this feature" -msgstr "" -"如果開啟， Orca Slicer 切片會沿著內部橋接的邊沿在其下方產生支撐輪廓。這些支撐" -"輪廓可以防止懸空地列印內部橋接並提高頂面質量，特別是在填充密度較低的情況下。" -"這個設置用於調整支撐輪廓的厚度，0表示關閉此特性。" +#~ msgid "" +#~ "If enabled, support loops will be generated under the contours of " +#~ "internal bridges.These support loops could prevent internal bridges from " +#~ "extruding over the air and improve the top surface quality, especially " +#~ "when the sparse infill density is low.This value determines the thickness " +#~ "of the support loops. 0 means disable this feature" +#~ msgstr "" +#~ "如果開啟， Orca Slicer 切片會沿著內部橋接的邊沿在其下方產生支撐輪廓。這些" +#~ "支撐輪廓可以防止懸空地列印內部橋接並提高頂面質量，特別是在填充密度較低的情" +#~ "況下。這個設置用於調整支撐輪廓的厚度，0表示關閉此特性。" -msgid "" -"Style and shape of the support. For normal support, projecting the supports " -"into a regular grid will create more stable supports (default), while snug " -"support towers will save material and reduce object scarring.\n" -"For tree support, slim style will merge branches more aggressively and save " -"a lot of material (default), while hybrid style will create similar " -"structure to normal support under large flat overhangs." -msgstr "" -"支撐物的樣式和形狀。對於普通支撐，將支撐投射到一個規則的網格中，將創建更穩定" -"的支撐（默認），而緊貼的支撐塔將節省材料並減少物體的瑕疵。\n" -"對於樹形支撐，苗條板的風格將更積極地合併樹枝，並節省大量的材料（默認），而混" -"合風格將在大的平面懸垂下創建與正常支撐類似的結構。" +#~ msgid "" +#~ "Style and shape of the support. For normal support, projecting the " +#~ "supports into a regular grid will create more stable supports (default), " +#~ "while snug support towers will save material and reduce object scarring.\n" +#~ "For tree support, slim style will merge branches more aggressively and " +#~ "save a lot of material (default), while hybrid style will create similar " +#~ "structure to normal support under large flat overhangs." +#~ msgstr "" +#~ "支撐物的樣式和形狀。對於普通支撐，將支撐投射到一個規則的網格中，將創建更穩" +#~ "定的支撐（默認），而緊貼的支撐塔將節省材料並減少物體的瑕疵。\n" +#~ "對於樹形支撐，苗條板的風格將更積極地合併樹枝，並節省大量的材料（默認），而" +#~ "混合風格將在大的平面懸垂下創建與正常支撐類似的結構。" -msgid "Target chamber temperature" -msgstr "目標腔體溫度" +#~ msgid "Target chamber temperature" +#~ msgstr "目標腔體溫度" -msgid "Bed temperature difference" -msgstr "熱床溫差" +#~ msgid "Bed temperature difference" +#~ msgstr "熱床溫差" -msgid "" -"Do not recommend bed temperature of other layer to be lower than initial " -"layer for more than this threshold. Too low bed temperature of other layer " -"may cause the model broken free from build plate" -msgstr "" -"不建議其它層熱床溫度比首層的熱床溫度低於這個值。太低的其它層熱床溫度可能導致" -"列印過程中模型從列印板脫落。" +#~ msgid "" +#~ "Do not recommend bed temperature of other layer to be lower than initial " +#~ "layer for more than this threshold. Too low bed temperature of other " +#~ "layer may cause the model broken free from build plate" +#~ msgstr "" +#~ "不建議其它層熱床溫度比首層的熱床溫度低於這個值。太低的其它層熱床溫度可能導" +#~ "致列印過程中模型從列印板脫落。" -msgid "Orient the model" -msgstr "旋轉模型" +#~ msgid "Orient the model" +#~ msgstr "旋轉模型" From df0a49a73d1c61ba6cfbebb61ea7719d8e8ab532 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 9 Nov 2023 20:54:33 +0800 Subject: [PATCH 20/47] Fix retraction issues --- src/libslic3r/Extruder.hpp | 5 ++--- src/libslic3r/GCode.hpp | 2 +- src/libslic3r/GCodeWriter.cpp | 6 +++--- src/libslic3r/libslic3r.h | 6 ++++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp index aa33891eee..d5066f91ec 100644 --- a/src/libslic3r/Extruder.hpp +++ b/src/libslic3r/Extruder.hpp @@ -22,9 +22,8 @@ public: } else { m_E = 0; m_retracted = 0; - m_restart_extra = 0; } - + m_restart_extra = 0; m_absolute_E = 0; } @@ -34,7 +33,7 @@ public: double retract(double length, double restart_extra); double unretract(); double E() const { return m_share_extruder ? m_share_E : m_E; } - void reset_E() { m_E = 0.; m_share_E = 0.; } + void reset_E() { reset(); } double e_per_mm(double mm3_per_mm) const { return mm3_per_mm * m_e_per_mm3; } double e_per_mm3() const { return m_e_per_mm3; } // Used filament volume in mm^3. diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 08c806a581..9fc63f63be 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -213,7 +213,7 @@ public: std::string travel_to(const Point& point, ExtrusionRole role, std::string comment); bool needs_retraction(const Polyline& travel, ExtrusionRole role, LiftType& lift_type); - std::string retract(bool toolchange = false, bool is_last_retraction = false, LiftType lift_type = LiftType::SpiralLift); + std::string retract(bool toolchange = false, bool is_last_retraction = false, LiftType lift_type = LiftType::NormalLift); std::string unretract() { return m_writer.unlift() + m_writer.unretract(); } std::string set_extruder(unsigned int extruder_id, double print_z); bool is_BBL_Printer(); diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp index d93a8af119..76ac289ae7 100644 --- a/src/libslic3r/GCodeWriter.cpp +++ b/src/libslic3r/GCodeWriter.cpp @@ -320,7 +320,7 @@ std::string GCodeWriter::reset_e(bool force) return ""; if (m_extruder != nullptr) { - if (m_extruder->E() == 0. && ! force) + if (is_zero(m_extruder->E()) && ! force) return ""; m_extruder->reset_E(); } @@ -709,7 +709,7 @@ std::string GCodeWriter::_retract(double length, double restart_extra, const std length = 1; std::string gcode; - if (double dE = m_extruder->retract(length, restart_extra); dE != 0) { + if (double dE = m_extruder->retract(length, restart_extra); !is_zero(dE)) { if (this->config.use_firmware_retraction) { gcode = FLAVOR_IS(gcfMachinekit) ? "G22 ; retract\n" : "G10 ; retract\n"; } @@ -737,7 +737,7 @@ std::string GCodeWriter::unretract() if (FLAVOR_IS(gcfMakerWare)) gcode = "M101 ; extruder on\n"; - if (double dE = m_extruder->unretract(); dE != 0) { + if (double dE = m_extruder->unretract(); !is_zero(dE)) { if (this->config.use_firmware_retraction) { gcode += FLAVOR_IS(gcfMachinekit) ? "G23 ; unretract\n" : "G11 ; unretract\n"; gcode += this->reset_e(); diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index ea218dced5..fa59415d4f 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -278,6 +278,12 @@ constexpr inline T sqr(T x) return x * x; } +template constexpr +inline bool is_zero(Number value) +{ + return std::fabs(double(value)) < 1e-6; +} + template constexpr inline T lerp(const T& a, const T& b, Number t) { From 22abe8cc9d74ea36ed3f229edd94aaa5ead09dea Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 9 Nov 2023 22:09:41 +0800 Subject: [PATCH 21/47] Automatically recover from corrupted config file --- src/slic3r/GUI/GUI_App.cpp | 17 ++++++++++++----- src/slic3r/GUI/GUI_App.hpp | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index b49dda3fbd..b9d3a8cd74 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2122,16 +2122,15 @@ void GUI_App::init_app_config() app_config = new AppConfig(); //app_config = new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer); + m_config_corrupted = false; // load settings m_app_conf_exists = app_config->exists(); if (m_app_conf_exists) { std::string error = app_config->load(); if (!error.empty()) { - // Error while parsing config file. We'll customize the error message and rethrow to be displayed. - throw Slic3r::RuntimeError( - _u8L("OrcaSlicer configuration file may be corrupted and is not abled to be parsed." - "Please delete the file and try again.") + - "\n\n" + app_config->config_path() + "\n\n" + error); + // Orca: if the config file is corrupted, we will show a error dialog and create a default config file. + m_config_corrupted = true; + } // Save orig_version here, so its empty if no app_config existed before this run. m_last_config_version = app_config->orig_version();//parse_semver_from_ini(app_config->config_path()); @@ -2748,6 +2747,7 @@ bool GUI_App::on_init_inner() if (m_post_initialized && app_config->dirty()) app_config->save(); + }); m_initialized = true; @@ -2755,6 +2755,13 @@ bool GUI_App::on_init_inner() flush_logs(); BOOST_LOG_TRIVIAL(info) << "finished the gui app init"; + if (m_config_corrupted) { + m_config_corrupted = false; + show_error(nullptr, + _u8L( + "The OrcaSlicer configuration file may be corrupted and cannot be parsed.\nOrcaSlicer has attempted to recreate the " + "configuration file.\nPlease note, application settings will be lost, but printer profiles will not be affected.")); + } //BBS: delete splash screen delete scrn; return true; diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 44411b361c..2defd53a5d 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -656,6 +656,7 @@ private: bool m_datadir_redefined { false }; std::string m_older_data_dir_path; boost::optional m_last_config_version; + bool m_config_corrupted { false }; }; DECLARE_APP(GUI_App) From cd8f555714cbb42462555ab20bfb5906e6bb3931 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Thu, 9 Nov 2023 22:19:40 +0800 Subject: [PATCH 22/47] Fix some gui issues (#2653) * Fix text gizmo input dialog caption alignment * Fix issue that layer slider top/bottom label left edge been cut by draw region (#2603) --- src/slic3r/GUI/Gizmos/GLGizmoText.cpp | 43 +++++++++++++++++---------- src/slic3r/GUI/IMSlider.cpp | 2 +- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index 553b477b32..8726d73146 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -147,6 +147,17 @@ bool GLGizmoText::on_init() reset_text_info(); + m_desc["font"] = _L("Font"); + m_desc["size"] = _L("Size"); + m_desc["thickness"] = _L("Thickness"); + m_desc["text_gap"] = _L("Text Gap"); + m_desc["angle"] = _L("Angle"); + m_desc["embeded_depth"] = _L("Embeded\ndepth"); + m_desc["input_text"] = _L("Input text"); + + m_desc["surface"] = _L("Surface"); + m_desc["horizontal_text"] = _L("Horizontal text"); + m_desc["rotate_text_caption"] = _L("Shift + Mouse move up or dowm"); m_desc["rotate_text"] = _L("Rotate text"); @@ -669,13 +680,13 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ImGui::PushStyleVar(ImGuiStyleVar_ScrollbarSize, 4.0f * currt_scale); GizmoImguiBegin("Text", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar); - float space_size = m_imgui->get_style_scaling() * 8; - float font_cap = m_imgui->calc_text_size(_L("Font")).x; - float size_cap = m_imgui->calc_text_size(_L("Size")).x; - float thickness_cap = m_imgui->calc_text_size(_L("Thickness")).x; - float input_cap = m_imgui->calc_text_size(_L("Input text")).x; - float depth_cap = m_imgui->calc_text_size(_L("Embeded")).x; - float caption_size = std::max(std::max(font_cap, size_cap), std::max(depth_cap, input_cap)) + space_size + ImGui::GetStyle().WindowPadding.x; + const float space_size = m_imgui->get_style_scaling() * 8; + const std::array cap_array = std::array{ "font", "size", "thickness", "text_gap", "angle", "embeded_depth", "input_text" }; + float caption_size = 0.0f; + for (const auto &t : cap_array) { + caption_size = std::max(caption_size, m_imgui->calc_text_size(m_desc[t]).x); + } + caption_size += space_size + ImGui::GetStyle().WindowPadding.x; float input_text_size = m_imgui->scaled(10.0f); float button_size = ImGui::GetFrameHeight(); @@ -702,7 +713,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Font")); + m_imgui->text(m_desc["font"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(list_width); push_combo_style(currt_scale); @@ -742,7 +753,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ImGui::PopStyleVar(2); pop_combo_style(); ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Size")); + m_imgui->text(m_desc["size"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(input_size); if(ImGui::InputFloat("###font_size", &m_font_size, 0.0f, 0.0f, "%.2f")) @@ -769,7 +780,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ImGui::PopStyleVar(3); ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Thickness")); + m_imgui->text(m_desc["thickness"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(list_width); float old_value = m_thickness; @@ -784,7 +795,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) const float drag_left_width = caption_size + slider_width + space_size; ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Text Gap")); + m_imgui->text(m_desc["text_gap"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(slider_width); if (m_imgui->bbl_slider_float_style("##text_gap", &m_text_gap, -100, 100, "%.2f", 1.0f, true)) @@ -795,7 +806,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) m_need_update_text = true; ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Angle")); + m_imgui->text(m_desc["angle"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(slider_width); if (m_imgui->bbl_slider_float_style("##angle", &m_rotate_angle, 0, 360, "%.2f", 1.0f, true)) @@ -806,7 +817,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) m_need_update_text = true; ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Embeded\ndepth")); + m_imgui->text(m_desc["embeded_depth"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(list_width); old_value = m_embeded_depth; @@ -817,7 +828,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) m_need_update_text = true; ImGui::AlignTextToFramePadding(); - m_imgui->text(_L("Input text")); + m_imgui->text(m_desc["input_text"]); ImGui::SameLine(caption_size); ImGui::PushItemWidth(list_width); @@ -835,12 +846,12 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ImGui::SameLine(caption_size); ImGui::AlignTextToFramePadding(); - if (m_imgui->bbl_checkbox(_L("Surface"), m_is_surface_text)) + if (m_imgui->bbl_checkbox(m_desc["surface"], m_is_surface_text)) m_need_update_text = true; ImGui::SameLine(); ImGui::AlignTextToFramePadding(); - if (m_imgui->bbl_checkbox(_L("Horizontal text"), m_keep_horizontal)) + if (m_imgui->bbl_checkbox(m_desc["horizontal_text"], m_keep_horizontal)) m_need_update_text = true; //ImGui::SameLine(); diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index 7987ea7862..0c8094a4bb 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -16,7 +16,7 @@ constexpr double miscalculation = scale_(scale_(1)); // equal to 1 mm2 static const float LEFT_MARGIN = 13.0f + 100.0f; // avoid thumbnail toolbar static const float HORIZONTAL_SLIDER_WINDOW_HEIGHT = 64.0f; -static const float VERTICAL_SLIDER_WINDOW_WIDTH = 124.0f; +static const float VERTICAL_SLIDER_WINDOW_WIDTH = 160.0f; static const float GROOVE_WIDTH = 12.0f; static const ImVec2 ONE_LAYER_MARGIN = ImVec2(20.0f, 20.0f); static const ImVec2 ONE_LAYER_BUTTON_SIZE = ImVec2(28.0f, 28.0f); From 333287535bf752bd2e3430d328940c52231ffac2 Mon Sep 17 00:00:00 2001 From: Hukete <100949318+Hukete@users.noreply.github.com> Date: Thu, 9 Nov 2023 22:20:14 +0800 Subject: [PATCH 23/47] Update fdm_filament_pla.json (#2657) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 10-25 Add TPU-95A HF * 1030 Adding Introduction of Chamber Temperature Control Macros(M191) to Notes * 1102 Add ABS-GF10 profile， Remove a extra "s" from the "0.36mm Standard @Qidi XPlus3 0.6 nozzle.json" file * 1106 Add the PA value to some genetic filament profiles * Update fdm_filament_pla.json Change the fan rate of begin layers --- resources/profiles/Qidi/filament/fdm_filament_pla.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/profiles/Qidi/filament/fdm_filament_pla.json b/resources/profiles/Qidi/filament/fdm_filament_pla.json index d72b51ae86..8a82c3711e 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_pla.json +++ b/resources/profiles/Qidi/filament/fdm_filament_pla.json @@ -65,7 +65,10 @@ "50%" ], "close_fan_the_first_x_layers": [ - "1" + "2" + ], + "full_fan_speed_layer": [ + "4" ], "nozzle_temperature": [ "220" From f16feff2a4951bc38fc75b49bb859d9f38d2f553 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Thu, 9 Nov 2023 22:21:44 +0800 Subject: [PATCH 24/47] Fixes scars on thing walls when "avoid crossing wall" is turned on (#2659) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Travel very close to the inner holes, could cross external perimeter when the avoid crossing perimeters was enabled. (cherry picked from commit prusa3d/PrusaSlicer@6c51e5148c0fca15c869d344e081aad249b0244f) * Modified variable offset in the avoid crossing perimeters to not cause scars on thin objects (#7699). Previously, the minimum contour width was chosen too conservative and, on some thin objects, only allowed minimal (or non) offset. This could result in travels being planned along the outer perimeter. Now, the minimum contour width is chosen much smaller at the start and tested if the variable offset wasn't failed (the outer contour broke up into more parts, more or fewer holes, etc.). If any problem is detected, the variable offset is recalculated with a larger minimum contour width. (cherry picked from commit prusa3d/PrusaSlicer@dc00f0bf983902a6cb81503afa78be4a0ccafb71) --------- Co-authored-by: Lukáš Hejl --- .../GCode/AvoidCrossingPerimeters.cpp | 261 +++++++++++------- .../GCode/AvoidCrossingPerimeters.hpp | 9 +- 2 files changed, 168 insertions(+), 102 deletions(-) diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp index 4d9f3dcf1b..0598db3b17 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp @@ -1,3 +1,7 @@ +///|/ Copyright (c) Prusa Research 2020 - 2022 Vojtěch Bubník @bubnikv, Lukáš Hejl @hejllukas +///|/ +///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher +///|/ #include "../Layer.hpp" #include "../GCode.hpp" #include "../EdgeGrid.hpp" @@ -13,6 +17,8 @@ #include #include +//#define AVOID_CROSSING_PERIMETERS_DEBUG_OUTPUT + namespace Slic3r { struct TravelPoint @@ -20,6 +26,8 @@ struct TravelPoint Point point; // Index of the polygon containing this point. A negative value indicates that the point is not on any border. int border_idx; + // simplify_travel() doesn't remove this point. + bool do_not_remove = false; }; struct Intersection @@ -32,6 +40,8 @@ struct Intersection Point point; // Distance from the first point in the corresponding boundary float distance; + // simplify_travel() doesn't remove this point. + bool do_not_remove = false; }; struct ClosestLine @@ -207,8 +217,8 @@ static std::vector extend_for_closest_lines(const std::vector new_intersections; - new_intersections.push_back({cl_start.border_idx, cl_start.line_idx, cl_start.point, compute_distance(cl_start)}); - new_intersections.push_back({cl_end.border_idx, cl_end.line_idx, cl_end.point, compute_distance(cl_end)}); + new_intersections.push_back({cl_start.border_idx, cl_start.line_idx, cl_start.point, compute_distance(cl_start), true}); + new_intersections.push_back({cl_end.border_idx, cl_end.line_idx, cl_end.point, compute_distance(cl_end), true}); return new_intersections; } } @@ -259,7 +269,7 @@ static std::vector extend_for_closest_lines(const std::vector::max()) { // If there is any ClosestLine around the start point closer to the Intersection, then replace this Intersection with ClosestLine. const ClosestLine &cl_start = start_lines[cl_start_idx]; - new_intersections.front() = {cl_start.border_idx, cl_start.line_idx, cl_start.point, compute_distance(cl_start)}; + new_intersections.front() = {cl_start.border_idx, cl_start.line_idx, cl_start.point, compute_distance(cl_start), true}; } else { // Check if there is any ClosestLine with the same boundary_idx as any Intersection. If this ClosestLine exists, then add it to the // vector of intersections. This allows in some cases when it is more than one around ClosestLine start point chose that one which @@ -267,7 +277,7 @@ static std::vector extend_for_closest_lines(const std::vector::max()) ? start_lines[start_closest_lines_idx] : start_lines.front(); - new_intersections.insert(new_intersections.begin(),{cl_start.border_idx, cl_start.line_idx, cl_start.point, compute_distance(cl_start)}); + new_intersections.insert(new_intersections.begin(),{cl_start.border_idx, cl_start.line_idx, cl_start.point, compute_distance(cl_start), true}); } } @@ -276,7 +286,7 @@ static std::vector extend_for_closest_lines(const std::vector::max()) { // If there is any ClosestLine around the end point closer to the Intersection, then replace this Intersection with ClosestLine. const ClosestLine &cl_end = end_lines[cl_end_idx]; - new_intersections.back() = {cl_end.border_idx, cl_end.line_idx, cl_end.point, compute_distance(cl_end)}; + new_intersections.back() = {cl_end.border_idx, cl_end.line_idx, cl_end.point, compute_distance(cl_end), true}; } else { // Check if there is any ClosestLine with the same boundary_idx as any Intersection. If this ClosestLine exists, then add it to the // vector of intersections. This allows in some cases when it is more than one around ClosestLine end point chose that one which @@ -284,7 +294,7 @@ static std::vector extend_for_closest_lines(const std::vector::max()) ? end_lines[end_closest_lines_idx] : end_lines.front(); - new_intersections.push_back({cl_end.border_idx, cl_end.line_idx, cl_end.point, compute_distance(cl_end)}); + new_intersections.push_back({cl_end.border_idx, cl_end.line_idx, cl_end.point, compute_distance(cl_end), true}); } } return new_intersections; @@ -350,8 +360,6 @@ static Polyline to_polyline(const std::vector &travel) return result; } -// #define AVOID_CROSSING_PERIMETERS_DEBUG_OUTPUT - #ifdef AVOID_CROSSING_PERIMETERS_DEBUG_OUTPUT static void export_travel_to_svg(const Polygons &boundary, const Line &original_travel, @@ -359,16 +367,17 @@ static void export_travel_to_svg(const Polygons &boundary, const std::vector &intersections, const std::string &path) { - BoundingBox bbox = get_extents(boundary); + coordf_t stroke_width = scale_(0.05); + BoundingBox bbox = get_extents(boundary); ::Slic3r::SVG svg(path, bbox); - svg.draw_outline(boundary, "green"); - svg.draw(original_travel, "blue"); - svg.draw(result_travel, "red"); - svg.draw(original_travel.a, "black"); - svg.draw(original_travel.b, "grey"); + svg.draw_outline(boundary, "green", stroke_width); + svg.draw(original_travel, "blue", stroke_width); + svg.draw(result_travel, "red", stroke_width); + svg.draw(original_travel.a, "black", stroke_width); + svg.draw(original_travel.b, "grey", stroke_width); for (const Intersection &intersection : intersections) - svg.draw(intersection.point, "lightseagreen"); + svg.draw(intersection.point, "lightseagreen", stroke_width); } static void export_travel_to_svg(const Polygons &boundary, @@ -433,21 +442,30 @@ static std::vector simplify_travel(const AvoidCrossingPerimeters::B visitor.pt_current = ¤t_point; - for (size_t point_idx_2 = point_idx + 1; point_idx_2 < travel.size(); ++point_idx_2) { - if (travel[point_idx_2].point == current_point) { - next = travel[point_idx_2]; - point_idx = point_idx_2; - continue; - } + if (!next.do_not_remove) + for (size_t point_idx_2 = point_idx + 1; point_idx_2 < travel.size(); ++point_idx_2) { + // Workaround for some issue in MSVC 19.29.30037 32-bit compiler. +#if defined(_WIN32) && !defined(_WIN64) + if (bool volatile do_not_remove = travel[point_idx_2].do_not_remove; do_not_remove) + break; +#else + if (travel[point_idx_2].do_not_remove) + break; +#endif + if (travel[point_idx_2].point == current_point) { + next = travel[point_idx_2]; + point_idx = point_idx_2; + continue; + } - visitor.pt_next = &travel[point_idx_2].point; - boundary.grid.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); - // Check if deleting point causes crossing a boundary - if (!visitor.intersect) { - next = travel[point_idx_2]; - point_idx = point_idx_2; + visitor.pt_next = &travel[point_idx_2].point; + boundary.grid.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); + // Check if deleting point causes crossing a boundary + if (!visitor.intersect) { + next = travel[point_idx_2]; + point_idx = point_idx_2; + } } - } simplified_path.emplace_back(next); } @@ -473,7 +491,7 @@ static float get_perimeter_spacing(const Layer &layer) size_t regions_count = 0; float perimeter_spacing = 0.f; for (const LayerRegion *layer_region : layer.regions()) - if (layer_region != nullptr && !layer_region->slices.empty()) { + if (layer_region != nullptr && ! layer_region->slices.empty()) { perimeter_spacing += layer_region->flow(frPerimeter).scaled_spacing(); ++regions_count; } @@ -494,7 +512,7 @@ static float get_perimeter_spacing_external(const Layer &layer) for (const PrintObject *object : layer.object()->print()->objects()) if (const Layer *l = object->get_layer_at_printz(layer.print_z, EPSILON); l) for (const LayerRegion *layer_region : l->regions()) - if (layer_region != nullptr && !layer_region->slices.empty()) { + if (layer_region != nullptr && ! layer_region->slices.empty()) { perimeter_spacing += layer_region->flow(frPerimeter).scaled_spacing(); ++ regions_count; } @@ -507,6 +525,25 @@ static float get_perimeter_spacing_external(const Layer &layer) return perimeter_spacing; } +// Returns average perimeter width calculated from all LayerRegion within the layer. +static float get_external_perimeter_width(const Layer &layer) +{ + size_t regions_count = 0; + float perimeter_width = 0.f; + for (const LayerRegion *layer_region : layer.regions()) + if (layer_region != nullptr && ! layer_region->slices.empty()) { + perimeter_width += float(layer_region->flow(frExternalPerimeter).scaled_width()); + ++regions_count; + } + + assert(perimeter_width >= 0.f); + if (regions_count != 0) + perimeter_width /= float(regions_count); + else + perimeter_width = get_default_perimeter_spacing(*layer.object()); + return perimeter_width; +} + // Called by avoid_perimeters() and by simplify_travel_heuristics(). static size_t avoid_perimeters_inner(const AvoidCrossingPerimeters::Boundary &boundary, const Point &start, @@ -566,7 +603,7 @@ static size_t avoid_perimeters_inner(const AvoidCrossingPerimeters::Boundary &bo // Offset of the polygon's point using get_middle_point_offset is used to simplify the calculation of intersection between the // boundary and the travel. The appended point is translated in the direction of inward normal. This translation ensures that the // appended point will be inside the polygon and not on the polygon border. - result.push_back({get_middle_point_offset(boundaries[intersection_first.border_idx], left_idx, right_idx, intersection_first.point, coord_t(SCALED_EPSILON)), int(intersection_first.border_idx)}); + result.push_back({get_middle_point_offset(boundaries[intersection_first.border_idx], left_idx, right_idx, intersection_first.point, coord_t(SCALED_EPSILON)), int(intersection_first.border_idx), intersection_first.do_not_remove}); // Check if intersection line also exit the boundary polygon if (it_second_r != it_last_item) { @@ -590,7 +627,7 @@ static size_t avoid_perimeters_inner(const AvoidCrossingPerimeters::Boundary &bo // Append the farthest intersection into the path left_idx = intersection_second.line_idx; right_idx = (intersection_second.line_idx >= (boundaries[intersection_second.border_idx].points.size() - 1)) ? 0 : (intersection_second.line_idx + 1); - result.push_back({get_middle_point_offset(boundaries[intersection_second.border_idx], left_idx, right_idx, intersection_second.point, coord_t(SCALED_EPSILON)), int(intersection_second.border_idx)}); + result.push_back({get_middle_point_offset(boundaries[intersection_second.border_idx], left_idx, right_idx, intersection_second.point, coord_t(SCALED_EPSILON)), int(intersection_second.border_idx), intersection_second.do_not_remove}); // Skip intersections in between it_first = it_second; } @@ -645,22 +682,22 @@ static size_t avoid_perimeters(const AvoidCrossingPerimeters::Boundary &boundary // Check if anyone of ExPolygons contains whole travel. // called by need_wipe() and AvoidCrossingPerimeters::travel_to() // FIXME Lukas H.: Maybe similar approach could also be used for ExPolygon::contains() -static bool any_expolygon_contains(const ExPolygons &ex_polygons, - const std::vector &ex_polygons_bboxes, - const EdgeGrid::Grid &grid_lslice, +static bool any_expolygon_contains(const ExPolygons &lslices_offset, + const std::vector &lslices_offset_bboxes, + const EdgeGrid::Grid &grid_lslices_offset, const Line &travel) { - assert(ex_polygons.size() == ex_polygons_bboxes.size()); - if(!grid_lslice.bbox().contains(travel.a) || !grid_lslice.bbox().contains(travel.b)) + assert(lslices_offset.size() == lslices_offset_bboxes.size()); + if(!grid_lslices_offset.bbox().contains(travel.a) || !grid_lslices_offset.bbox().contains(travel.b)) return false; - FirstIntersectionVisitor visitor(grid_lslice); + FirstIntersectionVisitor visitor(grid_lslices_offset); visitor.pt_current = &travel.a; visitor.pt_next = &travel.b; - grid_lslice.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); + grid_lslices_offset.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); if (!visitor.intersect) { - for (const ExPolygon &ex_polygon : ex_polygons) { - const BoundingBox &bbox = ex_polygons_bboxes[&ex_polygon - &ex_polygons.front()]; + for (const ExPolygon &ex_polygon : lslices_offset) { + const BoundingBox &bbox = lslices_offset_bboxes[&ex_polygon - &lslices_offset.front()]; if (bbox.contains(travel.a) && bbox.contains(travel.b) && ex_polygon.contains(travel.a)) return true; } @@ -670,18 +707,18 @@ static bool any_expolygon_contains(const ExPolygons &ex_polygons, // Check if anyone of ExPolygons contains whole travel. // called by need_wipe() -static bool any_expolygon_contains(const ExPolygons &ex_polygons, const std::vector &ex_polygons_bboxes, const EdgeGrid::Grid &grid_lslice, const Polyline &travel) +static bool any_expolygon_contains(const ExPolygons &ex_polygons, const std::vector &ex_polygons_bboxes, const EdgeGrid::Grid &grid_lslice_offset, const Polyline &travel) { assert(ex_polygons.size() == ex_polygons_bboxes.size()); - if(std::any_of(travel.points.begin(), travel.points.end(), [&grid_lslice](const Point &point) { return !grid_lslice.bbox().contains(point); })) + if(std::any_of(travel.points.begin(), travel.points.end(), [&grid_lslice_offset](const Point &point) { return !grid_lslice_offset.bbox().contains(point); })) return false; - FirstIntersectionVisitor visitor(grid_lslice); + FirstIntersectionVisitor visitor(grid_lslice_offset); bool any_intersection = false; for (size_t line_idx = 1; line_idx < travel.size(); ++line_idx) { visitor.pt_current = &travel.points[line_idx - 1]; visitor.pt_next = &travel.points[line_idx]; - grid_lslice.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); + grid_lslice_offset.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); any_intersection = visitor.intersect; if (any_intersection) break; } @@ -698,13 +735,13 @@ static bool any_expolygon_contains(const ExPolygons &ex_polygons, const std::vec } static bool need_wipe(const GCode &gcodegen, - const EdgeGrid::Grid &grid_lslice, - const Line &original_travel, - const Polyline &result_travel, - const size_t intersection_count) + const ExPolygons &lslices_offset, + const std::vector &lslices_offset_bboxes, + const EdgeGrid::Grid &grid_lslices_offset, + const Line &original_travel, + const Polyline &result_travel, + const size_t intersection_count) { - const ExPolygons &lslices = gcodegen.layer()->lslices; - const std::vector &lslices_bboxes = gcodegen.layer()->lslices_bboxes; bool z_lift_enabled = gcodegen.config().z_hop.get_at(gcodegen.writer().extruder()->id()) > 0.; bool wipe_needed = false; @@ -714,16 +751,16 @@ static bool need_wipe(const GCode &gcodegen, // The original layer is intersected with defined boundaries. Then it is necessary to make a detailed test. // If the z-lift is enabled, then a wipe is needed when the original travel leads above the holes. if (z_lift_enabled) { - if (any_expolygon_contains(lslices, lslices_bboxes, grid_lslice, original_travel)) { + if (any_expolygon_contains(lslices_offset, lslices_offset_bboxes, grid_lslices_offset, original_travel)) { // Check if original_travel and result_travel are not same. // If both are the same, then it is possible to skip testing of result_travel wipe_needed = !(result_travel.size() > 2 && result_travel.first_point() == original_travel.a && result_travel.last_point() == original_travel.b) && - !any_expolygon_contains(lslices, lslices_bboxes, grid_lslice, result_travel); + !any_expolygon_contains(lslices_offset, lslices_offset_bboxes, grid_lslices_offset, result_travel); } else { wipe_needed = true; } } else { - wipe_needed = !any_expolygon_contains(lslices, lslices_bboxes, grid_lslice, result_travel); + wipe_needed = !any_expolygon_contains(lslices_offset, lslices_offset_bboxes, grid_lslices_offset, result_travel); } } @@ -945,55 +982,71 @@ static std::vector contour_distance(const EdgeGrid::Grid &grid, // ExPolygons are handled one by one so returned ExPolygons could intersect. static ExPolygons inner_offset(const ExPolygons &ex_polygons, double offset) { - double min_contour_width = 2. * offset + SCALED_EPSILON; - double search_radius = 2. * (offset + min_contour_width); - ExPolygons ex_poly_result = ex_polygons; + const std::vector min_contour_width_values = {offset / 2., offset, 2. * offset + SCALED_EPSILON}; + ExPolygons ex_poly_result = ex_polygons; resample_expolygons(ex_poly_result, offset / 2, scaled(0.5)); for (ExPolygon &ex_poly : ex_poly_result) { BoundingBox bbox(get_extents(ex_poly)); bbox.offset(SCALED_EPSILON); - EdgeGrid::Grid grid; - grid.set_bbox(bbox); - grid.create(ex_poly, coord_t(0.7 * search_radius)); - std::vector> ex_poly_distances; - precompute_expolygon_distances(ex_poly, ex_poly_distances); + // Filter out expolygons smaller than 0.1mm^2 + if (Vec2d bbox_size = bbox.size().cast(); bbox_size.x() * bbox_size.y() < Slic3r::sqr(scale_(0.1f))) + continue; - std::vector> offsets; - offsets.reserve(ex_poly.holes.size() + 1); - for (size_t idx_contour = 0; idx_contour <= ex_poly.holes.size(); ++idx_contour) { - const Polygon &poly = (idx_contour == 0) ? ex_poly.contour : ex_poly.holes[idx_contour - 1]; - assert(poly.is_counter_clockwise() == (idx_contour == 0)); - std::vector distances = contour_distance(grid, ex_poly_distances[idx_contour], idx_contour, poly, offset, search_radius); - for (float &distance : distances) { - if (distance < min_contour_width) - distance = 0.f; - else if (distance > min_contour_width + 2. * offset) - distance = - float(offset); - else - distance = - (distance - float(min_contour_width)) / 2.f; - } - offsets.emplace_back(distances); - } + for (const double &min_contour_width : min_contour_width_values) { + const size_t min_contour_width_idx = &min_contour_width - &min_contour_width_values.front(); + const double search_radius = 2. * (offset + min_contour_width); - ExPolygons offset_ex_poly = variable_offset_inner_ex(ex_poly, offsets); - // If variable_offset_inner_ex produces empty result, then original ex_polygon is used - if (offset_ex_poly.size() == 1) { - ex_poly = std::move(offset_ex_poly.front()); - } else if (offset_ex_poly.size() > 1) { - // fix_after_inner_offset called inside variable_offset_inner_ex sometimes produces - // tiny artefacts polygons, so these artefacts are removed. - double max_area = offset_ex_poly.front().area(); - size_t max_area_idx = 0; - for (size_t poly_idx = 1; poly_idx < offset_ex_poly.size(); ++poly_idx) { - double area = offset_ex_poly[poly_idx].area(); - if (max_area < area) { - max_area = area; - max_area_idx = poly_idx; + EdgeGrid::Grid grid; + grid.set_bbox(bbox); + grid.create(ex_poly, coord_t(0.7 * search_radius)); + + std::vector> ex_poly_distances; + precompute_expolygon_distances(ex_poly, ex_poly_distances); + + std::vector> offsets; + offsets.reserve(ex_poly.holes.size() + 1); + for (size_t idx_contour = 0; idx_contour <= ex_poly.holes.size(); ++idx_contour) { + const Polygon &poly = (idx_contour == 0) ? ex_poly.contour : ex_poly.holes[idx_contour - 1]; + assert(poly.is_counter_clockwise() == (idx_contour == 0)); + std::vector distances = contour_distance(grid, ex_poly_distances[idx_contour], idx_contour, poly, offset, search_radius); + for (float &distance : distances) { + if (distance < min_contour_width) + distance = 0.f; + else if (distance > min_contour_width + 2. * offset) + distance = -float(offset); + else + distance = -(distance - float(min_contour_width)) / 2.f; } + offsets.emplace_back(distances); + } + + ExPolygons offset_ex_poly = variable_offset_inner_ex(ex_poly, offsets); + // If variable_offset_inner_ex produces empty result, then original ex_polygon is used + if (offset_ex_poly.size() == 1 && offset_ex_poly.front().holes.size() == ex_poly.holes.size()) { + ex_poly = std::move(offset_ex_poly.front()); + break; + } else if ((min_contour_width_idx + 1) < min_contour_width_values.size()) { + continue; // Try the next round with bigger min_contour_width. + } else if (offset_ex_poly.size() == 1) { + ex_poly = std::move(offset_ex_poly.front()); + break; + } else if (offset_ex_poly.size() > 1) { + // fix_after_inner_offset called inside variable_offset_inner_ex sometimes produces + // tiny artefacts polygons, so these artefacts are removed. + double max_area = offset_ex_poly.front().area(); + size_t max_area_idx = 0; + for (size_t poly_idx = 1; poly_idx < offset_ex_poly.size(); ++poly_idx) { + double area = offset_ex_poly[poly_idx].area(); + if (max_area < area) { + max_area = area; + max_area_idx = poly_idx; + } + } + ex_poly = std::move(offset_ex_poly[max_area_idx]); + break; } - ex_poly = std::move(offset_ex_poly[max_area_idx]); } } return ex_poly_result; @@ -1133,10 +1186,8 @@ Polyline AvoidCrossingPerimeters::travel_to(const GCode &gcodegen, const Point & Vec2d startf = start.cast(); Vec2d endf = end .cast(); - const ExPolygons &lslices = gcodegen.layer()->lslices; - const std::vector &lslices_bboxes = gcodegen.layer()->lslices_bboxes; - bool is_support_layer = (dynamic_cast(gcodegen.layer()) != nullptr); - if (!use_external && (is_support_layer || (!lslices.empty() && !any_expolygon_contains(lslices, lslices_bboxes, m_grid_lslice, travel)))) { + bool is_support_layer = dynamic_cast(gcodegen.layer()) != nullptr; + if (!use_external && (is_support_layer || (!m_lslices_offset.empty() && !any_expolygon_contains(m_lslices_offset, m_lslices_offset_bboxes, m_grid_lslices_offset, travel)))) { // Initialize m_internal only when it is necessary. if (m_internal.boundaries.empty()) init_boundary(&m_internal, to_polygons(get_boundary(*gcodegen.layer()))); @@ -1186,7 +1237,7 @@ Polyline AvoidCrossingPerimeters::travel_to(const GCode &gcodegen, const Point & } else if (max_detour_length_exceeded) { *could_be_wipe_disabled = false; } else - *could_be_wipe_disabled = !need_wipe(gcodegen, m_grid_lslice, travel, result_pl, travel_intersection_count); + *could_be_wipe_disabled = !need_wipe(gcodegen, m_lslices_offset, m_lslices_offset_bboxes, m_grid_lslices_offset, travel, result_pl, travel_intersection_count); return result_pl; } @@ -1197,13 +1248,21 @@ void AvoidCrossingPerimeters::init_layer(const Layer &layer) { m_internal.clear(); m_external.clear(); + m_lslices_offset.clear(); + m_lslices_offset_bboxes.clear(); + + float perimeter_offset = -get_external_perimeter_width(layer) / float(2.); + m_lslices_offset = offset_ex(layer.lslices, perimeter_offset); + + m_lslices_offset_bboxes.reserve(m_lslices_offset.size()); + for (const ExPolygon &ex_poly : m_lslices_offset) + m_lslices_offset_bboxes.emplace_back(get_extents(ex_poly)); BoundingBox bbox_slice(get_extents(layer.lslices)); bbox_slice.offset(SCALED_EPSILON); - m_grid_lslice.set_bbox(bbox_slice); - //FIXME 1mm grid? - m_grid_lslice.create(layer.lslices, coord_t(scale_(1.))); + m_grid_lslices_offset.set_bbox(bbox_slice); + m_grid_lslices_offset.create(m_lslices_offset, coord_t(scale_(1.))); } #if 0 diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp index b67642c5d8..5d85aace7f 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp @@ -1,3 +1,7 @@ +///|/ Copyright (c) Prusa Research 2020 - 2022 Lukáš Hejl @hejllukas, Vojtěch Bubník @bubnikv +///|/ +///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher +///|/ #ifndef slic3r_AvoidCrossingPerimeters_hpp_ #define slic3r_AvoidCrossingPerimeters_hpp_ @@ -58,8 +62,11 @@ private: // we enable it by default for the first travel move in print bool m_disabled_once { true }; + // Lslices offseted by half an external perimeter width. Used for detection if line or polyline is inside of any polygon. + ExPolygons m_lslices_offset; + std::vector m_lslices_offset_bboxes; // Used for detection of line or polyline is inside of any polygon. - EdgeGrid::Grid m_grid_lslice; + EdgeGrid::Grid m_grid_lslices_offset; // Store all needed data for travels inside object Boundary m_internal; // Store all needed data for travels outside object From 97502df924cb89209ef559d8ca18171eabf9ea16 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Thu, 9 Nov 2023 22:22:43 +0800 Subject: [PATCH 25/47] Fix cli segfault (#2661) (#2665) --- src/slic3r/GUI/PartPlate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index bd86ceaa3d..d07895b3de 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -459,7 +459,7 @@ void PartPlate::calc_vertex_for_icons(int index, GeometryBuffer &buffer) ExPolygon poly; auto bed_ext = get_extents(m_shape); Vec2d p = bed_ext[2]; - if (m_plater->get_build_volume_type() == BuildVolume_Type::Circle) + if (m_plater && m_plater->get_build_volume_type() == BuildVolume_Type::Circle) p[1] -= std::max( 0.0, (bed_ext.size()(1) - 5 * PARTPLATE_ICON_SIZE - 4 * PARTPLATE_ICON_GAP_Y - PARTPLATE_ICON_GAP_TOP) / 2); From 2203131211f1559810ff0207e3619b64e4fb8d2b Mon Sep 17 00:00:00 2001 From: niklasb <58566859+niklasb22@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:23:43 +0100 Subject: [PATCH 26/47] Fix: Height range Modifier translation in German #2613 (#2668) Update OrcaSlicer_de.po --- localization/i18n/de/OrcaSlicer_de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 171270cfeb..1c69a1d007 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -148,7 +148,7 @@ msgid "Bucket fill" msgstr "Flächenfüllung" msgid "Height range" -msgstr "Höhenreichweite" +msgstr "Höhenbereich" msgid "Ctrl + Shift + Enter" msgstr "Strg + Umschalt + Eingabetaste" @@ -163,7 +163,7 @@ msgid "Triangle" msgstr "Dreieck" msgid "Height Range" -msgstr "Höhenreichweite" +msgstr "Höhenbereich" msgid "Vertical" msgstr "Vertikal" From 1b53d1b72d7dcb2222d13ad9e99a70ad1b71f5ac Mon Sep 17 00:00:00 2001 From: renemosner <99507763+renemosner@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:24:49 +0100 Subject: [PATCH 27/47] Update OrcaSlicer_cs.po (#2670) --- localization/i18n/cs/OrcaSlicer_cs.po | 68 +++++++++++++-------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index b4ece6ed9c..a70af652b0 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -1787,10 +1787,10 @@ msgid "An SD card needs to be inserted before printing via LAN." msgstr "Před tiskem přes LAN je třeba vložit SD kartu." msgid "Sending gcode file over LAN" -msgstr "Odesílání souboru gcode přes LAN" +msgstr "Odesílání souboru gkód přes LAN" msgid "Sending gcode file to sdcard" -msgstr "Odesílání souboru gcode na sdcard" +msgstr "Odesílání souboru gkód na sd kartu" #, c-format, boost-format msgid "Successfully sent. Close current page in %s s" @@ -2181,7 +2181,7 @@ msgid "" "(Currently supporting automatic supply of consumables with the same brand, " "material type, and color)" msgstr "" -"Pokud v AMS existují dva identické filameny, bude povolena záloha AMS " +"Pokud v AMS existují dva identické filamenty, bude povolena záloha AMS " "filamentu. \n" "(Aktuálně podporuje automatické doplňování spotřebního materiálu stejné " "značky, typu materiálu a barvy)" @@ -2333,7 +2333,7 @@ msgid "" "Error message: %1%.\n" "Source file %2%." msgstr "" -"Soubor gcode se nepodařilo uložit.\n" +"Soubor gkód se nepodařilo uložit.\n" "Chybová zpráva: %1%.\n" "Zdrojový soubor %2%." @@ -2524,7 +2524,7 @@ msgstr "" "typ časosběru je tradiční." msgid " But machines with I3 structure will not generate timelapse videos." -msgstr " Ale stroje s I3 strukturou nevytvoří timelapse videa." +msgstr " Ale stroje s I3 strukturou nevytvářejí časosběrná videa." msgid "" "Change these settings automatically? \n" @@ -2645,7 +2645,7 @@ msgid "Calibrating the micro lida" msgstr "Kalibrace mikro lida" msgid "Calibrating extrusion flow" -msgstr "Kalibrace extruze průtpku" +msgstr "Kalibrace extruze průtoku" msgid "Paused due to nozzle temperature malfunction" msgstr "Pozastaveno kvůli poruše teploty trysky" @@ -3449,7 +3449,7 @@ msgid "Export current sliced file" msgstr "Exportovat aktuální Slicovaný soubor" msgid "Export all plate sliced file" -msgstr "Exportovat všechny soubor slicované na pdložce" +msgstr "Exportovat všechny soubor slicované na podložce" msgid "Export G-code" msgstr "Exportovat G-kód" @@ -4132,7 +4132,7 @@ msgid " upload config prase failed\n" msgstr " nahrávání konfigurace se nepodařilo zpracovat\n" msgid " No corresponding storage bucket\n" -msgstr " Žádný odpovídající úložný bucket\n" +msgstr " Žádný odpovídající úložný prostor\n" msgid " can not be opened\n" msgstr " nelze otevřít\n" @@ -4366,7 +4366,7 @@ msgid "" "The application cannot run normally because OpenGL version is lower than " "2.0.\n" msgstr "" -"Aplikace nemůže běžet normálně, protože máte nižší verzi OpenGLnež 2.0.\n" +"Aplikace nemůže běžet normálně, protože máte nižší verzi OpenGL než 2.0.\n" msgid "Please upgrade your graphics card driver." msgstr "Prosím aktualizujte ovladač grafické karty." @@ -4808,7 +4808,7 @@ msgid "" "The loaded file contains gcode only, Can not enter the Prepare page" msgstr "" "Režim pouze náhled:\n" -"Načtený soubor obsahuje pouze gcode, nelze vstoupit na stránku Příprava" +"Načtený soubor obsahuje pouze gkód, nelze vstoupit na stránku Příprava" msgid "You can keep the modified presets to the new project or discard them" msgstr "Upravené předvolby si můžete ponechat pro nový projekt nebo je zahodit" @@ -4914,7 +4914,7 @@ msgid "The following characters are not allowed by a FAT file system:" msgstr "Následující znaky nejsou v souborovém systému FAT povoleny:" msgid "Save Sliced file as:" -msgstr "Uložit Slicované soubor jako:" +msgstr "Uložit Slicovaný soubor jako:" #, c-format, boost-format msgid "" @@ -4932,7 +4932,7 @@ msgstr "" "kladné části." msgid "Is the printer ready? Is the print sheet in place, empty and clean?" -msgstr "Je tiskarna připravená k tisku? Je podložka prázdná a čistá?" +msgstr "Je tiskárna připravená k tisku? Je podložka prázdná a čistá?" msgid "Upload and Print" msgstr "Nahrát a Tisknout" @@ -6226,7 +6226,7 @@ msgid "Jerk limitation" msgstr "Omezení Jerk-Ryv" msgid "Single extruder multimaterial setup" -msgstr "Nastavení multimaterialu s jedním extruderem" +msgstr "Nastavení multimateriálu s jedním extruderem" msgid "Wipe tower" msgstr "Čistící věž" @@ -6558,7 +6558,7 @@ msgid "Login" msgstr "Přihlášení" msgid "The configuration package is changed in previous Config Guide" -msgstr "Konfigurační balíček byl změněn v předchozím Config Guide" +msgstr "Konfigurační balíček byl změněn v předchozím průvodci konfigurací" msgid "Configuration package changed" msgstr "Konfigurační balíček změněn" @@ -8221,7 +8221,7 @@ msgid "" msgstr "" "Materiál může mít objemovou změnu po přepnutí mezi roztaveným a krystalickým " "stavem. Toto nastavení proporcionálně změní veškerý vytlačovací tok tohoto " -"filamentu v gcode. Doporučený rozsah hodnot je mezi 0,95 a 1,05. Možná " +"filamentu v gkódu. Doporučený rozsah hodnot je mezi 0,95 a 1,05. Možná " "můžete tuto hodnotu vyladit, abyste získali pěkně rovný povrch, když dochází " "k mírnému přetečení nebo podtečení" @@ -8323,7 +8323,7 @@ msgid "" "Filament diameter is used to calculate extrusion in gcode, so it's important " "and should be accurate" msgstr "" -"Průměr filamentu se používá k výpočtu vytlačování v gcode, takže je důležitý " +"Průměr filamentu se používá k výpočtu vytlačování v gkódu, takže je důležitý " "a měl by být přesný" msgid "Shrinkage" @@ -8337,7 +8337,7 @@ msgid "" "Be sure to allow enough space between objects, as this compensation is done " "after the checks." msgstr "" -"Zadejte procento smrštění, které filament získá po ochlazení (94% pokud " +"Zadejte procento smrštění, které filament získá po ochlazení (94% i pokud " "naměříte 94mm místo 100mm). Část bude pro kompenzaci zmenšena v xy. Bere se " "v úvahu pouze filamentu použit pro obvod.\n" "Ujistěte se aby byl mezi objekty dostatek prostoru, protože tato kompenzace " @@ -8431,7 +8431,7 @@ msgid "" msgstr "" "Doba, po kterou firmware tiskárny (nebo jednotka Multi Material 2.0) zavádí " "nový filament během jeho výměny (při provádění kódu T). Tento čas je přidán " -"k celkové době tisku pomocí G-code odhadovače tiskového času." +"k celkové době tisku pomocí G-kódu odhadovače tiskového času." msgid "Ramming parameters" msgstr "Parametry rapidní extruze" @@ -8450,7 +8450,7 @@ msgid "" msgstr "" "Doba, po kterou firmware tiskárny (nebo jednotka Multi Material 2.0) vysouvá " "filament během jeho výměny (při provádění kódu T). Tento čas je přidán k " -"celkové době tisku pomocí G-code odhadovače tiskového času." +"celkové době tisku pomocí G-kódu odhadovače tiskového času." msgid "Enable ramming for multitool setups" msgstr "Povolení rapidní extruze tiskárny s více nástroji" @@ -9037,7 +9037,7 @@ msgid "G-code flavor" msgstr "Druh G-kódu" msgid "What kind of gcode the printer is compatible with" -msgstr "S jakým typem gcode je tiskárna kompatibilní" +msgstr "S jakým typem gkódu je tiskárna kompatibilní" msgid "Klipper" msgstr "Klipper" @@ -9181,7 +9181,7 @@ msgstr "" "použije výchozí metodu." msgid "This gcode part is inserted at every layer change after lift z" -msgstr "Tato část gcode je vložena při každé změně vrstvy po zvednutí z" +msgstr "Tato část gkódu je vložena při každé změně vrstvy po zvednutí z" msgid "Supports silent mode" msgstr "Podporuje tichý režim" @@ -9198,7 +9198,7 @@ msgid "" "pause G-code in gcode viewer" msgstr "" "Tento G-kód bude použit jako kód pro pozastavený tisk. Uživatel může vložit " -"pauzu G-kód do prohlížeče gcode" +"pauzu G-kód do prohlížeče gkódu" msgid "This G-code will be used as a custom code" msgstr "Tento G-kód bude použit jako vlastní kód" @@ -9669,7 +9669,7 @@ msgid "" "resolution and more time to slice" msgstr "" "Cesta G-kódu se generuje po zjednodušení obrysu modelu, aby se předešlo " -"příliš velkému počtu bodů a Linek gcode v souboru gcode. Menší hodnota " +"příliš velkému počtu bodů a Linek gkódu v souboru gkód. Menší hodnota " "znamená vyšší rozlišení a více času na slicování" msgid "Travel distance threshold" @@ -9680,7 +9680,7 @@ msgid "" "threshold" msgstr "" "Spusťte retrakci pouze tehdy, když je dráha jízdy delší než tato hraniční " -"hohnota" +"hodnota" msgid "Retract amount before wipe" msgstr "Délka retrakce před očištěním" @@ -9925,7 +9925,7 @@ msgid "" "The printing speed in exported gcode will be slowed down, when the estimated " "layer time is shorter than this value, to get better cooling for these layers" msgstr "" -"Rychlost tisku v exportovaném kódu gcode se zpomalí, když je odhadovaná doba " +"Rychlost tisku v exportovaném kódu gkód se zpomalí, když je odhadovaná doba " "vrstvy kratší než tato hodnota, aby se dosáhlo lepšího chlazení pro tyto " "vrstvy" @@ -10089,7 +10089,7 @@ msgid "" "print bed, set this to -0.3 (or fix your endstop)." msgstr "" "Tato hodnota bude přidána (nebo odečtena) ze všech souřadnic Z ve výstupním " -"G-code. Používá se ke kompenzování špatné pozice endstopu Z. Například pokud " +"G-kódu. Používá se ke kompenzování špatné pozice endstopu Z. Například pokud " "endstop 0 skutečně ponechá trysku 0,3 mm daleko od tiskové podložky, " "nastavte hodnotu -0,3 (nebo dolaďte svůj koncový doraz)." @@ -10283,7 +10283,7 @@ msgstr "" "ušetří materiál a sníží poškození objektu.\n" "Pro stromovou podpěru, tenký a organický styl bude agresivněji slučovat " "větve a ušetří mnoho materiálu (výchozí organický), zatímco hybridní styl " -"vytvoří podobnou strukturu jako běžná podpěra pod velkými plochými převiy." +"vytvoří podobnou strukturu jako běžná podpěra pod velkými plochými převisy." msgid "Snug" msgstr "Přiléhavý" @@ -10390,7 +10390,7 @@ msgstr "" "automaticky vypočítány" msgid "Tree support brim width" -msgstr "Šířka Limce podpěr stromů" +msgstr "Šířka Límce podpěr stromů" msgid "Distance from tree branch to the outermost brim line" msgstr "Vzdálenost od větve stromu k nejvzdálenější linii Límce" @@ -10406,7 +10406,7 @@ msgid "Tree support branch diameter" msgstr "Průměr větve podpěr stromů" msgid "This setting determines the initial diameter of support nodes." -msgstr "Toto nastavení určuje počáteční průměr uzlů poděry." +msgstr "Toto nastavení určuje počáteční průměr uzlů podpěr." #. TRN PrintSettings: #lmFIXME msgid "Branch Diameter Angle" @@ -10501,7 +10501,7 @@ msgid "" "This gcode is inserted when change filament, including T command to trigger " "tool change" msgstr "" -"Tento gcode se vloží při výměně filamentu, včetně příkazu T ke spuštění " +"Tento gkód se vloží při výměně filamentu, včetně příkazu T ke spuštění " "výměny nástroje" msgid "" @@ -10957,7 +10957,7 @@ msgid "Update the configs values of 3mf to latest." msgstr "Aktualizujte konfigurační hodnoty 3mf na nejnovější." msgid "Load default filaments" -msgstr "Načíst výchozí filameny" +msgstr "Načíst výchozí filamenty" msgid "Load first filament as default for those not loaded" msgstr "Načíst první filament jako výchozí pro ty, které nebyly načteny" @@ -11399,7 +11399,7 @@ msgid "" "3. If the max volumetric speed or print temperature is changed in the " "filament setting." msgstr "" -"Nyní jsme přidali automatickou kalibraci pro různé filameny, která je plně " +"Nyní jsme přidali automatickou kalibraci pro různé filamenty, která je plně " "automatizovaná a výsledek bude uložen do tiskárny pro budoucí použití. " "Kalibraci musíte provést pouze v následujících omezených případech:\n" "1. Pokud použijete nový filament jiné značky/modelu nebo je filament vlhký;\n" @@ -11747,7 +11747,7 @@ msgid "Success to get history result" msgstr "Úspěšně načtený historický výsledek kalibrace dynamiky průtoku" msgid "Refreshing the historical Flow Dynamics Calibration records" -msgstr "Aktualizace historických záznamů kalibrace dynamiky průtpku probíhá" +msgstr "Aktualizace historických záznamů kalibrace dynamiky průtoku probíhá" msgid "Action" msgstr "Akce" @@ -11768,7 +11768,7 @@ msgid "Service name" msgstr "Název služby" msgid "OctoPrint version" -msgstr "Service name" +msgstr "Verze OctoPrintu" msgid "Searching for devices" msgstr "Vyhledávání zařízení" From 120a3576a0745655f0159e16fd2ca6b615bc9bf0 Mon Sep 17 00:00:00 2001 From: Ocraftyone Date: Thu, 9 Nov 2023 09:30:30 -0500 Subject: [PATCH 28/47] SS port - Change extrusion role gcode (#2459) implement custom gcode for when the extrusion role is changed Co-authored-by: supermerill --- src/libslic3r/GCode.cpp | 43 +++++++++++++++++++++++++++++++++++ src/libslic3r/GCode.hpp | 1 + src/libslic3r/Preset.cpp | 2 +- src/libslic3r/PrintConfig.cpp | 9 ++++++++ src/libslic3r/PrintConfig.hpp | 1 + src/slic3r/GUI/Tab.cpp | 11 +++++++++ 6 files changed, 66 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index fa565cbe21..d2ae580d9d 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1402,6 +1402,8 @@ namespace DoExport { //BBS //if (ret.size() < MAX_TAGS_COUNT) check(_(L("Printing by object G-code")), config.printing_by_object_gcode.value); //if (ret.size() < MAX_TAGS_COUNT) check(_(L("Color Change G-code")), config.color_change_gcode.value); + //Orca + if (ret.size() < MAX_TAGS_COUNT) check(_(L("Change extrusion role G-code")), config.change_extrusion_role_gcode.value); if (ret.size() < MAX_TAGS_COUNT) check(_(L("Pause G-code")), config.machine_pause_gcode.value); if (ret.size() < MAX_TAGS_COUNT) check(_(L("Template Custom G-code")), config.template_custom_gcode.value); if (ret.size() < MAX_TAGS_COUNT) { @@ -4755,6 +4757,18 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, double F = speed * 60; // convert mm/sec to mm/min + //Orca: process custom gcode for extrusion role change + if (path.role() != m_last_extrusion_role && !m_config.change_extrusion_role_gcode.value.empty()) { + DynamicConfig config; + config.set_key_value("extrusion_role", new ConfigOptionString(extrusion_role_to_string_for_parser(path.role()))); + config.set_key_value("last_extrusion_role", new ConfigOptionString(extrusion_role_to_string_for_parser(m_last_extrusion_role))); + config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index + 1)); + config.set_key_value("layer_z", new ConfigOptionFloat(m_layer == nullptr ? m_last_height : m_layer->print_z)); + gcode += this->placeholder_parser_process("change_extrusion_role_gcode", + m_config.change_extrusion_role_gcode.value, m_writer.extruder()->id(), &config) + + "\n"; + } + // extrude arc or line if (m_enable_extrusion_role_markers) { if (path.role() != m_last_extrusion_role) { @@ -5002,6 +5016,35 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, return gcode; } +//Orca: get string name of extrusion role. used for change_extruder_role_gcode +std::string GCode::extrusion_role_to_string_for_parser(const ExtrusionRole & role) +{ + switch (role) { + case erPerimeter: return "Perimeter"; + case erExternalPerimeter: return "ExternalPerimeter"; + case erOverhangPerimeter: return "OverhangPerimeter"; + case erInternalInfill: return "InternalInfill"; + case erSolidInfill: return "SolidInfill"; + case erTopSolidInfill: return "TopSolidInfill"; + case erBottomSurface: return "BottomSurface"; + case erBridgeInfill: + case erInternalBridgeInfill: return "BridgeInfill"; + case erGapFill: return "GapFill"; + case erIroning: return "Ironing"; + case erSkirt: return "Skirt"; + case erBrim: return "Brim"; + case erSupportMaterial: return "SupportMaterial"; + case erSupportMaterialInterface: return "SupportMaterialInterface"; + case erSupportTransition: return "SupportTransition"; + case erWipeTower: return "WipeTower"; + case erCustom: + case erMixed: + case erCount: + case erNone: + default: return "Mixed"; + } +} + std::string encodeBase64(uint64_t value) { //Always use big endian mode diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 9fc63f63be..5e8d8d1934 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -205,6 +205,7 @@ public: // inside the generated string and after the G-code export finishes. std::string placeholder_parser_process(const std::string &name, const std::string &templ, unsigned int current_extruder_id, const DynamicConfig *config_override = nullptr); bool enable_cooling_markers() const { return m_enable_cooling_markers; } + std::string extrusion_role_to_string_for_parser(const ExtrusionRole &); // For Perl bindings, to be used exclusively by unit tests. unsigned int layer_count() const { return m_layer_count; } diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index f09240129e..c8c158f930 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -819,7 +819,7 @@ static std::vector s_Preset_printer_options { "printer_technology", "printable_area", "bed_exclude_area","bed_custom_texture", "bed_custom_model", "gcode_flavor", "fan_kickstart", "fan_speedup_time", "fan_speedup_overhangs", - "single_extruder_multi_material", "manual_filament_change", "machine_start_gcode", "machine_end_gcode", "before_layer_change_gcode", "layer_change_gcode", "time_lapse_gcode", "change_filament_gcode", + "single_extruder_multi_material", "manual_filament_change", "machine_start_gcode", "machine_end_gcode", "before_layer_change_gcode", "layer_change_gcode", "time_lapse_gcode", "change_filament_gcode", "change_extrusion_role_gcode", "printer_model", "printer_variant", "printable_height", "extruder_clearance_radius", "extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", "default_print_profile", "inherits", "silent_mode", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index aa63e6bfd7..2702e3b47f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3970,6 +3970,15 @@ def = this->add("filament_loading_speed", coFloats); def->mode = comAdvanced; def->set_default_value(new ConfigOptionString("")); + def = this->add("change_extrusion_role_gcode", coString); + def->label = L("Change extrusion role G-code"); + def->tooltip = L("This gcode is inserted when the extrusion role is changed"); + def->multiline = true; + def->full_width = true; + def->height = 5; + def->mode = comAdvanced; + def->set_default_value(new ConfigOptionString("")); + def = this->add("top_surface_line_width", coFloatOrPercent); def->label = L("Top surface"); def->category = L("Quality"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index fd853e1d0c..a44137a1ae 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -969,6 +969,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, single_extruder_multi_material_priming)) ((ConfigOptionBool, wipe_tower_no_sparse_layers)) ((ConfigOptionString, change_filament_gcode)) + ((ConfigOptionString, change_extrusion_role_gcode)) ((ConfigOptionFloat, travel_speed)) ((ConfigOptionFloat, travel_speed_z)) ((ConfigOptionBool, silent_mode)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 312944a524..9a38c7409a 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3231,6 +3231,17 @@ void TabPrinter::build_fff() option.opt.height = gcode_field_height;//150; optgroup->append_single_option_line(option); + optgroup = page->new_optgroup(L("Change extrusion role G-code"), L"param_gcode", 0); + optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { + validate_custom_gcode_cb(this, optgroup, opt_key, value); + }; + + option = optgroup->get_option("change_extrusion_role_gcode"); + option.opt.full_width = true; + option.opt.is_code = true; + option.opt.height = gcode_field_height;//150; + optgroup->append_single_option_line(option); + optgroup = page->new_optgroup(L("Pause G-code"), L"param_gcode", 0); optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { validate_custom_gcode_cb(this, optgroup, opt_key, value); From 466a17b8b422cba8b0877d682039e79c211059a5 Mon Sep 17 00:00:00 2001 From: Jeff Papiez <5460061+jpapiez@users.noreply.github.com> Date: Thu, 9 Nov 2023 18:19:48 -0800 Subject: [PATCH 29/47] Adding additional configurations for Voron Trident, V0, and Switchwiare (#2672) * Updating voron profiles * Add missing V0 configs and add default print profiles * Update nozzle_diameter for v0, switchwire, and triedent * Correcting names, nozzle diameters, and adding missing min and max layer heights --- resources/profiles/Voron.json | 122 +++++++++++++++++- .../Voron/filament/Voron Generic ABS.json | 32 ++++- .../Voron/filament/Voron Generic ASA.json | 84 ++++++++---- .../Voron/filament/Voron Generic PA-CF.json | 84 ++++++++---- .../Voron/filament/Voron Generic PA.json | 84 ++++++++---- .../Voron/filament/Voron Generic PC.json | 84 ++++++++---- .../Voron/filament/Voron Generic PETG.json | 85 ++++++++---- .../Voron/filament/Voron Generic PLA-CF.json | 85 ++++++++---- .../Voron/filament/Voron Generic PLA.json | 85 ++++++++---- .../Voron/filament/Voron Generic PVA.json | 85 ++++++++---- .../Voron/filament/Voron Generic TPU.json | 85 ++++++++---- .../Voron/machine/Voron 0.1 0.15 nozzle.json | 28 ++++ .../Voron/machine/Voron 0.1 0.2 nozzle.json | 28 ++++ .../Voron/machine/Voron 0.1 0.25 nozzle.json | 28 ++++ .../Voron/machine/Voron 0.1 0.4 nozzle.json | 6 + .../Voron/machine/Voron 0.1 0.6 nozzle.json | 28 ++++ .../Voron/machine/Voron 0.1 0.8 nozzle.json | 28 ++++ .../Voron/machine/Voron 0.1 1.0 nozzle.json | 28 ++++ .../profiles/Voron/machine/Voron 0.1.json | 2 +- .../machine/Voron 2.4 250 0.15 nozzle.json | 1 + .../machine/Voron 2.4 250 0.2 nozzle.json | 1 + .../machine/Voron 2.4 250 0.25 nozzle.json | 1 + .../machine/Voron 2.4 250 0.4 nozzle.json | 7 + .../machine/Voron 2.4 250 0.6 nozzle.json | 1 + .../machine/Voron 2.4 250 0.8 nozzle.json | 1 + .../machine/Voron 2.4 250 1.0 nozzle.json | 1 + .../machine/Voron 2.4 300 0.15 nozzle.json | 1 + .../machine/Voron 2.4 300 0.2 nozzle.json | 1 + .../machine/Voron 2.4 300 0.25 nozzle.json | 1 + .../machine/Voron 2.4 300 0.4 nozzle.json | 7 + .../machine/Voron 2.4 300 0.6 nozzle.json | 1 + .../machine/Voron 2.4 300 0.8 nozzle.json | 1 + .../machine/Voron 2.4 300 1.0 nozzle.json | 1 + .../machine/Voron 2.4 350 0.15 nozzle.json | 1 + .../machine/Voron 2.4 350 0.2 nozzle.json | 1 + .../machine/Voron 2.4 350 0.25 nozzle.json | 1 + .../machine/Voron 2.4 350 0.4 nozzle.json | 7 + .../machine/Voron 2.4 350 0.6 nozzle.json | 1 + .../machine/Voron 2.4 350 0.8 nozzle.json | 1 + .../machine/Voron 2.4 350 1.0 nozzle.json | 1 + .../Voron Switchwire 250 0.15 nozzle.json | 26 ++++ .../Voron Switchwire 250 0.2 nozzle.json | 26 ++++ .../Voron Switchwire 250 0.25 nozzle.json | 26 ++++ .../Voron Switchwire 250 0.4 nozzle.json | 7 + .../Voron Switchwire 250 0.6 nozzle.json | 26 ++++ .../Voron Switchwire 250 0.8 nozzle.json | 26 ++++ .../Voron Switchwire 250 1.0 nozzle.json | 26 ++++ .../Voron/machine/Voron Switchwire 250.json | 2 +- .../Voron Trident 250 0.15 nozzle.json | 26 ++++ .../machine/Voron Trident 250 0.2 nozzle.json | 26 ++++ .../Voron Trident 250 0.25 nozzle.json | 26 ++++ .../machine/Voron Trident 250 0.4 nozzle.json | 7 + .../machine/Voron Trident 250 0.6 nozzle.json | 26 ++++ .../machine/Voron Trident 250 0.8 nozzle.json | 26 ++++ .../machine/Voron Trident 250 1.0 nozzle.json | 26 ++++ .../Voron/machine/Voron Trident 250.json | 2 +- .../Voron Trident 300 0.15 nozzle.json | 26 ++++ .../machine/Voron Trident 300 0.2 nozzle.json | 26 ++++ .../Voron Trident 300 0.25 nozzle.json | 26 ++++ .../machine/Voron Trident 300 0.4 nozzle.json | 7 + .../machine/Voron Trident 300 0.6 nozzle.json | 26 ++++ .../machine/Voron Trident 300 0.8 nozzle.json | 26 ++++ .../machine/Voron Trident 300 1.0 nozzle.json | 26 ++++ .../Voron/machine/Voron Trident 300.json | 2 +- .../Voron Trident 350 0.15 nozzle.json | 26 ++++ .../machine/Voron Trident 350 0.2 nozzle.json | 26 ++++ .../Voron Trident 350 0.25 nozzle.json | 26 ++++ .../machine/Voron Trident 350 0.4 nozzle.json | 7 + .../machine/Voron Trident 350 0.6 nozzle.json | 26 ++++ .../machine/Voron Trident 350 0.8 nozzle.json | 26 ++++ .../machine/Voron Trident 350 1.0 nozzle.json | 26 ++++ .../Voron/machine/Voron Trident 350.json | 2 +- .../process/fdm_process_voron_common.json | 2 +- .../fdm_process_voron_common_0_1_5.json | 7 +- .../process/fdm_process_voron_common_0_2.json | 8 +- .../fdm_process_voron_common_0_2_5.json | 7 +- .../process/fdm_process_voron_common_0_6.json | 7 +- .../process/fdm_process_voron_common_0_8.json | 7 +- .../process/fdm_process_voron_common_1_0.json | 7 +- 79 files changed, 1578 insertions(+), 257 deletions(-) create mode 100644 resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json index 2aa2c2594d..1dcaf31a5d 100644 --- a/resources/profiles/Voron.json +++ b/resources/profiles/Voron.json @@ -1,6 +1,6 @@ { "name": "Voron", - "version": "01.06.05.02", + "version": "01.06.05.03", "force_update": "0", "description": "Voron configurations", "machine_model_list": [ @@ -382,21 +382,141 @@ "name": "Voron Trident 250 0.4 nozzle", "sub_path": "machine/Voron Trident 250 0.4 nozzle.json" }, + { + "name": "Voron Trident 250 0.15 nozzle", + "sub_path": "machine/Voron Trident 250 0.15 nozzle.json" + }, + { + "name": "Voron Trident 250 0.2 nozzle", + "sub_path": "machine/Voron Trident 250 0.2 nozzle.json" + }, + { + "name": "Voron Trident 250 0.25 nozzle", + "sub_path": "machine/Voron Trident 250 0.25 nozzle.json" + }, + { + "name": "Voron Trident 250 0.6 nozzle", + "sub_path": "machine/Voron Trident 250 0.6 nozzle.json" + }, + { + "name": "Voron Trident 250 0.8 nozzle", + "sub_path": "machine/Voron Trident 250 0.8 nozzle.json" + }, + { + "name": "Voron Trident 250 1.0 nozzle", + "sub_path": "machine/Voron Trident 250 1.0 nozzle.json" + }, { "name": "Voron Trident 300 0.4 nozzle", "sub_path": "machine/Voron Trident 300 0.4 nozzle.json" }, + { + "name": "Voron Trident 300 0.15 nozzle", + "sub_path": "machine/Voron Trident 300 0.15 nozzle.json" + }, + { + "name": "Voron Trident 300 0.2 nozzle", + "sub_path": "machine/Voron Trident 300 0.2 nozzle.json" + }, + { + "name": "Voron Trident 300 0.25 nozzle", + "sub_path": "machine/Voron Trident 300 0.25 nozzle.json" + }, + { + "name": "Voron Trident 300 0.6 nozzle", + "sub_path": "machine/Voron Trident 300 0.6 nozzle.json" + }, + { + "name": "Voron Trident 300 0.8 nozzle", + "sub_path": "machine/Voron Trident 300 0.8 nozzle.json" + }, + { + "name": "Voron Trident 300 1.0 nozzle", + "sub_path": "machine/Voron Trident 300 1.0 nozzle.json" + }, { "name": "Voron Trident 350 0.4 nozzle", "sub_path": "machine/Voron Trident 350 0.4 nozzle.json" }, + { + "name": "Voron Trident 350 0.15 nozzle", + "sub_path": "machine/Voron Trident 350 0.15 nozzle.json" + }, + { + "name": "Voron Trident 350 0.2 nozzle", + "sub_path": "machine/Voron Trident 350 0.2 nozzle.json" + }, + { + "name": "Voron Trident 350 0.25 nozzle", + "sub_path": "machine/Voron Trident 350 0.25 nozzle.json" + }, + { + "name": "Voron Trident 350 0.6 nozzle", + "sub_path": "machine/Voron Trident 350 0.6 nozzle.json" + }, + { + "name": "Voron Trident 350 0.8 nozzle", + "sub_path": "machine/Voron Trident 350 0.8 nozzle.json" + }, + { + "name": "Voron Trident 350 1.0 nozzle", + "sub_path": "machine/Voron Trident 350 1.0 nozzle.json" + }, { "name": "Voron 0.1 0.4 nozzle", "sub_path": "machine/Voron 0.1 0.4 nozzle.json" }, + { + "name": "Voron 0.1 0.15 nozzle", + "sub_path": "machine/Voron 0.1 0.15 nozzle.json" + }, + { + "name": "Voron 0.1 0.2 nozzle", + "sub_path": "machine/Voron 0.1 0.2 nozzle.json" + }, + { + "name": "Voron 0.1 0.25 nozzle", + "sub_path": "machine/Voron 0.1 0.25 nozzle.json" + }, + { + "name": "Voron 0.1 0.6 nozzle", + "sub_path": "machine/Voron 0.1 0.6 nozzle.json" + }, + { + "name": "Voron 0.1 0.8 nozzle", + "sub_path": "machine/Voron 0.1 0.8 nozzle.json" + }, + { + "name": "Voron 0.1 1.0 nozzle", + "sub_path": "machine/Voron 0.1 1.0 nozzle.json" + }, { "name": "Voron Switchwire 250 0.4 nozzle", "sub_path": "machine/Voron Switchwire 250 0.4 nozzle.json" + }, + { + "name": "Voron Switchwire 250 0.15 nozzle", + "sub_path": "machine/Voron Switchwire 250 0.15 nozzle.json" + }, + { + "name": "Voron Switchwire 250 0.2 nozzle", + "sub_path": "machine/Voron Switchwire 250 0.2 nozzle.json" + }, + { + "name": "Voron Switchwire 250 0.25 nozzle", + "sub_path": "machine/Voron Switchwire 250 0.25 nozzle.json" + }, + { + "name": "Voron Switchwire 250 0.6 nozzle", + "sub_path": "machine/Voron Switchwire 250 0.6 nozzle.json" + }, + { + "name": "Voron Switchwire 250 0.8 nozzle", + "sub_path": "machine/Voron Switchwire 250 0.8 nozzle.json" + }, + { + "name": "Voron Switchwire 250 1.0 nozzle", + "sub_path": "machine/Voron Switchwire 250 1.0 nozzle.json" } ] } diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json index 1f5696967c..a321511ad0 100644 --- a/resources/profiles/Voron/filament/Voron Generic ABS.json +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -35,9 +35,39 @@ "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json index bb187c3ce7..2e32235db1 100644 --- a/resources/profiles/Voron/filament/Voron Generic ASA.json +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -13,31 +13,61 @@ "12" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json index 03f9edf575..868ca5dba6 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -19,31 +19,61 @@ "8" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json index 5f09eba565..391f871744 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA.json +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -16,31 +16,61 @@ "12" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json index ddd8caa980..eec0beb6eb 100644 --- a/resources/profiles/Voron/filament/Voron Generic PC.json +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -13,31 +13,61 @@ "0.94" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json index 1317388057..ddd396ff4c 100644 --- a/resources/profiles/Voron/filament/Voron Generic PETG.json +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -43,31 +43,62 @@ "; filament start gcode\n" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} + \ No newline at end of file diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json index ab11d41694..9de164685b 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -19,31 +19,62 @@ "7" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} + \ No newline at end of file diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json index 69781e7e6c..699970bf68 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -16,31 +16,62 @@ "8" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} + diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json index f61e4db45c..631be1e27a 100644 --- a/resources/profiles/Voron/filament/Voron Generic PVA.json +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -19,31 +19,62 @@ "10" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} + \ No newline at end of file diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json index 15e42d9f0c..891156cf1d 100644 --- a/resources/profiles/Voron/filament/Voron Generic TPU.json +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -10,31 +10,62 @@ "3.2" ], "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 250 0.15 nozzle", - "Voron 2.4 250 0.2 nozzle", - "Voron 2.4 250 0.25 nozzle", - "Voron 2.4 250 0.6 nozzle", - "Voron 2.4 250 0.8 nozzle", - "Voron 2.4 250 1.0 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 2.4 350 0.15 nozzle", - "Voron 2.4 350 0.2 nozzle", - "Voron 2.4 350 0.25 nozzle", - "Voron 2.4 350 0.6 nozzle", - "Voron 2.4 350 0.8 nozzle", - "Voron 2.4 350 1.0 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 250 0.15 nozzle", + "Voron 2.4 250 0.2 nozzle", + "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.6 nozzle", + "Voron 2.4 250 0.8 nozzle", + "Voron 2.4 250 1.0 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 300 0.15 nozzle", + "Voron 2.4 300 0.2 nozzle", + "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.6 nozzle", + "Voron 2.4 300 0.8 nozzle", + "Voron 2.4 300 1.0 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 2.4 350 0.15 nozzle", + "Voron 2.4 350 0.2 nozzle", + "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.6 nozzle", + "Voron 2.4 350 0.8 nozzle", + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron 0.1 0.4 nozzle", + "Voron 0.1 0.15 nozzle", + "Voron 0.1 0.2 nozzle", + "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.6 nozzle", + "Voron 0.1 0.8 nozzle", + "Voron 0.1 1.0 nozzle", + "Voron Switchwire 250 0.4 nozzle", + "Voron Switchwire 250 0.15 nozzle", + "Voron Switchwire 250 0.2 nozzle", + "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.6 nozzle", + "Voron Switchwire 250 0.8 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] - } +} + diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json new file mode 100644 index 0000000000..ef4891fb5c --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron 0.1 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json new file mode 100644 index 0000000000..4ab6529fa7 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron 0.1 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json new file mode 100644 index 0000000000..263f5ebed8 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron 0.1 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json index bfd7347b2d..cd3d000faa 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json @@ -7,6 +7,12 @@ "inherits": "fdm_klipper_common", "printer_model": "Voron 0.1", "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json new file mode 100644 index 0000000000..cf1a44c00e --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron 0.1 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json new file mode 100644 index 0000000000..6057929b6f --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron 0.1 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json new file mode 100644 index 0000000000..9d0d6ec80a --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron 0.1 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json index 6a3d37f839..9377e6d3e0 100644 --- a/resources/profiles/Voron/machine/Voron 0.1.json +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 0.1", "model_id": "Voron0", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json index 6d1a763421..b4b9a2e545 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", "max_layer_height": [ "0.2" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json index 2998a4fce6..509cda963a 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", "max_layer_height": [ "0.20" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json index 135d0163b3..2843b6aeed 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", "max_layer_height": [ "0.25" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json index cb2de09bbd..f91fa96a25 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json index 0d5cf33367..fd8bd53a92 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", "max_layer_height": [ "0.45" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json index 414c63588e..b4b61bc850 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", "max_layer_height": [ "0.6" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json index f6418f1e98..b3d8d825cb 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", "max_layer_height": [ "0.9" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json index 88b59200f8..6fce0a532e 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", "max_layer_height": [ "0.2" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json index 071adba1b5..cd909ac392 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", "max_layer_height": [ "0.2" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json index 0789cf6fad..c294072639 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", "max_layer_height": [ "0.25" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json index 48d0e127bd..cc9ddcb13f 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json index 0716665d49..8528f3f1ea 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", "max_layer_height": [ "0.45" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json index d632af7b16..26ad74fb8d 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", "max_layer_height": [ "0.6" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json index 1ccf4bc63c..ffd16c27e8 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", "max_layer_height": [ "0.9" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json index 5f9dc94f34..47eef2b3e0 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", "max_layer_height": [ "0.2" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json index cb57e54578..6e409931fe 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", "max_layer_height": [ "0.2" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json index ef3da1e5ba..6530cd14d6 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", "max_layer_height": [ "0.25" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json index 7884fc5bb9..ca98c034b2 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json index b07342e7af..f2c0dcff8c 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", "max_layer_height": [ "0.45" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json index 83cc926bc3..dc3185d032 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", "max_layer_height": [ "0.6" ], diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json index 6ebbe763b9..03daef1c3b 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", "max_layer_height": [ "0.9" ], diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json new file mode 100644 index 0000000000..814ea530c2 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Switchwire 250 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json new file mode 100644 index 0000000000..033dd2486d --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Switchwire 250 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json new file mode 100644 index 0000000000..82af15d400 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Switchwire 250 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.4 nozzle.json index e87ecb56bd..c2a0534857 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json new file mode 100644 index 0000000000..fd9fd6e8fa --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Switchwire 250 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json new file mode 100644 index 0000000000..75c433739a --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Switchwire 250 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json new file mode 100644 index 0000000000..42d18832a8 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Switchwire 250 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250.json b/resources/profiles/Voron/machine/Voron Switchwire 250.json index c9e7fb34cd..6a3e3de7cc 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Switchwire 250", "model_id": "Voron_Switchwire_250", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json new file mode 100644 index 0000000000..2429e46933 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 250 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json new file mode 100644 index 0000000000..e8b18f047e --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 250 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json new file mode 100644 index 0000000000..c1ad6c6218 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 250 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json index d33c039ea1..d377b80b8d 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron Trident 250", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json new file mode 100644 index 0000000000..eb9ab32a52 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 250 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json new file mode 100644 index 0000000000..6656b9ae3b --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 250 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json new file mode 100644 index 0000000000..93f9cce13e --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 250 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json index 0fd8baac18..83872b6c98 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250.json +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Trident 250", "model_id": "Voron2_Trident_250", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json new file mode 100644 index 0000000000..9972b7594d --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 300 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json new file mode 100644 index 0000000000..1d8b711f43 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 300 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json new file mode 100644 index 0000000000..df880756a4 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 300 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json index c05ae24626..6fb710c37a 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron Trident 300", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json new file mode 100644 index 0000000000..fc8fcc5078 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 300 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json new file mode 100644 index 0000000000..df95f7090c --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 300 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json new file mode 100644 index 0000000000..a8fd806de1 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 300 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json index a84801a9f5..80e055efa1 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300.json +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Trident 300", "model_id": "Voron2_Trident_300", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json new file mode 100644 index 0000000000..ae619cf41f --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 350 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json new file mode 100644 index 0000000000..6a6f75516e --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 350 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json new file mode 100644 index 0000000000..85d9971b41 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 350 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json index c6b6f9f03b..bc4520cdef 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json @@ -6,6 +6,13 @@ "instantiation": "true", "inherits": "fdm_klipper_common", "printer_model": "Voron Trident 350", + "default_print_profile": "0.20mm Standard @Voron", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.10" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json new file mode 100644 index 0000000000..847ea3924b --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 350 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json new file mode 100644 index 0000000000..ce9d63ad4f --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 350 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json new file mode 100644 index 0000000000..d600ad315c --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 350 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json index 2cce35b6a8..ebb70b8d76 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350.json +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Trident 350", "model_id": "Voron2_Trident_350", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/process/fdm_process_voron_common.json b/resources/profiles/Voron/process/fdm_process_voron_common.json index 78dd3267c2..d242c947ed 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common.json @@ -120,6 +120,6 @@ "Voron Trident 300 0.4 nozzle", "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle", - "Voron Switchwire 250 0.4 nozzle" + "Voron Switchwire 250 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json index 291daf29db..6c61479962 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_1_5.json @@ -14,8 +14,13 @@ "support_line_width": "0.17", "top_surface_line_width": "0.17", "compatible_printers": [ + "Voron 0.1 0.15 nozzle", "Voron 2.4 250 0.15 nozzle", "Voron 2.4 300 0.15 nozzle", - "Voron 2.4 350 0.15 nozzle" + "Voron 2.4 350 0.15 nozzle", + "Voron Trident 250 0.15 nozzle", + "Voron Trident 300 0.15 nozzle", + "Voron Trident 350 0.15 nozzle", + "Voron Switchwire 250 0.15 nozzle" ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_2.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_2.json index d4428d53d6..275a684cb8 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common_0_2.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_2.json @@ -14,8 +14,14 @@ "support_line_width": "0.22", "top_surface_line_width": "0.22", "compatible_printers": [ + "Voron 0.1 0.2 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 300 0.2 nozzle", - "Voron 2.4 350 0.2 nozzle" + "Voron 2.4 350 0.2 nozzle", + "Voron Trident 250 0.2 nozzle", + "Voron Trident 300 0.2 nozzle", + "Voron Trident 350 0.2 nozzle", + "Voron Switchwire 250 0.2 nozzle" + ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json index b7f5de2364..646020a0ef 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_2_5.json @@ -14,8 +14,13 @@ "support_line_width": "0.27", "top_surface_line_width": "0.27", "compatible_printers": [ + "Voron 0.1 0.25 nozzle", "Voron 2.4 250 0.25 nozzle", "Voron 2.4 300 0.25 nozzle", - "Voron 2.4 350 0.25 nozzle" + "Voron 2.4 350 0.25 nozzle", + "Voron Trident 250 0.25 nozzle", + "Voron Trident 300 0.25 nozzle", + "Voron Trident 350 0.25 nozzle", + "Voron Switchwire 250 0.25 nozzle" ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_6.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_6.json index f6fd5d10e8..c4171809ce 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common_0_6.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_6.json @@ -14,8 +14,13 @@ "support_line_width": "0.62", "top_surface_line_width": "0.62", "compatible_printers": [ + "Voron 0.1 0.6 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 300 0.6 nozzle", - "Voron 2.4 350 0.6 nozzle" + "Voron 2.4 350 0.6 nozzle", + "Voron Trident 250 0.6 nozzle", + "Voron Trident 300 0.6 nozzle", + "Voron Trident 350 0.6 nozzle", + "Voron Switchwire 250 0.6 nozzle" ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_8.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_8.json index 629b80c2b3..7f94628e32 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common_0_8.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_8.json @@ -14,8 +14,13 @@ "support_line_width": "0.82", "top_surface_line_width": "0.82", "compatible_printers": [ + "Voron 0.1 0.8 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 300 0.8 nozzle", - "Voron 2.4 350 0.8 nozzle" + "Voron 2.4 350 0.8 nozzle", + "Voron Trident 250 0.8 nozzle", + "Voron Trident 300 0.8 nozzle", + "Voron Trident 350 0.8 nozzle", + "Voron Switchwire 250 0.8 nozzle" ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json b/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json index d4a16f925f..c23a90e9d5 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common_1_0.json @@ -14,8 +14,13 @@ "support_line_width": "1.02", "top_surface_line_width": "1.02", "compatible_printers": [ + "Voron 0.1 1.0 nozzle", "Voron 2.4 250 1.0 nozzle", "Voron 2.4 300 1.0 nozzle", - "Voron 2.4 350 1.0 nozzle" + "Voron 2.4 350 1.0 nozzle", + "Voron Trident 250 1.0 nozzle", + "Voron Trident 300 1.0 nozzle", + "Voron Trident 350 1.0 nozzle", + "Voron Switchwire 250 1.0 nozzle" ] } From c5a10b302abd3e4aa08443557892c506f6c15238 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 10 Nov 2023 18:00:09 +0800 Subject: [PATCH 30/47] fix Voron profiles --- .../machine/Snapmaker J1 0.6 nozzle.json | 21 +++---- .../Voron/machine/Voron 0.1 0.15 nozzle.json | 55 ++++++++++--------- .../Voron/machine/Voron 0.1 0.2 nozzle.json | 55 ++++++++++--------- .../Voron/machine/Voron 0.1 0.25 nozzle.json | 55 ++++++++++--------- .../Voron/machine/Voron 0.1 0.6 nozzle.json | 55 ++++++++++--------- .../Voron/machine/Voron 0.1 0.8 nozzle.json | 55 ++++++++++--------- .../Voron/machine/Voron 0.1 1.0 nozzle.json | 55 ++++++++++--------- .../machine/Voron 2.4 250 0.15 nozzle.json | 22 ++++---- .../machine/Voron 2.4 250 0.2 nozzle.json | 22 ++++---- .../machine/Voron 2.4 250 0.25 nozzle.json | 22 ++++---- .../machine/Voron 2.4 250 0.6 nozzle.json | 22 ++++---- .../machine/Voron 2.4 250 0.8 nozzle.json | 22 ++++---- .../machine/Voron 2.4 250 1.0 nozzle.json | 22 ++++---- .../machine/Voron 2.4 300 0.15 nozzle.json | 22 ++++---- .../machine/Voron 2.4 300 0.2 nozzle.json | 22 ++++---- .../machine/Voron 2.4 300 0.25 nozzle.json | 22 ++++---- .../machine/Voron 2.4 300 0.6 nozzle.json | 22 ++++---- .../machine/Voron 2.4 300 0.8 nozzle.json | 22 ++++---- .../machine/Voron 2.4 300 1.0 nozzle.json | 22 ++++---- .../machine/Voron 2.4 350 0.15 nozzle.json | 22 ++++---- .../machine/Voron 2.4 350 0.2 nozzle.json | 22 ++++---- .../machine/Voron 2.4 350 0.25 nozzle.json | 22 ++++---- .../machine/Voron 2.4 350 0.6 nozzle.json | 22 ++++---- .../machine/Voron 2.4 350 0.8 nozzle.json | 22 ++++---- .../machine/Voron 2.4 350 1.0 nozzle.json | 22 ++++---- .../Voron Switchwire 250 0.15 nozzle.json | 51 ++++++++--------- .../Voron Switchwire 250 0.2 nozzle.json | 51 ++++++++--------- .../Voron Switchwire 250 0.25 nozzle.json | 51 ++++++++--------- .../Voron Switchwire 250 0.6 nozzle.json | 51 ++++++++--------- .../Voron Switchwire 250 0.8 nozzle.json | 51 ++++++++--------- .../Voron Switchwire 250 1.0 nozzle.json | 51 ++++++++--------- .../Voron Trident 250 0.15 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 250 0.2 nozzle.json | 51 ++++++++--------- .../Voron Trident 250 0.25 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 250 0.6 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 250 0.8 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 250 1.0 nozzle.json | 51 ++++++++--------- .../Voron Trident 300 0.15 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 300 0.2 nozzle.json | 51 ++++++++--------- .../Voron Trident 300 0.25 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 300 0.6 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 300 0.8 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 300 1.0 nozzle.json | 51 ++++++++--------- .../Voron Trident 350 0.15 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 350 0.2 nozzle.json | 51 ++++++++--------- .../Voron Trident 350 0.25 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 350 0.6 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 350 0.8 nozzle.json | 51 ++++++++--------- .../machine/Voron Trident 350 1.0 nozzle.json | 51 ++++++++--------- 49 files changed, 1001 insertions(+), 970 deletions(-) diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json index 1e8bc2866f..578c99f5be 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json @@ -8,28 +8,28 @@ "printer_model": "Snapmaker J1", "default_print_profile": "0.20mm 0.6 Standard @Snapmaker J1", "retraction_minimum_travel": [ - "3" + "3" ], "thumbnails": [ - "400x400" + "400x400" ], "z_hop_types": [ - "Auto Lift" + "Auto Lift" ], "z_lift_type": [ - "SpiralLift" + "SpiralLift" ], "nozzle_diameter": [ "0.6" ], "bed_exclude_area": [ - "0x0" + "0x0" ], "printable_area": [ - "0x0", - "324x0", - "324x200", - "0x200" + "0x0", + "324x0", + "324x200", + "0x200" ], "printable_height": "200", "machine_start_gcode": ";***** Snapmaker J1\n;***** Update : 20221222\n;***** Printer : [printer_preset]\n;***** Profile : [print_preset]\nM593 P1 X F35.7 \nM593 P1 Y F33.7 \nM355 S1 P16 ;------------OPTIONAL ;dim led \nM83 ;absolute extrusion mode\nM140 S[first_layer_bed_temperature] ;Start Warming Bed\nT[initial_extruder] ;switch to initial extruder\n{if total_toolchanges < 1}; Preheat one extruder (just one used)\nM104 S160 ;preheat nozzle\n{else}; Preheat both extruders used\nM104 S160 T0 ;preheat T0\nM104 S160 T1 ;preheat T1\n{endif}\nG28 ; home all axes\nG90 ;absolute positioning\nG1 Z0.8 F1800\nM201 X5000 Y5000 Z500 E5000\nM205 V5\nM900 T0 K0.02\nM900 T1 K0.02\nM190 S[first_layer_bed_temperature] ; C3 W2 Wait For Bed Temperature\n{if total_toolchanges < 1}; Heat one extruder\nM104 S[first_layer_temperature]\nM109 S[first_layer_temperature] ;Wait for Hotend Temperature\n{else}; Heat both extruders\nM104 T0 S{first_layer_temperature[0]}\nM104 T1 S{first_layer_temperature[1]}\nM109 T0 S{first_layer_temperature[0]} ;Wait for Hotend Temperature\nM109 T1 S{first_layer_temperature[1]} ;Wait for Hotend Temperature\n{endif}\n;\n{if 1==1} ;-----------OPTIONAL ;led effect\n M355 S1 P32\n G4 S1\n M355 S1 P48\n G4 S1\n M355 S1 P64\n G4 S1\n M355 S1 P96\n G4 S1\n M355 S1 P128\n G4 S1\n M355 S1 P255\n{endif}\n;\nG92 E0\n;\n{if total_toolchanges > 0 or initial_extruder == 0}; Purge line T0\nT0\nG92 E0\nG1 F1200 X5 Z0.5\nG1 F600 X100 E20\nG1 F600 Z2\nG92 E0\nG1 F1200 E-6\nG0 X-20 F12000 ; park T0\n{endif}\n{if total_toolchanges > 0 or initial_extruder == 1}; Purge line T1\nT1\nG92 E0\nG1 F1200 X295 Z0.5\nG1 F600 X200 E20\nG1 F600 Z2\nG92 E0\nG1 F1200 E-6\nG0 X350 F12000 ; park T1 (old 345)\n{endif}\n;End Start Gcode J1\n", @@ -65,5 +65,6 @@ ], "scan_first_layer": "0", "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" + "auxiliary_fan": "0", + "printer_variant": "0.6" } \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json index ef4891fb5c..79c8f046af 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.15 nozzle.json @@ -1,28 +1,29 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron 0.1 0.15 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron 0.1", - "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", - "max_layer_height": [ - "0.12" - ], - "min_layer_height": [ - "0.04" - ], - "nozzle_diameter": [ - "0.15" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron 0.1 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json index 4ab6529fa7..6d1541f7cd 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.2 nozzle.json @@ -1,28 +1,29 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron 0.1 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron 0.1", - "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", - "max_layer_height": [ - "0.16" - ], - "min_layer_height": [ - "0.05" - ], - "nozzle_diameter": [ - "0.2" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron 0.1 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json index 263f5ebed8..4f8971139f 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.25 nozzle.json @@ -1,28 +1,29 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron 0.1 0.25 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron 0.1", - "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", - "max_layer_height": [ - "0.20" - ], - "min_layer_height": [ - "0.06" - ], - "nozzle_diameter": [ - "0.25" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron 0.1 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json index cf1a44c00e..f080961755 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.6 nozzle.json @@ -1,28 +1,29 @@ { - "type": "machine", - "setting_id": "GM003", - "name": "Voron 0.1 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron 0.1", - "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", - "max_layer_height": [ - "0.48" - ], - "min_layer_height": [ - "0.15" - ], - "nozzle_diameter": [ - "0.6" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} + "type": "machine", + "setting_id": "GM003", + "name": "Voron 0.1 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json index 6057929b6f..eeacefb3ed 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.8 nozzle.json @@ -1,28 +1,29 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron 0.1 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron 0.1", - "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", - "max_layer_height": [ - "0.64" - ], - "min_layer_height": [ - "0.2" - ], - "nozzle_diameter": [ - "0.8" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron 0.1 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json index 9d0d6ec80a..81fafc5460 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 1.0 nozzle.json @@ -1,28 +1,29 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron 0.1 1.0 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron 0.1", - "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", - "max_layer_height": [ - "0.80" - ], - "min_layer_height": [ - "0.25" - ], - "nozzle_diameter": [ - "1.0" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron 0.1 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json index b4b9a2e545..42b544336e 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.15 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 250", "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", "max_layer_height": [ - "0.2" + "0.2" ], "min_layer_height": [ - "0.04" + "0.04" ], - "nozzle_diameter": [ - "0.15" + "nozzle_diameter": [ + "0.15" ], "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" + "0x0", + "250x0", + "250x250", + "0x250" ], - "printable_height": "225" - } - \ No newline at end of file + "printable_height": "225", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json index 509cda963a..6aafb15d0b 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.2 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 250", "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", "max_layer_height": [ - "0.20" + "0.20" ], "min_layer_height": [ - "0.06" + "0.06" ], - "nozzle_diameter": [ - "0.2" + "nozzle_diameter": [ + "0.2" ], "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" + "0x0", + "250x0", + "250x250", + "0x250" ], - "printable_height": "225" - } - \ No newline at end of file + "printable_height": "225", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json index 2843b6aeed..79fcf9ff22 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.25 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 250", "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", "max_layer_height": [ - "0.25" + "0.25" ], "min_layer_height": [ - "0.06" + "0.06" ], - "nozzle_diameter": [ - "0.25" + "nozzle_diameter": [ + "0.25" ], "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" + "0x0", + "250x0", + "250x250", + "0x250" ], - "printable_height": "225" - } - \ No newline at end of file + "printable_height": "225", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json index fd8bd53a92..250323b147 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.6 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 250", "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", "max_layer_height": [ - "0.45" + "0.45" ], "min_layer_height": [ - "0.15" + "0.15" ], - "nozzle_diameter": [ - "0.6" + "nozzle_diameter": [ + "0.6" ], "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" + "0x0", + "250x0", + "250x250", + "0x250" ], - "printable_height": "225" - } - \ No newline at end of file + "printable_height": "225", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json index b4b61bc850..f8294e3674 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.8 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 250", "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", "max_layer_height": [ - "0.6" + "0.6" ], "min_layer_height": [ - "0.20" + "0.20" ], - "nozzle_diameter": [ - "0.8" + "nozzle_diameter": [ + "0.8" ], "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" + "0x0", + "250x0", + "250x250", + "0x250" ], - "printable_height": "225" - } - \ No newline at end of file + "printable_height": "225", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json index b3d8d825cb..db9113b9e7 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 1.0 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 250", "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", "max_layer_height": [ - "0.9" + "0.9" ], "min_layer_height": [ - "0.25" + "0.25" ], - "nozzle_diameter": [ - "1.0" + "nozzle_diameter": [ + "1.0" ], "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" + "0x0", + "250x0", + "250x250", + "0x250" ], - "printable_height": "225" - } - \ No newline at end of file + "printable_height": "225", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json index 6fce0a532e..efa782dd5d 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.15 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 300", "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", "max_layer_height": [ - "0.2" + "0.2" ], "min_layer_height": [ - "0.04" + "0.04" ], - "nozzle_diameter": [ - "0.15" + "nozzle_diameter": [ + "0.15" ], "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" + "0x0", + "300x0", + "300x300", + "0x300" ], - "printable_height": "2755" - } - \ No newline at end of file + "printable_height": "2755", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json index cd909ac392..ffd2ca597b 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.2 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 300", "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", "max_layer_height": [ - "0.2" + "0.2" ], "min_layer_height": [ - "0.06" + "0.06" ], - "nozzle_diameter": [ - "0.2" + "nozzle_diameter": [ + "0.2" ], "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" + "0x0", + "300x0", + "300x300", + "0x300" ], - "printable_height": "2755" - } - \ No newline at end of file + "printable_height": "2755", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json index c294072639..facfd9406f 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.25 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 300", "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", "max_layer_height": [ - "0.25" + "0.25" ], "min_layer_height": [ - "0.06" + "0.06" ], - "nozzle_diameter": [ - "0.25" + "nozzle_diameter": [ + "0.25" ], "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" + "0x0", + "300x0", + "300x300", + "0x300" ], - "printable_height": "2755" - } - \ No newline at end of file + "printable_height": "2755", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json index 8528f3f1ea..a446075a45 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.6 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 300", "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", "max_layer_height": [ - "0.45" + "0.45" ], "min_layer_height": [ - "0.15" + "0.15" ], - "nozzle_diameter": [ - "0.6" + "nozzle_diameter": [ + "0.6" ], "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" + "0x0", + "300x0", + "300x300", + "0x300" ], - "printable_height": "275" - } - \ No newline at end of file + "printable_height": "275", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json index 26ad74fb8d..34076cc03c 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.8 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 300", "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", "max_layer_height": [ - "0.6" + "0.6" ], "min_layer_height": [ - "0.20" + "0.20" ], - "nozzle_diameter": [ - "0.8" + "nozzle_diameter": [ + "0.8" ], "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" + "0x0", + "300x0", + "300x300", + "0x300" ], - "printable_height": "275" - } - \ No newline at end of file + "printable_height": "275", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json index ffd16c27e8..1c308a74a6 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 1.0 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 300", "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", "max_layer_height": [ - "0.9" + "0.9" ], "min_layer_height": [ - "0.25" + "0.25" ], - "nozzle_diameter": [ - "1.0" + "nozzle_diameter": [ + "1.0" ], "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" + "0x0", + "300x0", + "300x300", + "0x300" ], - "printable_height": "275" - } - \ No newline at end of file + "printable_height": "275", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json index 47eef2b3e0..8136c2e615 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.15 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 350", "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", "max_layer_height": [ - "0.2" + "0.2" ], "min_layer_height": [ - "0.04" + "0.04" ], - "nozzle_diameter": [ - "0.15" + "nozzle_diameter": [ + "0.15" ], "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" + "0x0", + "350x0", + "350x350", + "0x350" ], - "printable_height": "325" - } - \ No newline at end of file + "printable_height": "325", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json index 6e409931fe..d491a5d66d 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.2 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 350", "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", "max_layer_height": [ - "0.2" + "0.2" ], "min_layer_height": [ - "0.06" + "0.06" ], - "nozzle_diameter": [ - "0.2" + "nozzle_diameter": [ + "0.2" ], "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" + "0x0", + "350x0", + "350x350", + "0x350" ], - "printable_height": "325" - } - \ No newline at end of file + "printable_height": "325", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json index 6530cd14d6..cf169eff81 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.25 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 350", "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", "max_layer_height": [ - "0.25" + "0.25" ], "min_layer_height": [ - "0.06" + "0.06" ], - "nozzle_diameter": [ - "0.25" + "nozzle_diameter": [ + "0.25" ], "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" + "0x0", + "350x0", + "350x350", + "0x350" ], - "printable_height": "325" - } - \ No newline at end of file + "printable_height": "325", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json index f2c0dcff8c..6bc4a8752e 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.6 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 350", "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", "max_layer_height": [ - "0.45" + "0.45" ], "min_layer_height": [ - "0.15" + "0.15" ], - "nozzle_diameter": [ - "0.6" + "nozzle_diameter": [ + "0.6" ], "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" + "0x0", + "350x0", + "350x350", + "0x350" ], - "printable_height": "325" - } - \ No newline at end of file + "printable_height": "325", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json index dc3185d032..567e0a005d 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.8 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 350", "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", "max_layer_height": [ - "0.6" + "0.6" ], "min_layer_height": [ - "0.20" + "0.20" ], - "nozzle_diameter": [ - "0.8" + "nozzle_diameter": [ + "0.8" ], "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" + "0x0", + "350x0", + "350x350", + "0x350" ], - "printable_height": "325" - } - \ No newline at end of file + "printable_height": "325", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json index 03daef1c3b..905c481915 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 1.0 nozzle.json @@ -8,20 +8,20 @@ "printer_model": "Voron 2.4 350", "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", "max_layer_height": [ - "0.9" + "0.9" ], "min_layer_height": [ - "0.25" + "0.25" ], - "nozzle_diameter": [ - "1.0" + "nozzle_diameter": [ + "1.0" ], "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" + "0x0", + "350x0", + "350x350", + "0x350" ], - "printable_height": "325" - } - \ No newline at end of file + "printable_height": "325", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json index 814ea530c2..4ee7f37e68 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.15 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Switchwire 250 0.15 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Switchwire 250", - "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", - "max_layer_height": [ - "0.12" - ], - "min_layer_height": [ - "0.04" - ], - "nozzle_diameter": [ - "0.15" - ], - "printable_area": [ - "0x0", - "250x0", - "250x210", - "0x210" - ], - "printable_height": "240" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Switchwire 250 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json index 033dd2486d..66f744ff68 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.2 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Switchwire 250 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Switchwire 250", - "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", - "max_layer_height": [ - "0.16" - ], - "min_layer_height": [ - "0.05" - ], - "nozzle_diameter": [ - "0.2" - ], - "printable_area": [ - "0x0", - "250x0", - "250x210", - "0x210" - ], - "printable_height": "240" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Switchwire 250 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json index 82af15d400..7249b997e8 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.25 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Switchwire 250 0.25 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Switchwire 250", - "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", - "max_layer_height": [ - "0.20" - ], - "min_layer_height": [ - "0.06" - ], - "nozzle_diameter": [ - "0.25" - ], - "printable_area": [ - "0x0", - "250x0", - "250x210", - "0x210" - ], - "printable_height": "240" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Switchwire 250 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json index fd9fd6e8fa..4d8cc9b27c 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.6 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM003", - "name": "Voron Switchwire 250 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Switchwire 250", - "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", - "max_layer_height": [ - "0.48" - ], - "min_layer_height": [ - "0.15" - ], - "nozzle_diameter": [ - "0.6" - ], - "printable_area": [ - "0x0", - "250x0", - "250x210", - "0x210" - ], - "printable_height": "240" -} + "type": "machine", + "setting_id": "GM003", + "name": "Voron Switchwire 250 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json index 75c433739a..fb2bd8e849 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.8 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Switchwire 250 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Switchwire 250", - "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", - "max_layer_height": [ - "0.64" - ], - "min_layer_height": [ - "0.2" - ], - "nozzle_diameter": [ - "0.8" - ], - "printable_area": [ - "0x0", - "250x0", - "250x210", - "0x210" - ], - "printable_height": "240" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Switchwire 250 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json index 42d18832a8..97036eb739 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 1.0 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Switchwire 250 1.0 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Switchwire 250", - "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", - "max_layer_height": [ - "0.80" - ], - "min_layer_height": [ - "0.25" - ], - "nozzle_diameter": [ - "1.0" - ], - "printable_area": [ - "0x0", - "250x0", - "250x210", - "0x210" - ], - "printable_height": "240" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Switchwire 250 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json index 2429e46933..7fcbf7d4d9 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.15 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 250 0.15 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 250", - "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", - "max_layer_height": [ - "0.12" - ], - "min_layer_height": [ - "0.04" - ], - "nozzle_diameter": [ - "0.15" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 250 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json index e8b18f047e..d580d98c89 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.2 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 250 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 250", - "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", - "max_layer_height": [ - "0.16" - ], - "min_layer_height": [ - "0.05" - ], - "nozzle_diameter": [ - "0.2" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 250 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json index c1ad6c6218..40ea2a3675 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.25 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 250 0.25 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 250", - "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", - "max_layer_height": [ - "0.20" - ], - "min_layer_height": [ - "0.06" - ], - "nozzle_diameter": [ - "0.25" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 250 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json index eb9ab32a52..5269287844 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.6 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM003", - "name": "Voron Trident 250 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 250", - "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", - "max_layer_height": [ - "0.48" - ], - "min_layer_height": [ - "0.15" - ], - "nozzle_diameter": [ - "0.6" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 250 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json index 6656b9ae3b..973f22c006 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.8 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Trident 250 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 250", - "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", - "max_layer_height": [ - "0.64" - ], - "min_layer_height": [ - "0.2" - ], - "nozzle_diameter": [ - "0.8" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 250 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json index 93f9cce13e..4114469d00 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 1.0 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Trident 250 1.0 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 250", - "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", - "max_layer_height": [ - "0.80" - ], - "min_layer_height": [ - "0.25" - ], - "nozzle_diameter": [ - "1.0" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 250 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json index 9972b7594d..2a0cba4020 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.15 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 300 0.15 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 300", - "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", - "max_layer_height": [ - "0.12" - ], - "min_layer_height": [ - "0.04" - ], - "nozzle_diameter": [ - "0.15" - ], - "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 300 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json index 1d8b711f43..ac8b4551fe 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.2 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 300 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 300", - "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", - "max_layer_height": [ - "0.16" - ], - "min_layer_height": [ - "0.05" - ], - "nozzle_diameter": [ - "0.2" - ], - "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 300 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json index df880756a4..84feaf93a2 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.25 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 300 0.25 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 300", - "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", - "max_layer_height": [ - "0.20" - ], - "min_layer_height": [ - "0.06" - ], - "nozzle_diameter": [ - "0.25" - ], - "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 300 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json index fc8fcc5078..4834c3078a 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.6 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM003", - "name": "Voron Trident 300 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 300", - "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", - "max_layer_height": [ - "0.48" - ], - "min_layer_height": [ - "0.15" - ], - "nozzle_diameter": [ - "0.6" - ], - "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 300 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json index df95f7090c..fe2be20fca 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.8 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Trident 300 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 300", - "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", - "max_layer_height": [ - "0.64" - ], - "min_layer_height": [ - "0.2" - ], - "nozzle_diameter": [ - "0.8" - ], - "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 300 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json index a8fd806de1..3b20f8311a 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 1.0 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Trident 300 1.0 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 300", - "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", - "max_layer_height": [ - "0.80" - ], - "min_layer_height": [ - "0.25" - ], - "nozzle_diameter": [ - "1.0" - ], - "printable_area": [ - "0x0", - "300x0", - "300x300", - "0x300" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 300 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json index ae619cf41f..7d43d702b5 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.15 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 350 0.15 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 350", - "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", - "max_layer_height": [ - "0.12" - ], - "min_layer_height": [ - "0.04" - ], - "nozzle_diameter": [ - "0.15" - ], - "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 350 0.15 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.09mm Standard 0.15 nozzle @Voron", + "max_layer_height": [ + "0.12" + ], + "min_layer_height": [ + "0.04" + ], + "nozzle_diameter": [ + "0.15" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "0.15" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json index 6a6f75516e..af07cd1594 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.2 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 350 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 350", - "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", - "max_layer_height": [ - "0.16" - ], - "min_layer_height": [ - "0.05" - ], - "nozzle_diameter": [ - "0.2" - ], - "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 350 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.10mm Standard 0.2 nozzle @Voron", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "0.2" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json index 85d9971b41..7f578d8ff6 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.25 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM002", - "name": "Voron Trident 350 0.25 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 350", - "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", - "max_layer_height": [ - "0.20" - ], - "min_layer_height": [ - "0.06" - ], - "nozzle_diameter": [ - "0.25" - ], - "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM002", + "name": "Voron Trident 350 0.25 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.10mm Standard 0.25 nozzle @Voron", + "max_layer_height": [ + "0.20" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "0.25" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json index 847ea3924b..3d385460cf 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.6 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM003", - "name": "Voron Trident 350 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 350", - "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", - "max_layer_height": [ - "0.48" - ], - "min_layer_height": [ - "0.15" - ], - "nozzle_diameter": [ - "0.6" - ], - "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 350 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Voron", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json index ce9d63ad4f..72d91bb067 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.8 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Trident 350 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 350", - "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", - "max_layer_height": [ - "0.64" - ], - "min_layer_height": [ - "0.2" - ], - "nozzle_diameter": [ - "0.8" - ], - "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 350 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.40mm Standard 0.8 nozzle @Voron", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "0.8" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json index d600ad315c..a7421a2666 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 1.0 nozzle.json @@ -1,26 +1,27 @@ { - "type": "machine", - "setting_id": "GM004", - "name": "Voron Trident 350 1.0 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Voron Trident 350", - "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", - "max_layer_height": [ - "0.80" - ], - "min_layer_height": [ - "0.25" - ], - "nozzle_diameter": [ - "1.0" - ], - "printable_area": [ - "0x0", - "350x0", - "350x350", - "0x350" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM004", + "name": "Voron Trident 350 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.50mm Standard 1.0 nozzle @Voron", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "1.0" +} \ No newline at end of file From 109176864e8a09fc999b7ed46a9fb664bb746c39 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 10 Nov 2023 18:00:29 +0800 Subject: [PATCH 31/47] Update locale --- localization/i18n/OrcaSlicer.pot | 47 +++++++++------- localization/i18n/cs/OrcaSlicer_cs.po | 59 ++++++++++++-------- localization/i18n/de/OrcaSlicer_de.po | 61 +++++++++++++-------- localization/i18n/en/OrcaSlicer_en.po | 50 ++++++++++------- localization/i18n/es/OrcaSlicer_es.po | 59 ++++++++++++-------- localization/i18n/fr/OrcaSlicer_fr.po | 59 ++++++++++++-------- localization/i18n/hu/OrcaSlicer_hu.po | 50 ++++++++++------- localization/i18n/it/OrcaSlicer_it.po | 50 ++++++++++------- localization/i18n/ja/OrcaSlicer_ja.po | 50 ++++++++++------- localization/i18n/ko/OrcaSlicer_ko.po | 59 ++++++++++++-------- localization/i18n/nl/OrcaSlicer_nl.po | 61 +++++++++++++-------- localization/i18n/ru/OrcaSlicer_ru.po | 59 ++++++++++++-------- localization/i18n/sv/OrcaSlicer_sv.po | 50 ++++++++++------- localization/i18n/tr/OrcaSlicer_tr.po | 59 ++++++++++++-------- localization/i18n/uk/OrcaSlicer_uk.po | 59 ++++++++++++-------- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 58 ++++++++++++-------- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 52 ++++++++++-------- 17 files changed, 563 insertions(+), 379 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 5469754119..f45e237d77 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -489,27 +489,12 @@ msgstr "" msgid "Remove selection" msgstr "" -msgid "Shift + Mouse move up or dowm" -msgstr "" - -msgid "Rotate text" -msgstr "" - -msgid "Text shape" -msgstr "" - msgid "Font" msgstr "" msgid "Thickness" msgstr "" -msgid "Input text" -msgstr "" - -msgid "Embeded" -msgstr "" - msgid "Text Gap" msgstr "" @@ -521,12 +506,24 @@ msgid "" "depth" msgstr "" +msgid "Input text" +msgstr "" + msgid "Surface" msgstr "" msgid "Horizontal text" msgstr "" +msgid "Shift + Mouse move up or dowm" +msgstr "" + +msgid "Rotate text" +msgstr "" + +msgid "Text shape" +msgstr "" + msgid "Ctrl+" msgstr "" @@ -608,11 +605,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, possible-c-format, possible-boost-format msgid "" "%s\n" @@ -638,6 +630,13 @@ msgstr "" msgid "Info" msgstr "" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "" @@ -5769,6 +5768,9 @@ msgstr "" msgid "Change filament G-code" msgstr "" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "" @@ -9440,6 +9442,9 @@ msgid "" "tool change" msgstr "" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index a70af652b0..d26ad608c5 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-09-30 15:15+0200\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -497,27 +497,12 @@ msgstr "Malování pozice švu" msgid "Remove selection" msgstr "Odebrat výběr" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + pohyb myši nahoru nebo dolů" - -msgid "Rotate text" -msgstr "Otočit text" - -msgid "Text shape" -msgstr "Tvar textu" - msgid "Font" msgstr "Písmo" msgid "Thickness" msgstr "Tloušťka" -msgid "Input text" -msgstr "Vložit text" - -msgid "Embeded" -msgstr "Vloženo" - msgid "Text Gap" msgstr "Mezera v textu" @@ -531,12 +516,24 @@ msgstr "" "Vloženo\n" "hloubka" +msgid "Input text" +msgstr "Vložit text" + msgid "Surface" msgstr "Povrch" msgid "Horizontal text" msgstr "Vodorovný text" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + pohyb myši nahoru nebo dolů" + +msgid "Rotate text" +msgstr "Otočit text" + +msgid "Text shape" +msgstr "Tvar textu" + msgid "Ctrl+" msgstr "Ctrl+" @@ -628,13 +625,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 Runtime" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"Konfigurační soubor OrcaSlicer může být poškozen a nelze jej analyzovat." -"Smažte soubor a zkuste to znovu." - #, c-format, boost-format msgid "" "%s\n" @@ -662,6 +652,13 @@ msgstr "Toto je nejnovější verze." msgid "Info" msgstr "Info" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Obnovit" @@ -6204,6 +6201,9 @@ msgstr "Časosběrný G-kód" msgid "Change filament G-code" msgstr "G-kód Změny filamentu" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "G-kód Pauzy" @@ -10504,6 +10504,9 @@ msgstr "" "Tento gkód se vloží při výměně filamentu, včetně příkazu T ke spuštění " "výměny nástroje" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12368,6 +12371,16 @@ msgstr "" "při tisku filamentu s nižší teplotou a vyšší teplotě uzavřeného prostoru. " "Další informace naleznete ve Wiki." +#~ msgid "Embeded" +#~ msgstr "Vloženo" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "Konfigurační soubor OrcaSlicer může být poškozen a nelze jej analyzovat." +#~ "Smažte soubor a zkuste to znovu." + #~ msgid "Online Models" #~ msgstr "Online modely" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 1c69a1d007..94beb7ed5c 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -494,27 +494,12 @@ msgstr "Naht aufmalen" msgid "Remove selection" msgstr "Auswahl entfernen" -msgid "Shift + Mouse move up or dowm" -msgstr "Umschalttaste + Mausbewegung nach oben oder unten" - -msgid "Rotate text" -msgstr "Text drehen" - -msgid "Text shape" -msgstr "Text zufügen" - msgid "Font" msgstr "Schiftart" msgid "Thickness" msgstr "Dicke" -msgid "Input text" -msgstr "Text eingeben" - -msgid "Embeded" -msgstr "Eingebettet" - msgid "Text Gap" msgstr "Textabstand" @@ -528,12 +513,24 @@ msgstr "" "Eingebettete\n" "Tiefe" +msgid "Input text" +msgstr "Text eingeben" + msgid "Surface" msgstr "Oberfläche" msgid "Horizontal text" msgstr "Horizontaler Text" +msgid "Shift + Mouse move up or dowm" +msgstr "Umschalttaste + Mausbewegung nach oben oder unten" + +msgid "Rotate text" +msgstr "Text drehen" + +msgid "Text shape" +msgstr "Text zufügen" + msgid "Ctrl+" msgstr "Strg +" @@ -627,14 +624,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2-Runtime" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"Die OrcaSlicer-Konfigurationsdatei ist möglicherweise beschädigt und kann " -"nicht geladen werden. Bitte löschen Sie die Datei und versuchen Sie es " -"erneut." - #, c-format, boost-format msgid "" "%s\n" @@ -664,6 +653,13 @@ msgstr "Dies ist die neueste Version." msgid "Info" msgstr "Info" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Wiederaufbau" @@ -6352,6 +6348,9 @@ msgstr "Zeitraffer G-Code" msgid "Change filament G-code" msgstr "Filamentwechsel G-Code" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Pausen G-Code" @@ -10804,6 +10803,9 @@ msgstr "" "Dieser G-Code wird beim Filamentwechsel eingefügt, einschließlich des T-" "Befehls zum Auslösen des Werkzeugwechsels" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12723,6 +12725,17 @@ msgstr "" "höherer Gehäusetemperatur verringern. Weitere Informationen dazu finden Sie " "in der Wiki." +#~ msgid "Embeded" +#~ msgstr "Eingebettet" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "Die OrcaSlicer-Konfigurationsdatei ist möglicherweise beschädigt und kann " +#~ "nicht geladen werden. Bitte löschen Sie die Datei und versuchen Sie es " +#~ "erneut." + #~ msgid "Online Models" #~ msgstr "Online-Modelle" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 6edffd9b85..e143bf0c7e 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -491,27 +491,12 @@ msgstr "Seam painting" msgid "Remove selection" msgstr "Remove selection" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Mouse move up or dowm" - -msgid "Rotate text" -msgstr "Rotate text" - -msgid "Text shape" -msgstr "Text shape" - msgid "Font" msgstr "Font" msgid "Thickness" msgstr "Thickness" -msgid "Input text" -msgstr "Input text" - -msgid "Embeded" -msgstr "Embedded" - msgid "Text Gap" msgstr "Text Gap" @@ -523,12 +508,24 @@ msgid "" "depth" msgstr "Embedded depth" +msgid "Input text" +msgstr "Input text" + msgid "Surface" msgstr "Surface" msgid "Horizontal text" msgstr "Horizontal text" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Mouse move up or dowm" + +msgid "Rotate text" +msgstr "Rotate text" + +msgid "Text shape" +msgstr "Text shape" + msgid "Ctrl+" msgstr "Ctrl+" @@ -612,11 +609,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, c-format, boost-format msgid "" "%s\n" @@ -644,6 +636,13 @@ msgstr "This is the newest version." msgid "Info" msgstr "Info" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Rebuild" @@ -6088,6 +6087,9 @@ msgstr "" msgid "Change filament G-code" msgstr "Change filament G-code" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Pause G-code" @@ -10082,6 +10084,9 @@ msgstr "" "This G-code is inserted when filament is changed, including T commands to " "trigger tool change." +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11713,6 +11718,9 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Embedded" + #~ msgid "Online Models" #~ msgstr "Online Models" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 86eb370cd5..d5455d9bdd 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: \n" "Last-Translator: Carlos Fco. Caruncho Serrano \n" "Language-Team: \n" @@ -494,27 +494,12 @@ msgstr "Pintar costura" msgid "Remove selection" msgstr "Borrar selección" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Mover ratón arriba u abajo" - -msgid "Rotate text" -msgstr "Rotar texto" - -msgid "Text shape" -msgstr "Forma de texto" - msgid "Font" msgstr "Fuente" msgid "Thickness" msgstr "Grosor" -msgid "Input text" -msgstr "Texto de entrada" - -msgid "Embeded" -msgstr "Integrado" - msgid "Text Gap" msgstr "Espacio de texto" @@ -528,12 +513,24 @@ msgstr "" "Profundidad\n" "Integrada" +msgid "Input text" +msgstr "Texto de entrada" + msgid "Surface" msgstr "Superficie" msgid "Horizontal text" msgstr "Texto horizontal" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Mover ratón arriba u abajo" + +msgid "Rotate text" +msgstr "Rotar texto" + +msgid "Text shape" +msgstr "Forma de texto" + msgid "Ctrl+" msgstr "Ctrl+" @@ -634,13 +631,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "Tiempo de ejecución de WebView2" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"El archivo de configuración de OrcaSlicer puede estar dañado y no puede ser " -"procesado. Por favor borre el archivo e inténtelo otra vez." - # msgid "OrcaSlicer configuration file may be corrupted and is not abled to be parsed.Please delete the file and try again." # msgstr "Es posible que el archivo de configuración de OrcaSlicer esté dañado y no pueda ser procesado. Por favor, borre el archivo e inténtelo de nuevo." #, c-format, boost-format @@ -671,6 +661,13 @@ msgstr "Esta es la versión más reciente." msgid "Info" msgstr "Información" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Reconstruir" @@ -6300,6 +6297,9 @@ msgstr "Timelapse G-code" msgid "Change filament G-code" msgstr "G-Code para el cambio de filamento" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "G-Code de pausa" @@ -10745,6 +10745,9 @@ msgstr "" "Este G-Code se inserta cuando se cambia de filamento, incluyendo el comando " "T para activar el cambio de herramienta" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12658,6 +12661,16 @@ msgstr "" "extrusor/hotend al imprimir filamento de baja temperatura con una " "temperatura de carcasa más alta. Más información sobre esto en la Wiki." +#~ msgid "Embeded" +#~ msgstr "Integrado" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "El archivo de configuración de OrcaSlicer puede estar dañado y no puede " +#~ "ser procesado. Por favor borre el archivo e inténtelo otra vez." + #~ msgid "Online Models" #~ msgstr "Modelos En Línea" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 8e2750643d..12c0e625d3 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Guislain Cyril\n" @@ -498,27 +498,12 @@ msgstr "Peindre la couture" msgid "Remove selection" msgstr "Supprimer la sélection" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Déplacement de la souris vers le haut ou le bas" - -msgid "Rotate text" -msgstr "Rotation du texte" - -msgid "Text shape" -msgstr "Forme du texte" - msgid "Font" msgstr "Police" msgid "Thickness" msgstr "Épaisseur" -msgid "Input text" -msgstr "Texte" - -msgid "Embeded" -msgstr "Intégré" - msgid "Text Gap" msgstr "Espacement du texte" @@ -532,12 +517,24 @@ msgstr "" "Profondeur\n" "intégrée" +msgid "Input text" +msgstr "Texte" + msgid "Surface" msgstr "Surface" msgid "Horizontal text" msgstr "Texte horizontal" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Déplacement de la souris vers le haut ou le bas" + +msgid "Rotate text" +msgstr "Rotation du texte" + +msgid "Text shape" +msgstr "Forme du texte" + msgid "Ctrl+" msgstr "Ctrl+" @@ -633,13 +630,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"Le fichier de configuration de Orca Slicer est peut-être corrompu et ne peut " -"pas être analysé. Veuillez supprimer le fichier et réessayer." - #, c-format, boost-format msgid "" "%s\n" @@ -667,6 +657,13 @@ msgstr "Il s'agit de la version la plus récente." msgid "Info" msgstr "Info" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Reconstruire" @@ -6312,6 +6309,9 @@ msgstr "G-code de Time lapse" msgid "Change filament G-code" msgstr "G-code de changement de filament" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "G-code de mise en pause" @@ -10564,6 +10564,9 @@ msgstr "" "Ce gcode est inséré lors du changement de filament, y compris la commande T " "pour déclencher le changement d'outil" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12325,6 +12328,16 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Intégré" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "Le fichier de configuration de Orca Slicer est peut-être corrompu et ne " +#~ "peut pas être analysé. Veuillez supprimer le fichier et réessayer." + #~ msgid "Online Models" #~ msgstr "Modèles en ligne" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index f7ae4777c4..007853c48d 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -490,27 +490,12 @@ msgstr "Varratfestés" msgid "Remove selection" msgstr "Kijelölés törlése" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Mouse move up or dowm" - -msgid "Rotate text" -msgstr "Rotate text" - -msgid "Text shape" -msgstr "Szöveg alakja" - msgid "Font" msgstr "Betűtípus" msgid "Thickness" msgstr "Vastagság" -msgid "Input text" -msgstr "Szöveg" - -msgid "Embeded" -msgstr "Embedded" - msgid "Text Gap" msgstr "Text Gap" @@ -522,12 +507,24 @@ msgid "" "depth" msgstr "Embedded depth" +msgid "Input text" +msgstr "Szöveg" + msgid "Surface" msgstr "Surface" msgid "Horizontal text" msgstr "Horizontal text" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Mouse move up or dowm" + +msgid "Rotate text" +msgstr "Rotate text" + +msgid "Text shape" +msgstr "Szöveg alakja" + msgid "Ctrl+" msgstr "Ctrl+" @@ -613,11 +610,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, c-format, boost-format msgid "" "%s\n" @@ -645,6 +637,13 @@ msgstr "Ez a legújabb verzió." msgid "Info" msgstr "Infó" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Újraindítás" @@ -6134,6 +6133,9 @@ msgstr "" msgid "Change filament G-code" msgstr "Filament csere G-kód" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Szünet G-kód" @@ -10172,6 +10174,9 @@ msgstr "" "Ez a G-kód kerül beillesztésre, amikor a filament csere történik, beleértve " "a szerszámváltást indító T parancsokat is." +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11879,6 +11884,9 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Embedded" + #~ msgid "Online Models" #~ msgstr "Online Models" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 31efcbdc60..4a1d756596 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -489,27 +489,12 @@ msgstr "Pittura giunzione" msgid "Remove selection" msgstr "Rimuovi selezione" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Sposta il mouse verso l'alto o il basso" - -msgid "Rotate text" -msgstr "Ruota testo" - -msgid "Text shape" -msgstr "Formato testo" - msgid "Font" msgstr "Font" msgid "Thickness" msgstr "Spessore" -msgid "Input text" -msgstr "Inserisci testo" - -msgid "Embeded" -msgstr "Integrato" - msgid "Text Gap" msgstr "Gap testo" @@ -521,12 +506,24 @@ msgid "" "depth" msgstr "Profondità integrata" +msgid "Input text" +msgstr "Inserisci testo" + msgid "Surface" msgstr "Superficie" msgid "Horizontal text" msgstr "Testo orizzontale" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Sposta il mouse verso l'alto o il basso" + +msgid "Rotate text" +msgstr "Ruota testo" + +msgid "Text shape" +msgstr "Formato testo" + msgid "Ctrl+" msgstr "Ctrl+" @@ -610,11 +607,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, c-format, boost-format msgid "" "%s\n" @@ -642,6 +634,13 @@ msgstr "This is the newest version." msgid "Info" msgstr "Info" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Rebuild" @@ -6125,6 +6124,9 @@ msgstr "" msgid "Change filament G-code" msgstr "Change filament G-code" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Pause G-code" @@ -10142,6 +10144,9 @@ msgstr "" "This G-code is inserted when filament is changed, including T commands to " "trigger tool change." +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11860,6 +11865,9 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Integrato" + #~ msgid "Online Models" #~ msgstr "Modelli Online" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 6574b75a4e..fa406bf395 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -489,27 +489,12 @@ msgstr "継ぎ目ペイント" msgid "Remove selection" msgstr "選択を削除" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Mouse move up or dowm" - -msgid "Rotate text" -msgstr "Rotate text" - -msgid "Text shape" -msgstr "文字形状" - msgid "Font" msgstr "フォント" msgid "Thickness" msgstr "太さ" -msgid "Input text" -msgstr "テキスト" - -msgid "Embeded" -msgstr "Embedded" - msgid "Text Gap" msgstr "Text Gap" @@ -521,12 +506,24 @@ msgid "" "depth" msgstr "Embedded depth" +msgid "Input text" +msgstr "テキスト" + msgid "Surface" msgstr "Surface" msgid "Horizontal text" msgstr "Horizontal text" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Mouse move up or dowm" + +msgid "Rotate text" +msgstr "Rotate text" + +msgid "Text shape" +msgstr "文字形状" + msgid "Ctrl+" msgstr "Ctrl+" @@ -608,11 +605,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, c-format, boost-format msgid "" "%s\n" @@ -640,6 +632,13 @@ msgstr "最新バージョンです。" msgid "Info" msgstr "情報" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "再構築" @@ -5975,6 +5974,9 @@ msgstr "" msgid "Change filament G-code" msgstr "フィラメント変更G-code" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "G-codeを一時停止" @@ -9823,6 +9825,9 @@ msgid "" "tool change" msgstr "フィラメントを切り替える直後に実行するG-codeです。" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11481,6 +11486,9 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Embedded" + #~ msgid "Online Models" #~ msgstr "Online Models" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index ddfcd761ac..959e04a202 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-10-26 16:47+0900\n" "Last-Translator: Hotsolidinfill\n" "Language-Team: \n" @@ -495,27 +495,12 @@ msgstr "솔기 칠하기" msgid "Remove selection" msgstr "선택 삭제" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + 마우스 위 or 아래" - -msgid "Rotate text" -msgstr "텍스트 회전" - -msgid "Text shape" -msgstr "텍스트 모양" - msgid "Font" msgstr "글꼴" msgid "Thickness" msgstr "두께" -msgid "Input text" -msgstr "텍스트 입력" - -msgid "Embeded" -msgstr "매입" - msgid "Text Gap" msgstr "글자 간격" @@ -529,12 +514,24 @@ msgstr "" "내장\n" "깊이" +msgid "Input text" +msgstr "텍스트 입력" + msgid "Surface" msgstr "표면" msgid "Horizontal text" msgstr "가로 텍스트" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + 마우스 위 or 아래" + +msgid "Rotate text" +msgstr "텍스트 회전" + +msgid "Text shape" +msgstr "텍스트 모양" + msgid "Ctrl+" msgstr "Ctrl+" @@ -623,13 +620,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 런타임" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"OrcaSlicer 구성 파일이 손상되어 구문 분석할 수 없습니다. 파일을 삭제하고 다" -"시 시도하십시오." - #, c-format, boost-format msgid "" "%s\n" @@ -657,6 +647,13 @@ msgstr "최신 버전입니다." msgid "Info" msgstr "정보" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "재빌드" @@ -6096,6 +6093,9 @@ msgstr "타임랩스 G코드" msgid "Change filament G-code" msgstr "필라멘트 교체 G코드" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "일시정지 G코드" @@ -10287,6 +10287,9 @@ msgstr "" "이 G코드는 도구 변경을 유발하는 T 명령을 포함하여 필라멘트를 변경할 때 삽입됩" "니다" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12110,6 +12113,16 @@ msgstr "" "기/핫엔드가 막힐 가능성을 줄일 수 있습니다. 이에 대한 자세한 내용은 Wiki에서 " "확인하세요." +#~ msgid "Embeded" +#~ msgstr "매입" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "OrcaSlicer 구성 파일이 손상되어 구문 분석할 수 없습니다. 파일을 삭제하고 " +#~ "다시 시도하십시오." + #~ msgid "Online Models" #~ msgstr "온라인 모델" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index d313e8c3e9..d0cb08e646 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -492,28 +492,12 @@ msgstr "Naad schilderen" msgid "Remove selection" msgstr "Selectie verwijderen" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Muis op of neer" - -msgid "Rotate text" -msgstr "Draai tekst" - -msgid "Text shape" -msgstr "Tekstvorm" - msgid "Font" msgstr "Lettertype" msgid "Thickness" msgstr "Dikte" -msgid "Input text" -msgstr "Tekst invoeren" - -# Source and destination string both English but don't match! -msgid "Embeded" -msgstr "Embedded" - msgid "Text Gap" msgstr "Tekstruimte" @@ -525,12 +509,24 @@ msgid "" "depth" msgstr "Embedded depth" +msgid "Input text" +msgstr "Tekst invoeren" + msgid "Surface" msgstr "Oppervlak" msgid "Horizontal text" msgstr "Horizontale tekst" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Muis op of neer" + +msgid "Rotate text" +msgstr "Draai tekst" + +msgid "Text shape" +msgstr "Tekstvorm" + msgid "Ctrl+" msgstr "Ctrl+" @@ -623,13 +619,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 Runtime" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"OrcaSlicer configuratiebestand is mogelijks corrupt, en kan niet verwerkt " -"worden.Verwijder het configuratiebestand en probeer het opnieuw." - #, c-format, boost-format msgid "" "%s\n" @@ -658,6 +647,13 @@ msgstr "Dit is de nieuwste versie." msgid "Info" msgstr "Informatie" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Herbouwen" @@ -6207,6 +6203,9 @@ msgstr "" msgid "Change filament G-code" msgstr "Filament G-code aanpassen" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Pauzeer G-code" @@ -10286,6 +10285,9 @@ msgstr "" "Deze G-code wordt ingevoegd wanneer filament wordt vervangen, inclusief T-" "commando's om gereedschapswissel te activeren." +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12000,6 +12002,17 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +# Source and destination string both English but don't match! +#~ msgid "Embeded" +#~ msgstr "Embedded" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "OrcaSlicer configuratiebestand is mogelijks corrupt, en kan niet verwerkt " +#~ "worden.Verwijder het configuratiebestand en probeer het opnieuw." + #~ msgid "Online Models" #~ msgstr "Online Models" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 6c1850cdcb..14457462f3 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer V1.8.0 beta1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-10-31 14:13+0700\n" "Last-Translator: Andylg \n" "Language-Team: \n" @@ -498,27 +498,12 @@ msgstr "Рисование шва" msgid "Remove selection" msgstr "Удаление выделенного" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Мышь вверх или вниз" - -msgid "Rotate text" -msgstr "Поворот текста" - -msgid "Text shape" -msgstr "Форма текста" - msgid "Font" msgstr "Шрифт" msgid "Thickness" msgstr "Толщина" -msgid "Input text" -msgstr "Введите текст" - -msgid "Embeded" -msgstr "Проникновение" - msgid "Text Gap" msgstr "" "Межбуквенный \n" @@ -534,12 +519,24 @@ msgstr "" "Глубина\n" "проникновения" +msgid "Input text" +msgstr "Введите текст" + msgid "Surface" msgstr "На поверхности" msgid "Horizontal text" msgstr "Горизонтальный текст" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Мышь вверх или вниз" + +msgid "Rotate text" +msgstr "Поворот текста" + +msgid "Text shape" +msgstr "Форма текста" + msgid "Ctrl+" msgstr "Ctrl+" @@ -630,13 +627,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 Runtime" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"Возможно, файл конфигурации OrcaSlicer повреждён и не может быть обработан. " -"Пожалуйста, удалите файл и повторите попытку." - #, c-format, boost-format msgid "" "%s\n" @@ -665,6 +655,13 @@ msgstr "У вас стоит самая последняя версия." msgid "Info" msgstr "Информация" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Пересоздание" @@ -6313,6 +6310,9 @@ msgstr "G-код таймлапса" msgid "Change filament G-code" msgstr "G-код выполняемый при смене прутка" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "G-код паузы печати" @@ -10757,6 +10757,9 @@ msgstr "" "Этот G-код вставляется при смене материала, включая команду T для запуска " "смены инструмента." +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12670,6 +12673,16 @@ msgstr "" "камере, открытие дверцы принтера снижает вероятность засорения экструдера/" "хотэнда. Более подробную информацию читайте на вики-сайте." +#~ msgid "Embeded" +#~ msgstr "Проникновение" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "Возможно, файл конфигурации OrcaSlicer повреждён и не может быть " +#~ "обработан. Пожалуйста, удалите файл и повторите попытку." + #~ msgid "AMS %s" #~ msgstr "АСПП №%s" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 600695a9ac..58e94daf82 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -489,27 +489,12 @@ msgstr "Målning av sömmar" msgid "Remove selection" msgstr "Ta bort val" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Mus flytta uppåt eller nedåt" - -msgid "Rotate text" -msgstr "Rotera text" - -msgid "Text shape" -msgstr "Text form" - msgid "Font" msgstr "Typsnitt" msgid "Thickness" msgstr "Tjocklek" -msgid "Input text" -msgstr "Skriv in text" - -msgid "Embeded" -msgstr "Inbäddad" - msgid "Text Gap" msgstr "Text mellanrum" @@ -521,12 +506,24 @@ msgid "" "depth" msgstr "Inbäddat djup" +msgid "Input text" +msgstr "Skriv in text" + msgid "Surface" msgstr "Yta" msgid "Horizontal text" msgstr "Vågrät text" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Mus flytta uppåt eller nedåt" + +msgid "Rotate text" +msgstr "Rotera text" + +msgid "Text shape" +msgstr "Text form" + msgid "Ctrl+" msgstr "Ctrl +" @@ -609,11 +606,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, c-format, boost-format msgid "" "%s\n" @@ -641,6 +633,13 @@ msgstr "Det är den senaste versionen." msgid "Info" msgstr "Info" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Återskapa" @@ -6110,6 +6109,9 @@ msgstr "" msgid "Change filament G-code" msgstr "Byta filament G-kod" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Paus G-kod" @@ -10097,6 +10099,9 @@ msgstr "" "G-koden sätts in vid filament byte, inklusive T kommando som aktiverar " "verktygs byte" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11804,6 +11809,9 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Inbäddad" + #~ msgid "Online Models" #~ msgstr "Online modeller" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 9f44e71ff4..dd13d3169a 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-10-07 12:57+0300\n" "Last-Translator: Sadri Ercan\n" "Language-Team: Türkçe\n" @@ -497,27 +497,12 @@ msgstr "Dikiş boyama" msgid "Remove selection" msgstr "Seçimi kaldır" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + Fare yukarı veya aşağı hareket ettirir" - -msgid "Rotate text" -msgstr "Metni döndür" - -msgid "Text shape" -msgstr "Metin şekli" - msgid "Font" msgstr "Yazı tipi" msgid "Thickness" msgstr "Kalınlık" -msgid "Input text" -msgstr "Giriş metni" - -msgid "Embeded" -msgstr "Gömülü" - msgid "Text Gap" msgstr "Metin Boşluğu" @@ -531,12 +516,24 @@ msgstr "" "Gömülü\n" "derinlik" +msgid "Input text" +msgstr "Giriş metni" + msgid "Surface" msgstr "Yüzey" msgid "Horizontal text" msgstr "Yatay metin" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + Fare yukarı veya aşağı hareket ettirir" + +msgid "Rotate text" +msgstr "Metni döndür" + +msgid "Text shape" +msgstr "Metin şekli" + msgid "Ctrl+" msgstr "Ctrl+" @@ -626,13 +623,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 Çalışma Zamanı" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"OrcaSlicer yapılandırma dosyası bozulmuş olabilir ve ayrıştırılması mümkün " -"olmayabilir. Lütfen dosyayı silin ve tekrar deneyin." - #, c-format, boost-format msgid "" "%s\n" @@ -660,6 +650,13 @@ msgstr "Bu en yeni versiyondur." msgid "Info" msgstr "Bilgi" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Yeniden yükleniyor" @@ -6190,6 +6187,9 @@ msgstr "Time lapse G-code" msgid "Change filament G-code" msgstr "Filament değişimi G-kod" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "Duraklatma G-Kod" @@ -10475,6 +10475,9 @@ msgstr "" "Bu gcode, takım değişimini tetiklemek için T komutu da dahil olmak üzere " "filament değiştirildiğinde eklenir" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12330,6 +12333,16 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Gömülü" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "OrcaSlicer yapılandırma dosyası bozulmuş olabilir ve ayrıştırılması " +#~ "mümkün olmayabilir. Lütfen dosyayı silin ve tekrar deneyin." + #~ msgid "Online Models" #~ msgstr "Çevrimiçi Modeller" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index b63671fd9a..a72fb2dfe6 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-08-10 20:25-0400\n" "Last-Translator: \n" "Language-Team: \n" @@ -495,27 +495,12 @@ msgstr "Малювання шва" msgid "Remove selection" msgstr "Видалити виділення" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + переміщення миші вгору або вниз" - -msgid "Rotate text" -msgstr "Повернути текст" - -msgid "Text shape" -msgstr "Форма тексту" - msgid "Font" msgstr "Шрифт" msgid "Thickness" msgstr "Товщина" -msgid "Input text" -msgstr "Введення тексту" - -msgid "Embeded" -msgstr "Вбудовано" - msgid "Text Gap" msgstr "Пробіл у тексті" @@ -527,12 +512,24 @@ msgid "" "depth" msgstr "Вбудована глибина" +msgid "Input text" +msgstr "Введення тексту" + msgid "Surface" msgstr "Поверхня" msgid "Horizontal text" msgstr "Горизонтальний текст" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + переміщення миші вгору або вниз" + +msgid "Rotate text" +msgstr "Повернути текст" + +msgid "Text shape" +msgstr "Форма тексту" + msgid "Ctrl+" msgstr "Ctrl+" @@ -621,13 +618,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"Файл конфігурації OrcaSlicer може бути пошкоджений і не підлягає розбору. " -"Видаліть файл і спробуйте ще раз." - #, c-format, boost-format msgid "" "%s\n" @@ -653,6 +643,13 @@ msgstr "Це найновіша версія." msgid "Info" msgstr "Інформація" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "Відновити" @@ -6153,6 +6150,9 @@ msgstr "" msgid "Change filament G-code" msgstr "G-code Зміни філаменту" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "G-code Паузи" @@ -10279,6 +10279,9 @@ msgstr "" "Цей gcode вставляється при зміні філаменту, включаючи команду T для запуску " "зміни інструменту" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11993,6 +11996,16 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "Вбудовано" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "Файл конфігурації OrcaSlicer може бути пошкоджений і не підлягає розбору. " +#~ "Видаліть файл і спробуйте ще раз." + #~ msgid "The minimum printing speed when slow down for cooling" #~ msgstr "Мінімальна швидкість друку при уповільненні для охолодження" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 80f510ad0c..5a97ebf4d3 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-04-01 13:21+0800\n" "Last-Translator: SoftFever \n" "Language-Team: \n" @@ -491,27 +491,12 @@ msgstr "Z缝绘制" msgid "Remove selection" msgstr "移除绘制" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + 鼠标上移或下移" - -msgid "Rotate text" -msgstr "旋转文字" - -msgid "Text shape" -msgstr "文本形状" - msgid "Font" msgstr "字体" msgid "Thickness" msgstr "厚度" -msgid "Input text" -msgstr "输入文本" - -msgid "Embeded" -msgstr "嵌入的" - msgid "Text Gap" msgstr "文字间距" @@ -523,12 +508,24 @@ msgid "" "depth" msgstr "内嵌深度" +msgid "Input text" +msgstr "输入文本" + msgid "Surface" msgstr "附着曲面" msgid "Horizontal text" msgstr "水平文字" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + 鼠标上移或下移" + +msgid "Rotate text" +msgstr "旋转文字" + +msgid "Text shape" +msgstr "文本形状" + msgid "Ctrl+" msgstr "" @@ -614,12 +611,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 运行库" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" -"OrcaSlicer 配置文件可能已损坏而无法解析。请删除此文件并重新启动OrcaSlicer。" - #, c-format, boost-format msgid "" "%s\n" @@ -645,6 +636,13 @@ msgstr "已经是最新版本。" msgid "Info" msgstr "信息" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "重新构建" @@ -5925,6 +5923,9 @@ msgstr "延时摄影G-code" msgid "Change filament G-code" msgstr "耗材丝更换G-code" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "暂停 G-code" @@ -9804,6 +9805,9 @@ msgid "" "tool change" msgstr "换料时插入的G-code，包括T命令。" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -11541,6 +11545,16 @@ msgid "" "temperature. More info about this in the Wiki." msgstr "" +#~ msgid "Embeded" +#~ msgstr "嵌入的" + +#~ msgid "" +#~ "OrcaSlicer configuration file may be corrupted and is not abled to be " +#~ "parsed.Please delete the file and try again." +#~ msgstr "" +#~ "OrcaSlicer 配置文件可能已损坏而无法解析。请删除此文件并重新启动" +#~ "OrcaSlicer。" + #~ msgid "Online Models" #~ msgstr "在线模型" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index a9665558e4..9c572230d7 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 21:36+0800\n" +"POT-Creation-Date: 2023-11-10 14:54+0800\n" "PO-Revision-Date: 2023-11-06 14:37+0800\n" "Last-Translator: ablegods \n" "Language-Team: \n" @@ -517,28 +517,12 @@ msgstr "自訂Z縫" msgid "Remove selection" msgstr "移除繪製" -msgid "Shift + Mouse move up or dowm" -msgstr "Shift + 滑鼠上移或下移" - -msgid "Rotate text" -msgstr "旋轉文字" - -#, fuzzy -msgid "Text shape" -msgstr "新增文字" - msgid "Font" msgstr "字體" msgid "Thickness" msgstr "厚度" -msgid "Input text" -msgstr "輸入文字" - -msgid "Embeded" -msgstr "嵌入的" - msgid "Text Gap" msgstr "文字間距" @@ -550,12 +534,25 @@ msgid "" "depth" msgstr "內嵌深度" +msgid "Input text" +msgstr "輸入文字" + msgid "Surface" msgstr "附著於曲面" msgid "Horizontal text" msgstr "水平文字" +msgid "Shift + Mouse move up or dowm" +msgstr "Shift + 滑鼠上移或下移" + +msgid "Rotate text" +msgstr "旋轉文字" + +#, fuzzy +msgid "Text shape" +msgstr "新增文字" + msgid "Ctrl+" msgstr "" @@ -648,11 +645,6 @@ msgstr "" msgid "WebView2 Runtime" msgstr "WebView2 Runtime" -msgid "" -"OrcaSlicer configuration file may be corrupted and is not abled to be parsed." -"Please delete the file and try again." -msgstr "" - #, fuzzy, c-format, boost-format msgid "" "%s\n" @@ -682,6 +674,13 @@ msgstr "已經是最新版本。" msgid "Info" msgstr "資訊" +msgid "" +"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\n" +"OrcaSlicer has attempted to recreate the configuration file.\n" +"Please note, application settings will be lost, but printer profiles will " +"not be affected." +msgstr "" + msgid "Rebuild" msgstr "重新建構" @@ -6307,6 +6306,9 @@ msgstr "縮時錄影 G-code" msgid "Change filament G-code" msgstr "線材更換 G-code" +msgid "Change extrusion role G-code" +msgstr "" + msgid "Pause G-code" msgstr "暫停 G-code" @@ -10437,6 +10439,9 @@ msgid "" "tool change" msgstr "換料時插入的G-code，包括T命令。" +msgid "This gcode is inserted when the extrusion role is changed" +msgstr "" + msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " "the nozzle diameter." @@ -12277,6 +12282,9 @@ msgstr "" "當列印較低溫度的耗材時，打開印表機門可以減少擠出機或熱端堵塞的可能性。 有關此" "內容的更多信息，請參見 Wiki。" +#~ msgid "Embeded" +#~ msgstr "嵌入的" + #~ msgid "" #~ "Orca Slicer configuration file may be corrupted and is not abled to be " #~ "parsed.Please delete the file and try again." From edb5676dd14432a77d15312f85a17452e79e06f5 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 10 Nov 2023 18:00:56 +0800 Subject: [PATCH 32/47] Fixed a bug that filament start gcode was inserted twice when wipe tower is enabled fixed #2673 --- src/libslic3r/GCode/WipeTower2.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libslic3r/GCode/WipeTower2.cpp b/src/libslic3r/GCode/WipeTower2.cpp index 6bddcf5191..ab8a54ea06 100644 --- a/src/libslic3r/GCode/WipeTower2.cpp +++ b/src/libslic3r/GCode/WipeTower2.cpp @@ -1038,8 +1038,7 @@ void WipeTower2::toolchange_Change( // The toolchange Tn command will be inserted later, only in case that the user does // not provide a custom toolchange gcode. writer.set_tool(new_tool); // This outputs nothing, the writer just needs to know the tool has changed. - //writer.append("[start_filament_gcode]\n"); - writer.append("[filament_start_gcode]\n"); + // writer.append("[filament_start_gcode]\n"); writer.flush_planner_queue(); From c860680b2118ab1a23b28ec8569382b80a1a9578 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 10 Nov 2023 19:46:01 +0800 Subject: [PATCH 33/47] Fixed a issue that support_bottom_z_distance was not working as expected. Fixed #2667 --- src/libslic3r/GCode.cpp | 3 +-- src/libslic3r/PrintConfig.cpp | 3 ++- src/libslic3r/Slicing.cpp | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index d2ae580d9d..fd8a164f07 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1206,8 +1206,7 @@ std::vector GCode::collect_layers_to_print(const PrintObjec // Allow empty support layers, as the support generator may produce no extrusions for non-empty support regions. || (layer_to_print.support_layer /* && layer_to_print.support_layer->has_extrusions() */)) { double top_cd = object.config().support_top_z_distance; - //double bottom_cd = object.config().support_bottom_z_distance == 0. ? top_cd : object.config().support_bottom_z_distance; - double bottom_cd = top_cd; + double bottom_cd = object.config().support_bottom_z_distance; double extra_gap = (layer_to_print.support_layer ? bottom_cd : top_cd); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 2702e3b47f..94cb997fbc 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3501,6 +3501,7 @@ def = this->add("filament_loading_speed", coFloats); def = this->add("support_top_z_distance", coFloat); //def->gui_type = ConfigOptionDef::GUIType::f_enum_open; def->label = L("Top Z distance"); + def->min = 0; def->category = L("Support"); def->tooltip = L("The z gap between the top support interface and object"); def->sidetext = L("mm"); @@ -3516,12 +3517,12 @@ def = this->add("filament_loading_speed", coFloats); def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.2)); - // BBS:MusangKing def = this->add("support_bottom_z_distance", coFloat); def->label = L("Bottom Z distance"); def->category = L("Support"); def->tooltip = L("The z gap between the bottom support interface and object"); def->sidetext = L("mm"); + def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.2)); diff --git a/src/libslic3r/Slicing.cpp b/src/libslic3r/Slicing.cpp index acfb17e856..989610c7ac 100644 --- a/src/libslic3r/Slicing.cpp +++ b/src/libslic3r/Slicing.cpp @@ -119,8 +119,6 @@ SlicingParameters SlicingParameters::create_from_config( //BBS params.gap_object_support = object_config.support_bottom_z_distance.value; params.gap_support_object = object_config.support_top_z_distance.value; - if (params.gap_object_support <= 0) - params.gap_object_support = params.gap_support_object; if (!print_config.independent_support_layer_height) { params.gap_raft_object = std::round(params.gap_raft_object / object_config.layer_height + EPSILON) * object_config.layer_height; From 464594336012defbea3c497a33ef3904fd5424b2 Mon Sep 17 00:00:00 2001 From: Hukete <100949318+Hukete@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:51:44 +0800 Subject: [PATCH 34/47] Update fdm_process_qidi_x3_common.json (#2683) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 10-25 Add TPU-95A HF * 1030 Adding Introduction of Chamber Temperature Control Macros(M191) to Notes * 1102 Add ABS-GF10 profile， Remove a extra "s" from the "0.36mm Standard @Qidi XPlus3 0.6 nozzle.json" file * 1106 Add the PA value to some genetic filament profiles * Update fdm_filament_pla.json Change the fan rate of begin layers * Update fdm_process_qidi_x3_common.json Reduction of top surface particles --- resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json b/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json index cd84825bc2..6f710334de 100644 --- a/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json +++ b/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json @@ -113,5 +113,6 @@ "internal_bridge_speed": "50", "internal_solid_infill_pattern": "monotonic", "initial_layer_travel_speed": "50%", + "filter_out_gap_fill": "2", "notes": "If you want to use Orca's chamber temperature control feature, check that printer.cfg has added the following M191 macro.\nTo add it: go to Fluidd web interface--configuration, copy the following code to the top of the printer.cfg document, SAVE&RESATART \n\n[gcode_macro M191]\ngcode:\n #Parameters\n {% set s = params.S|float %}\n \n M141 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp\n {% if s != 0 %}\n TEMPERATURE_WAIT SENSOR=\"heater_generic hot\" MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree)\n {% endif %}" } From 09b84a0850ec48531a1fe1ebb240169556075f5a Mon Sep 17 00:00:00 2001 From: Heiko Liebscher Date: Fri, 10 Nov 2023 13:52:21 +0100 Subject: [PATCH 35/47] fix de language new feature (#2686) fix de --- localization/i18n/de/OrcaSlicer_de.po | 33 +++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 94beb7ed5c..fd95f27a34 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-10 14:54+0800\n" +"POT-Creation-Date: 2023-11-10 11:25+0100\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -659,6 +659,11 @@ msgid "" "Please note, application settings will be lost, but printer profiles will " "not be affected." msgstr "" +"Die OrcaSlicer-Konfigurationsdatei ist möglicherweise beschädigt und kann " +"nicht analysiert werden.\n" +"OrcaSlicer hat versucht, die Konfigurationsdatei neu zu erstellen.\n" +"Bitte beachten Sie, dass die Anwendungseinstellungen verloren gehen, die " +"Druckerprofile jedoch nicht betroffen sind." msgid "Rebuild" msgstr "Wiederaufbau" @@ -3218,7 +3223,7 @@ msgstr "Volumen:" msgid "Size:" msgstr "Größe:" -#, c-format, boost-format +#, boost-format msgid "" "Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please " "separate the conflicted objects farther (%s <-> %s)." @@ -6059,13 +6064,13 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add Primitive" -"\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add " +"Primitive\"->\"Timelapse Wipe Tower\"." msgstr "" "Wenn Sie einen Zeitraffer ohne Werkzeugkopf aufnehmen, wird empfohlen, einen " "\"Timelapse Wischturm\" hinzuzufügen, indem Sie mit der rechten Maustaste " -"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"->" -"\"Timelapse Wischturm\" wählen." +"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"-" +">\"Timelapse Wischturm\" wählen." msgid "Line width" msgstr "Breite der Linie" @@ -6349,7 +6354,7 @@ msgid "Change filament G-code" msgstr "Filamentwechsel G-Code" msgid "Change extrusion role G-code" -msgstr "" +msgstr "Ändere den G-Code der Extrusionsart" msgid "Pause G-code" msgstr "Pausen G-Code" @@ -9026,13 +9031,13 @@ msgstr "Volle Lüfterdrehzahl ab Schicht" msgid "" "Fan speed will be ramped up linearly from zero at layer " -"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer" -"\". \"full_fan_speed_layer\" will be ignored if lower than " -"\"close_fan_the_first_x_layers\", in which case the fan will be running at " -"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" to maximum at layer " +"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower " +"than \"close_fan_the_first_x_layers\", in which case the fan will be running " +"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." msgstr "" -"Die Lüftergeschwindigkeit wird linear von Null bei der Schicht" -"\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht " +"Die Lüftergeschwindigkeit wird linear von Null bei der " +"Schicht\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht " "\"full_fan_speed_layer\" erhöht. \"full_fan_speed_layer\" wird ignoriert, " "wenn es niedriger ist als \"close_fan_the_first_x_layers\",in diesem Fall " "läuft der Lüfter bei Schicht \"close_fan_the_first_x_layers\"+ 1 mit maximal " @@ -10804,7 +10809,7 @@ msgstr "" "Befehls zum Auslösen des Werkzeugwechsels" msgid "This gcode is inserted when the extrusion role is changed" -msgstr "" +msgstr "Dieser G-Code wird beim Wechsel der Extrusionsart eingefügt" msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " From 1e040f2fc35446fd20717676b0703d51ca6d7773 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 10 Nov 2023 21:13:27 +0800 Subject: [PATCH 36/47] bump version to 1.8.0-rc --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 42a601f663..60c72b29a0 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SoftFever_VERSION "1.8.0-beta2") +set(SoftFever_VERSION "1.8.0-rc") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" SoftFever_VERSION_MATCH ${SoftFever_VERSION}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1}) From de35ff9a6c6bbd8fc9edb593871b5147a568cd25 Mon Sep 17 00:00:00 2001 From: renemosner <99507763+renemosner@users.noreply.github.com> Date: Sat, 11 Nov 2023 01:58:32 +0100 Subject: [PATCH 37/47] Update CZ (#2688) --- localization/i18n/cs/OrcaSlicer_cs.po | 70 ++++++++++++++------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index d26ad608c5..b5cb790fbb 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -658,6 +658,10 @@ msgid "" "Please note, application settings will be lost, but printer profiles will " "not be affected." msgstr "" +"Soubor konfigurace programu OrcaSlicer může být poškozen a nelze ho analyzovat.\n" +"OrcaSlicer se pokusil znovu vytvořit konfigurační soubor.\n" +"Všimněte si, že nastavení aplikace bude ztraceno, ale profily tiskárny " +"nebudou ovlivněny." msgid "Rebuild" msgstr "Obnovit" @@ -6202,7 +6206,7 @@ msgid "Change filament G-code" msgstr "G-kód Změny filamentu" msgid "Change extrusion role G-code" -msgstr "" +msgstr "Změnit G-kód pro úlohu extruze" msgid "Pause G-code" msgstr "G-kód Pauzy" @@ -8323,7 +8327,7 @@ msgid "" "Filament diameter is used to calculate extrusion in gcode, so it's important " "and should be accurate" msgstr "" -"Průměr filamentu se používá k výpočtu vytlačování v gkódu, takže je důležitý " +"Průměr filamentu se používá k výpočtu extruze v gkódu, takže je důležitý " "a měl by být přesný" msgid "Shrinkage" @@ -9155,7 +9159,7 @@ msgid "" "layer height. Too high value results in overextrusion on the surface" msgstr "" "Množství materiálu, které se má vytlačit během žehlení. V poměru k průtoku " -"normální výšky vrstvy. Příliš vysoká hodnota vede k nadměrnému vytlačování " +"normální výšky vrstvy. Příliš vysoká hodnota vede k nadměrné extruzi " "na povrchu" msgid "Ironing line spacing" @@ -9327,7 +9331,7 @@ msgstr "" "maximální výšky vrstvy při povolení adaptivní výšky vrstvy" msgid "Extrusion rate smoothing" -msgstr "Zjemňování extruze" +msgstr "Vyhlazení rychlosti extruze" msgid "" "This parameter smooths out sudden extrusion rate changes that happen when " @@ -9357,32 +9361,30 @@ msgid "" "\n" "Note: this parameter disables arc fitting." msgstr "" -"Tento parametr zjemňuje náhlé změny extruzního toku, ke kterým dochází při " -"přechodu tiskárny z tisku s vysokým průtokem (vysokou rychlostí/větší " -"šířkou) extruze na tisk s nižším průtokem (nižší rychlostí/menší šířkou) " -"extruze a obráceně.\n" +"Tato hodnota vyhlazuje náhlé změny extruzní rychlosti, které nastávají, když " +"tiskárna přechází z extruze s vysokým průtokem (vysoká rychlost/větší šířka) " +"na extruzi s nižším průtokem (nižší rychlost/menší šířka) a naopak.\n" "\n" -"Definuje maximální rychlost, jakou se může objemový průtok extrudovaný v mm3/" -"s měnit v čase. Vyšší hodnoty znamenají, že jsou povoleny vyšší změny " +"Definuje maximální rychlost, kterou může objemový průtok extrudovaného materiálu " +"v mm3/s měnit v čase. Vyšší hodnoty znamenají, že jsou povoleny větší změny " "extruzní rychlosti, což vede k rychlejším přechodům rychlosti.\n" "\n" -"Hodnota 0 tuto funkci vypíná. \n" +"Hodnota 0 funkci zakáže. \n" "\n" -"Pro tiskárny s vysokou rychlostí a vysokým průtokem přímého pohonu (např. " -"Bambu lab nebo Voron) tato hodnota obvykle není potřebná. Avšak v některých " -"případech, kdy se rychlosti prvků velmi liší, může poskytnout marginální " -"přínos. Například při agresivním zpomalení kvůli přesahům. V těchto " -"případech se doporučuje vysoká hodnota kolem 300-350 mm3/s2, protože to " -"umožní právě dostatečné zjemnění pro pomoc předstihu tlaku (PA) k dosažení " -"plynulejšího přechodu průtoku.\n" +"Pro tiskárny s přímým pohonem a vysokou rychlostí a průtokem (např. Bambu lab " +"nebo Voron) tato hodnota obvykle není potřebná. Nicméně v některých případech, " +"kde se rychlosti funkcí výrazně liší, může poskytnout marginální přínos. " +"Například při agresivních zpomaleních způsobených přesahy. V těchto případech " +"se doporučuje vysoká hodnota kolem 300-350 mm3/s2, protože to umožňuje dostatečné " +"vyhlazení pro pomoc při dosažení plynulejšího přechodu tlaku při extruzi.\n" "\n" -"Pro pomalejší tiskárny bez předstihu tlaku (PA) by měla být hodnota " -"nastavena mnohem nižší. Pro extrudery s přímým pohonem je dobrým výchozím " -"bodem hodnota 10-15 mm3/s2 a pro styl Bowden 5-10 mm3/s2. \n" +"Pro pomalejší tiskárny bez tlakového předstihu by měla být hodnota nastavena " +"mnohem nižší. Pro přímé pohony je hodnota 10-15 mm3/s2 dobrým výchozím bodem, " +"a pro styl Bowden 5-10 mm3/s2. \n" "\n" -"Tato funkce je známá jako Pressure Equalizer v Prusa slicer.\n" +"Tato funkce je známa jako Pressure Equalizer v programu Prusa Slicer.\n" "\n" -"Poznámka: Tento parametr vypíná arc fitting." +"Poznámka: Tato hodnota zakazuje obloukové přizpůsobení." msgid "mm³/s²" msgstr "mm³/s²" @@ -9837,7 +9839,7 @@ msgid "Random" msgstr "Náhodný" msgid "Staggered inner seams" -msgstr "Posunuté vnitřní švy" +msgstr "Odstupňované vnitřní švy" msgid "" "This option causes the inner seams to be shifted backwards based on their " @@ -9868,9 +9870,9 @@ msgid "" "if a wipe action is executed immediately following an outer wall extrusion, " "the speed of the outer wall extrusion will be utilized for the wipe action." msgstr "" -"Rychlost čištění je určena rychlostí aktuální role vytlačování, např. pokud " -"je činnost čištění provedena bezprostředně po vytlačování vnější stěny, " -"rychlost vytlačování vnější stěny bude využita pro činnost čištění." +"Rychlost čištění je určena rychlostí aktuální role extruze, např. pokud " +"je činnost čištění provedena bezprostředně po extruzi vnější stěny, " +"rychlost extruze vnější stěny bude využita pro činnost čištění." msgid "Wipe on loops" msgstr "Čistit na smyčce" @@ -9879,7 +9881,7 @@ msgid "" "To minimize the visibility of the seam in a closed loop extrusion, a small " "inward movement is executed before the extruder leaves the loop." msgstr "" -"Aby byla minimalizována viditelnost švu při vytlačování s uzavřenou smyčkou, " +"Aby byla minimalizována viditelnost švu při extruzi s uzavřenou smyčkou, " "je proveden malý pohyb dovnitř předtím, než vytlačovací stroj opustí smyčku." msgid "Wipe speed" @@ -10505,7 +10507,7 @@ msgstr "" "výměny nástroje" msgid "This gcode is inserted when the extrusion role is changed" -msgstr "" +msgstr "Tento G-kód je vložen při změně role extruze" msgid "" "Line width for top surfaces. If expressed as a %, it will be computed over " @@ -10558,7 +10560,7 @@ msgid "" "Move nozzle along the last extrusion path when retracting to clean leaked " "material on nozzle. This can minimize blob when print new part after travel" msgstr "" -"Při zasouvání přesuňte trysku podél poslední dráhy vytlačování, abyste " +"Při retrakci přesuňte trysku podél poslední dráhy extruze, abyste " "vyčistili uniklý materiál na trysce. To může minimalizovat skvrny při tisku " "nového dílu po cestě" @@ -10775,9 +10777,9 @@ msgid "" "Wipe tower is only compatible with relative mode. It is always enabled on " "BambuLab printers. Default is checked" msgstr "" -"Při použití volby \"label_objects\" se doporučuje relativní vytlačování. " +"Při použití volby \"label_objects\" se doporučuje relativní extruzi. " "Některé extrudery fungují lépe, když je tato možnost odškrtnuta (režim " -"absolutního vytlačování). Čistící věž je kompatibilní pouze s relativním " +"absolutní extruze). Čistící věž je kompatibilní pouze s relativním " "režimem. Na tiskárnách BambuLab je vždy povolen. Výchozí je zaškrtnuto" msgid "" @@ -10808,7 +10810,7 @@ msgstr "" "Vyjadřuje se jako procento průměru trysky" msgid "Wall transitioning filter margin" -msgstr "Okraj filtru přechodu stěny" +msgstr "Filtr přechodového rozpětí stěny" msgid "" "Prevent transitioning back and forth between one extra wall and one less. " @@ -10843,7 +10845,7 @@ msgstr "" "mezery nebo přečnívat" msgid "Wall distribution count" -msgstr "Počet rozložení stěn" +msgstr "Počet ovlivněných stěn" msgid "" "The number of walls, counted from the center, over which the variation needs " From 714667ee1c483b67514e307bc4ca8897727a58a9 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Sat, 11 Nov 2023 15:13:24 +0800 Subject: [PATCH 38/47] Add search printer model in Setup wizard (#2692) Add search printer model in Setup wizard (#2563) Adopted from #2464 Co-authored-by: ZdDroid <601865048@qq.com> --- resources/web/guide/21/21.css | 28 ++++ resources/web/guide/21/21.js | 209 ++++++++++++++++++++++++++++-- resources/web/guide/21/index.html | 20 +++ 3 files changed, 247 insertions(+), 10 deletions(-) diff --git a/resources/web/guide/21/21.css b/resources/web/guide/21/21.css index a6c5a6ae20..933f823080 100644 --- a/resources/web/guide/21/21.css +++ b/resources/web/guide/21/21.css @@ -124,3 +124,31 @@ display: flex; justify-content:space-around; } + +.search { + width: 100%; + position: relative; + display: flex; + } + + .searchTerm { + width: 100%; + border: 3px solid #009688; + /*border-right: none;*/ + padding: 5px; + height: 20px; + border-radius: 5px 5px 5px 5px; + outline: none; + color: #9DBFAF; + } + + .searchTerm:focus{ + color: #009688; + } + + /*Resize the wrap to see the search bar change!*/ + .wrap{ + width: 30%; + padding-bottom: 5px; + padding-left: 42px; + } \ No newline at end of file diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 0aaee3e2f5..131420dbdd 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -40,7 +40,6 @@ function HandleStudio( pVal ) } } - function ShowPrinterThumb(pItem, strImg) { $(pItem).attr('src',strImg); @@ -52,7 +51,7 @@ function HandleModelList( pVal ) if( !pVal.hasOwnProperty("model") ) return; - let pModel=pVal['model']; + pModel=pVal['model']; let nTotal=pModel.length; let ModelHtml={}; @@ -99,7 +98,7 @@ function HandleModelList( pVal ) for(let m=0;m'+nNozzel+'mm nozzle'; + HtmlNozzel += '
'+nNozzel+'mm nozzle
'; } let CoverImage=OneModel['cover']; @@ -120,18 +119,20 @@ function HandleModelList( pVal ) for(let m=0;m' + + '
' + + '
' + + '
all
' + + '
none
' + + '
' + + ' ' + sVV + '' + + '
' + + '
' + + '
' + + ''; + + $('#Content').append(HtmlNewVendor); + } + + //Collect Html Node Nozzel Html + if (!ModelHtml.hasOwnProperty(strVendor)) + ModelHtml[strVendor] = ''; + + let NozzleArray = OneModel['nozzle_diameter'].split(';'); + let HtmlNozzel = ''; + for (let m = 0; m < NozzleArray.length; m++) { + let nNozzel = NozzleArray[m]; + HtmlNozzel += '
' + nNozzel + 'mm nozzle
'; + } + + let CoverImage = OneModel['cover']; + ModelHtml[strVendor] += '
' + + '
' + + '
' + OneModel['model'] + '
' + HtmlNozzel + '
'; + } + + //Update Nozzel Html Append + for (let key in ModelHtml) { + let obj = $(".OneVendorBlock[vendor='" + key + "'] .PrinterArea"); + obj.empty(); + obj.append(ModelHtml[key]); + } + + + //Update Checkbox + ModelSelect = $('input[type=checkbox]'); + for (let n = 0; n < ModelSelect.length; n++) { + let OneItem = ModelSelect[n]; + + let strModel = OneItem.getAttribute("model"); + let strVendor = OneItem.getAttribute("vendor"); + let strNozzel = OneItem.getAttribute("nozzel"); + + let checked = GetModelSelect(strVendor, strModel, strNozzel); + + OneItem.checked = checked; + } + + // let AlreadySelect=$("input:checked"); + // let nSelect=AlreadySelect.length; + // if(nSelect==0) + // { + // $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true); + // } + + TranslatePage(); +} function SelectPrinterAll( sVendor ) { @@ -162,15 +312,54 @@ function SelectPrinterNone( sVendor ) } -// function GotoFilamentPage() { - let nChoose=OnExit(); + let nChoose=OnExitFilter(); if(nChoose>0) window.open('../22/index.html','_self'); } +function OnExitFilter() { + + let nTotal = 0; + let ModelAll = {}; + for (vendor in ModelNozzleSelected) { + for (model in ModelNozzleSelected[vendor]) { + for (nozzel in ModelNozzleSelected[vendor][model]) { + if (!ModelNozzleSelected[vendor][model][nozzel]) + continue; + + if (!ModelAll.hasOwnProperty(model)) { + //alert("ADD: "+strModel); + + ModelAll[model] = {}; + + ModelAll[model]["model"] = model; + ModelAll[model]["nozzle_diameter"] = ''; + ModelAll[model]["vendor"] = vendor; + } + + ModelAll[model]["nozzle_diameter"] += ModelAll[model]["nozzle_diameter"] == '' ? nozzel : ';' + nozzel; + + nTotal++; + } + + } + } + + var tSend = {}; + tSend['sequence_id'] = Math.round(new Date() / 1000); + tSend['command'] = "save_userguide_models"; + tSend['data'] = ModelAll; + + SendWXMessage(JSON.stringify(tSend)); + + return nTotal; + +} + +// function OnExit() { let ModelAll={}; diff --git a/resources/web/guide/21/index.html b/resources/web/guide/21/index.html index b6589ca79a..a5163568bd 100644 --- a/resources/web/guide/21/index.html +++ b/resources/web/guide/21/index.html @@ -19,6 +19,11 @@
Printer Selection
+
+
+ +
+