vault backup: 2024-09-09 00:40:22

Edikoyo/.obsidian/workspace.json

@@ -8,31 +8,7 @@
         "type": "tabs",
         "children": [
           {
-            "id": "f84169dad44b3808",
+            "id": "65374afab15971d2",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Countries/Blanchister.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "987a006f259c3c08",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Countries/Dasona.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "afb42427bcca10d5",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -44,19 +20,18 @@
             }
           },
           {
-            "id": "6e9264aa36b7c209",
+            "id": "9bba1e7f22a41622",
             "type": "leaf",
             "state": {
-              "type": "markdown",
+              "type": "diff-view",
               "state": {
-                "file": "Animals/Cat.md",
+                "file": "content/Animals/Slimes/_index.md",
-                "mode": "source",
+                "staged": true
-                "source": false
               }
             }
           },
           {
-            "id": "a12c575a3e4e2f21",
+            "id": "f61093bc90ac3a19",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -68,19 +43,77 @@
             }
           },
           {
-            "id": "e18161b255f8c3cb",
+            "id": "b57aab6642ed017d",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Species/Turian.md",
+                "file": "Animals/Slimes/_index.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "4ae3635757746bf2",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "Edikoyo/.obsidian/icons/flags/Mantine.svg",
+                "staged": true
+              }
+            }
+          },
+          {
+            "id": "57403d9f7507ce81",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Animals/Slimes/_index.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "c6bfd1782535aaba",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "Edikoyo/.obsidian/icons/flags/Gokolm.svg",
+                "staged": true
+              }
+            }
+          },
+          {
+            "id": "0301fd3e66dac7f2",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Countries/Mantine.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "7c0e510d9bbb8171",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
                 "mode": "source",
                 "source": false
               }
             }
           }
         ],
-        "currentTab": 5
+        "currentTab": 8
       }
     ],
     "direction": "vertical"
@@ -146,7 +179,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Species/Turian.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -163,7 +196,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Species/Turian.md",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -186,7 +219,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Species/Turian.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -203,57 +236,47 @@
       }
     ],
     "direction": "horizontal",
-    "width": 300
+    "width": 760.5
   },
   "left-ribbon": {
     "hiddenItems": {
-      "random-note:Open random note": false,
+      "switcher:Abrir selector rápido": false,
-      "switcher:Open quick switcher": false,
+      "graph:Abrir vista gráfica": false,
-      "graph:Open graph view": false,
+      "templates:Insertar plantilla": false,
-      "templates:Insert template": false,
+      "command-palette:Abrir paleta de comandos": false,
-      "command-palette:Open command palette": false,
+      "random-note:Abrir nota al azar": false,
-      "obsidian-git:Open Git source control": false,
+      "obsidian-git:Open Git source control": false
-      "privacy-glasses:Reveal non-private": true,
-      "ribbon-divider:ribbon-divider-5b05ebe7-55cd-443b-9de6-33e3cb2c36c3": true,
-      "privacy-glasses:Reveal all": false,
-      "privacy-glasses:Hide all": false,
-      "privacy-glasses:Reveal headlines only": false,
-      "ribbon-divider:ribbon-divider-698b2a69-a92b-4b1b-bf0f-d93bf98733ef": false,
-      "pinned-notes:Countries": false
     }
   },
