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
45 changed files with 89 additions and 39 deletions
Showing only changes of commit 10a719082b - Show all commits

11
Edikoyo/.obsidian/types.json vendored Normal file
View file

@ -0,0 +1,11 @@
{
"types": {
"aliases": "aliases",
"cssclasses": "multitext",
"tags": "tags",
"art_variant1": "multitext",
"art_variant2": "multitext",
"art_variant3": "multitext",
"art_golden": "text"
}
}

View file

@ -6,7 +6,7 @@
{ {
"id": "16de56932df8d2b5", "id": "16de56932df8d2b5",
"type": "tabs", "type": "tabs",
"dimension": 16.366612111292962, "dimension": 77.27272727272727,
"children": [ "children": [
{ {
"id": "65374afab15971d2", "id": "65374afab15971d2",
@ -19,13 +19,49 @@
"source": false "source": false
} }
} }
},
{
"id": "9bba1e7f22a41622",
"type": "leaf",
"state": {
"type": "diff-view",
"state": {
"file": "content/Animals/Slimes/_index.md",
"staged": true
}
}
},
{
"id": "f61093bc90ac3a19",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "source",
"source": false
}
}
},
{
"id": "b57aab6642ed017d",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "source",
"source": false
}
}
} }
] ],
"currentTab": 3
}, },
{ {
"id": "a776313f551069bd", "id": "a776313f551069bd",
"type": "tabs", "type": "tabs",
"dimension": 83.63338788870703, "dimension": 22.727272727272727,
"children": [ "children": [
{ {
"id": "c400fd62d021c702", "id": "c400fd62d021c702",
@ -235,7 +271,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Countries/_index.md", "file": "Animals/Slimes/Ababa Slime.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -252,7 +288,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Countries/_index.md", "file": "Animals/Slimes/Ababa Slime.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -275,7 +311,7 @@
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {
"file": "Countries/_index.md" "file": "Animals/Slimes/Ababa Slime.md"
} }
} }
}, },
@ -292,7 +328,7 @@
} }
], ],
"direction": "horizontal", "direction": "horizontal",
"width": 695.5 "width": 523.5
}, },
"left-ribbon": { "left-ribbon": {
"hiddenItems": { "hiddenItems": {
@ -304,23 +340,30 @@
"obsidian-git:Open Git source control": false "obsidian-git:Open Git source control": false
} }
}, },
"active": "65374afab15971d2", "active": "b57aab6642ed017d",
"lastOpenFiles": [ "lastOpenFiles": [
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Untitled.md",
"conflict-files-obsidian-git.md",
"Animals/_index.md",
"Countries/_index.md",
"Images/Slimes/honey-4.png",
"Images/Slimes/honey-3.png",
"Images/Slimes/honey-2.png",
"Images/Slimes/honey-1.png",
"Images/Slimes/godot-4.png",
"Images/Slimes/godot-3.png",
"Images/Slimes/godot-2.png",
"Images/Slimes/godot-1.png",
"Images/Slimes/garden-4.png",
"Images/Slimes/garden-3.png",
"Languages/Mokrixi.md", "Languages/Mokrixi.md",
"Languages/Lacelian.md", "Languages/Lacelian.md",
"Languages/Guo.md", "Languages/Guo.md",
"Languages/Fayahi.md", "Languages/Fayahi.md",
"Images/Slimes/ababa/ababa-4.png",
"Images/Slimes/ababa/ababa-1.png",
"Images/Slimes/ababa/ababa-2.png",
"Images/Slimes/ababa/ababa-3.png",
"Images/Slimes/ababa", "Images/Slimes/ababa",
"Images/Slimes", "Images/Slimes",
"conflict-files-obsidian-git.md",
"Countries/_index.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Untitled.md",
"Countries/Faelani.md", "Countries/Faelani.md",
"Countries/Dolfeyja.md", "Countries/Dolfeyja.md",
"Countries/Felmyr.md", "Countries/Felmyr.md",
@ -331,12 +374,6 @@
"Countries/Seraphis.md", "Countries/Seraphis.md",
"Countries/Ovanos.md", "Countries/Ovanos.md",
"Countries/Oshela.md", "Countries/Oshela.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", "Images/Flags",
"Countries/Nonkur.md", "Countries/Nonkur.md",
"Countries/Nasahra.md", "Countries/Nasahra.md",
@ -344,7 +381,6 @@
"Countries/Mortham.md", "Countries/Mortham.md",
"Countries/Mantine.md", "Countries/Mantine.md",
"Countries/Llasuki.md", "Countries/Llasuki.md",
"Countries/Lekia.md",
"Images/slimes/ababa", "Images/slimes/ababa",
"Images/slimes", "Images/slimes",
"Animals/Slimes", "Animals/Slimes",

View file

@ -1,11 +1,17 @@
--- ---
art_variant1: "![[ababa-1.png]]" art_variant1:
art_variant2: "![[ababa-2.png]]" - "![[ababa-1.png]]"
art_variant3: "![[ababa-3.png]]" - "[[Batanoka]]"
art_variant2:
- "![[ababa-2.png]]"
- "[[Faelani]]"
art_variant3:
- "![[ababa-3.png]]"
- "[[Barrowmaw]]"
art_golden: "![[ababa-4.png]]" art_golden: "![[ababa-4.png]]"
country_variant1: "[[Batanoka]]" country_variant1: "[[Batanoka]]"
country_variant2: "[[Faelani]]" country_variant2:
country_variant3: "[[Barrowmaw]]" country_variant3:
--- ---
# On the Ababa Slime # On the Ababa Slime

View file

@ -1,12 +1,9 @@
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant", country_variant1 as "Country Variant 1", country_variant2 as "Country Variant 2", country_variant3 as "Country Variant 3" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant", country_variant1 as "Country Variant 1", country_variant2 as "Country Variant 2", country_variant3 as "Country Variant 3" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> <!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant | Country Variant 1 | Country Variant 2 | Country Variant 3 | | Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant |
| ---------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ----------------------------------- | --------------------------------- | ------------------------------------- | | ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------- |
| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | ![[ababa-4.png]] | [[Batanoka]] | [[Faelani]] | [[Barrowmaw]] | | [[Ababa Slime]] | <ul><li>![[ababa-1.png]]</li><li>[[Batanoka]]</li></ul> | <ul><li>![[ababa-2.png]]</li><li>[[Faelani]]</li></ul> | <ul><li>![[ababa-3.png]]</li><li>[[Barrowmaw]]</li></ul> | ![[ababa-4.png]] |
| [[Animals/Slimes/Untitled.md\|Untitled]] | \- | \- | \- | \- | \- | \- | \- | | [[Animals/Slimes/Untitled.md\|Untitled]] | \- | \- | \- | \- |
<!-- SerializedQuery END --> <!-- SerializedQuery END -->

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -6,7 +6,7 @@
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3| |Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
|------|---------|---------|---------|--------------|-----------------|-----------------|-----------------| |------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
|[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\Slimes\ababa\ababa-1.png)|![ababa-2.png](..\..\Images\Slimes\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\Slimes\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\Slimes\ababa\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)| |[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\Slimes\ababa-1.png)|![ababa-2.png](..\..\Images\Slimes\ababa-2.png)|![ababa-3.png](..\..\Images\Slimes\ababa-3.png)|![ababa-4.png](..\..\Images\Slimes\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
|[Untitled](Untitled.md)|-|-|-|-|-|-|-| |[Untitled](Untitled.md)|-|-|-|-|-|-|-|
<!-- SerializedQuery END --> <!-- SerializedQuery END -->

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB