Sync upstream/main into orca-latest-parity-bambu#32
Merged
Conversation
…cer#12680) 1. Dirty flags not showing for extruder options: 2. Crash when switching to non-first extruder tabs: 3. Modifying one extruder's parameter affects other extruders:
…er#12682) The WipeTower2 code path never called construct_mesh(), leaving wipe_tower_mesh_data as std::nullopt. GCode export then dereferenced it unconditionally, triggering an assertion failure / crash.
…licer#12688) * Set Adaptive Volumetric Speed as a developer mode setting, and further clarified in the tooltip * Fixed typo
wx strings to be converted to utf-8 before doing width calculation for consistency. JIRA-127
…licer#12693) # Description When using the Bambu H2D, users can use Filament Grouping, a button found next to the bed preview. When not on a H2D profile, the button is hidden. However, it remained usable, and clicking an empty space below all the buttons causes the dialog to appear. This PR fixes that by adding a check before the button is registered. Addresses point 9 (focusing on the 2nd bullet) in OrcaSlicer#12684 ## Tests Tried to click on the empty area right below the column of buttons (see the below images) Made sure to have the H2D profile loaded as well, and checked that the dialog still opens for that printer. H2D active <img width="1635" height="949" alt="image" src="https://github.com/user-attachments/assets/da6fb03b-e3c8-4504-ac60-b96ecc6347dc" /> Area to click for the invisible button <img width="935" height="788" alt="image" src="https://github.com/user-attachments/assets/1f001bcf-0224-4922-b5bf-47a95820e536" />
…ded esc to close dialog (OrcaSlicer#12694) Added entry to wipingdialog.html css to prevent it from being overscrollable and its position fixed. Added escape button to close dialog event on both javascript and webview events JIRA-136
### Description A couple of warning dialogs still used a caption containing "**BambuStudio warning**". It is a leftover from the original BambuStudio codebase. ### This PR - removes the explicit caption so the dialogs use the standard application warning title instead. ### Result - removes the remaining Bambu reference while keeping the visible behavior consistent with the rest of the UI. - addresses point 1. of "New ports from Bambu Studio" section from OrcaSlicer#12684 ### Screenshots - **Before:** <img width="1352" height="277" alt="image" src="https://github.com/user-attachments/assets/d107acaa-f159-496a-b14e-93cd149bf355" /> - **After:** <img width="1356" height="278" alt="image" src="https://github.com/user-attachments/assets/e111b5b3-9b3e-4b13-b20d-f98e5173ea16" />
Added wx event for esc to close dialog for filament grouping dialog JIRA-139
Fix obj import dialog encoding for non ASCII letters by making the correct conversion to wxstring JIRA-137
Translation added # Description <!-- > Please provide a summary of the changes made in this PR. Include details such as: > * What issue does this PR address or fix? > * What new features or enhancements does this PR introduce? > * Are there any breaking changes or dependencies that need to be considered? --> # Screenshots/Recordings/Graphs <!-- > Please attach relevant screenshots to showcase the UI changes. > Please attach images that can help explain the changes. --> ## Tests <!-- > Please describe the tests that you have conducted to verify the changes made in this PR. -->
# Description Ditto
# Description <!-- > Please provide a summary of the changes made in this PR. Include details such as: > * What issue does this PR address or fix? > * What new features or enhancements does this PR introduce? > * Are there any breaking changes or dependencies that need to be considered? --> Added eSUN Filament PLA Basic, Marble, Matte to Orca Filament Library <img width="811" height="331" alt="image" src="https://github.com/user-attachments/assets/5cda8b59-cd44-4e32-bae0-d08d2346dd39" /> ## Tests <!-- > Please describe the tests that you have conducted to verify the changes made in this PR. --> ``` ./OrcaSlicer_profile_validator -v eSUN Total loaded vendors: 1 Validation completed successfully ```
* feat: add K2 support * fix: remove k2 pro from k2 process json * fix: set correct start gcodes for the nozzles
# Description <!-- > Please provide a summary of the changes made in this PR. Include details such as: > * What issue does this PR address or fix? > * What new features or enhancements does this PR introduce? > * Are there any breaking changes or dependencies that need to be considered? --> # Screenshots/Recordings/Graphs <!-- > Please attach relevant screenshots to showcase the UI changes. > Please attach images that can help explain the changes. --> ## Tests <!-- > Please describe the tests that you have conducted to verify the changes made in this PR. -->
* Update TURKISH translations * Update TURKISH translations
Adapt language files to PR OrcaSlicer#12773 - Language files are adapated for the new msgid from PR OrcaSlicer#12773 - changes from PR OrcaSlicer#12773 applied to APPLE build also
Co-authored-by: SoftFever <[email protected]>
* Aktualisiere deutsche Übersetzungen in der i18n-Datei für bessere Klarheit und Konsistenz * Update German localization for OrcaSlicer - Improved translations for various messages, ensuring clarity and consistency. - Corrected terminology for technical terms such as "flow ratio" and "emboss text object." - Adjusted phrasing for better readability and grammatical accuracy. - Removed redundant or unclear phrases to streamline user experience. - Added new entries for warnings and notifications related to printer operations. * typo
* update flatpak app id and add migration code * tweak some text
* Optimised for the Artillery M1 Pro printer * tidy up --------- Co-authored-by: SoftFever <[email protected]>
…aSlicer#12869) Set exclude objects to enabled by default to support dynamic mesh bed leveling.
* Add Anet A8 Plus support because the folks in OrcaSlicer didn't * Fix the structure also import the orca_printer file to get the process * asdsadasd
* tidy up and bump profile version * fix error * tidy up * fix * tide up more * fix errors * fix more errors
…-sync # Conflicts: # localization/i18n/OrcaSlicer.pot # localization/i18n/ca/OrcaSlicer_ca.po # localization/i18n/cs/OrcaSlicer_cs.po # localization/i18n/de/OrcaSlicer_de.po # localization/i18n/en/OrcaSlicer_en.po # localization/i18n/es/OrcaSlicer_es.po # localization/i18n/fr/OrcaSlicer_fr.po # localization/i18n/hu/OrcaSlicer_hu.po # localization/i18n/it/OrcaSlicer_it.po # localization/i18n/ja/OrcaSlicer_ja.po # localization/i18n/ko/OrcaSlicer_ko.po # localization/i18n/lt/OrcaSlicer_lt.po # localization/i18n/nl/OrcaSlicer_nl.po # localization/i18n/pl/OrcaSlicer_pl.po # localization/i18n/pt_BR/OrcaSlicer_pt_BR.po # localization/i18n/ru/OrcaSlicer_ru.po # localization/i18n/sv/OrcaSlicer_sv.po # localization/i18n/tr/OrcaSlicer_tr.po # localization/i18n/uk/OrcaSlicer_uk.po # localization/i18n/vi/OrcaSlicer_vi.po # localization/i18n/zh_CN/OrcaSlicer_zh_CN.po # localization/i18n/zh_TW/OrcaSlicer_zh_TW.po # resources/profiles/Afinia.json # resources/profiles/Anker.json # resources/profiles/Anycubic.json # resources/profiles/Artillery.json # resources/profiles/BIQU.json # resources/profiles/Blocks.json # resources/profiles/CONSTRUCT3D.json # resources/profiles/Chuanying.json # resources/profiles/Co Print.json # resources/profiles/CoLiDo.json # resources/profiles/Comgrow.json # resources/profiles/Creality.json # resources/profiles/Cubicon.json # resources/profiles/Custom.json # resources/profiles/DeltaMaker.json # resources/profiles/Dremel.json # resources/profiles/Elegoo.json # resources/profiles/Eryone.json # resources/profiles/FLSun.json # resources/profiles/Flashforge.json # resources/profiles/FlyingBear.json # resources/profiles/Folgertech.json # resources/profiles/Geeetech.json # resources/profiles/Ginger Additive.json # resources/profiles/InfiMech.json # resources/profiles/Kingroon.json # resources/profiles/LONGER.json # resources/profiles/Lulzbot.json # resources/profiles/M3D.json # resources/profiles/MagicMaker.json # resources/profiles/Mellow.json # resources/profiles/OpenEYE.json # resources/profiles/OrcaArena.json # resources/profiles/OrcaFilamentLibrary.json # resources/profiles/Peopoly.json # resources/profiles/Phrozen.json # resources/profiles/Positron3D.json # resources/profiles/Prusa.json # resources/profiles/Qidi.json # resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json # resources/profiles/RH3D.json # resources/profiles/Raise3D.json # resources/profiles/Ratrig.json # resources/profiles/RolohaunDesign.json # resources/profiles/SecKit.json # resources/profiles/Snapmaker.json # resources/profiles/Sovol.json # resources/profiles/Tiertime.json # resources/profiles/Tronxy.json # resources/profiles/TwoTrees.json # resources/profiles/UltiMaker.json # resources/profiles/Vivedino.json # resources/profiles/Volumic.json # resources/profiles/Voron.json # resources/profiles/Voxelab.json # resources/profiles/Vzbot.json # resources/profiles/WEMAKE3D.json # resources/profiles/Wanhao France.json # resources/profiles/Wanhao.json # resources/profiles/WonderMaker.json # resources/profiles/Z-Bolt.json # resources/profiles/iQ.json # src/slic3r/GUI/MainFrame.cpp
|
Important Review skippedToo many files! This PR contains 298 files, which is 148 over the limit of 150. ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: ⛔ Files ignored due to path filters (2)
📒 Files selected for processing (298)
You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
upstream/main(SoftFever/OrcaSlicer) intoorca-latest-parity-bambu.po/.pot) — accepted upstream (version bumps)MainFrame.cpp— upstream commented out a spacer; kept our Helioexpand_program_holderlayout insertionGtkResizeBorderHandler → ResizeEdgePanelrefactor auto-merged cleanlyCloses #30
Test plan
enable_helio_processingis enabled🤖 Generated with Claude Code