Merge branch 'refs/heads/master' into dev_4.x

mini1798 · mini1798 · commit 050d926c67cf · 2024-07-16T22:25:47.000+08:00
# Conflicts:
#	.gitignore
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,4 @@ build/
 .vscode/
 
 ### MAC OS ###
-.DS_Store
+.DS_Store
