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
20 changed files with 209 additions and 142 deletions
Showing only changes of commit b579bccee5 - 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

@ -78,9 +78,20 @@
"source": false "source": false
} }
} }
},
{
"id": "99690ee270617d17",
"type": "leaf",
"state": {
"type": "diff-view",
"state": {
"file": "Edikoyo/.obsidian/workspace.json",
"staged": false
}
}
} }
], ],
"currentTab": 5 "currentTab": 6
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -146,7 +157,6 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Animals/Slimes/Ababa Slime.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -163,7 +173,6 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Animals/Slimes/Ababa Slime.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -185,9 +194,7 @@
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {}
"file": "Animals/Slimes/Ababa Slime.md"
}
} }
}, },
{ {
@ -215,10 +222,11 @@
"obsidian-git:Open Git source control": false "obsidian-git:Open Git source control": false
} }
}, },
"active": "e18161b255f8c3cb", "active": "90b57f41c87f2b3b",
"lastOpenFiles": [ "lastOpenFiles": [
"Animals/Slimes/_index.md", "conflict-files-obsidian-git.md",
"Animals/Slimes/Ababa Slime.md", "Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Sunflower Slime.md", "Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Marsh Slime.md", "Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md", "Animals/Slimes/Lagoon Slime.md",
@ -240,7 +248,6 @@
"Images/Slimes/Untitled", "Images/Slimes/Untitled",
"Images/Slimes/bark", "Images/Slimes/bark",
"Images/Slimes/garden", "Images/Slimes/garden",
"conflict-files-obsidian-git.md",
"Images/Slimes", "Images/Slimes",
"Languages/Mokrixi.md", "Languages/Mokrixi.md",
"Languages/Lacelian.md", "Languages/Lacelian.md",

View file

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

View file

@ -1,9 +1,12 @@
--- ---
art_variant1: "![[bark-1.png]]" variant1:
art_variant2: "![[bark-2.png]]" - "![[bark-1.png]]"
art_variant3: "![[bark-3.png]]" - "[[Dasona]]"
art_golden: "![[bark-4.png]]" variant2:
country_variant1: "[[Dasona]]" - "![[bark-2.png]]"
country_variant2: "[[Gudoko]]" - "[[Gudoko]]"
country_variant3: "[[Lekia]]" variant3:
- "![[bark-3.png]]"
- "[[Lekia]]"
golden: "![[bark-4.png]]"
--- ---

View file

@ -1,9 +1,12 @@
--- ---
art_variant1: "![[garden-1.png]]" variant1:
art_variant2: "![[garden-2.png]]" - "![[garden-1.png]]"
art_variant3: "![[garden-3.png]]" - "[[Dasona]]"
art_golden: "![[garden-4.png]]" variant2:
country_variant1: "[[Dasona]]" - "![[garden-2.png]]"
country_variant2: "[[Soljord]]" - "[[Soljord]]"
country_variant3: "[[Dolfeyja]]" variant3:
- "![[garden-3.png]]"
- "[[Dolfeyja]]"
golden: "![[garden-4.png]]"
--- ---

View file

@ -1,9 +1,12 @@
--- ---
art_variant1: "![[godot-1.png]]" variant1:
art_variant2: "![[godot-2.png]]" - "![[godot-1.png]]"
art_variant3: "![[godot-3.png]]" - "[[Gokolm]]"
art_golden: "![[godot-4.png]]" variant2:
country_variant1: "[[Gokolm]]" - "![[godot-2.png]]"
country_variant2: "[[Dasona]]" - "[[Dasona]]"
country_variant3: "[[Soljord]]" variant3:
- "![[godot-3.png]]"
- "[[Soljord]]"
golden: "![[godot-4.png]]"
--- ---

View file

@ -1,9 +1,12 @@
--- ---
art_variant1: "![[honey-1.png]]" variant1:
art_variant2: "![[honey-2.png]]" - "![[honey-1.png]]"
art_variant3: "![[honey-3.png]]" - "[[Dahallow]]"
art_golden: "![[honey-4.png]]" variant2:
country_variant1: "[[Dahallow]]" - "![[honey-2.png]]"
country_variant2: "[[Krakala]]" - "[[Krakala]]"
country_variant3: "[[Mantine]]" variant3:
- "![[honey-3.png]]"
- "[[Mantine]]"
golden: "![[honey-4.png]]"
--- ---

View file

@ -1,9 +1,12 @@
--- ---
art_variant1: "![[lagoon-1.png]]" art_variant1:
art_variant2: "![[lagoon-2.png]]" - "![[lagoon-1.png]]"
art_variant3: "![[lagoon-3.png]]" - "[[Dahallow]]"
art_variant2:
- "![[lagoon-2.png]]"
- "[[Mantine]]"
art_variant3:
- "![[lagoon-3.png]]"
- "[[Felmyr]]"
art_golden: "![[lagoon-4.png]]" art_golden: "![[lagoon-4.png]]"
country_variant1: "[[Dahallow]]"
country_variant2: "[[Mantine]]"
country_variant3: "[[Felmyr]]"
--- ---

View file

@ -1,9 +1,12 @@
--- ---
art_variant1: "![[marsh-1.png]]" art_variant1:
art_variant2: "![[marsh-2.png]]" - "![[marsh-1.png]]"
art_variant3: "![[marsh-3.png]]" - "[[Oshela]]"
art_variant2:
- "![[marsh-2.png]]"
- "[[Vikogyna]]"
art_variant3:
- "![[marsh-3.png]]"
- "[[Barrowmaw]]"
art_golden: "![[marsh-4.png]]" art_golden: "![[marsh-4.png]]"
country_variant1: "[[Oshela]]"
country_variant2: "[[Vikogyna]]"
country_variant3: "[[Barrowmaw]]"
--- ---

View file

@ -1,9 +1,14 @@
--- ---
art_variant1: "![[sunflower-1.png]]" art_variant1:
art_variant2: "![[sunflower-2.png]]" - "![[sunflower-1.png]]"
art_variant3: "![[sunflower-3.png]]" - "[[Calcetron]]"
art_variant2:
- "![[sunflower-2.png]]"
- "[[Llasuki]]"
art_variant3:
- "![[sunflower-3.png]]"
art_golden: "![[sunflower-4.png]]" art_golden: "![[sunflower-4.png]]"
country_variant1: "[[Calcetron]]" country_variant1:
country_variant2: "[[Llasuki]]" country_variant2:
country_variant3: "[[Blanchister]]" country_variant3:
--- ---

View file

@ -1,18 +1,15 @@
<!-- 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", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", 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", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", 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]] | \- | \- | \- | \- |
| [[Bark Slime]] | ![[bark-1.png]] | ![[bark-2.png]] | ![[bark-3.png]] | ![[bark-4.png]] | [[Dasona]] | [[Gudoko]] | [[Lekia]] | | [[Bark Slime]] | \- | \- | \- | \- |
| [[Garden Slime]] | ![[garden-1.png]] | ![[garden-2.png]] | ![[garden-3.png]] | ![[garden-4.png]] | [[Dasona]] | [[Soljord]] | [[Dolfeyja]] | | [[Garden Slime]] | \- | \- | \- | \- |
| [[Godot Slime]] | ![[godot-1.png]] | ![[godot-2.png]] | ![[godot-3.png]] | ![[godot-4.png]] | [[Gokolm]] | [[Dasona]] | [[Soljord]] | | [[Godot Slime]] | \- | \- | \- | \- |
| [[Honey Slime]] | ![[honey-1.png]] | ![[honey-2.png]] | ![[honey-3.png]] | ![[honey-4.png]] | [[Dahallow]] | [[Krakala]] | [[Mantine]] | | [[Honey Slime]] | \- | \- | \- | \- |
| [[Lagoon Slime]] | ![[lagoon-1.png]] | ![[lagoon-2.png]] | ![[lagoon-3.png]] | ![[lagoon-4.png]] | [[Dahallow]] | [[Mantine]] | [[Felmyr]] | | [[Lagoon Slime]] | \- | \- | \- | \- |
| [[Marsh Slime]] | ![[marsh-1.png]] | ![[marsh-2.png]] | ![[marsh-3.png]] | ![[marsh-4.png]] | [[Oshela]] | [[Vikogyna]] | [[Barrowmaw]] | | [[Marsh Slime]] | \- | \- | \- | \- |
| [[Sunflower Slime]] | ![[sunflower-1.png]] | ![[sunflower-2.png]] | ![[sunflower-3.png]] | ![[sunflower-4.png]] | [[Calcetron]] | [[Llasuki]] | [[Blanchister]] | | [[Sunflower Slime]] | \- | \- | \- | \- |
<!-- SerializedQuery END --> <!-- SerializedQuery END -->

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[ababa-1.png]]' variant1:
art_variant2: '![[ababa-2.png]]' - '![[ababa-1.png]]'
art_variant3: '![[ababa-3.png]]' - '[[Batanoka]]'
art_golden: '![[ababa-4.png]]' variant2:
country_variant1: '[[Batanoka]]' - '![[ababa-2.png]]'
country_variant2: '[[Faelani]]' - '[[Faelani]]'
country_variant3: '[[Barrowmaw]]' variant3:
- '![[ababa-3.png]]'
- '[[Barrowmaw]]'
golden: '![[ababa-4.png]]'
--- ---
# On the Ababa Slime # On the Ababa Slime

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[bark-1.png]]' variant1:
art_variant2: '![[bark-2.png]]' - '![[bark-1.png]]'
art_variant3: '![[bark-3.png]]' - '[[Dasona]]'
art_golden: '![[bark-4.png]]' variant2:
country_variant1: '[[Dasona]]' - '![[bark-2.png]]'
country_variant2: '[[Gudoko]]' - '[[Gudoko]]'
country_variant3: '[[Lekia]]' variant3:
- '![[bark-3.png]]'
- '[[Lekia]]'
golden: '![[bark-4.png]]'
--- ---

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[garden-1.png]]' variant1:
art_variant2: '![[garden-2.png]]' - '![[garden-1.png]]'
art_variant3: '![[garden-3.png]]' - '[[Dasona]]'
art_golden: '![[garden-4.png]]' variant2:
country_variant1: '[[Dasona]]' - '![[garden-2.png]]'
country_variant2: '[[Soljord]]' - '[[Soljord]]'
country_variant3: '[[Dolfeyja]]' variant3:
- '![[garden-3.png]]'
- '[[Dolfeyja]]'
golden: '![[garden-4.png]]'
--- ---

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[godot-1.png]]' variant1:
art_variant2: '![[godot-2.png]]' - '![[godot-1.png]]'
art_variant3: '![[godot-3.png]]' - '[[Gokolm]]'
art_golden: '![[godot-4.png]]' variant2:
country_variant1: '[[Gokolm]]' - '![[godot-2.png]]'
country_variant2: '[[Dasona]]' - '[[Dasona]]'
country_variant3: '[[Soljord]]' variant3:
- '![[godot-3.png]]'
- '[[Soljord]]'
golden: '![[godot-4.png]]'
--- ---

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[honey-1.png]]' variant1:
art_variant2: '![[honey-2.png]]' - '![[honey-1.png]]'
art_variant3: '![[honey-3.png]]' - '[[Dahallow]]'
art_golden: '![[honey-4.png]]' variant2:
country_variant1: '[[Dahallow]]' - '![[honey-2.png]]'
country_variant2: '[[Krakala]]' - '[[Krakala]]'
country_variant3: '[[Mantine]]' variant3:
- '![[honey-3.png]]'
- '[[Mantine]]'
golden: '![[honey-4.png]]'
--- ---

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[lagoon-1.png]]' art_variant1:
art_variant2: '![[lagoon-2.png]]' - '![[lagoon-1.png]]'
art_variant3: '![[lagoon-3.png]]' - '[[Dahallow]]'
art_variant2:
- '![[lagoon-2.png]]'
- '[[Mantine]]'
art_variant3:
- '![[lagoon-3.png]]'
- '[[Felmyr]]'
art_golden: '![[lagoon-4.png]]' art_golden: '![[lagoon-4.png]]'
country_variant1: '[[Dahallow]]'
country_variant2: '[[Mantine]]'
country_variant3: '[[Felmyr]]'
--- ---

