Commit Graph

280 Commits

Author SHA1 Message Date
maosheng.wei eb3a97f55b ENH: [STUDIO-2450] Update the bed type to be consistent with the gcode
Change-Id: Ic69face644bc193e7125535697905c35ba210058
2023-07-07 17:25:51 +08:00
maosheng.wei 2718eafb5a NEW: [STUDIO-2888] Slice, third-party printing buried point
Change-Id: Ic713bdc8087b57dfb37638da3e4b7a6c1662f4c0
2023-07-07 17:25:51 +08:00
tao wang 57873e6e59 FIX:fixed download address splicing failure
Change-Id: I41b3f822aac95be86bf05db40dee54da133e6acf
2023-07-07 17:25:51 +08:00
liz.li ab0c6611c8 NEW:add paint tool in assembly view
Change-Id: I108e1e24ca9d033d2279c8153585166971a347a6
2023-07-07 17:25:51 +08:00
tao wang 7af252fa99 NEW:support for sending print job from SD card view
Change-Id: I8366345ae4323c1b568bfd267d036e2474ff969a
2023-07-07 17:25:51 +08:00
zhimin.zeng ab17e418cf FIX: modify the flushing volume of transparent material
The transparent material is regarded as the white material to calculate the flushing volume

Change-Id: I922ff55ede62acb7040d6f7cdc6b14bcf6e31274
2023-07-07 17:25:51 +08:00
maosheng.wei f40851ff31 FIX: [STUDIO-2492] Model Centering Problem
Click on Add in the top menu bar, the model is not centered

Change-Id: I950ce13262090ada316d5c350af8c7edc9826222
2023-07-07 17:25:51 +08:00
zhou.xu 507a8a6d36 NEW: add overhang highlight area
overhang rgb=(200,0,0),remove supportType,do not save para after overhang operation preview

Change-Id: I947bbd9db264f00f0609b3f02140060f9a2621fb
(cherry picked from commit 796c4460fe998da206f9ca77973a20796fa1d3ca)
2023-07-07 17:25:51 +08:00
manch1n 35d6b072d3 ENH: merge all error when multi obj have empty layer
Change-Id: Iff091babff67050fe512a3cffe6cb2af0e91efa5

STUDIO-2540
(cherry picked from commit e23781245e3a6ae9bffcff869aa8991eb0298243)

Change-Id: Ia90ffa1244ef8a89c8d3007ca65b68439b09249b
2023-07-07 17:25:51 +08:00
tao wang 8b490adc51 NEW:optimizing error info for network requests
Change-Id: I8656c2f899b086b5ab52d94b7186e64df1625e3e
2023-07-07 17:25:51 +08:00
zhou.xu fdd7d11b14 NEW:Enhanced disk name function
Right click to modify the disk name, which is also displayed in the left UI bar
# Conflicts:
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/GUI_Factories.hpp

Change-Id: Ib688bef58d75fba1e5df4f201bfdcef7a3872308
(cherry picked from commit 019681ce69e115e8e4602a93dcb3dc61f20ecba5)
2023-07-07 17:25:51 +08:00
liz.li edba4d18a6 FIX: adjust the camera view of loading a .gcode.3mf file(STUDIO-2598)
Change-Id: I42e82e6883ac613c3683deb2c9a465618b0cb6ab
2023-07-07 17:25:51 +08:00
liz.li 000fab5261 FIX: thumbnail in preview display problem(STUDIO-2578)
after a .gcode.3mf file loaded, the thumbnail in preview will not show
until click the canvas3D region.

Change-Id: Ia58e5a44ea3dc87ac7609d434aebbf0e89cf3023
2023-07-07 17:25:51 +08:00
zhou.xu 2b9f3c9912 NEW: add plate name
referenced OrcaSlicer code and support for Chinese textures,chinese xml,limit plate_name length,Code decoupling,wxColour use Local Variables

Change-Id: I6434b90efb2f90235527c7dfb3a7ed516ac2cf4b
(cherry picked from commit 0ecfefb0e1cfccbe73b0fcc530e04e6405ecf68a)
2023-07-07 17:25:51 +08:00
chunmao.guo 21fbe91ca7 ENH: reduce share mesh from 3mf
Change-Id: I7c504c98fdf05c8dbd67e852e100c2cc38190c3b
(cherry picked from commit bab4fc7310e15354e98e650540fb91eefb2f4248)
2023-07-07 17:25:51 +08:00
maosheng.wei a6288503e9 NEW: [STUDIO-2776] Display the number of selected parts
The logic has been modified, please review again

Change-Id: I777ea27b9a4fa5d4e2d1a5e01ea32a108f9a5196
(cherry picked from commit f85834dfbc223a72b3e131886fffada2e6cedaab)
2023-07-07 17:25:51 +08:00
zhimin.zeng 89e7f1a8f1 FIX: Reload from disk does not work with STP-files
STUDIO-2734 Reload from disk does not work with STP-files loaded as a "single object with multiple parts"

Change-Id: Iab8a8d404505cb3cdd02631c320ab69fd88b40b4
2023-07-07 17:25:51 +08:00
maosheng.wei 3d8b1408ec FIX: [STUDIO-2349] Large model causing hot bed display issues
Change-Id: I8efbfe75bbfa50059ce9f124a8c4b308d0fddac0
2023-07-07 17:25:51 +08:00
tao wang 8ceb0e6b7b ENH:rename model file after download finish
Change-Id: I3ae1c8ca4f53bf41c00688b6bb5b0c0e0a4f869b
2023-07-07 17:25:51 +08:00
maosheng.wei 4d234b9785 FIX: Cancel sequence number
Jira: STUDIO-2688
Change-Id: I29d992354713dcc8caaa8fc2ab98506f1b4e0735
(cherry picked from commit f7a69618813648b0c611c9dfbff3a0ad1d7a18d6)
2023-04-17 15:39:02 +08:00
zhimin.zeng de3bb7eb4f FIX: new project use the app_config flush_multiplier
Change-Id: I5b820399a814a043581fcfadb9629cbe15dd1c52
2023-04-17 15:39:02 +08:00
liz.li 7efa355ff5 FIX: remove layer menu
1.remove layer menu
2.add dark color adaption of obj_layer

Change-Id: I8faf5f69359f0d0fff769887b800f3963884d55d
2023-04-17 15:39:02 +08:00
lane.wei 697a45379f ENH: refine the multiple-object detects logic while sinking opened
no need to detect the project file

Change-Id: Ia84d94832d16c2a68ecc25ee457d79735873e82a
(cherry picked from commit 39e9f3de907f19d452abf831221656c9a8e1d0e0)
2023-04-17 15:39:02 +08:00
liz.li b42a0d5632 FIX:custom gcodes are reset after import geometry only (STUDIO-2595)
Change-Id: I11052ea28aacca78103852d2beba0dc97b42eb31
2023-04-17 15:39:02 +08:00
Stone Li b99b1f8d73 FIX: fix a bug that can not send all to lan mode printers
Signed-off-by: Stone Li <stone.li@bambulab.com>
Change-Id: I704cf0336dc809c84a1d8e149e831ffcf55f3004
2023-04-17 15:39:02 +08:00
liz.li 69dcbef290 FIX: cannot save project after adding custom gcode tick (STUDIO-2451)
Change-Id: I8e787d7bd8eebd793a6e070a18f36afda57b0ecf
2023-04-17 15:39:02 +08:00
liz.li 3c6e68553b ENH: add height_range
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
2023-04-17 15:39:02 +08:00
chunmao.guo 8c39fbaf22 ENH: [STUDIO-2549] remember my choice on unsaved project/presets
Change-Id: Ib9fc9074075bfce19f9a02be3aff7b3d04e3802a
2023-04-17 15:39:02 +08:00
tao wang ccfc61492b ENH:use high contrast icons in dark mode
fixed STUDIO-2033

Change-Id: Ibfbc40b02f5333d80d2875d88bb3029109256e4a
2023-04-17 15:39:02 +08:00
tao wang 7481da52d6 NEW:support for launching studio from the model web
Change-Id: I931fc8633c057228441daf2ab4c9c37f97e898ab
2023-04-17 15:39:02 +08:00
zhimin.zeng cd4cddfca4 ENH: Cut optimization, support for custom connectors
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
2023-04-17 15:39:02 +08:00
chunmao.guo dbe1f3f5b1 ENH: [STUDIO-2437] new object sinking interaction
Change-Id: Ia93f3ee92abc7cd2ff5d623c6e1edfe7233e31d4
2023-04-17 15:39:02 +08:00
zhimin.zeng c098e01b22 FIX: modify plate print sequence, the wipe tower is not update
STUDIO-2279 STUDIO-2280

Change-Id: I9a65ae4c02afc48666131b37d0282d59aa25c560
2023-04-17 15:39:02 +08:00
lane.wei c65a5f8bf5 ENH: thumbnail: add top_view thumbnails and picking thumbnails
1. add top view thumbnail for each plate
2. add picking thumbnails for each plate
3. save model object id for picking

Change-Id: I1d7f6ade22726ff12c282cb12e4a78e6b444a070
2023-04-17 15:39:02 +08:00
chunmao.guo bd29ac769c FIX: [STUDIO-2295] update dynamic filament list on color change
Change-Id: I6a90e3ed6007b41ea38b50fac96b929d058dddfa
2023-04-17 15:39:02 +08:00
chunmao.guo 2bb8875e30 FIX: [STUDIO-2213] project title of restored new project
Change-Id: Ia8255016f77942274c9cf4f704115766735a820b
2023-04-17 15:39:02 +08:00
chunmao.guo 91ad491743 FIX: [STUDIO-2282] auto expand filament list on sync ams
Change-Id: Iad2fd419fc6da56418cda7423adcbcef641ee2a3
2023-04-17 15:39:02 +08:00
tao wang a86d94f2c9 NEW:update the content of the project page
Change-Id: Idb7f8a2564c78a1f062580f6b388ee033238cedf
2023-04-17 15:39:02 +08:00
zhimin.zeng 0532f837fa FIX: wipe tower is not generated when inserting custom gcode
Change-Id: I8f81dff79dba2fd60df2095ff37696ddc0b9597c
2023-04-17 15:39:02 +08:00
miaoxin 3448b7a053 FIX: avoid arrange to outer when quick click autoarrangement in plate.
Change-Id: Ic8fa2f605094c7a3b7fa5a6fe36c5159678c50fd

STUDIO-2202
(cherry picked from commit 641c18c25f5f297234059d463ac12220c4b6fa9f)

Change-Id: Ic452f2fa4357fcacf71f6a70df2c514d2628b217
2023-04-17 15:39:02 +08:00
lane.wei e20adc16dc FIX: fix the bed shape not correct issue when loading old 3mf
Change-Id: I924c47ea4a1f21b5e9854abdcedfe8b689ddcb67
2023-02-28 18:44:28 +08:00
chunmao.guo a48451df35 FIX: load_ams_list for initial select machine
Change-Id: I87ffa52ffb207b850156866f03bb54eb9852ee42
2023-02-24 17:44:15 +08:00
zhimin.zeng f144cd31b8 FIX: position is incorrect when reloading disk
STUDIO-2224

Change-Id: I179de7cde8edffbe686a1eff41d0e2271dcca65e
2023-02-24 09:23:57 +08:00
Stone Li 50462d14eb ENH: enlarge thumbnail size of plate to 512*512
Change-Id: I076060a8b315e3bda88d972cbf3cd05f42399c78
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
zhimin.zeng c7ec112420 ENH: optimize text interaction
Change-Id: I1d132124816ba0946fd4d05310f8cd6da17a7e45
(cherry picked from commit f741a33a3651e266edfd4c191322f8988a3666f2)
2023-02-22 20:09:17 +08:00
liz.li 9a18e4e54b FIX: preview model display problem after tick changed
Change-Id: I1d17fe1b19d323642ad2aff0329c919a627dc3fc
2023-02-22 20:09:17 +08:00
lane.wei 21a4b30e1b ENH: update the focus to the new plate when creating
Change-Id: Id7ea18274865966a2e9f89ff0b2eb9799de8e19f
(cherry picked from commit 3e13db7f0a2b29201f76b4721259fc2829abe68c)
2023-02-22 20:09:17 +08:00
chunmao.guo fc96370abe FIX: update po text
Change-Id: Ib120d6725031419e00a6098a40886859783f0b3e
2023-02-22 20:09:17 +08:00
liz.li 6114a415cf NEW:add statistics of all plates in preview
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
2023-02-22 20:09:17 +08:00
lane.wei f3af4558ce ENH: translate old models to correct position
Correct the position of some old models

Change-Id: I5105dacff5d6b2895507fb57d77197334a651b47
2023-02-22 20:09:17 +08:00
liz.li e7ea07944f ENH: custom gcode info should be owned by every plate
Change-Id: I5e5b000b7d04354d3c3cc311d089cb591a37501e
2023-02-22 20:09:17 +08:00
tao.jin 688084c475 NEW: add print sequence setting to plate
Change-Id: Ic4acb68743442a49dee04702e7a8073b6641bc39
2023-02-22 20:09:17 +08:00
lane.wei 9dceb42ba3 ENH: validate the config from 3mf and give some hints when there are errors
Change-Id: Ic25e5426e4e85a35a6a2413109f47b653955ec78
2023-02-22 20:09:17 +08:00
chunmao.guo e9c443fcd7 FIX: [STUDIO-2205] select sync all AMS filaments or only changes
Change-Id: I027158e2baa355c6147fea4d45b63ba564b18d0c
2023-02-22 20:09:17 +08:00
chunmao.guo b3a4384aec ENH: save ams list to compare with last sync
Change-Id: I44db0b0a61cf366929aed6ab703407e5d9b170b7
2023-02-22 20:09:17 +08:00
salt.wei de4e087b5b ENH: small change for warning
Handling for jira-1966

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I4deb68fad55f373be86004f53e4b296da4b5b7db
2023-02-22 20:09:17 +08:00
lane.wei 64173b3fa3 FIX: fix the duplicate model issue after open recent project in some corner cases
github issue-1185

Change-Id: I3be5be473cfe7328c4781b1533093cd860e64387
2023-02-01 16:24:44 +08:00
tao wang 625978355a FIX:fixed send print will crash when resources path is chinese path
Change-Id: Ie4a5161f853dca691bd69e5695720d99148a0134
2023-02-01 16:24:44 +08:00
tao wang 9a8f832498 ENH:Update IP address input process
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li 67d4e2148f FIX: fix sending gcode to octoprint
Change-Id: Id541b18d8e3522854d83f57dd4f3b02863a6aae7
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
SoftFever 5a42590d73 fix crashing issue when the model's path has Unicode characters on third party printers. 2023-01-29 15:45:21 +08:00
liz.li b27a9e27ce ENH: preview slider behavior
1.add pauseprint will not cause preview page refresh
2.fix add custom Gcode window and jump to layer window cannot input after reslice

Change-Id: I4f75457b6d6172080715393c975169c8f16464b9
2023-01-10 19:08:26 +08:00
lane.wei 38406e3e59 FIX: fix the object select state not correct issue when load project from drop-files
Change-Id: I6ad11ec3a96d73ac38f2f5aab74a3fcd685c0a34
2023-01-10 19:08:26 +08:00
lane.wei 0dc7f51782 FIX: fix the crash issue when right-click on object list in preview
Change-Id: I31fc987b762fe2718b4ca1659d14864e44a86225
2023-01-10 19:08:26 +08:00
tao wang 4d8d4cb69c ENH:wxStaticText set the default foreground colour
Change-Id: Ifb03554848bc869f8605fb10945e7681147204d5
2023-01-10 19:08:26 +08:00
Stone Li 9bc46daf40 ENH: optimize the copy description format
remove "\n" from _L macro

Change-Id: If1beda4a77f1c2b42945657b7386e155b8bc7a20
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
liz.li 5fc3694e08 NEW:add hide function in assemble_view menu
1.support hide funtion in assemble view
2.fix an issue that switch printable in assemble view will make
model-in-assemble-view turn transparent instead of model-in-view3D
3.fix a crash: right-click on objectlist after entering assemble view

Change-Id: Ia1a7ca492637eeaacd862ba015c440a55a83ca6e
2023-01-10 19:08:26 +08:00
tao wang c8df45c11f FIX:fixed some models with special names cannot be downloaded
Change-Id: Id5a3dff960d6e9868dfa87aef96093de2dc215e6
2023-01-10 19:08:26 +08:00
zhimin.zeng e70253cf25 FIX: can not save project when modify bed type in the scene
Change-Id: Iaea1bef142edcf0c68a64cfa1f3b1d309b96f251
2023-01-10 19:08:26 +08:00
tao.jin c75ca06f01 ENH: render mesh_errors notification in red
Change-Id: Ie13524dc27436b9e1c075e5e9e0363cfa1504147
2023-01-10 19:08:26 +08:00
zhimin.zeng 4284d2ddb0 ENH: generate wipe tower when custom change gcode filament
Change-Id: Ia0c81453f09457a9d1d56fbcdce79112953c0208
2023-01-10 19:08:26 +08:00
zhimin.zeng 75c5d7b267 FIX: the position is reset when reload from disk
Change-Id: I1acf9501f7211b45655c86dac7a529681f8cf150
(cherry picked from commit 1b7c763673e37f33ceea59be96cfb29760721f6b)
2023-01-10 19:08:26 +08:00
lane.wei 697d945ca1 ENH: add the logic to prompt user to update network plugins
Change-Id: I73cce20e58783a365ad2665c8e095dcf2e9c02ea
2022-12-26 05:31:54 -05:00
lane.wei 8b5a49f378 ENH: disable wireframe currently for some macos has performance issue
Change-Id: I7646927352b0097e1a7b4fa97da4730976996b80
2022-12-26 05:31:54 -05:00
lane.wei 13a1dc03c1 ENH: sync the different codes
especially for the translation files

Change-Id: I940578ff6e22b0939d42eeed2209bfeddb0eb191
2022-12-15 04:38:15 -05:00
lane.wei ff89c4d04d FIX: fix the crash at bootup in some corner case
when sys color changed on mac, we need to make sure glcanvas3d inited

Change-Id: I91f6995a07550de32fd732a2501a26c947abc5a4
2022-12-15 04:38:15 -05:00
chunmao.guo 59773eee02 FIX: [STUDIO-1725] DropDown: icon scale size on Mac
Change-Id: I8128035df0c8623d220c791225adeb4a827cbb3f
2022-12-15 04:38:15 -05:00
lane.wei daf4b4ef74 FIX: fix the bed position not correct issue for 3rd printers
also remove the unused gridlines in 3dBed

Change-Id: I547bf8f48c9d79ed831ed0872699ad1da1185da8
2022-12-15 04:38:15 -05:00
tao.jin 9ab6e86b47 FIX: get exported file name in preview-only mode
Change-Id: Ibea53d951e020ff03c1e7f378714b117a4e8a19f
2022-12-15 04:38:15 -05:00
tao.jin 38dfde8fc2 ENH: jump to prepare in preview only mode
Change-Id: Ic7d1b17938172f81f334df020699b3ffbe92d65f
2022-12-15 04:38:15 -05:00
Stone Li c69b7780ad ENH: do not invalid thumbnails when using expoted file
fix missing project name for gcode.3mf

