Skip to content

Commit

Permalink
Feature/merge 1.8.4 (#3827)
Browse files Browse the repository at this point in the history
* FIX: the logic of buried points that were not buried

JIRA: none

Signed-off-by: Kunlong Ma <[email protected]>
Change-Id: Id95174659c5fce7feba409eb5e14916608745fa4

* ci: update network module based on commit bc7ca98

Change-Id: I923526f0bf9ce5a288144fa1f9b0f2fc640f41b7

* Fix Firefox
Co-authored-by: hadess <[email protected]>

* FIX: cali: custom created filament from AMS displayed as incompatible

jira: new

remove the condition: is_system

Change-Id: Ib1366966bbdbe01bc9e2483d9914d270ebefa976

* FIX: duplicated items in comboBox at calibration completed page

jira: new

Change-Id: I4749a2206df16c438e0d3098e36274b2a20f313e

* ENH:update support for P1S plus

jira:[for p1s plus]

Change-Id: Id577d4e94e2162cb0045d261dfaa5f396ecded2f

* ENH: CLI: add mk information support

JIRA: no jira
Change-Id: Idd89b143d439de50d9f52eb8aec95b262d66875d

* ENH:calibration support p1p plus

jira:[plus]

Change-Id: Ia290d3a8a8b9adaac7a6ee26d9a8b5ea0c1b3aee

* FIX: add log for base_id and filament_id

github: #3087

Change-Id: Iebfbd0f224fce49f33fc81c71e6108f6e3abb5ff

* FIX: sync whole preset vendor directory

Change-Id: I191dbe979a87ff35d38cab1149b7975664344838
Jira: STUDIO-5534
(cherry picked from commit 628866608116336453804aa1217dd55db04d47ad)

* FIX: use t_utc for debug only

Change-Id: Ia05d8969d4de3dd38908980d6e17a3ebb11ca279
Github 3045

Change-Id: I77935df53bbf2772b1146e5c330c537165a3a2e6

* FIX:make sort_volumes right

Jira: STUDIO-5645
Change-Id: If324c9115bfaaf0c1b7b4be7c7ee96ba6b8ac890

* ENH:keep an unload logic

jira:[for unload]

Change-Id: Id30ec71ffa5b2dac89346ea47ca48a62479e3ab1

* FIX: several problems with mesh boolean

1. Cut with multiple volumes are OK now.
2. Close mesh boolean fail error with new object or open object
3. Fix wrong name and config of boolean resulting object

github: #3118
jira: none

Change-Id: If2c9dbfb36cbdfe4917a2371217923891bb7909c
(cherry picked from commit 982c0ecb92cf7c2b5ae5972ab900a6b10e7dda50)

* NEW:limit the length of project name

jira:[project name]

Change-Id: I955620f7073b3b7fda280d1118524f561d047751

* ENH:adjusting the warning level of timelpase

jira:[STUDIO-5662]

Change-Id: I4902b22d316f5e09a97a62c88b8a98e55c405434

* FIX: 3mf specification: change namespace form slic3rpe to BambuStudio

Jira: XXXX

Change-Id: Id705affc875ef23fdf2ac6d79f0cb0aafc4f7050

* NEW: Open MakerWorld With BambuStudio GetParam

JIRA: none
Change-Id: I0d65b364f1cd2d634a88882ab072c3e61ea89167
(cherry picked from commit 8eaf45e5359439a7c796fd79876c86775abcf48e)

* FIX: Filament issue generated when creating a printer

Jira: XXXX

Change-Id: I976770b69b47641bd54aa7a9c56fba7f58d1ab68
(cherry picked from commit ba42188b93c58b3954234d72acdd9769a68e3d3c)

* FIX: Blank page appears when editing presets

Jira: 5563

Change-Id: I4c49e05515b1beff55991e92f8079c4499c27eab
(cherry picked from commit e86517d290f4cd0765a230d811b0ddf2c9f34c17)

* FIX: context menu didn't update UI

jira: STUDIO-5691

Change-Id: Ia66b8623d832eba805aff5320941233a68ff258b

* FIX: crash of "filling bed"

"get_arrange_settings() const" gets trapped in infinite recursive calling.
Now we delete this function.

jira: STUDIO-5688
Change-Id: Ia39974734bb37b2a2f06b5bf78185f01be726872

* FIX: boolean hangs in the middle of color painting

Can't do splits in combine_mesh_fff, as do_boolean of mcut will split meshes.

jira: STUDIO-5693
Change-Id: Idddb7d20dd7ca386c39ddd3d87d9defc3136aa5d
(cherry picked from commit 6c67d015941458e37faaf0015b6509b5a0eadc0e)

* Fix: Fix a number of compilation problems

issues found when using gcc version 13.2.0 (GCC) in a Flatpak sandbox

github : bambulab/BambuStudio#3074
github pull request: bambulab/BambuStudio#3096

Change-Id: I08aeac593eb1ce7675894df72e8489200bae713d
(cherry picked from commit 069d133d66bfa682de4a860e379d5dc16b3d907c)

* fix: macos icns issue when icon was not attached

github pull request:bambulab/BambuStudio#3116

Change-Id: I49072ad49f3af7669a6d307c791594ade210da50
(cherry picked from commit c977e5582e3a30ad16dd267810037423aad9a53c)

* FIX: Add flush_length for change_filament_gcode

Change-Id: I30f4b97d3d61c2a57f0e92f157cbd31c38aa7265
Jira: XXXX
(cherry picked from commit 92eb2bac977a0c4095b316cbbc6580fb5228b710)

* FIX: edit preset dialog can't close on mac

Jira: 5696

Change-Id: Ib33dfd07cc588ddd3805e3490a4d8c36dcd890ac

* ENH: add dev_ota_version in ssdp

JIRA: STUDIO-5740

Change-Id: Ic80e6d4b9bf82813fdc4a76604a3d36213d12b03
Signed-off-by: Stone Li <[email protected]>

* NEW:Adapt to multicolour and gradient colour

JIRA:xxxx
Change-Id: I8084cab603d5681cbcaf2d6f5e0d7ad5419cb2af

* NEW:Adaptation of semi transparent materials

JIRA: XXXX
Change-Id: Ie32d8ce67c37b85eb6d7d6594cb514a696307e68

* FIX: disable flush options if prime tower is unchecked

jira: STUDIO-5639

Change-Id: I25081584d430bc7d062e14bcc2cdbf7522cf9d99

* ENH: refine GetVersion for HMS query

JIRA: STUDIO-5763

Change-Id: Ia3ccc07d79cc0736eb12e9782da50211abb74772
Signed-off-by: Stone Li <[email protected]>

* FIX: Prefer old selection when sync AMS not compatible

Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a
Jira: STUDIO-5416
(cherry picked from commit 077fae29823cf4f3071d408b1b40f55ee0cb33c6)

* FIX: The flushing was not auto-calc when sync ams list

JIRA: STUDIO-5551

1. flushing volume auto-calc when sync ams list
2. flushing volume takes the larger calculation value when filament has
   multi-colors

Signed-off-by: Kunlong Ma <[email protected]>
Change-Id: I72e6f9780ea56103a44c2da6068440a4615c254d

* FIX:fixed invalid links

jira:[fixed link]

Change-Id: I036a38b6e8e94da762f93805bd7be706538771fe

* FIX: Prompt to delete problematic presets

Jira: XXXX

Change-Id: Ic43f7bb782794d7ab0b6acbffbb5d73e94f6ed73

* FIX:fixed incorrect HMS content

jira:[STUDIO-5818]

Change-Id: Ia2896d6f0ab1ffedbc850e54168acece8e47bdbb

* FIX:external transparent material display error

JIRA: STUDIO-5845
Change-Id: I0a4f05ac5d5c0ac49d85a704ee65a7221c5f1e1d

* FIX: [5846] Custom Filament Page show System Filament

Simultaneously solve: When downloading Preset from the cloud, the filament_id of the preset in m_preset is null.

Jira: 5846

Change-Id: I6ba1b46fe92e345614b6a4af3fffa87d81fa2456

* FIX:A1 and p1 series do not support custom materials

JIRA:XXXX
Change-Id: Ib0459273d1f9a7152a5563757204634a8d0cd6f5

* FIX: exception when comparing profiles

jira:[NEW]

Signed-off-by: XunZhangBambu <[email protected]>
Change-Id: I946b5fcd35f779d271df2b3de731fdcada5aab29
(cherry picked from commit 00e739570812e5c4be3e0f7702ce8c72c0f9e72b)

* FIX: hide_id_middle_string

Change-Id: I28f32ec526b443d31d7992971b80ab1cb737deb6
Github: STUDIO-5825

* ENH: modify some logs level

JIRA: STUDIO-5958

Change-Id: I5a8592dfb8ffa9a81952535cb30944f867aa0e22
Signed-off-by: Stone Li <[email protected]>

* NEW:build plate marker detect

Change-Id: I70f03efea688bb6ce71c3f5990bb3c50605ab184

* FIX: Studio UI Freeze when saving user preset

github: #3335

Change-Id: Idaf53f673a3e46408826c06bdde2c592395d358b

* update bbl plugin version

* fix build errors

* update bbl profiles

* update color

---------

Signed-off-by: Kunlong Ma <[email protected]>
Signed-off-by: Stone Li <[email protected]>
Co-authored-by: Kunlong Ma <[email protected]>
Co-authored-by: gerrit <[email protected]>
Co-authored-by: liz.li <[email protected]>
Co-authored-by: tao wang <[email protected]>
Co-authored-by: lane.wei <[email protected]>
Co-authored-by: maosheng.wei <[email protected]>
Co-authored-by: chunmao.guo <[email protected]>
Co-authored-by: zhou.xu <[email protected]>
Co-authored-by: Arthur <[email protected]>
Co-authored-by: Bastien Nocera <[email protected]>
Co-authored-by: zhimin.zeng <[email protected]>
Co-authored-by: hu.wang <[email protected]>
Co-authored-by: Stone Li <[email protected]>
Co-authored-by: XunZhangBambu <[email protected]>
  • Loading branch information
15 people authored Jan 26, 2024
1 parent 481fff4 commit 3cb573d
Show file tree
Hide file tree
Showing 203 changed files with 1,990 additions and 620 deletions.
21 changes: 16 additions & 5 deletions cmake/modules/MacOSXBundleInfo.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>orcasliceropen url</string>
<key>CFBundleURLSchemes</key>
<array>
<string>orcasliceropen</string>
</array>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
Expand All @@ -35,7 +46,7 @@
<string>STL</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>stl.icns</string>
<string>images/stl.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
Expand All @@ -52,7 +63,7 @@
<string>OBJ</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
Expand All @@ -69,7 +80,7 @@
<string>AMF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>AMF</string>
<key>CFBundleTypeRole</key>
Expand All @@ -86,7 +97,7 @@
<string>3MF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>3MF</string>
<key>CFBundleTypeRole</key>
Expand All @@ -103,7 +114,7 @@
<string>GCODE</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>gcode.icns</string>
<string>images/gcode.icns</string>
<key>CFBundleTypeName</key>
<string>GCODE</string>
<key>CFBundleTypeRole</key>
Expand Down
2 changes: 1 addition & 1 deletion resources/images/transparent_ams_lib.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/images/transparent_color_picker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion resources/printers/N1.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"support_print_all":false,
"support_print_without_sd":false,
"support_flow_calibration":true,
"support_build_plate_marker_detect":false,
"support_lidar_calibration":false,
"support_ai_monitoring":false,
"support_first_layer_inspect":false,
Expand Down
1 change: 0 additions & 1 deletion resources/printers/N2S.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"support_print_all":false,
"support_print_without_sd":false,
"support_flow_calibration":true,
"support_build_plate_marker_detect":false,
"support_lidar_calibration":false,
"support_ai_monitoring":false,
"support_first_layer_inspect":false,
Expand Down
2 changes: 1 addition & 1 deletion resources/printers/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
01.08.02.01
01.08.03.01
126 changes: 125 additions & 1 deletion resources/profiles/BBL.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.08.00.13",
"version": "01.08.00.18",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
Expand Down Expand Up @@ -143,6 +143,22 @@
"name": "0.08mm Extra Fine @BBL A1",
"sub_path": "process/0.08mm Extra Fine @BBL A1.json"
},
{
"name": "0.08mm High Quality @BBL X1C",
"sub_path": "process/0.08mm High Quality @BBL X1C.json"
},
{
"name": "0.08mm High Quality @BBL P1P",
"sub_path": "process/0.08mm High Quality @BBL P1P.json"
},
{
"name": "0.08mm High Quality @BBL A1M",
"sub_path": "process/0.08mm High Quality @BBL A1M.json"
},
{
"name": "0.08mm High Quality @BBL A1",
"sub_path": "process/0.08mm High Quality @BBL A1.json"
},
{
"name": "0.10mm Standard @BBL X1C 0.2 nozzle",
"sub_path": "process/0.10mm Standard @BBL X1C 0.2 nozzle.json"
Expand All @@ -155,6 +171,22 @@
"name": "0.10mm Standard @BBL A1 0.2 nozzle",
"sub_path": "process/0.10mm Standard @BBL A1 0.2 nozzle.json"
},
{
"name": "0.10mm High Quality @BBL X1C 0.2 nozzle",
"sub_path": "process/0.10mm High Quality @BBL X1C 0.2 nozzle.json"
},
{
"name": "0.10mm High Quality @BBL P1P 0.2 nozzle",
"sub_path": "process/0.10mm High Quality @BBL P1P 0.2 nozzle.json"
},
{
"name": "0.10mm High Quality @BBL A1M 0.2 nozzle",
"sub_path": "process/0.10mm High Quality @BBL A1M 0.2 nozzle.json"
},
{
"name": "0.10mm High Quality @BBL A1 0.2 nozzle",
"sub_path": "process/0.10mm High Quality @BBL A1 0.2 nozzle.json"
},
{
"name": "0.40mm Standard @BBL X1C 0.8 nozzle",
"sub_path": "process/0.40mm Standard @BBL X1C 0.8 nozzle.json"
Expand Down Expand Up @@ -219,6 +251,22 @@
"name": "0.12mm Fine @BBL A1",
"sub_path": "process/0.12mm Fine @BBL A1.json"
},
{
"name": "0.12mm High Quality @BBL X1C",
"sub_path": "process/0.12mm High Quality @BBL X1C.json"
},
{
"name": "0.12mm High Quality @BBL P1P",
"sub_path": "process/0.12mm High Quality @BBL P1P.json"
},
{
"name": "0.12mm High Quality @BBL A1M",
"sub_path": "process/0.12mm High Quality @BBL A1M.json"
},
{
"name": "0.12mm High Quality @BBL A1",
"sub_path": "process/0.12mm High Quality @BBL A1.json"
},
{
"name": "0.16mm Optimal @BBL X1C",
"sub_path": "process/0.16mm Optimal @BBL X1C.json"
Expand All @@ -235,6 +283,22 @@
"name": "0.16mm Optimal @BBL A1",
"sub_path": "process/0.16mm Optimal @BBL A1.json"
},
{
"name": "0.16mm High Quality @BBL X1C",
"sub_path": "process/0.16mm High Quality @BBL X1C.json"
},
{
"name": "0.16mm High Quality @BBL P1P",
"sub_path": "process/0.16mm High Quality @BBL P1P.json"
},
{
"name": "0.16mm High Quality @BBL A1M",
"sub_path": "process/0.16mm High Quality @BBL A1M.json"
},
{
"name": "0.16mm High Quality @BBL A1",
"sub_path": "process/0.16mm High Quality @BBL A1.json"
},
{
"name": "0.20mm Standard @BBL X1C",
"sub_path": "process/0.20mm Standard @BBL X1C.json"
Expand Down Expand Up @@ -307,6 +371,22 @@
"name": "0.06mm Fine @BBL A1 0.2 nozzle",
"sub_path": "process/0.06mm Fine @BBL A1 0.2 nozzle.json"
},
{
"name": "0.06mm High Quality @BBL X1C 0.2 nozzle",
"sub_path": "process/0.06mm High Quality @BBL X1C 0.2 nozzle.json"
},
{
"name": "0.06mm High Quality @BBL P1P 0.2 nozzle",
"sub_path": "process/0.06mm High Quality @BBL P1P 0.2 nozzle.json"
},
{
"name": "0.06mm High Quality @BBL A1M 0.2 nozzle",
"sub_path": "process/0.06mm High Quality @BBL A1M 0.2 nozzle.json"
},
{
"name": "0.06mm High Quality @BBL A1 0.2 nozzle",
"sub_path": "process/0.06mm High Quality @BBL A1 0.2 nozzle.json"
},
{
"name": "0.08mm Standard @BBL X1C 0.2 nozzle",
"sub_path": "process/0.08mm Standard @BBL X1C 0.2 nozzle.json"
Expand All @@ -323,6 +403,22 @@
"name": "0.08mm Optimal @BBL A1 0.2 nozzle",
"sub_path": "process/0.08mm Optimal @BBL A1 0.2 nozzle.json"
},
{
"name": "0.08mm High Quality @BBL A1 0.2 nozzle",
"sub_path": "process/0.08mm High Quality @BBL A1 0.2 nozzle.json"
},
{
"name": "0.08mm High Quality @BBL A1M 0.2 nozzle",
"sub_path": "process/0.08mm High Quality @BBL A1M 0.2 nozzle.json"
},
{
"name": "0.08mm High Quality @BBL P1P 0.2 nozzle",
"sub_path": "process/0.08mm High Quality @BBL P1P 0.2 nozzle.json"
},
{
"name": "0.08mm High Quality @BBL X1C 0.2 nozzle",
"sub_path": "process/0.08mm High Quality @BBL X1C 0.2 nozzle.json"
},
{
"name": "0.12mm Standard @BBL X1C 0.2 nozzle",
"sub_path": "process/0.12mm Standard @BBL X1C 0.2 nozzle.json"
Expand Down Expand Up @@ -681,6 +777,10 @@
"name": "PolyLite PETG @base",
"sub_path": "filament/PolyLite PETG @base.json"
},
{
"name": "Bambu PETG Translucent @base",
"sub_path": "filament/Bambu PETG Translucent @base.json"
},
{
"name": "Bambu ABS @base",
"sub_path": "filament/Bambu ABS @base.json"
Expand Down Expand Up @@ -1553,6 +1653,30 @@
"name": "PolyLite PETG @BBL A1 0.2 nozzle",
"sub_path": "filament/PolyLite PETG @BBL A1 0.2 nozzle.json"
},
{
"name": "Bambu PETG Translucent @BBL X1C",
"sub_path": "filament/Bambu PETG Translucent @BBL X1C.json"
},
{
"name": "Bambu PETG Translucent @BBL X1C 0.8 nozzle",
"sub_path": "filament/Bambu PETG Translucent @BBL X1C 0.8 nozzle.json"
},
{
"name": "Bambu PETG Translucent @BBL A1M",
"sub_path": "filament/Bambu PETG Translucent @BBL A1M.json"
},
{
"name": "Bambu PETG Translucent @BBL A1M 0.8 nozzle",
"sub_path": "filament/Bambu PETG Translucent @BBL A1M 0.8 nozzle.json"
},
{
"name": "Bambu PETG Translucent @BBL A1 0.8 nozzle",
"sub_path": "filament/Bambu PETG Translucent @BBL A1 0.8 nozzle.json"
},
{
"name": "Bambu PETG Translucent @BBL A1",
"sub_path": "filament/Bambu PETG Translucent @BBL A1.json"
},
{
"name": "Bambu ABS @BBL X1C",
"sub_path": "filament/Bambu ABS @BBL X1C.json"
Expand Down
5 changes: 4 additions & 1 deletion resources/profiles/BBL/filament/Bambu PETG Basic @base.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,17 @@
"270"
],
"nozzle_temperature_range_low": [
"240"
"230"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"slow_down_layer_time": [
"12"
],
"textured_plate_temp": [
"70"
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"type": "filament",
"name": "Bambu PETG Translucent @BBL A1 0.8 nozzle",
"inherits": "Bambu PETG Translucent @base",
"from": "system",
"setting_id": "GFSG01_04",
"instantiation": "true",
"fan_max_speed": [
"60"
],
"fan_min_speed": [
"20"
],
"filament_max_volumetric_speed": [
"16"
],
"filament_retraction_length": [
"0.2"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab A1 0.6 nozzle"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "filament",
"name": "Bambu PETG Translucent @BBL A1",
"inherits": "Bambu PETG Translucent @base",
"from": "system",
"setting_id": "GFSG01_05",
"instantiation": "true",
"filament_retraction_length": [
"0.3"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab A1 0.4 nozzle"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"type": "filament",
"name": "Bambu PETG Translucent @BBL A1M 0.8 nozzle",
"inherits": "Bambu PETG Translucent @base",
"from": "system",
"setting_id": "GFSG01_03",
"instantiation": "true",
"fan_max_speed": [
"60"
],
"fan_min_speed": [
"20"
],
"filament_max_volumetric_speed": [
"16"
],
"filament_retraction_length": [
"0.2"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle"
]
}
Loading

0 comments on commit 3cb573d

Please sign in to comment.