Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop

2023-05-30 17:59:26 +01:00
parent eb03d0a2a2 954d4d701a
commit a951bd1c3e
235 changed files with 7925 additions and 3138 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -12,10 +12,14 @@ html/
 *.pro.user
 CMakeLists.txt.user
 CMakeLists.txt.user.*
+CMakeSettings.json
+/CMakeFiles
+CMakeCache.txt
 /.project
 /.settings
 /.idea
 /.vscode
+/.vs
 cmake-build-*/
 Debug

@@ -43,7 +47,9 @@ run/
 .cache/

 # Nix/NixOS
-result/
+.direnv/
+.pre-commit-config.yaml
+result

 # Flatpak
 .flatpak-builder