n04/EdikoyoWiki-n04
1
0
Fork 0
forked from Edikoyo/EdikoyoWiki
Code Pull requests Activity

Pull Edikoyo-Main into Edikoyo-n04 #1

Merged
n04 merged 107 commits from Edikoyo/EdikoyoWiki:main into main 2024-09-07 23:41:19 +00:00
Conversation 0 Commits 107 Files changed 326 +185 -165
68 changed files with 185 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bed4c6f3d0 - Show all commits

30
Edikoyo/.obsidian/workspace.json vendored
View file

@ -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",

2
Edikoyo/Countries/Blanchister.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Realm of Nomads
flag: "![[blanchister.png]]"
language:
capital:

2
Edikoyo/Countries/Calcetron.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Electric Republic
flag: "![[calcetron.png]]"
language:
capital:

2
Edikoyo/Countries/Dahallow.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Blooming Kingdom
flag: "![[dahallow.png]]"
language:
capital:

2
Edikoyo/Countries/Dolfeyja.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Peaceful Summit
flag: "![[dolfeyja.png]]"
language: "[[Edikan]]"
capital:

6
Edikoyo/Countries/Dratana.md
View file

@ -1,6 +1,6 @@
---
short:
short: Realm of Dragons
flag: "![[dratana.png]]"
capital:
language:
capital:
language:
---

6
Edikoyo/Countries/Drenvale.md
View file

@ -1,6 +1,6 @@
---
short:
short: Diesel Kingdom
flag: "![[drenvale.png]]"
capital:
language:
capital:
language:
---

4
Edikoyo/Countries/Faelani.md
View file

@ -1,6 +1,6 @@
---
short:
short: Fairy Forest
flag: "![[faelani.png]]"
capital:
language:
language: "[[Fayahi]]"
---

2
Edikoyo/Countries/Falaka.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Empire of Flames
flag: "![[falaka.png]]"
capital:
language:

2
Edikoyo/Countries/Felmyr.md
View file

@ -1,5 +1,5 @@
---
short:
short: Draconic Temples
flag: "![[felmyr.png]]"
capital:
language:

2
Edikoyo/Countries/Gokolm.md
View file

@ -1,5 +1,5 @@
---
short:
short: Mechanical Wasteland
flag: "![[gokolm.png]]"
capital:
language:

4
Edikoyo/Countries/Gudoko.md
View file

@ -1,6 +1,6 @@
---
short:
short: Unified Miners
flag: "![[gudoko.png]]"
capital:
language:
language: "[[Guo]]"
---

2
Edikoyo/Countries/Hanoka.md
View file

@ -1,5 +1,5 @@
---
short:
short: Harbringers of Peace
flag: "![[hanoka.png]]"
capital:
language:

2
Edikoyo/Countries/Krakala.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Merchant Capital
flag: "![[krakala.png]]"
capital:
language:

2
Edikoyo/Countries/Lavaki.md
View file

@ -1,5 +1,5 @@
---
short:
short: Volcanic Ridge
flag: "![[lavaki.png]]"
capital:
language:

4
Edikoyo/Countries/Lekia.md
View file

@ -1,6 +1,6 @@
---
short:
short: Marshy Jungles
flag: "![[lekia.png]]"
capital:
language:
language: "[[Lacelian]]"
---

2
Edikoyo/Countries/Llasuki.md
View file

@ -1,5 +1,5 @@
---
short:
short: Realm of the Gods
flag: "![[llasuki.png]]"
capital:
language:

2
Edikoyo/Countries/Mantine.md
View file

@ -1,5 +1,5 @@
---
short:
short: Deep Shores
flag: "![[mantine.png]]"
capital:
language:

2
Edikoyo/Countries/Mortham.md
View file

@ -1,5 +1,5 @@
---
short:
short: Pirate Bay
flag: "![[mortham.png]]"
capital:
language:

4
Edikoyo/Countries/Nakadon.md
View file

