Merge branch 'master' of https://github.com/TomAndJerry14/Daily

# Conflicts:
#	.obsidian/workspace.json

.obsidian/community-plugins.json

@@ -1 +0,0 @@
-[]

.obsidian/plugins/obsidian-version-history-diff/data.json

@@ -0,0 +1,5 @@
+{
+  "diffStyle": "word",
+  "matchWordsThreshold": 0.25,
+  "colorBlind": true
+}

.obsidian/plugins/obsidian-version-history-diff/manifest.json

@@ -0,0 +1,10 @@
+{
+	"id": "obsidian-version-history-diff",
+	"name": "Version History Diff",
+	"version": "2.1.0",
+	"minAppVersion": "1.1.7",
+	"description": "Diff the version history of the core Sync and File Recovery plugins and Git. Adds a command to open the core Sync version history as well.",
+	"author": "kometenstaub",
+	"authorUrl": "https://github.com/kometenstaub",
+	"isDesktopOnly": false
+}

.obsidian/workspace

@@ -1,111 +0,0 @@
-{
-  "main": {
-    "id": "c01acc1e0c3642a1",
-    "type": "split",
-    "children": [
-      {
-        "id": "458b5417a938cfb3",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "SerializedObject.md",
-            "mode": "source",
-            "source": false
-          }
-        }
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "b3f2fe956c600b2b",
-    "type": "split",
-    "children": [
-      {
-        "id": "b892947aee3a10a9",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "b736346aa28b495c",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {}
-            }
-          },
-          {
-            "id": "bd33cd6e5600118d",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 249
-  },
-  "right": {
-    "id": "d809b577c235ae94",
-    "type": "split",
-    "children": [
-      {
-        "id": "7cbbb049622f8875",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "fc04db1c3d5f37f2",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "SerializedObject.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          },
-          {
-            "id": "d9c52b59dc19017c",
-            "type": "leaf",
-            "state": {
-              "type": "calendar",
-              "state": {}
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "active": "b736346aa28b495c",
-  "lastOpenFiles": [
-    "SearchFilter UnityEditor筛选器.md",
-    "Pasted image 20221021171104.png",
-    "Mesh Baker.md",
-    "conflict-files-obsidian-git.md",
-    "图集处理.md",
-    "待办事项/TODO.md",
-    "本地化流程.md",
-    "待办事项/Work.md",
-    "待办事项/Learn.md",
-    "未命名.md"
-  ]
-}