1
0
Fork 0

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
59 changed files with 91 additions and 63 deletions
Showing only changes of commit cdc49b58c0 - Show all commits

View file

@ -73,7 +73,7 @@
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Countries/Blanchister.md", "file": "Countries/Vikogyna.md",
"mode": "source", "mode": "source",
"source": false "source": false
} }
@ -146,7 +146,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Countries/Blanchister.md", "file": "Countries/Vikogyna.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -163,7 +163,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Countries/Blanchister.md", "file": "Countries/Vikogyna.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -186,7 +186,7 @@
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {
"file": "Countries/Blanchister.md" "file": "Countries/Vikogyna.md"
} }
} }
}, },
@ -217,22 +217,32 @@
}, },
"active": "e18161b255f8c3cb", "active": "e18161b255f8c3cb",
"lastOpenFiles": [ "lastOpenFiles": [
"Countries/Batanoka.md",
"Countries/Barrowmaw.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md",
"30.md",
"Countries/Felmyr.md",
"Countries/Llasuki.md",
"conflict-files-obsidian-git.md",
"Countries/Vosaka.md", "Countries/Vosaka.md",
"Countries/Vikogyna.md",
"Countries/Vanatn.md",
"Countries/Soljord.md",
"Countries/Seraphis.md",
"Countries/Ovanos.md",
"Countries/Oshela.md",
"Countries/Nonkur.md",
"Countries/Nasahra.md",
"Countries/Nakadon.md",
"Countries/Mortham.md",
"Countries/Mantine.md",
"Countries/Llasuki.md",
"Countries/Lekia.md",
"Countries/Lavaki.md",
"Countries/Krakala.md",
"Countries/Hanoka.md",
"Countries/Gudoko.md",
"Countries/Gokolm.md",
"Countries/Felmyr.md",
"Countries/Falaka.md",
"Countries/Faelani.md",
"Countries/Drenvale.md",
"Countries/Dratana.md",
"Countries/Dolfeyja.md",
"Countries/Dasona.md",
"Images/Slimes/garden-1.png", "Images/Slimes/garden-1.png",
"Images/Slimes/sunflower-2.png", "Images/Slimes/sunflower-2.png",
"Images/Slimes/sunflower-1.png", "Images/Slimes/sunflower-1.png",
@ -247,16 +257,6 @@
"Images/Slimes/bark", "Images/Slimes/bark",
"Images/Slimes/garden", "Images/Slimes/garden",
"Images/Slimes", "Images/Slimes",
"Languages/Mokrixi.md",
"Languages/Lacelian.md",
"Languages/Guo.md",
"Languages/Fayahi.md",
"Languages/Edikan.md",
"Languages/_index.md",
"Countries/_index.md",
"Countries/Dolfeyja.md",
"Countries/Dasona.md",
"Countries/Faelani.md",
"Images/Slimes/ababa", "Images/Slimes/ababa",
"Images/slimes", "Images/slimes",
"Countries/Faelani", "Countries/Faelani",

View file

@ -4,5 +4,4 @@ flag: "![[blanchister.png]]"
language: language:
capital: capital:
--- ---
To be added
Test 5

View file

@ -4,3 +4,4 @@ flag: "![[calcetron.png]]"
language: language:
capital: capital:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[dahallow.png]]"
language: language:
capital: capital:
--- ---
To be added

View file

@ -4,6 +4,4 @@ flag: "![[dasona.png]]"
language: "[[Edikan]]" language: "[[Edikan]]"
capital: "[[Crester]]" capital: "[[Crester]]"
--- ---
To be added
Test Country Text

View file

@ -4,3 +4,4 @@ flag: "![[dolfeyja.png]]"
language: "[[Edikan]]" language: "[[Edikan]]"
capital: capital:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[dratana.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[drenvale.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[faelani.png]]"
capital: capital:
language: "[[Fayahi]]" language: "[[Fayahi]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[falaka.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[felmyr.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[gokolm.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[gudoko.png]]"
capital: capital:
language: "[[Guo]]" language: "[[Guo]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[hanoka.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[krakala.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[lavaki.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[lekia.png]]"
capital: capital:
language: "[[Lacelian]]" language: "[[Lacelian]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[llasuki.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[mantine.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[mortham.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[nakadon.png]]"
capital: capital:
language: "[[Lacelian]]" language: "[[Lacelian]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[nasahra.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[nonkur.png]]"
capital: capital:
language: "[[Mokrixi]]" language: "[[Mokrixi]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[oshela.png]]"
capital: capital:
language: "[[Lacelian]]" language: "[[Lacelian]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[ovanos.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[seraphis.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[soljord.png]]"
capital: capital:
language: "[[Edikan]]" language: "[[Edikan]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[vanatn.png]]"
capital: capital:
language: language:
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[vikogyna.png]]"
capital: capital:
language: "[[Edikan]]" language: "[[Edikan]]"
--- ---
To be added

View file

@ -4,3 +4,4 @@ flag: "![[vosaka.png]]"
capital: capital:
language: "[[Edikan]]" language: "[[Edikan]]"
--- ---
To be added

View file

@ -1,4 +1,8 @@
--- ---
short: The Realm of Nomads
flag: '![[blanchister.png]]'
language: null
capital: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ language: null
capital: null capital: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ language: null
capital: null capital: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ language: '[[Edikan]]'
capital: '[[Crester]]' capital: '[[Crester]]'
--- ---
Test Country Text To be added

View file

@ -5,4 +5,4 @@ language: '[[Edikan]]'
capital: null capital: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Fayahi]]' language: '[[Fayahi]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Guo]]' language: '[[Guo]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Lacelian]]' language: '[[Lacelian]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Lacelian]]' language: '[[Lacelian]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Mokrixi]]' language: '[[Mokrixi]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Lacelian]]' language: '[[Lacelian]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Edikan]]' language: '[[Edikan]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: null language: null
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Edikan]]' language: '[[Edikan]]'
--- ---
To be added

View file

@ -5,4 +5,4 @@ capital: null
language: '[[Edikan]]' language: '[[Edikan]]'
--- ---
To be added