Merge branch 'dev' into feature/v1.4.0

mac

2024-06-05 b24f21463d4d1692fe22666625253108cd106300

 .gitignore

@@ -49,3 +49,6 @@


local.properties
.idea/workspace.xml
.idea/
*.properties