Merge branch 'dev' into feature/v1.4.1

mac

2024-06-04 276156837ebca8b8b08a516e61fe105e670375fc

 .gitignore

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


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