View file

@ -1,11 +1,14 @@
--- ---
art_variant1: '![[marsh-1.png]]' art_variant1:
art_variant2: '![[marsh-2.png]]' - '![[marsh-1.png]]'
art_variant3: '![[marsh-3.png]]' - '[[Oshela]]'
art_variant2:
- '![[marsh-2.png]]'
- '[[Vikogyna]]'
art_variant3:
- '![[marsh-3.png]]'
- '[[Barrowmaw]]'
art_golden: '![[marsh-4.png]]' art_golden: '![[marsh-4.png]]'
country_variant1: '[[Oshela]]'
country_variant2: '[[Vikogyna]]'
country_variant3: '[[Barrowmaw]]'
--- ---

View file

@ -1,11 +1,16 @@
--- ---
art_variant1: '![[sunflower-1.png]]' art_variant1:
art_variant2: '![[sunflower-2.png]]' - '![[sunflower-1.png]]'
art_variant3: '![[sunflower-3.png]]' - '[[Calcetron]]'
art_variant2:
- '![[sunflower-2.png]]'
- '[[Llasuki]]'
art_variant3:
- '![[sunflower-3.png]]'
art_golden: '![[sunflower-4.png]]' art_golden: '![[sunflower-4.png]]'
country_variant1: '[[Calcetron]]' country_variant1: null
country_variant2: '[[Llasuki]]' country_variant2: null
country_variant3: '[[Blanchister]]' country_variant3: null
--- ---

