3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-29 04:52:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3026 commits 5 branches 70 tags 1.5 GiB
Commit graph

94 commits

Author SHA1 Message Date
Scott Mudge
8e4a43ea5c
Add option for skirt-speed override (#1371) 
Add skirt speed option.

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2023-06-26 20:53:17 +08:00
SoftFever
8b0e307941 infill_anchor #500 #136 2023-05-27 17:39:48 +08:00
SoftFever
79a43da863 minor changes 
1. when default hotend model
2. apply speed change for current path
 2023-05-10 22:32:51 +08:00
SoftFever
da90e22b9f Support interface fan speed 2023-05-07 23:52:11 +08:00
SoftFever
be4373583f Number of slow layers #796 2023-05-07 23:52:11 +08:00
Scott Mudge
2e223551e4
Fan Speed Delay + Fan Kickstart Feature (#910) 
Initial commit for fan speed delay, required some changes when porting from SuperSlicer.

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2023-05-06 13:41:47 +08:00
SoftFever
5b97935562 optimized hot end model 2023-04-24 17:55:22 +08:00
SoftFever
9f598046d1 Merge remote-tracking branch 'remote/master' into feature/merge_upstream 
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
 2023-04-19 08:48:07 +08:00
salt.wei
e2d6ed99d1 ENH: add post_process back 
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I05fc655080f3888255297d689552de84a81ed849
 2023-04-17 15:39:02 +08:00
MusangKing
4cb8b1e125 ENH: Re-open support independent layer height 
Allow user to disable support independent layer height when prime tower closed.
Fix wrong WIKI link jumping.

JIRA: STUDIO-1685
JIRA: STUDIO-2308
Change-Id: I894fdd37b707c53e17fd4ad7d1518897f307e557
(cherry picked from commit e10d31e123306a0893087ea03693303768a2daf6)
 2023-04-17 15:39:02 +08:00
SoftFever
6cb7d0de95 fix extruder_clearance_radius 
#620
 2023-04-02 20:58:49 +08:00
SoftFever
bf556a0272 New feature: show auto calibration marks on bed for X1/X1C printers 
#88
 2023-04-02 11:42:18 +08:00
SoftFever
22a24168e6 support Klipper Exclude objects natively. 
Also remove fake slicer info
 2023-04-01 13:25:55 +08:00
SoftFever
2e5c648be7 set z hop type to Normal by default 2023-03-29 23:38:08 +08:00
SoftFever
06d81098f3 support different URL for web ui 
#451
 2023-03-14 21:33:19 +08:00
SoftFever
5a986c18a1 First layer travel speed 
#443
 2023-03-14 00:58:02 +08:00
SoftFever
11c1c17245 Added brim width setting for tree support 2023-03-12 21:05:59 +08:00
SoftFever
a47c756112 Added gcode_label_objects and gcode_comments option 2023-03-12 18:25:42 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5 
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
 2023-03-08 00:08:26 +08:00
SoftFever
a6cd32fe72 Allow user to turn adaptive layer height for tree support. 
Signed-off-by: SoftFever <softfeverever@gmail.com>
#257
 2023-03-06 19:57:09 +08:00
SoftFever
c58ed92da1 Support filament shrinkage 
Ported from SuperSlicer

Signed-off-by: SoftFever <softfeverever@gmail.com>
#360
 2023-03-05 17:23:17 +08:00
Jason M-H
d535d70d03
Add sparse / internal solid infill accel controls (#382) 
* Add sparse / internal solid infill accel controls

* infill accel control as %

* update tooltip

* update to abs value
 2023-03-04 17:52:46 +08:00
chunmao.guo
5c61c834b0 FIX: [STUDIO-2207] update_compatible on load user presets 
Change-Id: Id410c9e0ec68031c0517285daf8a24b998ba2eda
 2023-02-22 20:09:17 +08:00
chunmao.guo
cbb84d2fb6 ENH: support filament_z_hop_types 
Support override z top type in filament

This is handling for STUDIO-2082

Change-Id: I885d1d5e44d626e28b260ff569d0359e462a5f8d
 2023-02-22 20:09:17 +08:00
SoftFever
30bb644e2b bridge accel 
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-02-18 20:48:51 +08:00
SoftFever
e9613e971d
1.4.5 features (#319) 
* Changes:
Improve precise wall
Port PS2.6 overhang slowdown feature
Implement overhang fan for new overhang slowdown algo
Add option to switch between classic/new overhang slowdown implementation
Set Arachne as default engine
Small adjustment of temp calibration range
turn off small perimeter by default
Small UI tweaks
Change default top_surface_pattern to monotonic
Fine tune jerk

Signed-off-by: SoftFever <softfeverever@gmail.com>

* Disable optimizations for RelWithDebInfo

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix an issue that max volumetirc/vfa calibration can't send to print

Signed-off-by: SoftFever <softfeverever@gmail.com>
#322

* fix build errors

Signed-off-by: SoftFever <softfeverever@gmail.com>

---------

Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-02-17 23:09:18 +08:00
SoftFever
7fe5b84c41 more calibrations 
precise wall
etc

Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-02-11 09:55:58 +08:00
SoftFever
fe9a2715e6
New feature: bridge density (#275) 
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-02-02 00:43:36 +08:00
SoftFever
854470cfba wipe on loops 
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-01-26 01:29:44 +08:00
Patrice Côté
bf782028ac
Option for klipper only: Adjustment of "accel_to_decel" (#220) 
* Klipper option: Adjustment of "accel_to_decel"

Add option to automatically adjust accel_to_decel to 50% of chosen acceleration.

* allow variable accel_to_decel percentage

allow variable accel_to_decel percentage for klipper firmware
 2023-01-24 21:33:34 +08:00
Patrice Côté
5692e02c54
Enable absolute/relative extrusion option on non BBL printers (#205) 
Add the option to use non-relative extrusion in printer config screen. Some extruders do not play well with relative extrusion...

Remove reference to multi-extruder

Remove reference to multi-extruder

change g-code comment for M83 relative extrusion

changed comment for M83

Remove commented line of code

In this specific case, we delete the old line of code because it refers to a variable that was deleted from the rest of the code (RELATIVE_E_AXIS)
 2023-01-24 13:02:52 +08:00
SoftFever
b7bdb65fd3 Add option to set jerk for infills 
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-01-22 22:05:19 +08:00
SoftFever
8350895513 role_based_wipe_speed and wipe_speed 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-15 21:05:35 +08:00
SoftFever
594819ef9c seam gap parameter 2023-01-14 19:39:00 +08:00
Patrice Côté
540aa13e25
Add Post-processing (#159) 
It is now possible to call external  post-process scripts
 2023-01-12 19:42:31 +08:00
chunmao.guo
ae959b7400 ENH: [STUDIO-1871] merge changes of user presets from other sessions 
Change-Id: I2841ff4e23b18ebe7cdf374b69a494a4c05a49ee
 2023-01-10 19:08:26 +08:00
yifan.wu
5d9bb61f8e ENH: use spiral lift only when it is needed 
If a travel path goes through an overhang expolygons, and their distance
is shorter than threshold, lift type will be set to SpiralLift.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I345788711755dd8611ecf385818e6052cd8abe9e
 2023-01-10 19:08:26 +08:00
SoftFever
15b49bf856 Fix a bug that after load a project, printer connection info is missing 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-07 22:06:30 +08:00
SoftFever
0f04df2699 Support firmware retration and retract_restart_extra 2023-01-07 11:17:55 +08:00
SoftFever
7e1a2840e5 Set flowrate per object 2022-12-25 23:29:48 +08:00
SoftFever
45a00489ec fix crash when open filament setting dialog 2022-12-16 20:08:04 +08:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever 
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
 2022-12-16 13:59:30 +08:00
salt.wei
6551b86230 ENH: enable arachne for wall 
Refer to prusa and enable arachne for wall.

Arachne also has corner case and cause strange
slicing result and bad quality when print, while
class engine is much better for these cases.

Provide option for user to choose.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ieb3a1c6a457ca610561f8734de4a122d74165afd
 2022-12-15 04:38:15 -05:00
qing.zhang
fe4fc04eb8 ENH: add upward_compatible_machine to preset 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I489f3cc7f9fbd0de79861b71c47494b377ef1a16
 2022-12-15 04:38:15 -05:00
yifan.wu
3b0f75bd4e FIX: fix a cherry-pick conflict error 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ib8cc0598ec07fd204c3629206fb09939b7501215
 2022-12-15 04:38:15 -05:00
zhimin.zeng
7dddb17d8a FIX: the P1P printer is not support smooth timelapse 
Change-Id: I0e9faf9d9c63d6541189724813fd803c8522a26b
(cherry picked from commit 84edf0b3eeb84c65990926ab8fc69b0f51ce6f3d)
 2022-12-15 04:38:15 -05:00
Arthur
95ed039879 ENH: simplify support options and fix a tree sup bug 
1. add default support base pattern (lightning for tree support,
   rectilinear for normal)
2. change default support interface pattern to "Default" (concentric for
   absoluble material, rectilinear for others)
3. delete tree_support_with_infill, replace no-infill optio with "None" infill type
4. delete HAS_LIGHTNING_INFILL macro (lightning is impossible to be
   removed now)
5. fix the issue that tree support base may grow above interface by
   adding virtual nodes (distance_to_top<0).

Change-Id: I5affa44e1f72d0dc54052927f2b315de83702870
(cherry picked from commit a2b41b1dfd9227e68ac6d971312133ec3382baa7)
 2022-12-15 04:38:15 -05:00
MusangKing
d1e4cb430c NEW: Add "Support xy expansion distance" setting 
Open the "Support xy expansion distance" setting for users who can set
expanding and shrinking distance along xy to change normal supports' overhang area.

Jira: STUDIO-1297
Change-Id: If3a1efe99acaced12216966a6f8abd0dc3734757
(cherry picked from commit c1fd588a181b17403109b64a0019818f428252da)
 2022-12-15 04:38:15 -05:00
MusangKing
2a8fe9ec54 NEW: Open "Bottom Z distance" setting for users 
Users can set distance between support bottom contacts and object
once enable normal/tree support.

Jira: STUDIO-1383

TODO：Func seems good though, some details (e.g., bottom_interface
detection) need to be optimized furthur. Will keep follow-up.

Change-Id: I85815e7aa6cf1a5d0249633cd8ab995873461e8a
(cherry picked from commit eab39e89c94d749ebe6266ab745cbb70a068277d)
 2022-12-15 04:38:15 -05:00
salt.wei
588f18ac58 ENH: improve archor of internal bridge 
Add loop inside sparse infill of lower layer
to provide archor for internal bridge.

This option controls how many lower layers generate
loop path.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ifdb6db9090115732aa2cacf5d155b587a10e18fc
(cherry picked from commit 4fdb87ecd5c2e680f6bad2d018ba39cd05f787ce)
 2022-12-15 04:33:48 -05:00