Merge remote-tracking branch 'origin/master'

# Conflicts:
#	game_notes/.obsidian/workspace

game_notes/.obsidian/workspace

@@ -4,12 +4,12 @@
     "type": "split",
     "children": [
       {
-        "id": "11e411e48d3d2c9b",
+        "id": "6b1a00ba2962ff61",
         "type": "leaf",
         "state": {
           "type": "markdown",
           "state": {
-            "file": "GameDesign notes.md",
+            "file": "Core Mechanics/Resource Generation.md",
             "mode": "source",
             "source": false
           }
@@ -77,7 +77,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "GameDesign notes.md",
+                "file": "Core Mechanics/Resource Generation.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -94,7 +94,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "GameDesign notes.md",
+                "file": "Core Mechanics/Resource Generation.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -117,7 +117,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "GameDesign notes.md"
+                "file": "Core Mechanics/Resource Generation.md"
               }
             }
           }
@@ -125,10 +125,16 @@
       }
     ],
     "direction": "horizontal",
-    "width": 300
+    "width": 300,
+    "collapsed": true
   },
-  "active": "11e411e48d3d2c9b",
+  "active": "6b1a00ba2962ff61",
   "lastOpenFiles": [
-    "Test.md"
+    "Core Mechanics/Enemy AI.md",
+    "Core Mechanics/Resource Extraction.md",
+    "Core Mechanics/Power Delivery.md",
+    "Untitled.md",
+    "Test.md",
+    "2022-09-17.md"
   ]
 }