@ -1,6 +1,6 @@
---
short:
short: The Jungle Maze
flag: "![[nakadon.png]]"
capital:
language:
language: "[[Lacelian]]"
---

2
Edikoyo/Countries/Nasahra.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Scrap Desert
flag: "![[nasahra.png]]"
capital:
language:

4
Edikoyo/Countries/Nonkur.md
View file

@ -1,6 +1,6 @@
---
short:
short: Realm of the Dead
flag: "![[nonkur.png]]"
capital:
language:
language: "[[Mokrixi]]"
---

4
Edikoyo/Countries/Oshela.md
View file

@ -1,6 +1,6 @@
---
short:
short: Seaside Rainforest
flag: "![[oshela.png]]"
capital:
language:
language: "[[Lacelian]]"
---

2
Edikoyo/Countries/Ovanos.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Flying City
flag: "![[ovanos.png]]"
capital:
language:

2
Edikoyo/Countries/Seraphis.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Blessed Lands
flag: "![[seraphis.png]]"
capital:
language:

4
Edikoyo/Countries/Soljord.md
View file

@ -1,6 +1,6 @@
---
short:
short: Land of the Frozen Sun
flag: "![[soljord.png]]"
capital:
language:
language: "[[Edikan]]"
---

2
Edikoyo/Countries/Vanatn.md
View file

@ -1,5 +1,5 @@
---
short:
short: The Underwater Metropolis
flag: "![[vanatn.png]]"
capital:
language:

4
Edikoyo/Countries/Vikogyna.md
View file

@ -1,6 +1,6 @@
---
short:
short: The Desert Market
flag: "![[vikogyna.png]]"
capital:
language:
language: "[[Edikan]]"
---

4
Edikoyo/Countries/Vosaka.md
View file

@ -1,6 +1,6 @@
---
short:
short: The Oasis Encampment
flag: "![[vosaka.png]]"
capital:
language:
language: "[[Edikan]]"
---

66
Edikoyo/Countries/_index.md
View file

@ -1,39 +1,39 @@
<!-- QueryToSerialize: 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 -->
<!-- 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]] | \- | \- | \- | \- |
| [[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]] |
<!-- SerializedQuery END -->

1
Edikoyo/Languages/Fayahi.md Normal file
View file

@ -0,0 +1 @@
Test

1
Edikoyo/Languages/Guo.md Normal file
View file

@ -0,0 +1 @@
Test

1
Edikoyo/Languages/Lacelian.md Normal file
View file

@ -0,0 +1 @@
Test

1
Edikoyo/Languages/Mokrixi.md Normal file
View file

@ -0,0 +1 @@
Test

2
content/Countries/Blanchister.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Realm of Nomads
flag: '![[blanchister.png]]'
language: null
capital: null

2
content/Countries/Calcetron.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Electric Republic
flag: '![[calcetron.png]]'
language: null
capital: null

2
content/Countries/Dahallow.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Blooming Kingdom
flag: '![[dahallow.png]]'
language: null
capital: null

2
content/Countries/Dolfeyja.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Peaceful Summit
flag: '![[dolfeyja.png]]'
language: '[[Edikan]]'
capital: null

2
content/Countries/Dratana.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Realm of Dragons
flag: '![[dratana.png]]'
capital: null
language: null

2
content/Countries/Drenvale.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Diesel Kingdom
flag: '![[drenvale.png]]'
capital: null
language: null

4
content/Countries/Faelani.md
View file

@ -1,8 +1,8 @@
---
short: null
short: Fairy Forest
flag: '![[faelani.png]]'
capital: null
language: null
language: '[[Fayahi]]'
---

2
content/Countries/Falaka.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Empire of Flames
flag: '![[falaka.png]]'
capital: null
language: null

2
content/Countries/Felmyr.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Draconic Temples
flag: '![[felmyr.png]]'
capital: null
language: null

