diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index 88a5d18..f327a3e 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -188,7 +188,6 @@ "state": { "type": "backlink", "state": { - "file": "Countries/_index.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -205,7 +204,6 @@ "state": { "type": "outgoing-link", "state": { - "file": "Countries/_index.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -228,7 +226,7 @@ "state": { "type": "outline", "state": { - "file": "Countries/_index.md" + "file": "conflict-files-obsidian-git.md" } } }, @@ -245,7 +243,7 @@ } ], "direction": "horizontal", - "width": 354.5 + "width": 695.5 }, "left-ribbon": { "hiddenItems": { @@ -257,49 +255,48 @@ "obsidian-git:Open Git source control": false } }, - "active": "efb1a9199c2e99b6", + "active": "90b57f41c87f2b3b", "lastOpenFiles": [ - "Animals/Slimes/_index.md", + "Countries/_index.md", "conflict-files-obsidian-git.md", + "Images/flags/nonkur.png", + "Images/flags/nasahra.png", + "Images/flags/nakadon.png", + "Images/flags/mortham.png", + "Images/flags/mantine.png", + "Images/flags/llasuki.png", + "Images/flags/lekia.png", + "Images/flags/lavaki.png", + "Images/flags/krakala.png", + "Images/flags/hanoka.png", + "Images/Flags", + "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", + "Animals/Slimes/Untitled.md", + "Animals/Slimes/_index.md", "Animals/Slimes/Ababa Slime.md", - "Images/slimes/ababa/ababa-2.png", - "Images/slimes/ababa/ababa-1.png", "Continents/_index.md", "Animals/_index.md", - "Countries/_index.md", - "Images/slimes/ababa/ababa-4.png", - "Images/slimes/ababa/ababa-3.png", "Images/slimes/ababa", "Images/slimes", "Countries/Barrowmaw.md", "Cities/Bririe.md", "Cities/_index.md", - "Images/flags/batanoka.png", - "Images/flags/barrowmaw.png", - "Animals/Cat.md", "Animals/Slimes", - "Cultures/_index.md", - "Countries/Blanchister.md", - "Animals/Taura.md", - "Animals/Slom.md", - "Animals/Dog.md", - "Languages/Edikan.md", - "Cities/Crester.md", - "Countries/Drenvale.md", - "Countries/Dasona.md", - "Countries/Dolfeyja.md", - "Countries/Dratana.md", - "Countries/Dahallow.md", - "Countries/Calcetron.md", - "Countries/Batanoka.md", - "Cities/Nanera.md", "Languages", - "Images/Flags/vosaka.png", - "Images/Flags/vikogyna.png", - "Images/Flags/vanatn.png", - "Images/Flags/soljord.png", - "Images/Flags", - "Images/Flags", "Images", "Regions", "Territories", diff --git a/Edikoyo/Animals/Slimes/Untitled.md b/Edikoyo/Animals/Slimes/Untitled.md new file mode 100644 index 0000000..e69de29 diff --git a/Edikoyo/Countries/Dratana.md b/Edikoyo/Countries/Dratana.md index 5425609..48b5bdf 100644 --- a/Edikoyo/Countries/Dratana.md +++ b/Edikoyo/Countries/Dratana.md @@ -1,6 +1,6 @@ --- short: flag: "![[dratana.png]]" -language: capital: +language: --- diff --git a/Edikoyo/Countries/Faelani.md b/Edikoyo/Countries/Faelani.md new file mode 100644 index 0000000..f2ca905 --- /dev/null +++ b/Edikoyo/Countries/Faelani.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[faelani.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Falaka.md b/Edikoyo/Countries/Falaka.md new file mode 100644 index 0000000..0e21935 --- /dev/null +++ b/Edikoyo/Countries/Falaka.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[falaka.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Felmyr.md b/Edikoyo/Countries/Felmyr.md new file mode 100644 index 0000000..98f5def --- /dev/null +++ b/Edikoyo/Countries/Felmyr.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[felmyr.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Gokolm.md b/Edikoyo/Countries/Gokolm.md new file mode 100644 index 0000000..196a961 --- /dev/null +++ b/Edikoyo/Countries/Gokolm.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[gokolm.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Gudoko.md b/Edikoyo/Countries/Gudoko.md new file mode 100644 index 0000000..d484183 --- /dev/null +++ b/Edikoyo/Countries/Gudoko.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[gudoko.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Hanoka.md b/Edikoyo/Countries/Hanoka.md new file mode 100644 index 0000000..26df8d5 --- /dev/null +++ b/Edikoyo/Countries/Hanoka.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[hanoka.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Krakala.md b/Edikoyo/Countries/Krakala.md new file mode 100644 index 0000000..0d80e36 --- /dev/null +++ b/Edikoyo/Countries/Krakala.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[krakala.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Lavaki.md b/Edikoyo/Countries/Lavaki.md new file mode 100644 index 0000000..04f82a5 --- /dev/null +++ b/Edikoyo/Countries/Lavaki.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[lavaki.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Lekia.md b/Edikoyo/Countries/Lekia.md new file mode 100644 index 0000000..596085d --- /dev/null +++ b/Edikoyo/Countries/Lekia.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[lekia.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Llasuki.md b/Edikoyo/Countries/Llasuki.md new file mode 100644 index 0000000..b237bf4 --- /dev/null +++ b/Edikoyo/Countries/Llasuki.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[llasuki.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Mantine.md b/Edikoyo/Countries/Mantine.md new file mode 100644 index 0000000..b92d14f --- /dev/null +++ b/Edikoyo/Countries/Mantine.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[mantine.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Mortham.md b/Edikoyo/Countries/Mortham.md new file mode 100644 index 0000000..d0fd250 --- /dev/null +++ b/Edikoyo/Countries/Mortham.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[mortham.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Nakadon.md b/Edikoyo/Countries/Nakadon.md new file mode 100644 index 0000000..5f02435 --- /dev/null +++ b/Edikoyo/Countries/Nakadon.md @@ -0,0 +1,6 @@ +--- +short: +flag: "![[nakadon.png]]" +capital: +language: +--- diff --git a/Edikoyo/Countries/Nasahra.md b/Edikoyo/Countries/Nasahra.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Nasahra.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Nonkur.md b/Edikoyo/Countries/Nonkur.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Nonkur.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Oshela.md b/Edikoyo/Countries/Oshela.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Oshela.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Ovanos.md b/Edikoyo/Countries/Ovanos.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Ovanos.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Seraphis.md b/Edikoyo/Countries/Seraphis.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Seraphis.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Soljord.md b/Edikoyo/Countries/Soljord.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Soljord.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Vanatn.md b/Edikoyo/Countries/Vanatn.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Vanatn.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Vikogyna.md b/Edikoyo/Countries/Vikogyna.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Vikogyna.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/Vosaka.md b/Edikoyo/Countries/Vosaka.md new file mode 100644 index 0000000..f635395 --- /dev/null +++ b/Edikoyo/Countries/Vosaka.md @@ -0,0 +1,6 @@ +--- +short: +flag: +capital: +language: +--- diff --git a/Edikoyo/Countries/_index.md b/Edikoyo/Countries/_index.md index e94947e..d739db4 100644 --- a/Edikoyo/Countries/_index.md +++ b/Edikoyo/Countries/_index.md @@ -12,6 +12,28 @@ | [[Dolfeyja]] | ![[dolfeyja.png]] | \- | \- | \- | [[Edikan]] | | [[Dratana]] | ![[dratana.png]] | \- | \- | \- | \- | | [[Drenvale]] | ![[drenvale.png]] | \- | \- | \- | \- | +| [[Faelani]] | \- | \- | \- | \- | \- | +| [[Falaka]] | \- | \- | \- | \- | \- | +| [[Felmyr]] | \- | \- | \- | \- | \- | +| [[Gokolm]] | \- | \- | \- | \- | \- | +| [[Gudoko]] | \- | \- | \- | \- | \- | +| [[Hanoka]] | \- | \- | \- | \- | \- | +| [[Krakala]] | \- | \- | \- | \- | \- | +| [[Lavaki]] | \- | \- | \- | \- | \- | +| [[Lekia]] | \- | \- | \- | \- | \- | +| [[Llasuki]] | \- | \- | \- | \- | \- | +| [[Mantine]] | \- | \- | \- | \- | \- | +| [[Mortham]] | \- | \- | \- | \- | \- | +| [[Nakadon]] | \- | \- | \- | \- | \- | +| [[Nasahra]] | \- | \- | \- | \- | \- | +| [[Nonkur]] | \- | \- | \- | \- | \- | +| [[Oshela]] | \- | \- | \- | \- | \- | +| [[Ovanos]] | \- | \- | \- | \- | \- | +| [[Seraphis]] | \- | \- | \- | \- | \- | +| [[Soljord]] | \- | \- | \- | \- | \- | +| [[Vanatn]] | \- | \- | \- | \- | \- | +| [[Vikogyna]] | \- | \- | \- | \- | \- | +| [[Vosaka]] | \- | \- | \- | \- | \- | \ No newline at end of file diff --git a/Edikoyo/Images/flags/barrowmaw.png b/Edikoyo/Images/Flags/barrowmaw.png similarity index 100% rename from Edikoyo/Images/flags/barrowmaw.png rename to Edikoyo/Images/Flags/barrowmaw.png diff --git a/Edikoyo/Images/flags/batanoka.png b/Edikoyo/Images/Flags/batanoka.png similarity index 100% rename from Edikoyo/Images/flags/batanoka.png rename to Edikoyo/Images/Flags/batanoka.png diff --git a/Edikoyo/Images/flags/blanchister.png b/Edikoyo/Images/Flags/blanchister.png similarity index 100% rename from Edikoyo/Images/flags/blanchister.png rename to Edikoyo/Images/Flags/blanchister.png diff --git a/Edikoyo/Images/flags/calcetron.png b/Edikoyo/Images/Flags/calcetron.png similarity index 100% rename from Edikoyo/Images/flags/calcetron.png rename to Edikoyo/Images/Flags/calcetron.png diff --git a/Edikoyo/Images/flags/dahallow.png b/Edikoyo/Images/Flags/dahallow.png similarity index 100% rename from Edikoyo/Images/flags/dahallow.png rename to Edikoyo/Images/Flags/dahallow.png diff --git a/Edikoyo/Images/flags/dasona.png b/Edikoyo/Images/Flags/dasona.png similarity index 100% rename from Edikoyo/Images/flags/dasona.png rename to Edikoyo/Images/Flags/dasona.png diff --git a/Edikoyo/Images/flags/dolfeyja.png b/Edikoyo/Images/Flags/dolfeyja.png similarity index 100% rename from Edikoyo/Images/flags/dolfeyja.png rename to Edikoyo/Images/Flags/dolfeyja.png diff --git a/Edikoyo/Images/flags/dratana.png b/Edikoyo/Images/Flags/dratana.png similarity index 100% rename from Edikoyo/Images/flags/dratana.png rename to Edikoyo/Images/Flags/dratana.png diff --git a/Edikoyo/Images/flags/drenvale.png b/Edikoyo/Images/Flags/drenvale.png similarity index 100% rename from Edikoyo/Images/flags/drenvale.png rename to Edikoyo/Images/Flags/drenvale.png diff --git a/Edikoyo/Images/flags/faelani.png b/Edikoyo/Images/Flags/faelani.png similarity index 100% rename from Edikoyo/Images/flags/faelani.png rename to Edikoyo/Images/Flags/faelani.png diff --git a/Edikoyo/Images/flags/falaka.png b/Edikoyo/Images/Flags/falaka.png similarity index 100% rename from Edikoyo/Images/flags/falaka.png rename to Edikoyo/Images/Flags/falaka.png diff --git a/Edikoyo/Images/flags/felmyr.png b/Edikoyo/Images/Flags/felmyr.png similarity index 100% rename from Edikoyo/Images/flags/felmyr.png rename to Edikoyo/Images/Flags/felmyr.png diff --git a/Edikoyo/Images/flags/gokolm.png b/Edikoyo/Images/Flags/gokolm.png similarity index 100% rename from Edikoyo/Images/flags/gokolm.png rename to Edikoyo/Images/Flags/gokolm.png diff --git a/Edikoyo/Images/flags/gudoko.png b/Edikoyo/Images/Flags/gudoko.png similarity index 100% rename from Edikoyo/Images/flags/gudoko.png rename to Edikoyo/Images/Flags/gudoko.png diff --git a/Edikoyo/Images/flags/hanoka.png b/Edikoyo/Images/Flags/hanoka.png similarity index 100% rename from Edikoyo/Images/flags/hanoka.png rename to Edikoyo/Images/Flags/hanoka.png diff --git a/Edikoyo/Images/flags/krakala.png b/Edikoyo/Images/Flags/krakala.png similarity index 100% rename from Edikoyo/Images/flags/krakala.png rename to Edikoyo/Images/Flags/krakala.png diff --git a/Edikoyo/Images/flags/lavaki.png b/Edikoyo/Images/Flags/lavaki.png similarity index 100% rename from Edikoyo/Images/flags/lavaki.png rename to Edikoyo/Images/Flags/lavaki.png diff --git a/Edikoyo/Images/flags/lekia.png b/Edikoyo/Images/Flags/lekia.png similarity index 100% rename from Edikoyo/Images/flags/lekia.png rename to Edikoyo/Images/Flags/lekia.png diff --git a/Edikoyo/Images/flags/llasuki.png b/Edikoyo/Images/Flags/llasuki.png similarity index 100% rename from Edikoyo/Images/flags/llasuki.png rename to Edikoyo/Images/Flags/llasuki.png diff --git a/Edikoyo/Images/flags/mantine.png b/Edikoyo/Images/Flags/mantine.png similarity index 100% rename from Edikoyo/Images/flags/mantine.png rename to Edikoyo/Images/Flags/mantine.png diff --git a/Edikoyo/Images/flags/mortham.png b/Edikoyo/Images/Flags/mortham.png similarity index 100% rename from Edikoyo/Images/flags/mortham.png rename to Edikoyo/Images/Flags/mortham.png diff --git a/Edikoyo/Images/flags/nakadon.png b/Edikoyo/Images/Flags/nakadon.png similarity index 100% rename from Edikoyo/Images/flags/nakadon.png rename to Edikoyo/Images/Flags/nakadon.png diff --git a/Edikoyo/Images/flags/nasahra.png b/Edikoyo/Images/Flags/nasahra.png similarity index 100% rename from Edikoyo/Images/flags/nasahra.png rename to Edikoyo/Images/Flags/nasahra.png diff --git a/Edikoyo/Images/flags/nonkur.png b/Edikoyo/Images/Flags/nonkur.png similarity index 100% rename from Edikoyo/Images/flags/nonkur.png rename to Edikoyo/Images/Flags/nonkur.png diff --git a/Edikoyo/Images/flags/oshela.png b/Edikoyo/Images/Flags/oshela.png similarity index 100% rename from Edikoyo/Images/flags/oshela.png rename to Edikoyo/Images/Flags/oshela.png diff --git a/Edikoyo/Images/flags/ovanos.png b/Edikoyo/Images/Flags/ovanos.png similarity index 100% rename from Edikoyo/Images/flags/ovanos.png rename to Edikoyo/Images/Flags/ovanos.png diff --git a/Edikoyo/Images/flags/seraphis.png b/Edikoyo/Images/Flags/seraphis.png similarity index 100% rename from Edikoyo/Images/flags/seraphis.png rename to Edikoyo/Images/Flags/seraphis.png diff --git a/Edikoyo/Images/flags/soljord.png b/Edikoyo/Images/Flags/soljord.png similarity index 100% rename from Edikoyo/Images/flags/soljord.png rename to Edikoyo/Images/Flags/soljord.png diff --git a/Edikoyo/Images/flags/vanatn.png b/Edikoyo/Images/Flags/vanatn.png similarity index 100% rename from Edikoyo/Images/flags/vanatn.png rename to Edikoyo/Images/Flags/vanatn.png diff --git a/Edikoyo/Images/flags/vikogyna.png b/Edikoyo/Images/Flags/vikogyna.png similarity index 100% rename from Edikoyo/Images/flags/vikogyna.png rename to Edikoyo/Images/Flags/vikogyna.png diff --git a/Edikoyo/Images/flags/vosaka.png b/Edikoyo/Images/Flags/vosaka.png similarity index 100% rename from Edikoyo/Images/flags/vosaka.png rename to Edikoyo/Images/Flags/vosaka.png diff --git a/Edikoyo/People/_index.md b/Edikoyo/People/_index.md new file mode 100644 index 0000000..e69de29 diff --git a/content/Animals/Slimes/Untitled.md b/content/Animals/Slimes/Untitled.md new file mode 100644 index 0000000..8a8a7b6 --- /dev/null +++ b/content/Animals/Slimes/Untitled.md @@ -0,0 +1,4 @@ +--- +--- + + diff --git a/content/Countries/Dratana.md b/content/Countries/Dratana.md index 3e08e5a..27df267 100644 --- a/content/Countries/Dratana.md +++ b/content/Countries/Dratana.md @@ -1,8 +1,8 @@ --- short: null flag: '![[dratana.png]]' -language: null capital: null +language: null --- diff --git a/content/Countries/Faelani.md b/content/Countries/Faelani.md new file mode 100644 index 0000000..95c66e1 --- /dev/null +++ b/content/Countries/Faelani.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[faelani.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Falaka.md b/content/Countries/Falaka.md new file mode 100644 index 0000000..968ef6a --- /dev/null +++ b/content/Countries/Falaka.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[falaka.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Felmyr.md b/content/Countries/Felmyr.md new file mode 100644 index 0000000..fddde89 --- /dev/null +++ b/content/Countries/Felmyr.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[felmyr.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Gokolm.md b/content/Countries/Gokolm.md new file mode 100644 index 0000000..ec264ab --- /dev/null +++ b/content/Countries/Gokolm.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[gokolm.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Gudoko.md b/content/Countries/Gudoko.md new file mode 100644 index 0000000..523276b --- /dev/null +++ b/content/Countries/Gudoko.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[gudoko.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Hanoka.md b/content/Countries/Hanoka.md new file mode 100644 index 0000000..cfa8f95 --- /dev/null +++ b/content/Countries/Hanoka.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[hanoka.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Krakala.md b/content/Countries/Krakala.md new file mode 100644 index 0000000..4b7b387 --- /dev/null +++ b/content/Countries/Krakala.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[krakala.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Lavaki.md b/content/Countries/Lavaki.md new file mode 100644 index 0000000..53fbaf0 --- /dev/null +++ b/content/Countries/Lavaki.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[lavaki.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Lekia.md b/content/Countries/Lekia.md new file mode 100644 index 0000000..017c926 --- /dev/null +++ b/content/Countries/Lekia.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[lekia.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Llasuki.md b/content/Countries/Llasuki.md new file mode 100644 index 0000000..0e7bca9 --- /dev/null +++ b/content/Countries/Llasuki.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[llasuki.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Mantine.md b/content/Countries/Mantine.md new file mode 100644 index 0000000..1a12395 --- /dev/null +++ b/content/Countries/Mantine.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[mantine.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Mortham.md b/content/Countries/Mortham.md new file mode 100644 index 0000000..0bed378 --- /dev/null +++ b/content/Countries/Mortham.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[mortham.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Nakadon.md b/content/Countries/Nakadon.md new file mode 100644 index 0000000..488a8bf --- /dev/null +++ b/content/Countries/Nakadon.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[nakadon.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Nasahra.md b/content/Countries/Nasahra.md new file mode 100644 index 0000000..1d7f143 --- /dev/null +++ b/content/Countries/Nasahra.md @@ -0,0 +1,8 @@ +--- +short: null +flag: '![[nasahra.png]]' +capital: null +language: null +--- + + diff --git a/content/Countries/Nonkur.md b/content/Countries/Nonkur.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Nonkur.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Oshela.md b/content/Countries/Oshela.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Oshela.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Ovanos.md b/content/Countries/Ovanos.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Ovanos.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Seraphis.md b/content/Countries/Seraphis.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Seraphis.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Soljord.md b/content/Countries/Soljord.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Soljord.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Vanatn.md b/content/Countries/Vanatn.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Vanatn.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Vikogyna.md b/content/Countries/Vikogyna.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Vikogyna.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/Vosaka.md b/content/Countries/Vosaka.md new file mode 100644 index 0000000..7343529 --- /dev/null +++ b/content/Countries/Vosaka.md @@ -0,0 +1,8 @@ +--- +short: null +flag: null +capital: null +language: null +--- + + diff --git a/content/Countries/_index.md b/content/Countries/_index.md index 7552aa9..0ffb936 100644 --- a/content/Countries/_index.md +++ b/content/Countries/_index.md @@ -15,6 +15,28 @@ |[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)|-|-|-|-|-| +|[Falaka](Falaka.md)|-|-|-|-|-| +|[Felmyr](Felmyr.md)|-|-|-|-|-| +|[Gokolm](Gokolm.md)|-|-|-|-|-| +|[Gudoko](Gudoko.md)|-|-|-|-|-| +|[Hanoka](Hanoka.md)|-|-|-|-|-| +|[Krakala](Krakala.md)|-|-|-|-|-| +|[Lavaki](Lavaki.md)|-|-|-|-|-| +|[Lekia](Lekia.md)|-|-|-|-|-| +|[Llasuki](Llasuki.md)|-|-|-|-|-| +|[Mantine](Mantine.md)|-|-|-|-|-| +|[Mortham](Mortham.md)|-|-|-|-|-| +|[Nakadon](Nakadon.md)|-|-|-|-|-| +|[Nasahra](Nasahra.md)|-|-|-|-|-| +|[Nonkur](Nonkur.md)|-|-|-|-|-| +|[Oshela](Oshela.md)|-|-|-|-|-| +|[Ovanos](Ovanos.md)|-|-|-|-|-| +|[Seraphis](Seraphis.md)|-|-|-|-|-| +|[Soljord](Soljord.md)|-|-|-|-|-| +|[Vanatn](Vanatn.md)|-|-|-|-|-| +|[Vikogyna](Vikogyna.md)|-|-|-|-|-| +|[Vosaka](Vosaka.md)|-|-|-|-|-| diff --git a/content/Images/flags/barrowmaw.png b/content/Images/Flags/barrowmaw.png similarity index 100% rename from content/Images/flags/barrowmaw.png rename to content/Images/Flags/barrowmaw.png diff --git a/content/Images/flags/batanoka.png b/content/Images/Flags/batanoka.png similarity index 100% rename from content/Images/flags/batanoka.png rename to content/Images/Flags/batanoka.png diff --git a/content/Images/flags/blanchister.png b/content/Images/Flags/blanchister.png similarity index 100% rename from content/Images/flags/blanchister.png rename to content/Images/Flags/blanchister.png diff --git a/content/Images/flags/calcetron.png b/content/Images/Flags/calcetron.png similarity index 100% rename from content/Images/flags/calcetron.png rename to content/Images/Flags/calcetron.png diff --git a/content/Images/flags/dahallow.png b/content/Images/Flags/dahallow.png similarity index 100% rename from content/Images/flags/dahallow.png rename to content/Images/Flags/dahallow.png diff --git a/content/Images/flags/dasona.png b/content/Images/Flags/dasona.png similarity index 100% rename from content/Images/flags/dasona.png rename to content/Images/Flags/dasona.png diff --git a/content/Images/flags/dolfeyja.png b/content/Images/Flags/dolfeyja.png similarity index 100% rename from content/Images/flags/dolfeyja.png rename to content/Images/Flags/dolfeyja.png diff --git a/content/Images/flags/dratana.png b/content/Images/Flags/dratana.png similarity index 100% rename from content/Images/flags/dratana.png rename to content/Images/Flags/dratana.png diff --git a/content/Images/flags/drenvale.png b/content/Images/Flags/drenvale.png similarity index 100% rename from content/Images/flags/drenvale.png rename to content/Images/Flags/drenvale.png diff --git a/content/Images/flags/faelani.png b/content/Images/Flags/faelani.png similarity index 100% rename from content/Images/flags/faelani.png rename to content/Images/Flags/faelani.png diff --git a/content/Images/flags/falaka.png b/content/Images/Flags/falaka.png similarity index 100% rename from content/Images/flags/falaka.png rename to content/Images/Flags/falaka.png diff --git a/content/Images/flags/felmyr.png b/content/Images/Flags/felmyr.png similarity index 100% rename from content/Images/flags/felmyr.png rename to content/Images/Flags/felmyr.png diff --git a/content/Images/flags/gokolm.png b/content/Images/Flags/gokolm.png similarity index 100% rename from content/Images/flags/gokolm.png rename to content/Images/Flags/gokolm.png diff --git a/content/Images/flags/gudoko.png b/content/Images/Flags/gudoko.png similarity index 100% rename from content/Images/flags/gudoko.png rename to content/Images/Flags/gudoko.png diff --git a/content/Images/flags/hanoka.png b/content/Images/Flags/hanoka.png similarity index 100% rename from content/Images/flags/hanoka.png rename to content/Images/Flags/hanoka.png diff --git a/content/Images/flags/krakala.png b/content/Images/Flags/krakala.png similarity index 100% rename from content/Images/flags/krakala.png rename to content/Images/Flags/krakala.png diff --git a/content/Images/flags/lavaki.png b/content/Images/Flags/lavaki.png similarity index 100% rename from content/Images/flags/lavaki.png rename to content/Images/Flags/lavaki.png diff --git a/content/Images/flags/lekia.png b/content/Images/Flags/lekia.png similarity index 100% rename from content/Images/flags/lekia.png rename to content/Images/Flags/lekia.png diff --git a/content/Images/flags/llasuki.png b/content/Images/Flags/llasuki.png similarity index 100% rename from content/Images/flags/llasuki.png rename to content/Images/Flags/llasuki.png diff --git a/content/Images/flags/mantine.png b/content/Images/Flags/mantine.png similarity index 100% rename from content/Images/flags/mantine.png rename to content/Images/Flags/mantine.png diff --git a/content/Images/flags/mortham.png b/content/Images/Flags/mortham.png similarity index 100% rename from content/Images/flags/mortham.png rename to content/Images/Flags/mortham.png diff --git a/content/Images/flags/nakadon.png b/content/Images/Flags/nakadon.png similarity index 100% rename from content/Images/flags/nakadon.png rename to content/Images/Flags/nakadon.png diff --git a/content/Images/flags/nasahra.png b/content/Images/Flags/nasahra.png similarity index 100% rename from content/Images/flags/nasahra.png rename to content/Images/Flags/nasahra.png diff --git a/content/Images/flags/nonkur.png b/content/Images/Flags/nonkur.png similarity index 100% rename from content/Images/flags/nonkur.png rename to content/Images/Flags/nonkur.png diff --git a/content/Images/flags/oshela.png b/content/Images/Flags/oshela.png similarity index 100% rename from content/Images/flags/oshela.png rename to content/Images/Flags/oshela.png diff --git a/content/Images/flags/ovanos.png b/content/Images/Flags/ovanos.png similarity index 100% rename from content/Images/flags/ovanos.png rename to content/Images/Flags/ovanos.png diff --git a/content/Images/flags/seraphis.png b/content/Images/Flags/seraphis.png similarity index 100% rename from content/Images/flags/seraphis.png rename to content/Images/Flags/seraphis.png diff --git a/content/Images/flags/soljord.png b/content/Images/Flags/soljord.png similarity index 100% rename from content/Images/flags/soljord.png rename to content/Images/Flags/soljord.png diff --git a/content/Images/flags/vanatn.png b/content/Images/Flags/vanatn.png similarity index 100% rename from content/Images/flags/vanatn.png rename to content/Images/Flags/vanatn.png diff --git a/content/Images/flags/vikogyna.png b/content/Images/Flags/vikogyna.png similarity index 100% rename from content/Images/flags/vikogyna.png rename to content/Images/Flags/vikogyna.png diff --git a/content/Images/flags/vosaka.png b/content/Images/Flags/vosaka.png similarity index 100% rename from content/Images/flags/vosaka.png rename to content/Images/Flags/vosaka.png diff --git a/content/People/_index.md b/content/People/_index.md new file mode 100644 index 0000000..8a8a7b6 --- /dev/null +++ b/content/People/_index.md @@ -0,0 +1,4 @@ +--- +--- + + 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 -````