View file

@ -1,19 +1,19 @@
--- ---
--- ---
<!-- 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", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", 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", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", 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%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)| |[Ababa Slime](Ababa%20Slime.md)|-|-|-|-|
|[Bark Slime](Bark%20Slime.md)|![bark-1.png](..\..\Images\Slimes\bark-1.png)|![bark-2.png](..\..\Images\Slimes\bark-2.png)|![bark-3.png](..\..\Images\Slimes\bark-3.png)|![bark-4.png](..\..\Images\Slimes\bark-4.png)|[Dasona](..\..\Countries\Dasona.md)|[Gudoko](..\..\Countries\Gudoko.md)|[Lekia](..\..\Countries\Lekia.md)| |[Bark Slime](Bark%20Slime.md)|-|-|-|-|
|[Garden Slime](Garden%20Slime.md)|![garden-1.png](..\..\Images\Slimes\garden-1.png)|![garden-2.png](..\..\Images\Slimes\garden-2.png)|![garden-3.png](..\..\Images\Slimes\garden-3.png)|![garden-4.png](..\..\Images\Slimes\garden-4.png)|[Dasona](..\..\Countries\Dasona.md)|[Soljord](..\..\Countries\Soljord.md)|[Dolfeyja](..\..\Countries\Dolfeyja.md)| |[Garden Slime](Garden%20Slime.md)|-|-|-|-|
|[Godot Slime](Godot%20Slime.md)|![godot-1.png](..\..\Images\Slimes\godot-1.png)|![godot-2.png](..\..\Images\Slimes\godot-2.png)|![godot-3.png](..\..\Images\Slimes\godot-3.png)|![godot-4.png](..\..\Images\Slimes\godot-4.png)|[Gokolm](..\..\Countries\Gokolm.md)|[Dasona](..\..\Countries\Dasona.md)|[Soljord](..\..\Countries\Soljord.md)| |[Godot Slime](Godot%20Slime.md)|-|-|-|-|
|[Honey Slime](Honey%20Slime.md)|![honey-1.png](..\..\Images\Slimes\honey-1.png)|![honey-2.png](..\..\Images\Slimes\honey-2.png)|![honey-3.png](..\..\Images\Slimes\honey-3.png)|![honey-4.png](..\..\Images\Slimes\honey-4.png)|[Dahallow](..\..\Countries\Dahallow.md)|[Krakala](..\..\Countries\Krakala.md)|[Mantine](..\..\Countries\Mantine.md)| |[Honey Slime](Honey%20Slime.md)|-|-|-|-|
|[Lagoon Slime](Lagoon%20Slime.md)|![lagoon-1.png](..\..\Images\Slimes\lagoon-1.png)|![lagoon-2.png](..\..\Images\Slimes\lagoon-2.png)|![lagoon-3.png](..\..\Images\Slimes\lagoon-3.png)|![lagoon-4.png](..\..\Images\Slimes\lagoon-4.png)|[Dahallow](..\..\Countries\Dahallow.md)|[Mantine](..\..\Countries\Mantine.md)|[Felmyr](..\..\Countries\Felmyr.md)| |[Lagoon Slime](Lagoon%20Slime.md)|-|-|-|-|
|[Marsh Slime](Marsh%20Slime.md)|![marsh-1.png](..\..\Images\Slimes\marsh-1.png)|![marsh-2.png](..\..\Images\Slimes\marsh-2.png)|![marsh-3.png](..\..\Images\Slimes\marsh-3.png)|![marsh-4.png](..\..\Images\Slimes\marsh-4.png)|[Oshela](..\..\Countries\Oshela.md)|[Vikogyna](..\..\Countries\Vikogyna.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)| |[Marsh Slime](Marsh%20Slime.md)|-|-|-|-|
|[Sunflower Slime](Sunflower%20Slime.md)|![sunflower-1.png](..\..\Images\Slimes\sunflower-1.png)|![sunflower-2.png](..\..\Images\Slimes\sunflower-2.png)|![sunflower-3.png](..\..\Images\Slimes\sunflower-3.png)|![sunflower-4.png](..\..\Images\Slimes\sunflower-4.png)|[Calcetron](..\..\Countries\Calcetron.md)|[Llasuki](..\..\Countries\Llasuki.md)|[Blanchister](..\..\Countries\Blanchister.md)| |[Sunflower Slime](Sunflower%20Slime.md)|-|-|-|-|
<!-- SerializedQuery END --> <!-- SerializedQuery END -->