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
64 changed files with 26 additions and 28 deletions
Showing only changes of commit e283852bc7 - Show all commits

View file

@ -83,11 +83,9 @@
"id": "6e65a1802f52d161",
"type": "leaf",
"state": {
"type": "markdown",
"type": "image",
"state": {
"file": "People/_index.md",
"mode": "source",
"source": false
"file": "Images/barrowmaw.png"
}
}
}
@ -158,7 +156,7 @@
"state": {
"type": "backlink",
"state": {
"file": "People/_index.md",
"file": "Images/barrowmaw.png",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -175,7 +173,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "People/_index.md",
"file": "Images/barrowmaw.png",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -198,7 +196,7 @@
"state": {
"type": "outline",
"state": {
"file": "People/_index.md"
"file": "Images/barrowmaw.png"
}
}
},
@ -227,10 +225,10 @@
"obsidian-git:Open Git source control": false
}
},
"active": "6e65a1802f52d161",
"active": "fdbd8ce5e8a10389",
"lastOpenFiles": [
"Countries/_index.md",
"People/_index.md",
"Countries/_index.md",
"Countries/Barrowmaw.md",
"Cultures/_index.md",
"test.md",
@ -257,16 +255,16 @@
"Countries/Dolfeyja.md",
"Countries/Dratana.md",
"Languages",
"Images/Flags/vosaka.png",
"Images/Flags/vikogyna.png",
"Images/Flags/vanatn.png",
"Images/Flags/soljord.png",
"Images/Flags/seraphis.png",
"Images/Flags/ovanos.png",
"Images/Flags/oshela.png",
"Images/Flags/nonkur.png",
"Images/Flags/nasahra.png",
"Images/Flags/nakadon.png",
"Images/vosaka.png",
"Images/vikogyna.png",
"Images/vanatn.png",
"Images/soljord.png",
"Images/seraphis.png",
"Images/ovanos.png",
"Images/oshela.png",
"Images/nonkur.png",
"Images/nasahra.png",
"Images/nakadon.png",
"Images/Flags",
"Images/Flags",
"Images",

View file

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 528 B

View file

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 510 B

View file

Before

Width:  |  Height:  |  Size: 813 B

After

Width:  |  Height:  |  Size: 813 B

View file

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 521 B

View file

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 599 B

View file

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 581 B

View file

Before

Width:  |  Height:  |  Size: 788 B

After

Width:  |  Height:  |  Size: 788 B

View file

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 495 B

View file

Before

Width:  |  Height:  |  Size: 594 B

After

Width:  |  Height:  |  Size: 594 B

View file

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 555 B

View file

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 733 B

View file

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 552 B

View file

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 570 B

View file

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 655 B

View file

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 503 B

View file

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 540 B

View file

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 493 B

View file

Before

Width:  |  Height:  |  Size: 658 B

After

Width:  |  Height:  |  Size: 658 B

View file

Before

Width:  |  Height:  |  Size: 687 B

After

Width:  |  Height:  |  Size: 687 B

View file

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 450 B

View file

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

View file

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 599 B

View file

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 629 B

View file

Before

Width:  |  Height:  |  Size: 684 B

After

Width:  |  Height:  |  Size: 684 B

View file

Before

Width:  |  Height:  |  Size: 515 B

After

Width:  |  Height:  |  Size: 515 B

View file

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 400 B

View file

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 628 B

View file

Before

Width:  |  Height:  |  Size: 835 B

After

Width:  |  Height:  |  Size: 835 B

View file

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 552 B

View file

Before

Width:  |  Height:  |  Size: 507 B

After

Width:  |  Height:  |  Size: 507 B

View file

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 538 B

View file

@ -6,15 +6,15 @@
|File|Flag|Short|Population|Capital|Language|
|----|----|-----|----------|-------|--------|
|[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)|-|-|-|-|
|[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)|-|-|-|-|
|[Barrowmaw](Barrowmaw.md)|![barrowmaw.png](..\Images\barrowmaw.png)|The Undead Wasteland|-|-|-|
|[Batanoka](Batanoka.md)|![batanoka.png](..\Images\batanoka.png)|The Subterranean Sun|-|[Bririe](..\Cities\Bririe.md)|[Edikan](..\Languages\Edikan.md)|
|[Blanchister](Blanchister.md)|![blanchister.png](..\Images\blanchister.png)|-|-|-|-|
|[Calcetron](Calcetron.md)|![calcetron.png](..\Images\calcetron.png)|-|-|-|-|
|[Dahallow](Dahallow.md)|![dahallow.png](..\Images\dahallow.png)|-|-|-|-|
|[Dasona](Dasona.md)|![dasona.png](..\Images\dasona.png)|The Country of Hopes|-|[Crester](..\Cities\Crester.md)|[Edikan](..\Languages\Edikan.md)|
|[Dolfeyja](Dolfeyja.md)|![dolfeyja.png](..\Images\dolfeyja.png)|-|-|-|[Edikan](..\Languages\Edikan.md)|
|[Dratana](Dratana.md)|![dratana.png](..\Images\dratana.png)|-|-|-|-|
|[Drenvale](Drenvale.md)|![drenvale.png](..\Images\drenvale.png)|-|-|-|-|
<!-- SerializedQuery END -->

View file

After

Width:  |  Height:  |  Size: 528 B

View file

After

Width:  |  Height:  |  Size: 510 B

View file

After

Width:  |  Height:  |  Size: 813 B

View file

After

Width:  |  Height:  |  Size: 521 B

View file

After

Width:  |  Height:  |  Size: 599 B

View file

After

Width:  |  Height:  |  Size: 581 B

View file

After

Width:  |  Height:  |  Size: 788 B

View file

After

Width:  |  Height:  |  Size: 495 B

View file

After

Width:  |  Height:  |  Size: 594 B

View file

After

Width:  |  Height:  |  Size: 555 B

View file

After

Width:  |  Height:  |  Size: 733 B

View file

After

Width:  |  Height:  |  Size: 552 B

View file

After

Width:  |  Height:  |  Size: 570 B

View file

After

Width:  |  Height:  |  Size: 655 B

View file

After

Width:  |  Height:  |  Size: 503 B

View file

After

Width:  |  Height:  |  Size: 540 B

View file

After

Width:  |  Height:  |  Size: 493 B

View file

After

Width:  |  Height:  |  Size: 658 B

View file

After

Width:  |  Height:  |  Size: 687 B

View file

After

Width:  |  Height:  |  Size: 450 B

View file

After

Width:  |  Height:  |  Size: 420 B

View file

After

Width:  |  Height:  |  Size: 599 B

View file

After

Width:  |  Height:  |  Size: 629 B

View file

After

Width:  |  Height:  |  Size: 684 B

View file

After

Width:  |  Height:  |  Size: 515 B

View file

After

Width:  |  Height:  |  Size: 400 B

View file

After

Width:  |  Height:  |  Size: 628 B

View file

After

Width:  |  Height:  |  Size: 835 B

View file

After

Width:  |  Height:  |  Size: 552 B

View file

After

Width:  |  Height:  |  Size: 507 B

View file

After

Width:  |  Height:  |  Size: 538 B