xun.zhang 5499007bc3 FIX: solve the conflict ...

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If3862fbf7a543283ff77d4511d7c321a6e24d38b
(cherry picked from commit 162b5ac65f74cc8ec8c5bfa285d630d165aee437)

2025-10-03 22:32:45 +08:00

..

calib

Disable resonance avoidance in calibration routines + Calibration Reorder (#10174)

2025-07-25 15:21:22 +08:00

cert

FIX:use a complete certificate

2025-09-29 23:38:22 +08:00

dailytip

…

data

Wiki Update part 5 (#9873)

2025-06-20 10:19:48 +08:00

flush

ENH: update flush data for H2D

2025-09-23 21:42:00 +08:00

fonts

Feature/bs1.8beta (#2844)

2023-12-01 10:42:45 +00:00

handy_models

Disable resonance avoidance in calibration routines + Calibration Reorder (#10174)

2025-07-25 15:21:22 +08:00

hms

ENH: add code for bambu lab h2d pro

2025-10-02 17:07:20 +08:00

i18n

ENH: add a text translation of a dailytip

2023-10-13 14:43:42 +08:00

images

NEW: add images for O1S

2025-10-03 22:32:32 +08:00

info

ENH: update nozzle incompatible info for high flow nozzle

2025-10-02 17:07:21 +08:00

printers

NEW: add images for O1S

2025-10-03 22:32:32 +08:00

profiles

FIX: solve the conflict

2025-10-03 22:32:45 +08:00

profiles_template

Styrene Butadiene Styrene (SBS) - Template and profiles for Bambu (#6278)

2024-08-11 23:03:02 +08:00

shaders

ENH: 3dbed: support rendering extruder area with different color

2025-08-24 23:18:12 +08:00

tooltip

…

web

Merge remote-tracking branch 'remote/main' into dev/h2d

2025-09-20 13:10:10 +08:00

check_access_code.txt

…

Icon.icns

fix Mac icon

2023-09-08 00:41:23 +08:00