Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/merge 1.8.4 #3827

Merged
merged 49 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6d71a5d
FIX: the logic of buried points that were not buried
MklBambu Jan 17, 2024
3ba6dea
ci: update network module based on commit bc7ca98
Jan 16, 2024
d0bf195
Fix Firefox
SoftFever Jan 25, 2024
a31b8e4
FIX: cali: custom created filament from AMS displayed as incompatible
LiZ-Li-BBL Dec 18, 2023
e8b493d
FIX: duplicated items in comboBox at calibration completed page
LiZ-Li-BBL Dec 18, 2023
68199b5
ENH:update support for P1S plus
walterwongbbl Dec 14, 2023
22eeaa3
ENH: CLI: add mk information support
lanewei120 Dec 19, 2023
9a3f940
ENH:calibration support p1p plus
walterwongbbl Dec 20, 2023
3922161
FIX: add log for base_id and filament_id
DanBao-Bambu Dec 19, 2023
06ad4b1
FIX: sync whole preset vendor directory
bambu123 Dec 8, 2023
6c843f4
FIX: use t_utc for debug only
bambu123 Dec 18, 2023
bc985c1
FIX:make sort_volumes right
Haidiye00 Dec 19, 2023
0490e1b
ENH:keep an unload logic
walterwongbbl Dec 20, 2023
ae0012e
FIX: several problems with mesh boolean
ArthurBambulab Dec 21, 2023
5f880b8
NEW:limit the length of project name
walterwongbbl Dec 22, 2023
4636999
ENH:adjusting the warning level of timelpase
walterwongbbl Dec 22, 2023
22b7412
FIX: 3mf specification: change namespace form slic3rpe to BambuStudio
DanBao-Bambu Dec 26, 2023
8f9790e
NEW: Open MakerWorld With BambuStudio GetParam
SoftFever Jan 25, 2024
766e835
FIX: Filament issue generated when creating a printer
DanBao-Bambu Dec 5, 2023
bff31a5
FIX: Blank page appears when editing presets
DanBao-Bambu Dec 13, 2023
9210e68
FIX: context menu didn't update UI
LiZ-Li-BBL Dec 26, 2023
39d3c8c
FIX: crash of "filling bed"
ArthurBambulab Dec 26, 2023
53b5ef3
FIX: boolean hangs in the middle of color painting
ArthurBambulab Dec 26, 2023
aeb4160
Fix: Fix a number of compilation problems
hadess Dec 10, 2023
d2139e5
fix: macos icns issue when icon was not attached
SoftFever Jan 25, 2024
44e9816
FIX: Add flush_length for change_filament_gcode
zhimin-zeng-bambulab Dec 21, 2023
c590101
FIX: edit preset dialog can't close on mac
DanBao-Bambu Dec 27, 2023
13e99cf
ENH: add dev_ota_version in ssdp
SoftFever Jan 25, 2024
d4a7a9e
NEW:Adapt to multicolour and gradient colour
bam-winterfell Dec 26, 2023
edf89a8
NEW:Adaptation of semi transparent materials
bam-winterfell Dec 29, 2023
80e75ee
FIX: disable flush options if prime tower is unchecked
LiZ-Li-BBL Jan 2, 2024
bf038ab
ENH: refine GetVersion for HMS query
StoneLiBambulab Jan 3, 2024
e15fe43
FIX: Prefer old selection when sync AMS not compatible
bambu123 Dec 1, 2023
9da3b26
FIX: The flushing was not auto-calc when sync ams list
MklBambu Dec 14, 2023
94607e4
FIX:fixed invalid links
walterwongbbl Jan 3, 2024
1caac85
FIX: Prompt to delete problematic presets
SoftFever Jan 25, 2024
5e59d41
FIX:fixed incorrect HMS content
walterwongbbl Jan 5, 2024
60c56b0
FIX:external transparent material display error
bam-winterfell Jan 8, 2024
1f1dca8
FIX: [5846] Custom Filament Page show System Filament
DanBao-Bambu Jan 8, 2024
08d01f3
FIX:A1 and p1 series do not support custom materials
bam-winterfell Jan 9, 2024
3c12dce
FIX: exception when comparing profiles
XunZhangBambu Jan 11, 2024
eed1ddf
FIX: hide_id_middle_string
bambu123 Jan 8, 2024
14d3f14
ENH: modify some logs level
StoneLiBambulab Jan 12, 2024
21dc860
NEW:build plate marker detect
bam-winterfell Jan 12, 2024
e0e1a77
FIX: Studio UI Freeze when saving user preset
DanBao-Bambu Jan 12, 2024
4e0598c
update bbl plugin version
SoftFever Jan 25, 2024
b9223e4
fix build errors
SoftFever Jan 25, 2024
124f961
update bbl profiles
SoftFever Jan 25, 2024
ee26e08
update color
SoftFever Jan 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading