SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								9e73dfeb5d 
								
							 
						 
						
							
							
								
								enforce no tracking  
							
							
							
						 
						
							2023-08-08 19:36:24 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								bcbbbf35db 
								
							 
						 
						
							
							
								
								Merge some BS1.7 changes:  
							
							... 
							
							
							
							internal_solid_infill_pattern 
							
						 
						
							2023-08-08 19:08:13 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								7ece35931e 
								
							 
						 
						
							
							
								
								Merge some BS1.7 changes:  
							
							... 
							
							
							
							Port object canceling for BL X1 from BS.
Todo: refactor 
							
						 
						
							2023-08-08 19:08:13 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								3acd89e877 
								
							 
						 
						
							
							
								
								Merge some BS1.7 changes:  
							
							... 
							
							
							
							bring back fill_bed feature, original implemention from PrusaSlicer. BS added exclusion logic. 
							
						 
						
							2023-08-08 19:08:13 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								a8c7f9db84 
								
							 
						 
						
							
							
								
								FIX: Revert overhang optimization  
							
							... 
							
							
							
							Revert overhang degrre split
This reverts commit 7d8c98117ae6b7c2c2d62176d1bf8cf51b28a79b.
Revert "ENH: arachne overhang efficiency optimization"
This reverts commit 7adcceda95fc52be4a37c3e74de1aa776a3c434a.
Change-Id: Ic33a2e8bb11e48b40388706a662267e05508fd25 
							
						 
						
							2023-08-08 10:41:55 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								84ef39a555 
								
							 
						 
						
							
							
								
								ENH: fix arachne wall order  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0f3680ba73689c6fb673c070b0355a84fc25de26 
							
						 
						
							2023-08-08 10:41:55 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur 
								
							 
						 
						
							
							
							
							
								
							
							
								c364dc733b 
								
							 
						 
						
							
							
								
								FIX: tree support's enforcers inside a hole were wrong  
							
							... 
							
							
							
							Previously holes of enforcer_polygons was taken as contours,
which caused enforcers inside a hole were too large.
Jira: STUDIO-3877
Change-Id: If38c34e2469b822012a2ed0b082783563fe99228 
							
						 
						
							2023-08-08 10:41:55 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								22171e6534 
								
							 
						 
						
							
							
								
								FIX: crash at flow rate cali save when input Chinese  
							
							... 
							
							
							
							Change-Id: Idfc913e79c13646c9536c8d331c216acdb1e2ef5
(cherry picked from commit cd68769b8fae92d2026ea91e5c32afaf6fb85b76) 
							
						 
						
							2023-08-08 10:41:55 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								b8db25ac0e 
								
							 
						 
						
							
							
								
								revert PA tower  
							
							
							
						 
						
							2023-08-06 23:19:02 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									maosheng.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								3010678a61 
								
							 
						 
						
							
							
								
								FIX: translation  
							
							... 
							
							
							
							Change-Id: I4e6ce9943df178c80a47c49fb50da1ba16d1d7a3