Change-Id: Iabc43cd54ceaa9cbbdfb7b045f5d4a24124d7007
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo 91d36e0562 ENH: [STUDIO-1667] show ams tray name in color icon
Change-Id: Id98de7c8d08a337f32559b54acc0f8613aa2cf65
2022-12-15 04:38:15 -05:00
chunmao.guo 31ff48ccca FIX: [STUDIO-1694] change support filament to default if out of range
Change-Id: Ie67b1832ec92cd66c14461d01363bbf2c2069185
2022-12-15 04:38:15 -05:00
chunmao.guo 41b1ad6f2f ENH: [STUDIO-1608] select support filament by combobox
Change-Id: I26543530202a53ef5753c38404617458a6d4a1ef
2022-12-15 04:38:15 -05:00
liz.li aab62b77bf ENH:refine GLCanvas update dark mode logic
Change-Id: Id4c4f00a18fa0672eab528a6819b6665031a8915
2022-12-15 04:38:15 -05:00
tao.jin 047e5c2e90 FIX: refine hint of lacking model repair on mac
Change-Id: I3301422a46587cd92ef3688f494dd33f657fbb7c
2022-12-15 04:38:15 -05:00
tao.jin 4ea3d16fcc ENH: hint of lacking model repair on mac
Change-Id: Ie6bb669c642e4fbdafd29218bc8af6b55b1adc36
2022-12-15 04:38:15 -05:00
chunmao.guo 8cee81b5ef FIX: [STUDIO-1574] not switch filament preset after wizard
Change-Id: Ica703553a6994456f12b509564443902697ed374
2022-12-15 04:38:15 -05:00
chunmao.guo e54f3a75d4 FIX: [STUDIO-1563] dark mode of dataview's header
Change-Id: Ied9358df9d2edd9f0d40a81694655b8f2fdefdb8
2022-12-15 04:38:15 -05:00
lane.wei 67c2f5a285 FIX: fix the slice_all display error
don't reset gcode toolpath in some cases

Change-Id: I06e5c2558462244bdd43f2712054c6097be7599a
2022-12-15 04:38:15 -05:00
chunmao.guo 26bb461667 FIX: [STUDIO-1615] adjust message for project save failed
Change-Id: Ia135053dd2206ffb2c743df65ea5273cb95f7666
2022-12-15 04:38:15 -05:00
chunmao.guo 15d6130b29 FIX: [STUDIO-1562] fix sizeof PresetComboBox
Change-Id: Ia64128f9fded669cd3e7eb1c64868fada76df6b8
2022-12-15 04:38:15 -05:00
Arthur 3ad732bd93 ENH: translate "Slicing Canceled" and others
Change-Id: I034445d285a86e732abb9bd1dddd6cb5aabcead6
2022-12-15 04:38:15 -05:00
chunmao.guo c3398a089c FIX: [STUDIO-1586] take new project snapshot after reset
Change-Id: Iad3be50d5c783d0114eaea8c0a5b03f45a45aa36
2022-12-15 04:38:15 -05:00
Stone Li 08b40dc5e8 FIX: do not reset thumbnails when using exported file
Change-Id: I4d8c7ccdf21b92354bd0c2c816665db2d2a4a958
2022-12-15 04:38:15 -05:00
tao wang 6f1040f0df FIX:fixed some issues for dark mode
Change-Id: I6b2b75507cf8a72672cce39cf7d8af8773723c22
2022-12-15 04:38:15 -05:00
yifan.wu 0acad21707 ENH: update Chinese translations
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I369cc80e3d7fb0c7d3292663d1fdf70544f8c765
2022-12-15 04:38:15 -05:00
chunmao.guo 1b995c2d47 FIX: optimize click area in filament title bar
Change-Id: Id56f43b54f32730795295bb5e124898420cb0735
2022-12-15 04:38:15 -05:00
chunmao.guo 5a6263c9f3 FIX: [STUDIO-1525] not switch preset after cancel edit dialog
Change-Id: I91810298da40250e3c5def72737b2be6df764a3b
2022-12-15 04:38:15 -05:00
yifan.wu 41fcf8eb1e ENH: optimize WipeTowerDialog logics
1. flush_multiplier will be apply the the flush volume during slicing
   rather than only in auto-calc
2. mark too small flush volume as red instead of a warning dialog
3. do not forbidden flush volume lower than the nozzle volume
4. fix incorrect focus status of text input box in WipeTowerDialog
5. check the minimum flush volume based on flush_multiplier
6. limit the decimal digit to two places

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Icdcc50c88ecd9463fb9ce73f996d57c2d9f0187f
(cherry picked from commit 60e01edc511f117b05a8a9b92aaf6fd55325e485)
2022-12-15 04:38:15 -05:00