2
content/Countries/Gokolm.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Mechanical Wasteland
flag: '![[gokolm.png]]'
capital: null
language: null

4
content/Countries/Gudoko.md
View file

@ -1,8 +1,8 @@
---
short: null
short: Unified Miners
flag: '![[gudoko.png]]'
capital: null
language: null
language: '[[Guo]]'
---

2
content/Countries/Hanoka.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Harbringers of Peace
flag: '![[hanoka.png]]'
capital: null
language: null

2
content/Countries/Krakala.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Merchant Capital
flag: '![[krakala.png]]'
capital: null
language: null

2
content/Countries/Lavaki.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Volcanic Ridge
flag: '![[lavaki.png]]'
capital: null
language: null

4
content/Countries/Lekia.md
View file

@ -1,8 +1,8 @@
---
short: null
short: Marshy Jungles
flag: '![[lekia.png]]'
capital: null
language: null
language: '[[Lacelian]]'
---

2
content/Countries/Llasuki.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Realm of the Gods
flag: '![[llasuki.png]]'
capital: null
language: null

2
content/Countries/Mantine.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Deep Shores
flag: '![[mantine.png]]'
capital: null
language: null

2
content/Countries/Mortham.md
View file

@ -1,5 +1,5 @@
---
short: null
short: Pirate Bay
flag: '![[mortham.png]]'
capital: null
language: null

4
content/Countries/Nakadon.md
View file

@ -1,8 +1,8 @@
---
short: null
short: The Jungle Maze
flag: '![[nakadon.png]]'
capital: null
language: null
language: '[[Lacelian]]'
---

2
content/Countries/Nasahra.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Scrap Desert
flag: '![[nasahra.png]]'
capital: null
language: null

4
content/Countries/Nonkur.md
View file

@ -1,8 +1,8 @@
---
short: null
short: Realm of the Dead
flag: '![[nonkur.png]]'
capital: null
language: null
language: '[[Mokrixi]]'
---

4
content/Countries/Oshela.md
View file

@ -1,8 +1,8 @@
---
short: null
short: Seaside Rainforest
flag: '![[oshela.png]]'
capital: null
language: null
language: '[[Lacelian]]'
---

2
content/Countries/Ovanos.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Flying City
flag: '![[ovanos.png]]'
capital: null
language: null

2
content/Countries/Seraphis.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Blessed Lands
flag: '![[seraphis.png]]'
capital: null
language: null

4
content/Countries/Soljord.md
View file

@ -1,8 +1,8 @@
---
short: null
short: Land of the Frozen Sun
flag: '![[soljord.png]]'
capital: null
language: null
language: '[[Edikan]]'
---

2
content/Countries/Vanatn.md
View file

@ -1,5 +1,5 @@
---
short: null
short: The Underwater Metropolis
flag: '![[vanatn.png]]'
capital: null
language: null

4
content/Countries/Vikogyna.md
View file

@ -1,8 +1,8 @@
---
short: null
short: The Desert Market
flag: '![[vikogyna.png]]'
capital: null
language: null
language: '[[Edikan]]'
---

4
content/Countries/Vosaka.md
View file

@ -1,8 +1,8 @@
---
short: null
short: The Oasis Encampment
flag: '![[vosaka.png]]'
capital: null
language: null
language: '[[Edikan]]'
---

56
content/Countries/_index.md
View file

@ -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 -->

4
content/Languages/Fayahi.md Normal file
View file

@ -0,0 +1,4 @@
---
---
Test

4
content/Languages/Guo.md Normal file
View file

@ -0,0 +1,4 @@
---
---
Test

4
content/Languages/Lacelian.md Normal file
View file

@ -0,0 +1,4 @@
---
---
Test

4
content/Languages/Mokrixi.md Normal file
View file

@ -0,0 +1,4 @@
---
---
Test

22
content/conflict-files-obsidian-git.md
View file

@ -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
````