Commit Graph

11987 Commits

Author SHA1 Message Date
80df06448f Merge remote-tracking branch 'upstream/main' into dev/p2s-pr 2025-11-07 10:42:06 +08:00
446834e6f7 Fix AMS Material Selection to sort by both filament vendor and type (#11261)
Fix AMS Material Selection dialog combo box sorting to also sort by filament types.
2025-11-07 10:40:47 +08:00
4ec272a22b Fix: Hiding the ironing_angle_fixed setting in the UI if the ironing is disabled (#11286)
* Fix: Hiding the `ironing_angle_fixed` setting in the UI if the ironing is disabled
2025-11-06 23:53:57 +08:00
7db0ff9a19 Fix issue that dev printers no longer sync calib & filament info from AMS 2025-11-05 22:54:49 +08:00
c5692c88e7 Merge branch 'main' into dev/p2s-pr 2025-11-05 20:55:28 +08:00
7444878927 IF-enable PA in IS and Cornering Calibs (#11178)
* Re-enable PA in Calibs

* Disable APA if Disabled PA
2025-11-04 21:45:14 +08:00
484f9e222f Merge branch 'main' into dev/p2s-pr 2025-11-04 10:26:47 +08:00
a6bffacba1 Multi-color code compatible with QIDI models (#11185)
* The 0.30mm layer height configuration for the 0.4 nozzle of the QIDI model has been removed

* Merge branch 'main' into main

* Merge branch 'SoftFever:main' into main

* Revert "The 0.30mm layer height configuration for the 0.4 nozzle of the QIDI model has been removed"

This reverts commit 8d296720b8de58b1bfa4f008a24cee841a8472c6.

* Update Qidi Q2 0.4 nozzle.json

修改Q2打印高度

* Merge branch 'SoftFever:main' into main

* Merge branch 'SoftFever:main' into main

* change machine_gcode

* Merge branch 'main' of https://github.com/HYzd766/OrcaSlicer

* Merge branch 'SoftFever:main' into main

* Multi-color code compatible with QIDI models

* Merge branch 'main' into main

* toggle axis visibility on canvas (#9666)

* toggle axis visibility on canvas

* set show_axes config on toggle

* fix: Add pause and filament change to machine gcodes for Sovol SV08 MAX (#11214)

* Add fixed Ironing Angle setting for uniform surface finish (#11195)

* Initial working fixed ironing angle implemented with new Fixed ironing angle setting

* update documentation

* Combine Fill.is_using_template_angle and Fill.alternate_fill_direction into Fill.fixed_angle

* Rename SurfaceFillParams.is_using_template_angle to SurfaceFillParam.fixed_angle.
2025-11-03 21:34:11 +08:00
8a547e3a01 FIX: cannot select k value when connect 2 printer
github: 4085
Change-Id: I660f20032535ad8ab1f218224af68f7cc0dc3395
(cherry picked from commit dc94ad4fb63c4907993e6970511bed90337b6c30)
2025-11-03 20:36:47 +08:00
97df33f25c Add fixed Ironing Angle setting for uniform surface finish (#11195)
* Initial working fixed ironing angle implemented with new Fixed ironing angle setting

* update documentation

* Combine Fill.is_using_template_angle and Fill.alternate_fill_direction into Fill.fixed_angle

* Rename SurfaceFillParams.is_using_template_angle to SurfaceFillParam.fixed_angle.
2025-11-03 17:21:01 +08:00
b25541c592 toggle axis visibility on canvas (#9666)
* toggle axis visibility on canvas

* set show_axes config on toggle
2025-11-02 00:23:26 +08:00
a0b35848f8 Merge branch 'main' into dev/p2s-pr 2025-11-01 20:29:55 +08:00
cb33669d20 Fix plate icons & filament grouping (#11222)
* init

* Update PartPlate.cpp
2025-11-01 20:20:25 +08:00
c1024e23c6 Fix failed to retrive PA calib result 2025-11-01 14:23:32 +08:00
909b3ed3c6 Merge branch 'main' into dev/p2s-pr 2025-10-31 16:54:45 +08:00
fc77bac5d1 Fix black bed texture if svg file (#11166)
* Fix blank bed texture if svg file

* Refresh scene once the texture compression is completed
2025-10-31 16:53:08 +08:00
e4610d407c Log error when image resource not found 2025-10-31 09:00:22 +08:00
62400f566d Fix dialog icon title 2025-10-31 08:53:54 +08:00
026d2bbfd7 FIX:reslove polish translation cover other select use tooltips
jira:[STUDIO-15128]

Change-Id: I148eaa6245b18359597c3b96f205639ae66bbc8a
(cherry picked from commit 3eb422faaf99956001941839c4dd2b55235d3053)
(cherry picked from commit 4a65fef5dc7cf3cfe312d7ed3706d9ff5b6ee58d)
2025-10-30 14:56:49 +08:00
3a6068f633 Remove print tracking 2025-10-30 14:56:49 +08:00
d60070c399 FIX:Add pointer protection
jira: STUDIO-15102
Change-Id: I08c7039ba7c12e20cff1c28c7d588614d86ff9ff
(cherry picked from commit 0e806a4a242c463accfe78cf165de0d1193fa1e6)
2025-10-30 14:56:49 +08:00
b169c91ec9 FIX: only A series with old protocol display as AMS_LITE
JIRA: [STUDIO-15101]
Change-Id: I340c14e88c57ca81c0bfb2f3087a46ee88ab4f31
(cherry picked from commit fa9181386b0e973785900b21962b40217e9585bd)
2025-10-30 14:39:57 +08:00
bec3eb098f set_user_selected_machine no longer works for local machines 2025-10-29 21:51:01 +08:00
11ac4d071b Merge branch 'main' into dev/p2s-pr
# Conflicts:
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/Utils/CalibUtils.cpp
2025-10-29 21:03:22 +08:00
99c4c050ab Add setting to enable uploads to abnormal Storage; improve sd_card_state error reporting (#10981)
* Add option to allow upload to SD-Cards marked as abnormal, also add better error description

+ Adds the options under the Network Settings to allow upload to abnormal SD-Card.
+ If not enabled user will now see why the upload is stuck at 10% depending on the sd_card_state (Readonly/Abnormal)

* Merging with current branch, and updateing "sd-card" to "storage"

* Generate localization and also change remaining sd_card_abnormal states to _storage_abnormal

* Fix issues from merge, and other bugfixes.

* Regenerate localization files.

* Improve Missing Storage Message, Add skip for abnormal storage in printer select dialog
2025-10-29 20:32:38 +08:00
5cb26bd707 Replace all with stl (#11145)
* Add "Replace all from STL" command
this operates on the currently selected plate or on the selection

* Add more translations for "Replace all from STL"

* build fix

* "Replace all with STL" also works with multiple selected plates

* fix build

* replace all from stl: better error handling and a nicer status message box

---------

Co-authored-by: Nils Hasler <hasler@thecaptury.com>
2025-10-29 16:30:23 +08:00
4ccaa1fd96 Merge branch 'main' into dev/p2s-pr 2025-10-28 22:19:27 +08:00
dbe9c93182 Fix: The fix of the adaptive layer height logic for supports (#10697)
Fix: Fixing the logic of the adaptive layer height for supports

Removing `tree_support_adaptive_layer_height` because its logic duplicates `independent_support_layer_height`
2025-10-28 17:31:49 +08:00
53c415d355 Update color 2025-10-28 15:30:06 +08:00
2883a7a66a FIX:change translation
jira:[none]

Change-Id: Ife277664dab5ad85cd39825ee1e163b21e5765a2
(cherry picked from commit d8fd4e23acf946c4c9adfd3c03642433dba27eb4)
2025-10-28 15:30:06 +08:00
3f50972dbb FIX:add darkmode of thermalprecondition
jira:[STUDIO-14662]

Change-Id: I75998ff04e1073d07e23ff6970dce90627b7b860
(cherry picked from commit 93fc862f7e74c52d7a9cfb75d24ecf0685788341)
2025-10-28 15:30:06 +08:00
24db6161ce FIX:reslove mac compatibility question
jira:[STUDIO-14604][STUDIO-14660][STUDIO-14662]

Change-Id: I71833726fb3533960e38f87324b7d3da566730d7
(cherry picked from commit 7e6a18c81d92517e5f421569d103502e44c703a5)
2025-10-28 15:30:06 +08:00
0f58c56023 ENH: add initial layer time to plate_x.json and slice_info.config
Jira: STUDIO-14504
Change-Id: I32460f1c19cce7c729806e35370e8b4b57aa069e
(cherry picked from commit 04a487d210134c28245c1f0f7d0986266a1c66f2)
2025-10-28 15:30:05 +08:00
9f651e0e35 FIX:remove underline of thermal preconditioning
jira:[STUDIO-14597]

Change-Id: Ibf43718060b47cc4890b491500b6795d57bf6f8e
(cherry picked from commit 16df0fa6f9eb8049b0eb46bef81445112df10767)
2025-10-28 15:30:05 +08:00
5fa6441e9d FIX:remove play of icon
jira:[none]

Change-Id: I64aa43ddf3088bde9296385f36db3e2782d0c280
(cherry picked from commit db2d72cc42f564e37c1de13340555dd2ae745045)
2025-10-28 15:30:05 +08:00
4b41c18970 ENH:Add thermal precondition
jira:[STUDIO-13970][STUDIO-13904]

Change-Id: I4b4fa27da1a65e0019c5f4c1dcc099c92189bf50
(cherry picked from commit 92dbde8385fec9719e0e9cfde764421793decd4d)
2025-10-28 15:30:05 +08:00
e281962c00 FIX: Fix missing std::optional declaration
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h:16:10: error: ‘optional’ in namespace ‘std’ does not name a template type
   16 |     std::optional<bool> IsDetectOnInsertEnabled() const { return m_enable_detect_on_insert; };
      |          ^~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h:4:1: note: ‘std::optional’ is defined in header ‘<optional>’; this is probably fixable by adding ‘#include <optional>’
    3 | #include "DevCtrl.h"
  +++ |+#include <optional>
    4 |

/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaSystem.h:174:10: error: ‘optional’ in namespace ‘std’ does not name a template type
  174 |     std::optional<bool>  IsDetectOnInsertEnabled() const { return m_ams_system_setting.IsDetectOnInsertEnabled(); };
      |          ^~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaSystem.h:13:1: note: ‘std::optional’ is defined in header ‘<optional>’; this is probably fixable by adding ‘#include <optional>’
   12 | #include <wx/colour.h>
  +++ |+#include <optional>
   13 |

(cherry picked from commit fa482b1c0dc7faa2ad87c37eb7f1ea2ce87a5084)
2025-10-28 15:30:05 +08:00
eb4a99751a ENH: support nozzle refresh for H2D Pro
Jira: [STUDIO-13185]
Change-Id: Ib8b5905c32f83b1f849ad4ed327c9d77826d6a18
(cherry picked from commit c603e0f88be71a301ed2fc7f6fff2a34398b6708)
2025-10-28 15:30:04 +08:00
a75ca58d30 FIX: Prevent refresh during connection
jira: none
Change-Id: I84fda87d4b62d6cf2b22614336336aae5229feca
(cherry picked from commit 920bb3da0160c63cee66958a7b59d3ae5314ca88)
2025-10-28 15:30:04 +08:00
0e830fe221 FIX: delete old error code
Jira: [STUDIO-15017]
Change-Id: Ib2e5d3b658b156de8bf0b4ccc32f66b3bb22a642
(cherry picked from commit ef9598cbd52b99ce147a0a5a877d7b3403e4335c)
2025-10-28 15:30:04 +08:00
9e8378a8d8 FIX: FanControlPopupNew::init_names
JIRA: [STUDIO-14993]
Change-Id: Ie33bcde858ef379deaaeea99f790fd880eb0184e
(cherry picked from commit 3b7016d5598b2e655446019d8ad710e1612281a2)
2025-10-28 15:30:03 +08:00
7406b6cea4 FIX: PrintStatusFilamentWarningHighChamberTempCloseDoor
JIRA: [STUDIO-13676]
Change-Id: Ia9405ebbbad69ccc2407fdecb4a15b39c1caec58
(cherry picked from commit a81d8720b9f8c157faa55300b3f1afd4c0e46ea9)
2025-10-28 15:30:03 +08:00
03c6371878 FIX:change dark mode color of send page
jira:[none]

Change-Id: I21e4d76628315944f55e3df17b40208aa63fd9ec
(cherry picked from commit f66994b1bb1bc95739b1a9b8952f82d62abf0a36)
2025-10-28 15:30:02 +08:00
db743d88d3 ENH: add notice for PrintStatusAmsMappingInvalid
JIRA: [STUDIO-14577]
Change-Id: Ibcd742c109970490998fcf90f5520afcda5a4244
(cherry picked from commit 662338ab0e2e82db48dc173f3413a11302285132)
2025-10-28 15:30:02 +08:00
ebe6035995 FIX:add m_new_project_and_check_state flag
jira: STUDIO-14994
Change-Id: I068b18cfb29622de1641bc34c671d4710c1a07d3
(cherry picked from commit 670fb1764748e0d69cb2b4e657bfbd5c92daff9f)
2025-10-28 15:30:02 +08:00
4dbd3c8e40 FIX:change interface for send
jira:[none]

Change-Id: Ia59bb1bb606399541aa191991ff0fb3f106d75d1
(cherry picked from commit b22af6cfe0a589ae5fa2e95a01ebe47f6742ee99)
2025-10-28 15:30:02 +08:00
25135e0130 Fix: When the flushing multiplier is 0, a warning popup should also be displayed.
Jira: STUDIO-14962

Change-Id: Iee6887fb6ed6941bbd58d9d2b834b6654ee9c806
(cherry picked from commit 43dbb7f228afb4304b6ea398991efd2659feafbe)
2025-10-28 15:30:01 +08:00
7cb2222c51 FIX: ams PA display for A series printer
Jira: [STUDIO-14883]
Change-Id: Icdaf5350772fc6420421b13868d973d99c7831b8
(cherry picked from commit 6b15a2bb0c5ca9df8835c55f48bbbb613d4770f5)
2025-10-28 15:30:01 +08:00
01637b5b24 FIX: Mode switch button animation lost
Jira: STUDIO-14878
Change-Id: I53f7009ac3db692c7218a86cd7333261a2423c5b
(cherry picked from commit ec43e13d3907bc2b120f796f8a9b1df767291c5b)
2025-10-28 15:30:01 +08:00
e9e00f3e4c ENH:change send mode(master three patchs merged in this)
jira:[STUDIO-14427]

Change-Id: I1081e5252be3d932b2ffa29f70cbf93fee57eef9
(cherry picked from commit 662b7fdac8a999e54942cc9be0e5e2c2b8a90f06)
2025-10-28 15:30:01 +08:00