(cherry picked from commit e9aa706f5887658cab8cc962020760c9e6fdad27) 
							
						 
						
							2023-08-04 22:33:22 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								576c275b61 
								
							 
						 
						
							
							
								
								ENH: key name-only one wall on top surface  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ife706b02d51badddc7e6dcba446a4d049695a706 
							
						 
						
							2023-08-04 22:09:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								c0759fbd32 
								
							 
						 
						
							
							
								
								ENH: fix overhang degree split  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I81b946f2fab5e561f965df2ab9852c10c61f8480 
							
						 
						
							2023-08-04 22:09:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								14f248f8fa 
								
							 
						 
						
							
							
								
								fixed an bug that CN plate name was not working properly  
							
							
							
						 
						
							2023-08-04 20:36:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hotsolidinfill 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								580424701b 
								
							 
						 
						
							
							
								
								fix Korean font not be loaded properly ( #1681 )  
							
							... 
							
							
							
							* Update Korean Translation
- Make overhang printable
- Lift Z Enforcement
- etc
* fix Korean font not be loaded 
							
						 
						
							2023-08-04 19:15:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								013a64243f 
								
							 
						 
						
							
							
								
								tweak single wall  #1680  
							
							
							
						 
						
							2023-08-04 18:56:58 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								ce59235bd7 
								
							 
						 
						
							
							
								
								Fix set fan bug  
							
							
							
						 
						
							2023-08-04 18:56:58 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								f00dc9c675 
								
							 
						 
						
							
							
								
								FIX:fixed sending print failure due to long plate name  
							
							... 
							
							
							
							Change-Id: I89f32f7d7f214d55051e736f834e0e49d7c808ab 
							
						 
						
							2023-08-04 18:19:21 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								0aa638c729 
								
							 
						 
						
							
							
								
								ENH: top one wall for arachne  
							
							... 
							
							
							
							split to 3 mode
not apply
all top surface
topmost surface
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Id9bb1a6ded7414b2f093ac01e4ecb4b93057d022 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zhimin.zeng 
								
							 
						 
						
							
							
							
							
								
							
							
								a672870222 
								
							 
						 
						
							
							
								
								FIX: display failed when the flow rate is 0 or too large  
							
							... 
							
							
							
							Change-Id: I20af5b0badba63a12129fb571524a152b591d974
(cherry picked from commit f57ce4133c6a5a460c43767c898c3068d9bff60d) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									maosheng.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								2bb6dc65b8 
								
							 
						 
						
							
							
								
								FIX: add Chinese pictures in cali page  
							
							... 
							
							
							
							Change-Id: Ibcb0a01ec0fcbb3a73708cb6dc771748b3ebc2ea
(cherry picked from commit 848e51c5da6d9c5c3f4227ed6dc706b19e9eceae) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									maosheng.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								3a5ddb3ea1 
								
							 
						 
						
							
							
								
								FIX: [STUDIO-3835] Cali translations  
							
							... 
							
							
							
							Change-Id: I705d27ff172c8c9c0eed617f69af3128f2e3ffe0
(cherry picked from commit 0a1722ebee63ab79a29c3add56d5386b32c3dae9) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								2eb9dd01a7 
								
							 
						 
						
							
							
								
								FIX: cali related encoding problem  
							
							... 
							
							
							
							Change-Id: Ia79237d9e2f37fd8720411891fb724c3bd00b9fb 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zhimin.zeng 
								
							 
						 
						
							
							
							
							
								
							
							
								cefd9876fc 
								
							 
						 
						
							
							
								
								FIX: the n value is not correct when set pa cali value  
							
							... 
							
							
							
							If it is manual, set it to 0, if it is automatic, use the calibrated value
Change-Id: I7c8737366e0ec0c6c2c17a7ad905cfb34e236fd8
(cherry picked from commit b235b0c8b79b1baf6a393ccfea236e1e650dcb7d)
(cherry picked from commit 298f7b6b9349fdf7fe7f9092e3012188d27b9bf2) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								4eb1edea13 
								
							 
						 
						
							
							
								
								FIX: fedora: cannot select preview plate thumbnail  
							
							... 
							
							
							
							Change-Id: I1bb774f7f48a7b905498d5c1cc06263aa3b01ce9 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								7174712e29 
								
							 
						 
						
							
							
								
								FIX:fixed issue of not displaying load/unload entries  
							
							... 
							
							
							
							Change-Id: I6e264de950f194a93055c4120a025ce37d1e2b15 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								e599469d01 
								
							 
						 
						
							
							
								
								FIX: cali: manage result crash  
							
							... 
							
							
							
							1. fix input chinese on editing name will crash
2. fix: repeat editing action before the whole dialog is refreshed, will crash
Change-Id: Ia5f785987aec547007a1d71e1af770b606b50d65
(cherry picked from commit a1f60dc682b5e46ae098ad2a720e5cb12f8148d7) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								76cac6fac3 
								
							 
						 
						
							
							
								
								ENH: arachne overhang efficiency optimization  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I9b0954e24867b5f4a29e0e5d24708cd977ec22aa 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								d603315d72 
								
							 
						 
						
							
							
								
								ENH: remove check link state  
							
							... 
							
							
							
							Change-Id: Iba16694299f92a89e63ea9c4829e3087a29bade1
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit f8ccd60bdb7489d325e457948e27c5d854089e08) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								91f3c7bd1b 
								
							 
						 
						
							
							
								
								ENH: close logging in console of libcurl  
							
							... 
							
							
							
							Change-Id: I434f733a66ee79af762cfc2e52c28aba0e192d97
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 2886ebbbedf60cd131cbd14594223ad5c5795b1d) 
							
						 
						
							2023-08-04 18:15:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								12195c722f 
								
							 
						 
						
							
							
								
								update locale  
							
							
							
						 
						
							2023-08-03 00:48:54 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kunlong Ma 
								
							 
						 
						
							
							
							
							
								
							
							
								93f94bf07c 
								
							 
						 
						
							
							
								
								FIX:FIX BUG on Buried  
							
							... 
							
							
							
							Change-Id: Id7a1d6c3686377c8f77b6071cc9e0754d5d31bbf 
							
						 
						
							2023-08-01 22:09:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								2dde3708d1 
								
							 
						 
						
							
							
								
								FIX: add protection to fix crash when mesh boolean  
							
							... 
							
							
							
							when the split has no effect
