Merge remote-tracking branch 'origin/main'

# Conflicts: # src-tauri/tauri.conf.json
2025-12-12 23:24:35 +01:00 · 2022-05-08 22:47:42 -04:00
parent 972d956d94 a304e6964f
commit bc3f26eb96
6 changed files with 102 additions and 319 deletions
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -12,7 +12,22 @@
  },
  "tauri": {
    "allowlist": {
-      "all": true
+      "fs": {
+        "scope": [
+          "$DATA",
+          "$DATA/cultivation/*"
+        ],
+        "readDir": true,
+        "readFile": true,
+        "writeFile": true,
+        "createDir": true
+      },
+      "path": {
+        "all": true
+      },
+      "dialog": {
+        "all": true
+      }
    },
    "bundle": {
      "active": true,