diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index 777c178..66c43c8 100644 --- 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", diff --git a/Edikoyo/Countries/Blanchister.md b/Edikoyo/Countries/Blanchister.md index 11dc40d..59d59c9 100644 --- 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: diff --git a/Edikoyo/Countries/Calcetron.md b/Edikoyo/Countries/Calcetron.md index 8e210bb..6e11d4a 100644 --- a/Edikoyo/Countries/Calcetron.md +++ b/Edikoyo/Countries/Calcetron.md @@ -1,5 +1,5 @@ --- -short: +short: The Electric Republic flag: "![[calcetron.png]]" language: capital: diff --git a/Edikoyo/Countries/Dahallow.md b/Edikoyo/Countries/Dahallow.md index 1f55868..f85f24e 100644 --- a/Edikoyo/Countries/Dahallow.md +++ b/Edikoyo/Countries/Dahallow.md @@ -1,5 +1,5 @@ --- -short: +short: The Blooming Kingdom flag: "![[dahallow.png]]" language: capital: diff --git a/Edikoyo/Countries/Dolfeyja.md b/Edikoyo/Countries/Dolfeyja.md index 0a52ef9..98107c2 100644 --- 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: diff --git a/Edikoyo/Countries/Dratana.md b/Edikoyo/Countries/Dratana.md index 48b5bdf..3658663 100644 --- a/Edikoyo/Countries/Dratana.md +++ b/Edikoyo/Countries/Dratana.md @@ -1,6 +1,6 @@ --- -short: +short: Realm of Dragons flag: "![[dratana.png]]" -capital: -language: +capital: +language: --- diff --git a/Edikoyo/Countries/Drenvale.md b/Edikoyo/Countries/Drenvale.md index 56ceb84..b98a03a 100644 --- a/Edikoyo/Countries/Drenvale.md +++ b/Edikoyo/Countries/Drenvale.md @@ -1,6 +1,6 @@ --- -short: +short: Diesel Kingdom flag: "![[drenvale.png]]" -capital: -language: +capital: +language: --- diff --git a/Edikoyo/Countries/Faelani.md b/Edikoyo/Countries/Faelani.md index f2ca905..106305e 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Falaka.md b/Edikoyo/Countries/Falaka.md index 0e21935..7c2438a 100644 --- 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: diff --git a/Edikoyo/Countries/Felmyr.md b/Edikoyo/Countries/Felmyr.md index 98f5def..0149689 100644 --- a/Edikoyo/Countries/Felmyr.md +++ b/Edikoyo/Countries/Felmyr.md @@ -1,5 +1,5 @@ --- -short: +short: Draconic Temples flag: "![[felmyr.png]]" capital: language: diff --git a/Edikoyo/Countries/Gokolm.md b/Edikoyo/Countries/Gokolm.md index 196a961..762106e 100644 --- a/Edikoyo/Countries/Gokolm.md +++ b/Edikoyo/Countries/Gokolm.md @@ -1,5 +1,5 @@ --- -short: +short: Mechanical Wasteland flag: "![[gokolm.png]]" capital: language: diff --git a/Edikoyo/Countries/Gudoko.md b/Edikoyo/Countries/Gudoko.md index d484183..a8bbfb3 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Hanoka.md b/Edikoyo/Countries/Hanoka.md index 26df8d5..db853c8 100644 --- a/Edikoyo/Countries/Hanoka.md +++ b/Edikoyo/Countries/Hanoka.md @@ -1,5 +1,5 @@ --- -short: +short: Harbringers of Peace flag: "![[hanoka.png]]" capital: language: diff --git a/Edikoyo/Countries/Krakala.md b/Edikoyo/Countries/Krakala.md index 0d80e36..88e0044 100644 --- a/Edikoyo/Countries/Krakala.md +++ b/Edikoyo/Countries/Krakala.md @@ -1,5 +1,5 @@ --- -short: +short: The Merchant Capital flag: "![[krakala.png]]" capital: language: diff --git a/Edikoyo/Countries/Lavaki.md b/Edikoyo/Countries/Lavaki.md index 04f82a5..9dbdf2b 100644 --- a/Edikoyo/Countries/Lavaki.md +++ b/Edikoyo/Countries/Lavaki.md @@ -1,5 +1,5 @@ --- -short: +short: Volcanic Ridge flag: "![[lavaki.png]]" capital: language: diff --git a/Edikoyo/Countries/Lekia.md b/Edikoyo/Countries/Lekia.md index 596085d..a54798d 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Llasuki.md b/Edikoyo/Countries/Llasuki.md index b237bf4..3db2848 100644 --- 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: diff --git a/Edikoyo/Countries/Mantine.md b/Edikoyo/Countries/Mantine.md index b92d14f..a10a0e5 100644 --- a/Edikoyo/Countries/Mantine.md +++ b/Edikoyo/Countries/Mantine.md @@ -1,5 +1,5 @@ --- -short: +short: Deep Shores flag: "![[mantine.png]]" capital: language: diff --git a/Edikoyo/Countries/Mortham.md b/Edikoyo/Countries/Mortham.md index d0fd250..8440564 100644 --- a/Edikoyo/Countries/Mortham.md +++ b/Edikoyo/Countries/Mortham.md @@ -1,5 +1,5 @@ --- -short: +short: Pirate Bay flag: "![[mortham.png]]" capital: language: diff --git a/Edikoyo/Countries/Nakadon.md b/Edikoyo/Countries/Nakadon.md index 5f02435..4269aba 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Nasahra.md b/Edikoyo/Countries/Nasahra.md index 372d8d7..d3b7682 100644 --- a/Edikoyo/Countries/Nasahra.md +++ b/Edikoyo/Countries/Nasahra.md @@ -1,5 +1,5 @@ --- -short: +short: The Scrap Desert flag: "![[nasahra.png]]" capital: language: diff --git a/Edikoyo/Countries/Nonkur.md b/Edikoyo/Countries/Nonkur.md index 0d4afe9..d20e30b 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Oshela.md b/Edikoyo/Countries/Oshela.md index a8c0445..d9834e0 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Ovanos.md b/Edikoyo/Countries/Ovanos.md index a9d9efb..d91b96b 100644 --- a/Edikoyo/Countries/Ovanos.md +++ b/Edikoyo/Countries/Ovanos.md @@ -1,5 +1,5 @@ --- -short: +short: The Flying City flag: "![[ovanos.png]]" capital: language: diff --git a/Edikoyo/Countries/Seraphis.md b/Edikoyo/Countries/Seraphis.md index 39b5781..b475ff4 100644 --- a/Edikoyo/Countries/Seraphis.md +++ b/Edikoyo/Countries/Seraphis.md @@ -1,5 +1,5 @@ --- -short: +short: The Blessed Lands flag: "![[seraphis.png]]" capital: language: diff --git a/Edikoyo/Countries/Soljord.md b/Edikoyo/Countries/Soljord.md index a2d71dc..122d7d7 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Vanatn.md b/Edikoyo/Countries/Vanatn.md index 6cc1427..68e8713 100644 --- a/Edikoyo/Countries/Vanatn.md +++ b/Edikoyo/Countries/Vanatn.md @@ -1,5 +1,5 @@ --- -short: +short: The Underwater Metropolis flag: "![[vanatn.png]]" capital: language: diff --git a/Edikoyo/Countries/Vikogyna.md b/Edikoyo/Countries/Vikogyna.md index 06d575b..65afcba 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/Vosaka.md b/Edikoyo/Countries/Vosaka.md index 9aec4c3..84822bb 100644 --- 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]]" --- diff --git a/Edikoyo/Countries/_index.md b/Edikoyo/Countries/_index.md index 0853f7b..8d7eba9 100644 --- a/Edikoyo/Countries/_index.md +++ b/Edikoyo/Countries/_index.md @@ -1,39 +1,39 @@ -| 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]] | \- | \- | \- | \- | -| [[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]] | \- | \- | \- | \- | +| File | Flag | Short | Population | Capital | Language | +| ----------------------------------------- | -------------------------------------------------- | ------------------------- | ---------- | ------------------------------ | ----------------------------------- | +| [[Barrowmaw]] | ![[barrowmaw.png]] | The Undead Wasteland | \- | \- | \- | +| [[Batanoka]] | ![[batanoka.png]] | The Subterranean Sun | \- | [[Bririe]] | [[Edikan]] | +| [[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]] | 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]] | \ No newline at end of file diff --git a/Edikoyo/Languages/Fayahi.md b/Edikoyo/Languages/Fayahi.md new file mode 100644 index 0000000..8318c86 --- /dev/null +++ b/Edikoyo/Languages/Fayahi.md @@ -0,0 +1 @@ +Test \ No newline at end of file diff --git a/Edikoyo/Languages/Guo.md b/Edikoyo/Languages/Guo.md new file mode 100644 index 0000000..8318c86 --- /dev/null +++ b/Edikoyo/Languages/Guo.md @@ -0,0 +1 @@ +Test \ No newline at end of file diff --git a/Edikoyo/Languages/Lacelian.md b/Edikoyo/Languages/Lacelian.md new file mode 100644 index 0000000..8318c86 --- /dev/null +++ b/Edikoyo/Languages/Lacelian.md @@ -0,0 +1 @@ +Test \ No newline at end of file diff --git a/Edikoyo/Languages/Mokrixi.md b/Edikoyo/Languages/Mokrixi.md new file mode 100644 index 0000000..8318c86 --- /dev/null +++ b/Edikoyo/Languages/Mokrixi.md @@ -0,0 +1 @@ +Test \ No newline at end of file diff --git a/content/Countries/Blanchister.md b/content/Countries/Blanchister.md index ad82115..8bc44ed 100644 --- 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 diff --git a/content/Countries/Calcetron.md b/content/Countries/Calcetron.md index 9021aed..24ad9bd 100644 --- 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 diff --git a/content/Countries/Dahallow.md b/content/Countries/Dahallow.md index 5acbd7e..718e10d 100644 --- 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 diff --git a/content/Countries/Dolfeyja.md b/content/Countries/Dolfeyja.md index c57020c..352f5fb 100644 --- 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 diff --git a/content/Countries/Dratana.md b/content/Countries/Dratana.md index 27df267..14768c0 100644 --- 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 diff --git a/content/Countries/Drenvale.md b/content/Countries/Drenvale.md index fd3d1f9..d5ad982 100644 --- 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 diff --git a/content/Countries/Faelani.md b/content/Countries/Faelani.md index 95c66e1..2f67f21 100644 --- 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]]' --- diff --git a/content/Countries/Falaka.md b/content/Countries/Falaka.md index 968ef6a..b8348cc 100644 --- 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 diff --git a/content/Countries/Felmyr.md b/content/Countries/Felmyr.md index fddde89..064b9a6 100644 --- 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 diff --git a/content/Countries/Gokolm.md b/content/Countries/Gokolm.md index ec264ab..8544778 100644 --- 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 diff --git a/content/Countries/Gudoko.md b/content/Countries/Gudoko.md index 523276b..62be307 100644 --- 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]]' --- diff --git a/content/Countries/Hanoka.md b/content/Countries/Hanoka.md index cfa8f95..e7746d2 100644 --- 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 diff --git a/content/Countries/Krakala.md b/content/Countries/Krakala.md index 4b7b387..7ef018f 100644 --- 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 diff --git a/content/Countries/Lavaki.md b/content/Countries/Lavaki.md index 53fbaf0..5d59ce2 100644 --- 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 diff --git a/content/Countries/Lekia.md b/content/Countries/Lekia.md index 017c926..c42563e 100644 --- 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]]' --- diff --git a/content/Countries/Llasuki.md b/content/Countries/Llasuki.md index 0e7bca9..00af84c 100644 --- 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 diff --git a/content/Countries/Mantine.md b/content/Countries/Mantine.md index 1a12395..2376fe5 100644 --- 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 diff --git a/content/Countries/Mortham.md b/content/Countries/Mortham.md index 0bed378..ba29ce1 100644 --- 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 diff --git a/content/Countries/Nakadon.md b/content/Countries/Nakadon.md index 488a8bf..1310de0 100644 --- 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]]' --- diff --git a/content/Countries/Nasahra.md b/content/Countries/Nasahra.md index 1d7f143..a799eac 100644 --- 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 diff --git a/content/Countries/Nonkur.md b/content/Countries/Nonkur.md index ed66313..099d47f 100644 --- 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]]' --- diff --git a/content/Countries/Oshela.md b/content/Countries/Oshela.md index f446f20..96a649a 100644 --- 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]]' --- diff --git a/content/Countries/Ovanos.md b/content/Countries/Ovanos.md index d819c84..5c2dd03 100644 --- 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 diff --git a/content/Countries/Seraphis.md b/content/Countries/Seraphis.md index b7b7a07..c393691 100644 --- 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 diff --git a/content/Countries/Soljord.md b/content/Countries/Soljord.md index 5c8d926..b0f21e9 100644 --- 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]]' --- diff --git a/content/Countries/Vanatn.md b/content/Countries/Vanatn.md index 98ba5fa..9588b54 100644 --- 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 diff --git a/content/Countries/Vikogyna.md b/content/Countries/Vikogyna.md index d4af93a..ac4e4e4 100644 --- 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]]' --- diff --git a/content/Countries/Vosaka.md b/content/Countries/Vosaka.md index bbf01a0..4112284 100644 --- 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]]' --- diff --git a/content/Countries/_index.md b/content/Countries/_index.md index ad63682..a6783dc 100644 --- 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)| diff --git a/content/Languages/Fayahi.md b/content/Languages/Fayahi.md new file mode 100644 index 0000000..95e4291 --- /dev/null +++ b/content/Languages/Fayahi.md @@ -0,0 +1,4 @@ +--- +--- + +Test diff --git a/content/Languages/Guo.md b/content/Languages/Guo.md new file mode 100644 index 0000000..95e4291 --- /dev/null +++ b/content/Languages/Guo.md @@ -0,0 +1,4 @@ +--- +--- + +Test diff --git a/content/Languages/Lacelian.md b/content/Languages/Lacelian.md new file mode 100644 index 0000000..95e4291 --- /dev/null +++ b/content/Languages/Lacelian.md @@ -0,0 +1,4 @@ +--- +--- + +Test diff --git a/content/Languages/Mokrixi.md b/content/Languages/Mokrixi.md new file mode 100644 index 0000000..95e4291 --- /dev/null +++ b/content/Languages/Mokrixi.md @@ -0,0 +1,4 @@ +--- +--- + +Test diff --git a/content/conflict-files-obsidian-git.md b/content/conflict-files-obsidian-git.md deleted file mode 100644 index f44af68..0000000 --- a/content/conflict-files-obsidian-git.md +++ /dev/null @@ -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 -````