we should return directly
Change-Id: I81510c3edea96e101abfedf77023264e06d7d35c 
							
						 
						
							2023-08-01 22:09:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								dbcfec8a32 
								
							 
						 
						
							
							
								
								ENH: mcut: disable debug related logic  
							
							... 
							
							
							
							found a crash in dump_mesh,
disable debug currently
Change-Id: I9f210ce074333e95233af08d3e782546107091dd 
							
						 
						
							2023-08-01 22:09:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kunlong Ma 
								
							 
						 
						
							
							
							
							
								
							
							
								fcb7db2dde 
								
							 
						 
						
							
							
								
								FIX:Fix bugs caused by buried points  
							
							... 
							
							
							
							Change-Id: I47d4e786912120124c134404afce15dec48c7974
Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> 
							
						 
						
							2023-08-01 22:09:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								aaefc400e1 
								
							 
						 
						
							
							
								
								Tweak profiles  
							
							... 
							
							
							
							1. Fix Voron Trident printable height issue #1641 
2. Revamp Qidi X3 printer profiles
3. Turn on accel_to_decel_enable for klipper machine by default
4. Many other profiles tweaks 
							
						 
						
							2023-07-31 19:52:56 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								85e2868110 
								
							 
						 
						
							
							
								
								FIX: CLI: fix a compatible check issue for old printer and process  
							
							... 
							
							
							
							Change-Id: I74c75984d1abd0d1c52d8d4a19b6410c0041f280 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									salt.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								d1ba5cf9a4 
								
							 
						 
						
							
							
								
								ENH: miss extruder_type in the list  
							
							... 
							
							
							
							Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3450b98b2ccf33a5b823729ada454dfd6ad475c1 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xun.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								6ce4a6c5f2 
								
							 
						 
						
							
							
								
								ENH: modify chamber_temperature to array  
							
							... 
							
							
							
							Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8c1afc85ff91ebf4458871fecba5f2f1f1e32f1d 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Bubnik 
								
							 
						 
						
							
							
							
							
								
							
							
								153c9517ce 
								
							 
						 
						
							
							
								
								FIX: fix the crash issue  #1944  caused by wronog thread name in some  
							
							... 
							
							
							
							corner cases
