diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index dba80ba..88a5d18 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -6,33 +6,39 @@ { "id": "16de56932df8d2b5", "type": "tabs", + "dimension": 16.366612111292962, "children": [ { - "id": "f84169dad44b3808", + "id": "65374afab15971d2", + "type": "leaf", + "state": { + "type": "image", + "state": { + "file": "Images/slimes/ababa/ababa-1.png" + } + } + } + ] + }, + { + "id": "a776313f551069bd", + "type": "tabs", + "dimension": 83.63338788870703, + "children": [ + { + "id": "c400fd62d021c702", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "Countries/Blanchister.md", + "file": "Animals/Slimes/Ababa Slime.md", "mode": "source", - "source": false + "source": true } } }, { - "id": "987a006f259c3c08", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Countries/Dasona.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "afb42427bcca10d5", + "id": "d186fdb7d8783998", "type": "leaf", "state": { "type": "markdown", @@ -44,18 +50,19 @@ } }, { - "id": "012199ac4431105d", + "id": "3828af17ae2bbb6a", "type": "leaf", "state": { - "type": "diff-view", + "type": "markdown", "state": { - "file": "Edikoyo/.obsidian/workspace.json", - "staged": false + "file": "Countries/_index.md", + "mode": "source", + "source": false } } }, { - "id": "832f0e22f10664bb", + "id": "cd8543c15ea2f09f", "type": "leaf", "state": { "type": "markdown", @@ -65,9 +72,57 @@ "source": false } } + }, + { + "id": "6ad99838c94a15dd", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "Animals/Slimes/Ababa Slime.md", + "mode": "source", + "source": false + } + } + }, + { + "id": "a289d6327d739306", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "Animals/Slimes/_index.md", + "mode": "source", + "source": false + } + } + }, + { + "id": "b704e930ac81712d", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "Animals/Slimes/Ababa Slime.md", + "mode": "preview", + "source": false + } + } + }, + { + "id": "efb1a9199c2e99b6", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "Countries/_index.md", + "mode": "preview", + "source": false + } + } } ], - "currentTab": 4 + "currentTab": 7 } ], "direction": "vertical" @@ -133,7 +188,7 @@ "state": { "type": "backlink", "state": { - "file": "Animals/Slimes/_index.md", + "file": "Countries/_index.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -150,7 +205,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "Animals/Slimes/_index.md", + "file": "Countries/_index.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -173,7 +228,7 @@ "state": { "type": "outline", "state": { - "file": "Animals/Slimes/_index.md" + "file": "Countries/_index.md" } } }, @@ -190,7 +245,7 @@ } ], "direction": "horizontal", - "width": 603.5 + "width": 354.5 }, "left-ribbon": { "hiddenItems": { @@ -202,26 +257,34 @@ "obsidian-git:Open Git source control": false } }, - "active": "832f0e22f10664bb", + "active": "efb1a9199c2e99b6", "lastOpenFiles": [ - "Animals/Slimes/Ababa Slime.md", - "Countries/_index.md", "Animals/Slimes/_index.md", "conflict-files-obsidian-git.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", - "Continents/_index.md", - "Cities/_index.md", - "Countries/Barrowmaw.md", "Animals/Taura.md", "Animals/Slom.md", "Animals/Dog.md", "Languages/Edikan.md", "Cities/Crester.md", - "Cities/Bririe.md", "Countries/Drenvale.md", "Countries/Dasona.md", "Countries/Dolfeyja.md", @@ -230,25 +293,16 @@ "Countries/Calcetron.md", "Countries/Batanoka.md", "Cities/Nanera.md", - "Languages/_index.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/Flags", "Images/Flags", "Images", "Regions", "Territories", - "Provinces", - "Plants", - "Continents" + "Provinces" ] } \ No newline at end of file diff --git a/Edikoyo/Animals/Slimes/Ababa Slime.md b/Edikoyo/Animals/Slimes/Ababa Slime.md index 71222ab..69e9257 100644 --- a/Edikoyo/Animals/Slimes/Ababa Slime.md +++ b/Edikoyo/Animals/Slimes/Ababa Slime.md @@ -1,8 +1,18 @@ +--- +art_variant1: "![[ababa-1.png]]" +art_variant2: "![[ababa-2.png]]" +art_variant3: "![[ababa-3.png]]" +art_golden: "![[ababa-4.png]]" +country_variant1: "[[Batanoka]]" +country_variant2: Faelani +country_variant3: "[[Barrowmaw]]" +--- + # On the Ababa Slime Instances of the “Ababa” Slime are found within many historical scripts from many different cultures.  -Even before the formation of ![](https://lh7-rt.googleusercontent.com/docsz/AD_4nXdjzFW2lbntnHCw2cGLDKSU1vvxhFzzlg8JP-1zE7QLBO6lBrQ02OB_eBYCzMf86-rk1BsOck-77cLBrD5beoEz6TqXwgiXPmVh1ThUrq4HRk8hM2rt6__IoiLLAgtDy1N98qvRDpLGW9L_bWeGLcVwoME?key=bnI7Woon4tEfL42TRpP0aQ)Dasona, pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/.  +Even before the formation of [[Dasona]], pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/.  Some researchers argue that the origin of the Slime itself is so ancient that its naming has maintained itself through time, reaching us today. Some theories behind the etymology of “Ababa” explain that most probably, Ababa is a way of phonetically depicting the creature’s shape. Rapidly opening and closing the mouth, depicting the wavy shape. diff --git a/Edikoyo/Animals/Slimes/_index.md b/Edikoyo/Animals/Slimes/_index.md index 086568b..6c4779a 100644 --- a/Edikoyo/Animals/Slimes/_index.md +++ b/Edikoyo/Animals/Slimes/_index.md @@ -1,3 +1,11 @@ -[[Ababa Slime]] + + + + +| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant | Country Variant 1 | Country Variant 2 | Country Variant 3 | +| ---------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ----------------------------------- | ----------------- | ------------------------------------- | +| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | ![[ababa-4.png]] | [[Batanoka]] | Faelani | [[Barrowmaw]] | + + diff --git a/Edikoyo/Images/slimes/ababa/ababa-1.png b/Edikoyo/Images/slimes/ababa/ababa-1.png new file mode 100644 index 0000000..9790b72 Binary files /dev/null and b/Edikoyo/Images/slimes/ababa/ababa-1.png differ diff --git a/Edikoyo/Images/slimes/ababa/ababa-2.png b/Edikoyo/Images/slimes/ababa/ababa-2.png new file mode 100644 index 0000000..09b5344 Binary files /dev/null and b/Edikoyo/Images/slimes/ababa/ababa-2.png differ diff --git a/Edikoyo/Images/slimes/ababa/ababa-3.png b/Edikoyo/Images/slimes/ababa/ababa-3.png new file mode 100644 index 0000000..d489d99 Binary files /dev/null and b/Edikoyo/Images/slimes/ababa/ababa-3.png differ diff --git a/Edikoyo/Images/slimes/ababa/ababa-4.png b/Edikoyo/Images/slimes/ababa/ababa-4.png new file mode 100644 index 0000000..886ef55 Binary files /dev/null and b/Edikoyo/Images/slimes/ababa/ababa-4.png differ diff --git a/content/Animals/Slimes/Ababa Slime.md b/content/Animals/Slimes/Ababa Slime.md index 7c44835..963979c 100644 --- a/content/Animals/Slimes/Ababa Slime.md +++ b/content/Animals/Slimes/Ababa Slime.md @@ -5,7 +5,7 @@ Instances of the “Ababa” Slime are found within many historical scripts from many different cultures.  -Even before the formation of ![](https://lh7-rt.googleusercontent.com/docsz/AD_4nXdjzFW2lbntnHCw2cGLDKSU1vvxhFzzlg8JP-1zE7QLBO6lBrQ02OB_eBYCzMf86-rk1BsOck-77cLBrD5beoEz6TqXwgiXPmVh1ThUrq4HRk8hM2rt6__IoiLLAgtDy1N98qvRDpLGW9L_bWeGLcVwoME?key=bnI7Woon4tEfL42TRpP0aQ)Dasona, pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/.  +Even before the formation of [Dasona](..\..\Countries\Dasona.md), pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/.  Some researchers argue that the origin of the Slime itself is so ancient that its naming has maintained itself through time, reaching us today. Some theories behind the etymology of “Ababa” explain that most probably, Ababa is a way of phonetically depicting the creature’s shape. Rapidly opening and closing the mouth, depicting the wavy shape. diff --git a/content/Animals/Slimes/_index.md b/content/Animals/Slimes/_index.md index 88d6863..75784f0 100644 --- a/content/Animals/Slimes/_index.md +++ b/content/Animals/Slimes/_index.md @@ -1,4 +1,4 @@ --- --- -Ababa Slime +[Ababa Slime](Ababa%20Slime.md) diff --git a/content/conflict-files-obsidian-git.md b/content/conflict-files-obsidian-git.md new file mode 100644 index 0000000..f44af68 --- /dev/null +++ b/content/conflict-files-obsidian-git.md @@ -0,0 +1,22 @@ +--- +--- + +# 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 +````