Merge branch 'main' of https://uap-core.de/git/note

diff --cc .gitignore
index 0f391ad43b64b042930932dd435301636b9538d4,1c756e16cc92d877339af30c55593fb1c08e2e7c..259435f4697e81d66676ad6657e4ff8c0f5d0694
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -7,10 -7,5 +7,9 @@@ make/vs/vcpkg_installe
  ui/winui/winui.vcxproj.user
  ui/winui/Generated Files
  gmon.out
- 
- 
 +.idea
+ .DS_Store
  
 +# Added by cargo
 +
 +/target