this patch is cherry-picked from PrusaSlicer's 84722876012ca310e29b291e10fef9d18ae26cea
thanks to 'Vojtech Bubnik' for the fix
Implementing a test whether the current thread is the main (UI) thread
and using it on AppConfig::save() to assert if save is called
from a worker thread.
The old assert was using thread names, which did not always work
on Windows.
Fixes  #7839  #9178  #9370  #9420  
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xun.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								793c657b46 
								
							 
						 
						
							
							
								
								ENH: remove nozzle_hrc in params page and profiles  
							
							... 
							
							
							
							use std::map to map nozzle_type to nozzle_hrc
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie9d1db486808bd5164c7952caecaf4ac279f43d8 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								0c45cac1a8 
								
							 
						 
						
							
							
								
								ENH: CLI: refine some logic of repetions and load configs  
							
							... 
							
							
							
							1. when object skipped, it should not be duplicated
it is set to unprintable before arrange
and the plate needs to be considered a skipped plate also
2. skip the wipe tower if not multi-color after skip
3. load default configs if there are no configs loaded
4. refine the result.json to include key_values
Change-Id: I8c132cabcdd78756673fe900267a226a41ae1b4d 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zhimin.zeng 
								
							 
						 
						
							
							
							
							
								
							
							
								09c94acfcf 
								
							 
						 
						
							
							
								
								FIX: set n value to 0 by default in extrusion_cali_set  
							
							... 
							
							
							
							Change-Id: Ib3c34608413cdde1078c11c6e0cb6ca8a0c02d56 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								90e0184313 
								
							 
						 
						
							
							
								
								ENH: adjust imgui plate thumbnail color  
							
							... 
							
							
							
							Change-Id: Iec5cb3162c55e44eef2c67a3e5d8c65b5eadd785 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								e9182b2d1d 
								
							 
						 
						
							
							
								
								FIX:fixed UI display error in the monitor page  
							
							... 
							
							
							
							fixed STUDIO-3754
Change-Id: I96f9e52a9924b7f34e8e6ac7139ca70514af79ae 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								8c29a57be4 
								
							 
						 
						
							
							
								
								ENH: CLI: add logic of uptodate_settings  
							
							... 
							
							
							
							1. load the updated machine/process config from uptodate_settings
2. if don't have uptodate_settings, keep the logic as before, use from local
Change-Id: I3520469ab6094f03895b8e0e4e84c7549190f244 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								99bbce0f0f 
								
							 
						 
						
							
							
								
								ENH: CLI: add the repetitions logic  
							
							... 
							
							
							
							support to duplicate object in a plate
Change-Id: I6bc964a2b9660adf3be7919f230524c979da9d50 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zhimin.zeng 
								
							 
						 
						
							
							
							
							
								
							
							
								ce06bb08aa 
								
							 
						 
						
							
							
								
								FIX: crash when the text has only spaces STUDIO-3661  
							
							... 
							
							
							
							Change-Id: Ib433e3afbe8b161f42b0d907e9d78dbc93569cdf 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									maosheng.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								cd8e7e80ba 
								
							 
						 
						
							
							
								
								FIX: Calibration supplementary translation  
							
							... 
							
							
							
							Change-Id: Id4203f55e921dc5c1d1d462f7dcacd262d88c603 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								8ae8b6b878 
								
							 
						 
						
							
							
								
								FIX: wrong text encoding [STUDIO-3753]  
							
							... 
							
							
							
							Change-Id: Ie05367ab294c87426dc4ce534ffb28a183a447bf 
							
						 
						
							2023-07-31 14:29:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								5328d346c7 
								
							 
						 
						
							
							
								
								FIX: calibration history window item be cut off [STUDIO-3742]  
							
							... 
							
							
							
							Change-Id: I60a7b35ebb87d00f5fcf04ad8f1a038bfdd71f36 
							
						 
						
							2023-07-31 14:29:15 +08:00