vault backup: 2024-09-07 07:58:42

2024-09-07 07:58:42 +02:00 · 2024-09-07 07:58:42 +02:00 · bed4c6f3d0
commit bed4c6f3d0
parent 422b973088 5e21fac342
68 changed files with 185 additions and 165 deletions
--- a/Edikoyo/.obsidian/workspace.json
+++ b/Edikoyo/.obsidian/workspace.json
@ -139,13 +139,35 @@
            "state": {
              "type": "diff-view",
              "state": {
-                "file": "content/Animals/Slimes/Ababa Slime.md",
+                "file": "content/Countries/_index.md",
                "staged": true
              }
            }
+          },
+          {
+            "id": "bfd0d82c27739a48",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "content/Countries/Blanchister.md",
+                "staged": true
+              }
+            }
+          },
+          {
+            "id": "0e473423f5963692",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "Edikoyo/conflict-files-obsidian-git.md",
+                "staged": false
+              }
+            }
          }
        ],
-        "currentTab": 9
+        "currentTab": 11
      }
    ],
    "direction": "vertical"
@ -276,10 +298,10 @@
      "obsidian-git:Open Git source control": false
    }
  },
-  "active": "68af507ebd93d4fd",
+  "active": "0e473423f5963692",
  "lastOpenFiles": [
-    "Countries/_index.md",
    "conflict-files-obsidian-git.md",
+    "Countries/_index.md",
    "Animals/Slimes/_index.md",
    "Animals/Slimes/Ababa Slime.md",
    "Animals/Slimes/Untitled.md",
--- a/Edikoyo/Countries/Blanchister.md
+++ b/Edikoyo/Countries/Blanchister.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Realm of Nomads
 flag: "![[blanchister.png]]"
 language: 
 capital:
--- a/Edikoyo/Countries/Calcetron.md
+++ b/Edikoyo/Countries/Calcetron.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Electric Republic
 flag: "![[calcetron.png]]"
 language: 
 capital:
--- a/Edikoyo/Countries/Dahallow.md
+++ b/Edikoyo/Countries/Dahallow.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Blooming Kingdom
 flag: "![[dahallow.png]]"
 language: 
 capital:
--- a/Edikoyo/Countries/Dolfeyja.md
+++ b/Edikoyo/Countries/Dolfeyja.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Peaceful Summit
 flag: "![[dolfeyja.png]]"
 language: "[[Edikan]]"
 capital:
--- a/Edikoyo/Countries/Dratana.md
+++ b/Edikoyo/Countries/Dratana.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Realm of Dragons
 flag: "![[dratana.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Drenvale.md
+++ b/Edikoyo/Countries/Drenvale.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Diesel Kingdom
 flag: "![[drenvale.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Faelani.md
+++ b/Edikoyo/Countries/Faelani.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: Fairy Forest
 flag: "![[faelani.png]]"
 capital: 
-language:
+language: "[[Fayahi]]"
 ---
--- a/Edikoyo/Countries/Falaka.md
+++ b/Edikoyo/Countries/Falaka.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Empire of Flames
 flag: "![[falaka.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Felmyr.md
+++ b/Edikoyo/Countries/Felmyr.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Draconic Temples
 flag: "![[felmyr.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Gokolm.md
+++ b/Edikoyo/Countries/Gokolm.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Mechanical Wasteland
 flag: "![[gokolm.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Gudoko.md
+++ b/Edikoyo/Countries/Gudoko.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: Unified Miners
 flag: "![[gudoko.png]]"
 capital: 
-language:
+language: "[[Guo]]"
 ---
--- a/Edikoyo/Countries/Hanoka.md
+++ b/Edikoyo/Countries/Hanoka.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Harbringers of Peace
 flag: "![[hanoka.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Krakala.md
+++ b/Edikoyo/Countries/Krakala.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Merchant Capital
 flag: "![[krakala.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Lavaki.md
+++ b/Edikoyo/Countries/Lavaki.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Volcanic Ridge
 flag: "![[lavaki.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Lekia.md
+++ b/Edikoyo/Countries/Lekia.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: Marshy Jungles
 flag: "![[lekia.png]]"
 capital: 
-language:
+language: "[[Lacelian]]"
 ---
--- a/Edikoyo/Countries/Llasuki.md
+++ b/Edikoyo/Countries/Llasuki.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Realm of the Gods
 flag: "![[llasuki.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Mantine.md
+++ b/Edikoyo/Countries/Mantine.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Deep Shores
 flag: "![[mantine.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Mortham.md
+++ b/Edikoyo/Countries/Mortham.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: Pirate Bay
 flag: "![[mortham.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Nakadon.md
+++ b/Edikoyo/Countries/Nakadon.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: The Jungle Maze
 flag: "![[nakadon.png]]"
 capital: 
-language:
+language: "[[Lacelian]]"
 ---
--- a/Edikoyo/Countries/Nasahra.md
+++ b/Edikoyo/Countries/Nasahra.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Scrap Desert
 flag: "![[nasahra.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Nonkur.md
+++ b/Edikoyo/Countries/Nonkur.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: Realm of the Dead
 flag: "![[nonkur.png]]"
 capital: 
-language:
+language: "[[Mokrixi]]"
 ---
--- a/Edikoyo/Countries/Oshela.md
+++ b/Edikoyo/Countries/Oshela.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: Seaside Rainforest
 flag: "![[oshela.png]]"
 capital: 
-language:
+language: "[[Lacelian]]"
 ---
--- a/Edikoyo/Countries/Ovanos.md
+++ b/Edikoyo/Countries/Ovanos.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Flying City
 flag: "![[ovanos.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Seraphis.md
+++ b/Edikoyo/Countries/Seraphis.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Blessed Lands
 flag: "![[seraphis.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Soljord.md
+++ b/Edikoyo/Countries/Soljord.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: Land of the Frozen Sun
 flag: "![[soljord.png]]"
 capital: 
-language:
+language: "[[Edikan]]"
 ---
--- a/Edikoyo/Countries/Vanatn.md
+++ b/Edikoyo/Countries/Vanatn.md
@ -1,5 +1,5 @@
 ---
-short: 
+short: The Underwater Metropolis
 flag: "![[vanatn.png]]"
 capital: 
 language:
--- a/Edikoyo/Countries/Vikogyna.md
+++ b/Edikoyo/Countries/Vikogyna.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: The Desert Market
 flag: "![[vikogyna.png]]"
 capital: 
-language:
+language: "[[Edikan]]"
 ---
--- a/Edikoyo/Countries/Vosaka.md
+++ b/Edikoyo/Countries/Vosaka.md
@ -1,6 +1,6 @@
 ---
-short: 
+short: The Oasis Encampment
 flag: "![[vosaka.png]]"
 capital: 
-language:
+language: "[[Edikan]]"
 ---
--- a/Edikoyo/Countries/_index.md
+++ b/Edikoyo/Countries/_index.md
@ -2,38 +2,38 @@
 <!-- SerializedQuery: TABLE flag as "Flag",  short as "Short", population as "Population", capital as "Capital", language as "Language" FROM "Countries" WHERE file.name != "_index" SORT file.name -->

 | File                                      | Flag                                               | Short                     | Population | Capital                        | Language                            |
-| ----------------------------------------- | -------------------------------------------------- | -------------------- | ---------- | ------------------------------ | ------------------------------- |
+| ----------------------------------------- | -------------------------------------------------- | ------------------------- | ---------- | ------------------------------ | ----------------------------------- |
 | [[Barrowmaw]]     | ![[barrowmaw.png]]     | The Undead Wasteland      | \-         | \-                             | \-                                  |
 | [[Batanoka]]       | ![[batanoka.png]]       | The Subterranean Sun      | \-         | [[Bririe]]   | [[Edikan]]     |
-| [[Blanchister]] | ![[blanchister.png]] | \-                   | \-         | \-                             | \-                              |
-| [[Calcetron]]     | ![[calcetron.png]]     | \-                   | \-         | \-                             | \-                              |
-| [[Dahallow]]       | ![[dahallow.png]]       | \-                   | \-         | \-                             | \-                              |
+| [[Blanchister]] | ![[blanchister.png]] | The Realm of Nomads       | \-         | \-                             | \-                                  |
+| [[Calcetron]]     | ![[calcetron.png]]     | The Electric Republic     | \-         | \-                             | \-                                  |
+| [[Dahallow]]       | ![[dahallow.png]]       | The Blooming Kingdom      | \-         | \-                             | \-                                  |
 | [[Dasona]]           | ![[dasona.png]]           | The Country of Hopes      | \-         | [[Crester]] | [[Edikan]]     |
-| [[Dolfeyja]]       | ![[dolfeyja.png]]       | \-                   | \-         | \-                             | [[Edikan]] |
-| [[Dratana]]         | ![[dratana.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Drenvale]]       | ![[drenvale.png]]       | \-                   | \-         | \-                             | \-                              |
-| [[Faelani]]         | ![[faelani.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Falaka]]           | ![[falaka.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Felmyr]]           | ![[felmyr.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Gokolm]]           | ![[gokolm.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Gudoko]]           | ![[gudoko.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Hanoka]]           | ![[hanoka.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Krakala]]         | ![[krakala.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Lavaki]]           | ![[lavaki.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Lekia]]             | ![[lekia.png]]             | \-                   | \-         | \-                             | \-                              |
-| [[Llasuki]]         | ![[llasuki.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Mantine]]         | ![[mantine.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Mortham]]         | ![[mortham.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Nakadon]]         | ![[nakadon.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Nasahra]]         | ![[nasahra.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Nonkur]]           | ![[nonkur.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Oshela]]           | ![[oshela.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Ovanos]]           | ![[ovanos.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Seraphis]]       | ![[seraphis.png]]       | \-                   | \-         | \-                             | \-                              |
-| [[Soljord]]         | ![[soljord.png]]         | \-                   | \-         | \-                             | \-                              |
-| [[Vanatn]]           | ![[vanatn.png]]           | \-                   | \-         | \-                             | \-                              |
-| [[Vikogyna]]       | ![[vikogyna.png]]       | \-                   | \-         | \-                             | \-                              |
-| [[Vosaka]]           | ![[vosaka.png]]           | \-                   | \-         | \-                             | \-                              |
+| [[Dolfeyja]]       | ![[dolfeyja.png]]       | The Peaceful Summit       | \-         | \-                             | [[Edikan]]     |
+| [[Dratana]]         | ![[dratana.png]]         | Realm of Dragons          | \-         | \-                             | \-                                  |
+| [[Drenvale]]       | ![[drenvale.png]]       | Diesel Kingdom            | \-         | \-                             | \-                                  |
+| [[Faelani]]         | ![[faelani.png]]         | Fairy Forest              | \-         | \-                             | [[Fayahi]]     |
+| [[Falaka]]           | ![[falaka.png]]           | The Empire of Flames      | \-         | \-                             | \-                                  |
+| [[Felmyr]]           | ![[felmyr.png]]           | Draconic Temples          | \-         | \-                             | \-                                  |
+| [[Gokolm]]           | ![[gokolm.png]]           | Mechanical Wasteland      | \-         | \-                             | \-                                  |
+| [[Gudoko]]           | ![[gudoko.png]]           | Unified Miners            | \-         | \-                             | [[Guo]]           |
+| [[Hanoka]]           | ![[hanoka.png]]           | Harbringers of Peace      | \-         | \-                             | \-                                  |
+| [[Krakala]]         | ![[krakala.png]]         | The Merchant Capital      | \-         | \-                             | \-                                  |
+| [[Lavaki]]           | ![[lavaki.png]]           | Volcanic Ridge            | \-         | \-                             | \-                                  |
+| [[Lekia]]             | ![[lekia.png]]             | Marshy Jungles            | \-         | \-                             | [[Lacelian]] |
+| [[Llasuki]]         | ![[llasuki.png]]         | Realm of the Gods         | \-         | \-                             | \-                                  |
+| [[Mantine]]         | ![[mantine.png]]         | Deep Shores               | \-         | \-                             | \-                                  |
+| [[Mortham]]         | ![[mortham.png]]         | Pirate Bay                | \-         | \-                             | \-                                  |
+| [[Nakadon]]         | ![[nakadon.png]]         | The Jungle Maze           | \-         | \-                             | [[Lacelian]] |
+| [[Nasahra]]         | ![[nasahra.png]]         | The Scrap Desert          | \-         | \-                             | \-                                  |
+| [[Nonkur]]           | ![[nonkur.png]]           | Realm of the Dead         | \-         | \-                             | [[Mokrixi]]   |
+| [[Oshela]]           | ![[oshela.png]]           | Seaside Rainforest        | \-         | \-                             | [[Lacelian]] |
+| [[Ovanos]]           | ![[ovanos.png]]           | The Flying City           | \-         | \-                             | \-                                  |
+| [[Seraphis]]       | ![[seraphis.png]]       | The Blessed Lands         | \-         | \-                             | \-                                  |
+| [[Soljord]]         | ![[soljord.png]]         | Land of the Frozen Sun    | \-         | \-                             | [[Edikan]]     |
+| [[Vanatn]]           | ![[vanatn.png]]           | The Underwater Metropolis | \-         | \-                             | \-                                  |
+| [[Vikogyna]]       | ![[vikogyna.png]]       | The Desert Market         | \-         | \-                             | [[Edikan]]     |
+| [[Vosaka]]           | ![[vosaka.png]]           | The Oasis Encampment      | \-         | \-                             | [[Edikan]]     |
 <!-- SerializedQuery END -->

 	
--- a/Edikoyo/Languages/Fayahi.md
+++ b/Edikoyo/Languages/Fayahi.md
@ -0,0 +1 @@
+Test
--- a/Edikoyo/Languages/Guo.md
+++ b/Edikoyo/Languages/Guo.md
@ -0,0 +1 @@
+Test
--- a/Edikoyo/Languages/Lacelian.md
+++ b/Edikoyo/Languages/Lacelian.md
@ -0,0 +1 @@
+Test
--- a/Edikoyo/Languages/Mokrixi.md
+++ b/Edikoyo/Languages/Mokrixi.md
@ -0,0 +1 @@
+Test
--- a/content/Countries/Blanchister.md
+++ b/content/Countries/Blanchister.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Realm of Nomads
 flag: '![[blanchister.png]]'
 language: null
 capital: null
--- a/content/Countries/Calcetron.md
+++ b/content/Countries/Calcetron.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Electric Republic
 flag: '![[calcetron.png]]'
 language: null
 capital: null
--- a/content/Countries/Dahallow.md
+++ b/content/Countries/Dahallow.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Blooming Kingdom
 flag: '![[dahallow.png]]'
 language: null
 capital: null
--- a/content/Countries/Dolfeyja.md
+++ b/content/Countries/Dolfeyja.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Peaceful Summit
 flag: '![[dolfeyja.png]]'
 language: '[[Edikan]]'
 capital: null
--- a/content/Countries/Dratana.md
+++ b/content/Countries/Dratana.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Realm of Dragons
 flag: '![[dratana.png]]'
 capital: null
 language: null
--- a/content/Countries/Drenvale.md
+++ b/content/Countries/Drenvale.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Diesel Kingdom
 flag: '![[drenvale.png]]'
 capital: null
 language: null
--- a/content/Countries/Faelani.md
+++ b/content/Countries/Faelani.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: Fairy Forest
 flag: '![[faelani.png]]'
 capital: null
-language: null
+language: '[[Fayahi]]'
 ---


--- a/content/Countries/Falaka.md
+++ b/content/Countries/Falaka.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Empire of Flames
 flag: '![[falaka.png]]'
 capital: null
 language: null
--- a/content/Countries/Felmyr.md
+++ b/content/Countries/Felmyr.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Draconic Temples
 flag: '![[felmyr.png]]'
 capital: null
 language: null
--- a/content/Countries/Gokolm.md
+++ b/content/Countries/Gokolm.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Mechanical Wasteland
 flag: '![[gokolm.png]]'
 capital: null
 language: null
--- a/content/Countries/Gudoko.md
+++ b/content/Countries/Gudoko.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: Unified Miners
 flag: '![[gudoko.png]]'
 capital: null
-language: null
+language: '[[Guo]]'
 ---


--- a/content/Countries/Hanoka.md
+++ b/content/Countries/Hanoka.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Harbringers of Peace
 flag: '![[hanoka.png]]'
 capital: null
 language: null
--- a/content/Countries/Krakala.md
+++ b/content/Countries/Krakala.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Merchant Capital
 flag: '![[krakala.png]]'
 capital: null
 language: null
--- a/content/Countries/Lavaki.md
+++ b/content/Countries/Lavaki.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Volcanic Ridge
 flag: '![[lavaki.png]]'
 capital: null
 language: null
--- a/content/Countries/Lekia.md
+++ b/content/Countries/Lekia.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: Marshy Jungles
 flag: '![[lekia.png]]'
 capital: null
-language: null
+language: '[[Lacelian]]'
 ---


--- a/content/Countries/Llasuki.md
+++ b/content/Countries/Llasuki.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Realm of the Gods
 flag: '![[llasuki.png]]'
 capital: null
 language: null
--- a/content/Countries/Mantine.md
+++ b/content/Countries/Mantine.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Deep Shores
 flag: '![[mantine.png]]'
 capital: null
 language: null
--- a/content/Countries/Mortham.md
+++ b/content/Countries/Mortham.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: Pirate Bay
 flag: '![[mortham.png]]'
 capital: null
 language: null
--- a/content/Countries/Nakadon.md
+++ b/content/Countries/Nakadon.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: The Jungle Maze
 flag: '![[nakadon.png]]'
 capital: null
-language: null
+language: '[[Lacelian]]'
 ---


--- a/content/Countries/Nasahra.md
+++ b/content/Countries/Nasahra.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Scrap Desert
 flag: '![[nasahra.png]]'
 capital: null
 language: null
--- a/content/Countries/Nonkur.md
+++ b/content/Countries/Nonkur.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: Realm of the Dead
 flag: '![[nonkur.png]]'
 capital: null
-language: null
+language: '[[Mokrixi]]'
 ---


--- a/content/Countries/Oshela.md
+++ b/content/Countries/Oshela.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: Seaside Rainforest
 flag: '![[oshela.png]]'
 capital: null
-language: null
+language: '[[Lacelian]]'
 ---


--- a/content/Countries/Ovanos.md
+++ b/content/Countries/Ovanos.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Flying City
 flag: '![[ovanos.png]]'
 capital: null
 language: null
--- a/content/Countries/Seraphis.md
+++ b/content/Countries/Seraphis.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Blessed Lands
 flag: '![[seraphis.png]]'
 capital: null
 language: null
--- a/content/Countries/Soljord.md
+++ b/content/Countries/Soljord.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: Land of the Frozen Sun
 flag: '![[soljord.png]]'
 capital: null
-language: null
+language: '[[Edikan]]'
 ---


--- a/content/Countries/Vanatn.md
+++ b/content/Countries/Vanatn.md
@ -1,5 +1,5 @@
 ---
-short: null
+short: The Underwater Metropolis
 flag: '![[vanatn.png]]'
 capital: null
 language: null
--- a/content/Countries/Vikogyna.md
+++ b/content/Countries/Vikogyna.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: The Desert Market
 flag: '![[vikogyna.png]]'
 capital: null
-language: null
+language: '[[Edikan]]'
 ---


--- a/content/Countries/Vosaka.md
+++ b/content/Countries/Vosaka.md
@ -1,8 +1,8 @@
 ---
-short: null
+short: The Oasis Encampment
 flag: '![[vosaka.png]]'
 capital: null
-language: null
+language: '[[Edikan]]'
 ---


--- a/content/Countries/_index.md
+++ b/content/Countries/_index.md
@ -8,35 +8,35 @@
 |----|----|-----|----------|-------|--------|
 |[Barrowmaw](Barrowmaw.md)|![barrowmaw.png](..\Images\Flags\barrowmaw.png)|The Undead Wasteland|-|-|-|
 |[Batanoka](Batanoka.md)|![batanoka.png](..\Images\Flags\batanoka.png)|The Subterranean Sun|-|[Bririe](..\Cities\Bririe.md)|[Edikan](..\Languages\Edikan.md)|
-|[Blanchister](Blanchister.md)|![blanchister.png](..\Images\Flags\blanchister.png)|-|-|-|-|
-|[Calcetron](Calcetron.md)|![calcetron.png](..\Images\Flags\calcetron.png)|-|-|-|-|
-|[Dahallow](Dahallow.md)|![dahallow.png](..\Images\Flags\dahallow.png)|-|-|-|-|
+|[Blanchister](Blanchister.md)|![blanchister.png](..\Images\Flags\blanchister.png)|The Realm of Nomads|-|-|-|
+|[Calcetron](Calcetron.md)|![calcetron.png](..\Images\Flags\calcetron.png)|The Electric Republic|-|-|-|
+|[Dahallow](Dahallow.md)|![dahallow.png](..\Images\Flags\dahallow.png)|The Blooming Kingdom|-|-|-|
 |[Dasona](Dasona.md)|![dasona.png](..\Images\Flags\dasona.png)|The Country of Hopes|-|[Crester](..\Cities\Crester.md)|[Edikan](..\Languages\Edikan.md)|
-|[Dolfeyja](Dolfeyja.md)|![dolfeyja.png](..\Images\Flags\dolfeyja.png)|-|-|-|[Edikan](..\Languages\Edikan.md)|
-|[Dratana](Dratana.md)|![dratana.png](..\Images\Flags\dratana.png)|-|-|-|-|
-|[Drenvale](Drenvale.md)|![drenvale.png](..\Images\Flags\drenvale.png)|-|-|-|-|
-|[Faelani](Faelani.md)|![faelani.png](..\Images\Flags\faelani.png)|-|-|-|-|
-|[Falaka](Falaka.md)|![falaka.png](..\Images\Flags\falaka.png)|-|-|-|-|
-|[Felmyr](Felmyr.md)|![felmyr.png](..\Images\Flags\felmyr.png)|-|-|-|-|
-|[Gokolm](Gokolm.md)|![gokolm.png](..\Images\Flags\gokolm.png)|-|-|-|-|
-|[Gudoko](Gudoko.md)|![gudoko.png](..\Images\Flags\gudoko.png)|-|-|-|-|
-|[Hanoka](Hanoka.md)|![hanoka.png](..\Images\Flags\hanoka.png)|-|-|-|-|
-|[Krakala](Krakala.md)|![krakala.png](..\Images\Flags\krakala.png)|-|-|-|-|
-|[Lavaki](Lavaki.md)|![lavaki.png](..\Images\Flags\lavaki.png)|-|-|-|-|
-|[Lekia](Lekia.md)|![lekia.png](..\Images\Flags\lekia.png)|-|-|-|-|
-|[Llasuki](Llasuki.md)|![llasuki.png](..\Images\Flags\llasuki.png)|-|-|-|-|
-|[Mantine](Mantine.md)|![mantine.png](..\Images\Flags\mantine.png)|-|-|-|-|
-|[Mortham](Mortham.md)|![mortham.png](..\Images\Flags\mortham.png)|-|-|-|-|
-|[Nakadon](Nakadon.md)|![nakadon.png](..\Images\Flags\nakadon.png)|-|-|-|-|
-|[Nasahra](Nasahra.md)|![nasahra.png](..\Images\Flags\nasahra.png)|-|-|-|-|
-|[Nonkur](Nonkur.md)|![nonkur.png](..\Images\Flags\nonkur.png)|-|-|-|-|
-|[Oshela](Oshela.md)|![oshela.png](..\Images\Flags\oshela.png)|-|-|-|-|
-|[Ovanos](Ovanos.md)|![ovanos.png](..\Images\Flags\ovanos.png)|-|-|-|-|
-|[Seraphis](Seraphis.md)|![seraphis.png](..\Images\Flags\seraphis.png)|-|-|-|-|
-|[Soljord](Soljord.md)|![soljord.png](..\Images\Flags\soljord.png)|-|-|-|-|
-|[Vanatn](Vanatn.md)|![vanatn.png](..\Images\Flags\vanatn.png)|-|-|-|-|
-|[Vikogyna](Vikogyna.md)|![vikogyna.png](..\Images\Flags\vikogyna.png)|-|-|-|-|
-|[Vosaka](Vosaka.md)|![vosaka.png](..\Images\Flags\vosaka.png)|-|-|-|-|
+|[Dolfeyja](Dolfeyja.md)|![dolfeyja.png](..\Images\Flags\dolfeyja.png)|The Peaceful Summit|-|-|[Edikan](..\Languages\Edikan.md)|
+|[Dratana](Dratana.md)|![dratana.png](..\Images\Flags\dratana.png)|Realm of Dragons|-|-|-|
+|[Drenvale](Drenvale.md)|![drenvale.png](..\Images\Flags\drenvale.png)|Diesel Kingdom|-|-|-|
+|[Faelani](Faelani.md)|![faelani.png](..\Images\Flags\faelani.png)|Fairy Forest|-|-|[Fayahi](..\Languages\Fayahi.md)|
+|[Falaka](Falaka.md)|![falaka.png](..\Images\Flags\falaka.png)|The Empire of Flames|-|-|-|
+|[Felmyr](Felmyr.md)|![felmyr.png](..\Images\Flags\felmyr.png)|Draconic Temples|-|-|-|
+|[Gokolm](Gokolm.md)|![gokolm.png](..\Images\Flags\gokolm.png)|Mechanical Wasteland|-|-|-|
+|[Gudoko](Gudoko.md)|![gudoko.png](..\Images\Flags\gudoko.png)|Unified Miners|-|-|[Guo](..\Languages\Guo.md)|
+|[Hanoka](Hanoka.md)|![hanoka.png](..\Images\Flags\hanoka.png)|Harbringers of Peace|-|-|-|
+|[Krakala](Krakala.md)|![krakala.png](..\Images\Flags\krakala.png)|The Merchant Capital|-|-|-|
+|[Lavaki](Lavaki.md)|![lavaki.png](..\Images\Flags\lavaki.png)|Volcanic Ridge|-|-|-|
+|[Lekia](Lekia.md)|![lekia.png](..\Images\Flags\lekia.png)|Marshy Jungles|-|-|[Lacelian](..\Languages\Lacelian.md)|
+|[Llasuki](Llasuki.md)|![llasuki.png](..\Images\Flags\llasuki.png)|Realm of the Gods|-|-|-|
+|[Mantine](Mantine.md)|![mantine.png](..\Images\Flags\mantine.png)|Deep Shores|-|-|-|
+|[Mortham](Mortham.md)|![mortham.png](..\Images\Flags\mortham.png)|Pirate Bay|-|-|-|
+|[Nakadon](Nakadon.md)|![nakadon.png](..\Images\Flags\nakadon.png)|The Jungle Maze|-|-|[Lacelian](..\Languages\Lacelian.md)|
+|[Nasahra](Nasahra.md)|![nasahra.png](..\Images\Flags\nasahra.png)|The Scrap Desert|-|-|-|
+|[Nonkur](Nonkur.md)|![nonkur.png](..\Images\Flags\nonkur.png)|Realm of the Dead|-|-|[Mokrixi](..\Languages\Mokrixi.md)|
+|[Oshela](Oshela.md)|![oshela.png](..\Images\Flags\oshela.png)|Seaside Rainforest|-|-|[Lacelian](..\Languages\Lacelian.md)|
+|[Ovanos](Ovanos.md)|![ovanos.png](..\Images\Flags\ovanos.png)|The Flying City|-|-|-|
+|[Seraphis](Seraphis.md)|![seraphis.png](..\Images\Flags\seraphis.png)|The Blessed Lands|-|-|-|
+|[Soljord](Soljord.md)|![soljord.png](..\Images\Flags\soljord.png)|Land of the Frozen Sun|-|-|[Edikan](..\Languages\Edikan.md)|
+|[Vanatn](Vanatn.md)|![vanatn.png](..\Images\Flags\vanatn.png)|The Underwater Metropolis|-|-|-|
+|[Vikogyna](Vikogyna.md)|![vikogyna.png](..\Images\Flags\vikogyna.png)|The Desert Market|-|-|[Edikan](..\Languages\Edikan.md)|
+|[Vosaka](Vosaka.md)|![vosaka.png](..\Images\Flags\vosaka.png)|The Oasis Encampment|-|-|[Edikan](..\Languages\Edikan.md)|

 <!-- SerializedQuery END -->

--- a/content/Languages/Fayahi.md
+++ b/content/Languages/Fayahi.md
@ -0,0 +1,4 @@
+---
+---
+
+Test
--- a/content/Languages/Guo.md
+++ b/content/Languages/Guo.md
@ -0,0 +1,4 @@
+---
+---
+
+Test
--- a/content/Languages/Lacelian.md
+++ b/content/Languages/Lacelian.md
@ -0,0 +1,4 @@
+---
+---
+
+Test
--- a/content/Languages/Mokrixi.md
+++ b/content/Languages/Mokrixi.md
@ -0,0 +1,4 @@
+---
+---
+
+Test
--- a/content/conflict-files-obsidian-git.md
+++ b/content/conflict-files-obsidian-git.md
@ -1,22 +0,0 @@
---
---
-
-# Conflicts
-
-Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
-(This file will automatically be deleted before commit)
-[Additional Instructions](conflict-files-obsidian-git.md#additional-instructions) available below file list
-
-* Not a file: Edikoyo/.obsidian/workspace.json
-
-# Additional Instructions
-
-I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
-
-````diff
-<<<<<<< HEAD
-    File changes in local repository
-=======
-    File changes in remote repository
->>>>>>> origin/main
-````