Upstream sync: merge v2.3.2 into orca-latest-parity-bambu#67
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
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
Resolves merge conflicts from upstream OrcaSlicer v2.3.2 sync: - build_all.yml: kept Helio CI gating (orca-latest-parity-bambu branch + ready-to-build label) - build_orca.yml: kept Helio macOS signing extension (ENABLE_SIGNING variable) - CLAUDE.md: kept Helio version (already more complete than upstream) - MainFrame.cpp: kept Helio expand_program_holder, dropped 15px spacer per upstream All Helio-only files preserved. All Helio modifications in shared files preserved. Fixes #66
There was a problem hiding this comment.
Pull request overview
Syncs upstream OrcaSlicer v2.3.2 into the orca-latest-parity-bambu branch and resolves merge conflicts while preserving Helio integration UI elements in MainFrame.
Changes:
- Removes the extra fixed-width spacer between the Helio
expand_program_holderwidget and the slice controls in the side tools sizer layout.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
💤 Files with no reviewable changes (1)
📝 WalkthroughWalkthroughThe side toolbar layout in ChangesSide Toolbar Layout Adjustment
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes Possibly related issues
Possibly related PRs
Suggested labels
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Review rate limit: 0/1 reviews remaining, refill in 60 minutes.Comment |
|
Build verified ✅ — all core platform builds passed:\n\n- Linux: ✅\n- macOS arm64: ✅\n- macOS x86_64: ✅\n- macOS Universal: ✅\n- Windows: ✅\n- Unit Tests: ✅\n- Flatpak aarch64: ✅\n- Flatpak x86_64: ⏳ still running (no failures)\n\nCI run: https://github.com/Helio-Additive/OrcaSlicer/actions/runs/25314778097\n\nPosted to #orcaslicer-claude-updates.\n\n---\n_Generated by Claude Code_ Generated by Claude Code |
* Fix upstream sync workflow failing on re-runs after manual merge The Helio Upstream Sync workflow was failing because: 1. After v2.3.2 was merged manually via PR #67, the tracking tag was never updated, so the workflow kept retrying the same sync 2. The conflict-path push used --force-with-lease on a branch that already existed from a previous run, hitting branch-protection rules Add an ancestor check that detects out-of-band merges and auto-updates the tracking tag. Replace force-with-lease with delete+push for the conflict branch. Fixes run 26750483377. https://claude.ai/code/session_01VoDwiKGeju8mfjQweQPrL2 * Fix conflict branch push to check for divergence before deleting Addresses Copilot review: the unconditional delete-then-push could destroy conflict-resolution work pushed by someone between runs. Now checks if the remote branch has advanced beyond our base commit and skips the push if so, only replacing stale branches from previous runs. https://claude.ai/code/session_01NBUUwkh6FkmhB9GyJE8Lo9 --------- Co-authored-by: Claude <[email protected]>
Summary\n\nMerges upstream OrcaSlicer v2.3.2 (
c724a3f) intoorca-latest-parity-bambu, resolving all merge conflicts.\n\nFixes #66\n\n## Conflict Resolutions\n\n-.github/workflows/build_all.yml— Kept Helio version: includesorca-latest-parity-bambubranch trigger andready-to-buildlabel gating for PRs\n-.github/workflows/build_orca.yml— Kept Helio version: extends macOS signing condition to supportENABLE_SIGNINGrepo variable (2 conflict sites)\n-CLAUDE.md— Kept Helio version: already contains all upstream build commands plus Helio-specific documentation\n-src/slic3r/GUI/MainFrame.cpp— Kept Helioexpand_program_holderwidget in sizer layout; dropped the 15px spacer that upstream removed\n\n## What's preserved\n\n- All 32 Helio-only files (API client, dialogs, resources, workflows)\n- All Helio modifications in 32 shared files (per HELIO_INTEGRATION.md)\n- All upstream v2.3.2 changes that auto-merged cleanly\n\n## Upstream changes included\n\nKey upstream changes from v2.3.2:\n-Plater.cpp/hpp: UI and slicing pipeline updates (+42/-31, +1)\n-MainFrame.cpp/hpp: Layout changes (+177/-142, +9/-2)\n-GCodeViewer.cpp: Preview enhancements (+23/-1)\n-PartPlate.cpp/hpp: Plate management updates (+110/-59, +1/-2)\n-GUI_App.cpp/hpp: App initialization changes (+119/-61, +2/-1)\n-Preferences.cpp: Settings UI updates (+40/-11)\n-PrintConfig.cpp: Config definition changes (+70/-51)\n-GLCanvas3D.cpp: Canvas rendering updates (+14/-33)\n\n## Test plan\n\n- [ ] CI builds pass on all platforms (Linux, Windows, macOS)\n- [ ] Helio button visible in toolbar when enabled in preferences\n- [ ] "Slice with Helio" option in slice dropdown\n- [ ] Helio History accessible from Help menu\n- [ ] Thermal Index view types available in GCode preview\n- [ ] Basic slice workflow unaffected by upstream changes\n\n---\n_Generated by Claude Code_Generated by Claude Code
Summary by CodeRabbit