forked from Edikoyo/EdikoyoWiki
Pull Edikoyo-Main into Edikoyo-n04 #1
68 changed files with 185 additions and 165 deletions
30
Edikoyo/.obsidian/workspace.json
vendored
30
Edikoyo/.obsidian/workspace.json
vendored
|
|
@ -139,13 +139,35 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "diff-view",
|
"type": "diff-view",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "content/Animals/Slimes/Ababa Slime.md",
|
"file": "content/Countries/_index.md",
|
||||||
"staged": true
|
"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"
|
"direction": "vertical"
|
||||||
|
|
@ -276,10 +298,10 @@
|
||||||
"obsidian-git:Open Git source control": false
|
"obsidian-git:Open Git source control": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "68af507ebd93d4fd",
|
"active": "0e473423f5963692",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"Countries/_index.md",
|
|
||||||
"conflict-files-obsidian-git.md",
|
"conflict-files-obsidian-git.md",
|
||||||
|
"Countries/_index.md",
|
||||||
"Animals/Slimes/_index.md",
|
"Animals/Slimes/_index.md",
|
||||||
"Animals/Slimes/Ababa Slime.md",
|
"Animals/Slimes/Ababa Slime.md",
|
||||||
"Animals/Slimes/Untitled.md",
|
"Animals/Slimes/Untitled.md",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Realm of Nomads
|
||||||
flag: "![[blanchister.png]]"
|
flag: "![[blanchister.png]]"
|
||||||
language:
|
language:
|
||||||
capital:
|
capital:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Electric Republic
|
||||||
flag: "![[calcetron.png]]"
|
flag: "![[calcetron.png]]"
|
||||||
language:
|
language:
|
||||||
capital:
|
capital:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Blooming Kingdom
|
||||||
flag: "![[dahallow.png]]"
|
flag: "![[dahallow.png]]"
|
||||||
language:
|
language:
|
||||||
capital:
|
capital:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Peaceful Summit
|
||||||
flag: "![[dolfeyja.png]]"
|
flag: "![[dolfeyja.png]]"
|
||||||
language: "[[Edikan]]"
|
language: "[[Edikan]]"
|
||||||
capital:
|
capital:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Realm of Dragons
|
||||||
flag: "![[dratana.png]]"
|
flag: "![[dratana.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Diesel Kingdom
|
||||||
flag: "![[drenvale.png]]"
|
flag: "![[drenvale.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Fairy Forest
|
||||||
flag: "![[faelani.png]]"
|
flag: "![[faelani.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Fayahi]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Empire of Flames
|
||||||
flag: "![[falaka.png]]"
|
flag: "![[falaka.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Draconic Temples
|
||||||
flag: "![[felmyr.png]]"
|
flag: "![[felmyr.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Mechanical Wasteland
|
||||||
flag: "![[gokolm.png]]"
|
flag: "![[gokolm.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Unified Miners
|
||||||
flag: "![[gudoko.png]]"
|
flag: "![[gudoko.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Guo]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Harbringers of Peace
|
||||||
flag: "![[hanoka.png]]"
|
flag: "![[hanoka.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Merchant Capital
|
||||||
flag: "![[krakala.png]]"
|
flag: "![[krakala.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Volcanic Ridge
|
||||||
flag: "![[lavaki.png]]"
|
flag: "![[lavaki.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Marshy Jungles
|
||||||
flag: "![[lekia.png]]"
|
flag: "![[lekia.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Lacelian]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Realm of the Gods
|
||||||
flag: "![[llasuki.png]]"
|
flag: "![[llasuki.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Deep Shores
|
||||||
flag: "![[mantine.png]]"
|
flag: "![[mantine.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Pirate Bay
|
||||||
flag: "![[mortham.png]]"
|
flag: "![[mortham.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Jungle Maze
|
||||||
flag: "![[nakadon.png]]"
|
flag: "![[nakadon.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Lacelian]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Scrap Desert
|
||||||
flag: "![[nasahra.png]]"
|
flag: "![[nasahra.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Realm of the Dead
|
||||||
flag: "![[nonkur.png]]"
|
flag: "![[nonkur.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Mokrixi]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Seaside Rainforest
|
||||||
flag: "![[oshela.png]]"
|
flag: "![[oshela.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Lacelian]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Flying City
|
||||||
flag: "![[ovanos.png]]"
|
flag: "![[ovanos.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Blessed Lands
|
||||||
flag: "![[seraphis.png]]"
|
flag: "![[seraphis.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: Land of the Frozen Sun
|
||||||
flag: "![[soljord.png]]"
|
flag: "![[soljord.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Edikan]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Underwater Metropolis
|
||||||
flag: "![[vanatn.png]]"
|
flag: "![[vanatn.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Desert Market
|
||||||
flag: "![[vikogyna.png]]"
|
flag: "![[vikogyna.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Edikan]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
short:
|
short: The Oasis Encampment
|
||||||
flag: "![[vosaka.png]]"
|
flag: "![[vosaka.png]]"
|
||||||
capital:
|
capital:
|
||||||
language:
|
language: "[[Edikan]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -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 -->
|
<!-- 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 -->
|
<!-- 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 |
|
| File | Flag | Short | Population | Capital | Language |
|
||||||
| ----------------------------------------- | -------------------------------------------------- | -------------------- | ---------- | ------------------------------ | ------------------------------- |
|
| ----------------------------------------- | -------------------------------------------------- | ------------------------- | ---------- | ------------------------------ | ----------------------------------- |
|
||||||
| [[Barrowmaw]] | ![[barrowmaw.png]] | The Undead Wasteland | \- | \- | \- |
|
| [[Barrowmaw]] | ![[barrowmaw.png]] | The Undead Wasteland | \- | \- | \- |
|
||||||
| [[Batanoka]] | ![[batanoka.png]] | The Subterranean Sun | \- | [[Bririe]] | [[Edikan]] |
|
| [[Batanoka]] | ![[batanoka.png]] | The Subterranean Sun | \- | [[Bririe]] | [[Edikan]] |
|
||||||
| [[Blanchister]] | ![[blanchister.png]] | \- | \- | \- | \- |
|
| [[Blanchister]] | ![[blanchister.png]] | The Realm of Nomads | \- | \- | \- |
|
||||||
| [[Calcetron]] | ![[calcetron.png]] | \- | \- | \- | \- |
|
| [[Calcetron]] | ![[calcetron.png]] | The Electric Republic | \- | \- | \- |
|
||||||
| [[Dahallow]] | ![[dahallow.png]] | \- | \- | \- | \- |
|
| [[Dahallow]] | ![[dahallow.png]] | The Blooming Kingdom | \- | \- | \- |
|
||||||
| [[Dasona]] | ![[dasona.png]] | The Country of Hopes | \- | [[Crester]] | [[Edikan]] |
|
| [[Dasona]] | ![[dasona.png]] | The Country of Hopes | \- | [[Crester]] | [[Edikan]] |
|
||||||
| [[Dolfeyja]] | ![[dolfeyja.png]] | \- | \- | \- | [[Edikan]] |
|
| [[Dolfeyja]] | ![[dolfeyja.png]] | The Peaceful Summit | \- | \- | [[Edikan]] |
|
||||||
| [[Dratana]] | ![[dratana.png]] | \- | \- | \- | \- |
|
| [[Dratana]] | ![[dratana.png]] | Realm of Dragons | \- | \- | \- |
|
||||||
| [[Drenvale]] | ![[drenvale.png]] | \- | \- | \- | \- |
|
| [[Drenvale]] | ![[drenvale.png]] | Diesel Kingdom | \- | \- | \- |
|
||||||
| [[Faelani]] | ![[faelani.png]] | \- | \- | \- | \- |
|
| [[Faelani]] | ![[faelani.png]] | Fairy Forest | \- | \- | [[Fayahi]] |
|
||||||
| [[Falaka]] | ![[falaka.png]] | \- | \- | \- | \- |
|
| [[Falaka]] | ![[falaka.png]] | The Empire of Flames | \- | \- | \- |
|
||||||
| [[Felmyr]] | ![[felmyr.png]] | \- | \- | \- | \- |
|
| [[Felmyr]] | ![[felmyr.png]] | Draconic Temples | \- | \- | \- |
|
||||||
| [[Gokolm]] | ![[gokolm.png]] | \- | \- | \- | \- |
|
| [[Gokolm]] | ![[gokolm.png]] | Mechanical Wasteland | \- | \- | \- |
|
||||||
| [[Gudoko]] | ![[gudoko.png]] | \- | \- | \- | \- |
|
| [[Gudoko]] | ![[gudoko.png]] | Unified Miners | \- | \- | [[Guo]] |
|
||||||
| [[Hanoka]] | ![[hanoka.png]] | \- | \- | \- | \- |
|
| [[Hanoka]] | ![[hanoka.png]] | Harbringers of Peace | \- | \- | \- |
|
||||||
| [[Krakala]] | ![[krakala.png]] | \- | \- | \- | \- |
|
| [[Krakala]] | ![[krakala.png]] | The Merchant Capital | \- | \- | \- |
|
||||||
| [[Lavaki]] | ![[lavaki.png]] | \- | \- | \- | \- |
|
| [[Lavaki]] | ![[lavaki.png]] | Volcanic Ridge | \- | \- | \- |
|
||||||
| [[Lekia]] | ![[lekia.png]] | \- | \- | \- | \- |
|
| [[Lekia]] | ![[lekia.png]] | Marshy Jungles | \- | \- | [[Lacelian]] |
|
||||||
| [[Llasuki]] | ![[llasuki.png]] | \- | \- | \- | \- |
|
| [[Llasuki]] | ![[llasuki.png]] | Realm of the Gods | \- | \- | \- |
|
||||||
| [[Mantine]] | ![[mantine.png]] | \- | \- | \- | \- |
|
| [[Mantine]] | ![[mantine.png]] | Deep Shores | \- | \- | \- |
|
||||||
| [[Mortham]] | ![[mortham.png]] | \- | \- | \- | \- |
|
| [[Mortham]] | ![[mortham.png]] | Pirate Bay | \- | \- | \- |
|
||||||
| [[Nakadon]] | ![[nakadon.png]] | \- | \- | \- | \- |
|
| [[Nakadon]] | ![[nakadon.png]] | The Jungle Maze | \- | \- | [[Lacelian]] |
|
||||||
| [[Nasahra]] | ![[nasahra.png]] | \- | \- | \- | \- |
|
| [[Nasahra]] | ![[nasahra.png]] | The Scrap Desert | \- | \- | \- |
|
||||||
| [[Nonkur]] | ![[nonkur.png]] | \- | \- | \- | \- |
|
| [[Nonkur]] | ![[nonkur.png]] | Realm of the Dead | \- | \- | [[Mokrixi]] |
|
||||||
| [[Oshela]] | ![[oshela.png]] | \- | \- | \- | \- |
|
| [[Oshela]] | ![[oshela.png]] | Seaside Rainforest | \- | \- | [[Lacelian]] |
|
||||||
| [[Ovanos]] | ![[ovanos.png]] | \- | \- | \- | \- |
|
| [[Ovanos]] | ![[ovanos.png]] | The Flying City | \- | \- | \- |
|
||||||
| [[Seraphis]] | ![[seraphis.png]] | \- | \- | \- | \- |
|
| [[Seraphis]] | ![[seraphis.png]] | The Blessed Lands | \- | \- | \- |
|
||||||
| [[Soljord]] | ![[soljord.png]] | \- | \- | \- | \- |
|
| [[Soljord]] | ![[soljord.png]] | Land of the Frozen Sun | \- | \- | [[Edikan]] |
|
||||||
| [[Vanatn]] | ![[vanatn.png]] | \- | \- | \- | \- |
|
| [[Vanatn]] | ![[vanatn.png]] | The Underwater Metropolis | \- | \- | \- |
|
||||||
| [[Vikogyna]] | ![[vikogyna.png]] | \- | \- | \- | \- |
|
| [[Vikogyna]] | ![[vikogyna.png]] | The Desert Market | \- | \- | [[Edikan]] |
|
||||||
| [[Vosaka]] | ![[vosaka.png]] | \- | \- | \- | \- |
|
| [[Vosaka]] | ![[vosaka.png]] | The Oasis Encampment | \- | \- | [[Edikan]] |
|
||||||
<!-- SerializedQuery END -->
|
<!-- SerializedQuery END -->
|
||||||
|
|
||||||
|
|
||||||
1
Edikoyo/Languages/Fayahi.md
Normal file
1
Edikoyo/Languages/Fayahi.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Test
|
||||||
1
Edikoyo/Languages/Guo.md
Normal file
1
Edikoyo/Languages/Guo.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Test
|
||||||
1
Edikoyo/Languages/Lacelian.md
Normal file
1
Edikoyo/Languages/Lacelian.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Test
|
||||||
1
Edikoyo/Languages/Mokrixi.md
Normal file
1
Edikoyo/Languages/Mokrixi.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Test
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Realm of Nomads
|
||||||
flag: '![[blanchister.png]]'
|
flag: '![[blanchister.png]]'
|
||||||
language: null
|
language: null
|
||||||
capital: null
|
capital: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Electric Republic
|
||||||
flag: '![[calcetron.png]]'
|
flag: '![[calcetron.png]]'
|
||||||
language: null
|
language: null
|
||||||
capital: null
|
capital: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Blooming Kingdom
|
||||||
flag: '![[dahallow.png]]'
|
flag: '![[dahallow.png]]'
|
||||||
language: null
|
language: null
|
||||||
capital: null
|
capital: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Peaceful Summit
|
||||||
flag: '![[dolfeyja.png]]'
|
flag: '![[dolfeyja.png]]'
|
||||||
language: '[[Edikan]]'
|
language: '[[Edikan]]'
|
||||||
capital: null
|
capital: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Realm of Dragons
|
||||||
flag: '![[dratana.png]]'
|
flag: '![[dratana.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Diesel Kingdom
|
||||||
flag: '![[drenvale.png]]'
|
flag: '![[drenvale.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Fairy Forest
|
||||||
flag: '![[faelani.png]]'
|
flag: '![[faelani.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Fayahi]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Empire of Flames
|
||||||
flag: '![[falaka.png]]'
|
flag: '![[falaka.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Draconic Temples
|
||||||
flag: '![[felmyr.png]]'
|
flag: '![[felmyr.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Mechanical Wasteland
|
||||||
flag: '![[gokolm.png]]'
|
flag: '![[gokolm.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Unified Miners
|
||||||
flag: '![[gudoko.png]]'
|
flag: '![[gudoko.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Guo]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Harbringers of Peace
|
||||||
flag: '![[hanoka.png]]'
|
flag: '![[hanoka.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Merchant Capital
|
||||||
flag: '![[krakala.png]]'
|
flag: '![[krakala.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Volcanic Ridge
|
||||||
flag: '![[lavaki.png]]'
|
flag: '![[lavaki.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Marshy Jungles
|
||||||
flag: '![[lekia.png]]'
|
flag: '![[lekia.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Lacelian]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Realm of the Gods
|
||||||
flag: '![[llasuki.png]]'
|
flag: '![[llasuki.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Deep Shores
|
||||||
flag: '![[mantine.png]]'
|
flag: '![[mantine.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Pirate Bay
|
||||||
flag: '![[mortham.png]]'
|
flag: '![[mortham.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Jungle Maze
|
||||||
flag: '![[nakadon.png]]'
|
flag: '![[nakadon.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Lacelian]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Scrap Desert
|
||||||
flag: '![[nasahra.png]]'
|
flag: '![[nasahra.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Realm of the Dead
|
||||||
flag: '![[nonkur.png]]'
|
flag: '![[nonkur.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Mokrixi]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Seaside Rainforest
|
||||||
flag: '![[oshela.png]]'
|
flag: '![[oshela.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Lacelian]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Flying City
|
||||||
flag: '![[ovanos.png]]'
|
flag: '![[ovanos.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Blessed Lands
|
||||||
flag: '![[seraphis.png]]'
|
flag: '![[seraphis.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: Land of the Frozen Sun
|
||||||
flag: '![[soljord.png]]'
|
flag: '![[soljord.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Edikan]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Underwater Metropolis
|
||||||
flag: '![[vanatn.png]]'
|
flag: '![[vanatn.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: null
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Desert Market
|
||||||
flag: '![[vikogyna.png]]'
|
flag: '![[vikogyna.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Edikan]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
short: null
|
short: The Oasis Encampment
|
||||||
flag: '![[vosaka.png]]'
|
flag: '![[vosaka.png]]'
|
||||||
capital: null
|
capital: null
|
||||||
language: null
|
language: '[[Edikan]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,35 +8,35 @@
|
||||||
|----|----|-----|----------|-------|--------|
|
|----|----|-----|----------|-------|--------|
|
||||||
|[Barrowmaw](Barrowmaw.md)||The Undead Wasteland|-|-|-|
|
|[Barrowmaw](Barrowmaw.md)||The Undead Wasteland|-|-|-|
|
||||||
|[Batanoka](Batanoka.md)||The Subterranean Sun|-|[Bririe](..\Cities\Bririe.md)|[Edikan](..\Languages\Edikan.md)|
|
|[Batanoka](Batanoka.md)||The Subterranean Sun|-|[Bririe](..\Cities\Bririe.md)|[Edikan](..\Languages\Edikan.md)|
|
||||||
|[Blanchister](Blanchister.md)||-|-|-|-|
|
|[Blanchister](Blanchister.md)||The Realm of Nomads|-|-|-|
|
||||||
|[Calcetron](Calcetron.md)||-|-|-|-|
|
|[Calcetron](Calcetron.md)||The Electric Republic|-|-|-|
|
||||||
|[Dahallow](Dahallow.md)||-|-|-|-|
|
|[Dahallow](Dahallow.md)||The Blooming Kingdom|-|-|-|
|
||||||
|[Dasona](Dasona.md)||The Country of Hopes|-|[Crester](..\Cities\Crester.md)|[Edikan](..\Languages\Edikan.md)|
|
|[Dasona](Dasona.md)||The Country of Hopes|-|[Crester](..\Cities\Crester.md)|[Edikan](..\Languages\Edikan.md)|
|
||||||
|[Dolfeyja](Dolfeyja.md)||-|-|-|[Edikan](..\Languages\Edikan.md)|
|
|[Dolfeyja](Dolfeyja.md)||The Peaceful Summit|-|-|[Edikan](..\Languages\Edikan.md)|
|
||||||
|[Dratana](Dratana.md)||-|-|-|-|
|
|[Dratana](Dratana.md)||Realm of Dragons|-|-|-|
|
||||||
|[Drenvale](Drenvale.md)||-|-|-|-|
|
|[Drenvale](Drenvale.md)||Diesel Kingdom|-|-|-|
|
||||||
|[Faelani](Faelani.md)||-|-|-|-|
|
|[Faelani](Faelani.md)||Fairy Forest|-|-|[Fayahi](..\Languages\Fayahi.md)|
|
||||||
|[Falaka](Falaka.md)||-|-|-|-|
|
|[Falaka](Falaka.md)||The Empire of Flames|-|-|-|
|
||||||
|[Felmyr](Felmyr.md)||-|-|-|-|
|
|[Felmyr](Felmyr.md)||Draconic Temples|-|-|-|
|
||||||
|[Gokolm](Gokolm.md)||-|-|-|-|
|
|[Gokolm](Gokolm.md)||Mechanical Wasteland|-|-|-|
|
||||||
|[Gudoko](Gudoko.md)||-|-|-|-|
|
|[Gudoko](Gudoko.md)||Unified Miners|-|-|[Guo](..\Languages\Guo.md)|
|
||||||
|[Hanoka](Hanoka.md)||-|-|-|-|
|
|[Hanoka](Hanoka.md)||Harbringers of Peace|-|-|-|
|
||||||
|[Krakala](Krakala.md)||-|-|-|-|
|
|[Krakala](Krakala.md)||The Merchant Capital|-|-|-|
|
||||||
|[Lavaki](Lavaki.md)||-|-|-|-|
|
|[Lavaki](Lavaki.md)||Volcanic Ridge|-|-|-|
|
||||||
|[Lekia](Lekia.md)||-|-|-|-|
|
|[Lekia](Lekia.md)||Marshy Jungles|-|-|[Lacelian](..\Languages\Lacelian.md)|
|
||||||
|[Llasuki](Llasuki.md)||-|-|-|-|
|
|[Llasuki](Llasuki.md)||Realm of the Gods|-|-|-|
|
||||||
|[Mantine](Mantine.md)||-|-|-|-|
|
|[Mantine](Mantine.md)||Deep Shores|-|-|-|
|
||||||
|[Mortham](Mortham.md)||-|-|-|-|
|
|[Mortham](Mortham.md)||Pirate Bay|-|-|-|
|
||||||
|[Nakadon](Nakadon.md)||-|-|-|-|
|
|[Nakadon](Nakadon.md)||The Jungle Maze|-|-|[Lacelian](..\Languages\Lacelian.md)|
|
||||||
|[Nasahra](Nasahra.md)||-|-|-|-|
|
|[Nasahra](Nasahra.md)||The Scrap Desert|-|-|-|
|
||||||
|[Nonkur](Nonkur.md)||-|-|-|-|
|
|[Nonkur](Nonkur.md)||Realm of the Dead|-|-|[Mokrixi](..\Languages\Mokrixi.md)|
|
||||||
|[Oshela](Oshela.md)||-|-|-|-|
|
|[Oshela](Oshela.md)||Seaside Rainforest|-|-|[Lacelian](..\Languages\Lacelian.md)|
|
||||||
|[Ovanos](Ovanos.md)||-|-|-|-|
|
|[Ovanos](Ovanos.md)||The Flying City|-|-|-|
|
||||||
|[Seraphis](Seraphis.md)||-|-|-|-|
|
|[Seraphis](Seraphis.md)||The Blessed Lands|-|-|-|
|
||||||
|[Soljord](Soljord.md)||-|-|-|-|
|
|[Soljord](Soljord.md)||Land of the Frozen Sun|-|-|[Edikan](..\Languages\Edikan.md)|
|
||||||
|[Vanatn](Vanatn.md)||-|-|-|-|
|
|[Vanatn](Vanatn.md)||The Underwater Metropolis|-|-|-|
|
||||||
|[Vikogyna](Vikogyna.md)||-|-|-|-|
|
|[Vikogyna](Vikogyna.md)||The Desert Market|-|-|[Edikan](..\Languages\Edikan.md)|
|
||||||
|[Vosaka](Vosaka.md)||-|-|-|-|
|
|[Vosaka](Vosaka.md)||The Oasis Encampment|-|-|[Edikan](..\Languages\Edikan.md)|
|
||||||
|
|
||||||
<!-- SerializedQuery END -->
|
<!-- SerializedQuery END -->
|
||||||
|
|
||||||
|
|
|
||||||
4
content/Languages/Fayahi.md
Normal file
4
content/Languages/Fayahi.md
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
---
|
||||||
|
|
||||||
|
Test
|
||||||
4
content/Languages/Guo.md
Normal file
4
content/Languages/Guo.md
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
---
|
||||||
|
|
||||||
|
Test
|
||||||
4
content/Languages/Lacelian.md
Normal file
4
content/Languages/Lacelian.md
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
---
|
||||||
|
|
||||||
|
Test
|
||||||
4
content/Languages/Mokrixi.md
Normal file
4
content/Languages/Mokrixi.md
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
---
|
||||||
|
|
||||||
|
Test
|
||||||
|
|
@ -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
|
|
||||||
````
|
|
||||||
Loading…
Reference in a new issue