-  "active": "e18161b255f8c3cb",
+  "active": "7c0e510d9bbb8171",
   "lastOpenFiles": [
+    "Countries/Mantine.md",
+    "conflict-files-obsidian-git.md",
     "Species/_index.md",
     "Species/Turian.md",
-    "Animals/Slimes/Garden Slime.md",
+    "Species",
-    "Animals/_index.md",
-    "Animals/Cat.md",
-    "Images/Icons/cat.svg",
-    "Animals/Slimes/_index.md",
-    "Images/Icons/cat.png",
-    "Images/Icons",
-    "Animals/Slimes/Ababa Slime.md",
-    "Animals/Slimes/Godot Slime.md",
-    "Animals/Slimes/Bark Slime.md",
-    "Plants/_index.md",
-    "Languages/_index.md",
-    "People/_index.md",
-    "Countries/_index.md",
     "Regions/_index.md",
+    "Regions",
     "Provinces/_index.md",
+    "Provinces",
+    "Plants/_index.md",
+    "Plants",
     "Landmarks/_index.md",
-    "Countries/Batanoka.md",
+    "Images/Icons/cat.svg",
-    "Countries/Barrowmaw.md",
+    "Images/Icons",
-    "Countries/Dasona.md",
+    "Animals/Slimes/_index.md",
-    "Animals/Dog.md",
+    "Animals/Slimes/Ababa Slime.md",
-    "Landmarks/Untitled.md",
+    "Countries/Krakala.md",
-    "Animals/Taura.md",
+    "Countries/Hanoka.md",
-    "Animals/Slom.md",
-    "Animals/Slimes/Sunflower Slime.md",
     "Animals/Slimes/Marsh Slime.md",
+    "Animals/Slimes/Sunflower Slime.md",
     "Animals/Slimes/Lagoon Slime.md",
-    "Images/Slimes/garden-1.png",
+    "Animals/Slimes/Honey Slime.md",
+    "Animals/Slimes/Godot Slime.md",
+    "Animals/Slimes/Garden Slime.md",
+    "Animals/Slimes/Bark Slime.md",
+    "Images/Slimes/sunflower-4.png",
+    "Images/Slimes/sunflower-3.png",
     "Images/Slimes/sunflower-2.png",
     "Images/Slimes/sunflower-1.png",
     "Images/Slimes/marsh-4.png",
@@ -261,14 +284,17 @@
     "Images/Slimes/marsh-2.png",
     "Images/Slimes/marsh-1.png",
     "Images/Slimes/lagoon-4.png",
-    "Images/Slimes/Untitled",
+    "Animals/Slimes/Untitled.md",
-    "Images/Slimes/bark",
+    "Animals/_index.md",
-    "Images/Slimes/garden",
+    "Countries/_index.md",
-    "Images/Slimes",
+    "Languages/Mokrixi.md",
+    "Languages/Lacelian.md",
+    "Languages/Guo.md",
+    "Languages/Fayahi.md",
     "Images/Slimes/ababa",
-    "Images/slimes",
+    "Images/Slimes",
-    "Countries/Faelani",
+    "Images/Flags",
-    "Animals/Slimes",
+    "Images/slimes/ababa",
-    "Languages"
+    "Images/slimes"
   ]
 }

Edikoyo/Countries/Mantine.md

@@ -4,4 +4,25 @@ flag: "![[mantine.png]]"
 capital: 
 language:
 ---
-To be added
+<<<<<<< HEAD
+  
+Mantine was a calm region for part of its history; some small cities formed, but growth was slow and dispersed throughout the region. 
+
+Two main distinctions happened after a while between the inland and the coast land. 
+
+The Coast region's economy was purely based on fishing and some farming. Having ancient ways of doing so that still remain today.
+
+The Inland region's discovered some mines, gathering metal and developing ways of smelting and using them; later on, they would create powerful tools mixing magic and machines; this made the Coast Region aware that they were falling behind in research and development.
+
+After a while, the region of Medine started to export raw materials to other countries. The Queen of Sidone, who only sold some of the overall produced nourishment to Medine, noticed that Medine's relationship with some countries also included reselling what they were buying from them. Which escalated the relationship between both regions.
+
+Through decades, both regions were on the brink of a civil war. 
+
+One of the earliest depictions of diplomacy appeared through this era between the Chancellor of Medine, the main inland city, and the Queen of Sidone. 
+
+The most tense event from this period occurred when a party of Medine's Army tried getting some steel to Sidone's port, where a ship from another country was waiting. The Queen of Sidone retained this party for a time; she wouldn't allow this to happen without some competition for the crown. 
+
+While this happened, The Great Storm of Mantine started.
+=======
+To be added
+>>>>>>> origin/main