n04/EdikoyoWiki-n04
1
0
Fork 0
forked from Edikoyo/EdikoyoWiki
Code Pull requests Activity

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
Conversation 0 Commits 107 Files changed 326 +97 -81
10 changed files with 97 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 59eb24b4f3 - Show all commits

24
Edikoyo/.obsidian/workspace.json vendored
View file

@ -49,7 +49,7 @@
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"file": "Animals/Slimes/Sunflower Slime.md",
"mode": "source",
"source": false
}
@ -271,7 +271,7 @@
"state": {
"type": "backlink",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"file": "Animals/Slimes/Sunflower Slime.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -288,7 +288,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"file": "Animals/Slimes/Sunflower Slime.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -311,7 +311,7 @@
"state": {
"type": "outline",
"state": {
"file": "Animals/Slimes/Ababa Slime.md"
"file": "Animals/Slimes/Sunflower Slime.md"
}
}
},
@ -342,8 +342,15 @@
},
"active": "b57aab6642ed017d",
"lastOpenFiles": [
"conflict-files-obsidian-git.md",
"Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/_index.md",
"conflict-files-obsidian-git.md",
"Images/Slimes/sunflower-4.png",
"Images/Slimes/sunflower-3.png",
"Images/Slimes/sunflower-2.png",
@ -355,13 +362,6 @@
"Images/Slimes/lagoon-4.png",
"Images/Slimes/lagoon-3.png",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Untitled.md",
"Animals/_index.md",
"Countries/_index.md",

8
Edikoyo/Animals/Slimes/Ababa Slime.md
View file

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

17
Edikoyo/Animals/Slimes/Bark Slime.md
View file

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

17
Edikoyo/Animals/Slimes/Garden Slime.md
View file

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

17
Edikoyo/Animals/Slimes/Godot Slime.md
View file

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

17
Edikoyo/Animals/Slimes/Honey Slime.md
View file

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

15
Edikoyo/Animals/Slimes/Lagoon Slime.md
View file

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

15
Edikoyo/Animals/Slimes/Marsh Slime.md
View file

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

17
Edikoyo/Animals/Slimes/Sunflower Slime.md
View file

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

31
Edikoyo/Animals/Slimes/_index.md
View file

@ -1,22 +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" 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 -->
<!-- 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", 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 -->
<<<<<<< HEAD
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant |
| ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------- |
| [[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]] | \- | \- | \- | \- |
=======
| 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]] |
| [[Bark Slime]] | ![[bark-1.png]] | ![[bark-2.png]] | ![[bark-3.png]] | ![[bark-4.png]] | [[Dasona]] | [[Gudoko]] | [[Lekia]] |
| [[Garden Slime]] | ![[garden-1.png]] | ![[garden-2.png]] | ![[garden-3.png]] | ![[garden-4.png]] | [[Dasona]] | [[Soljord]] | [[Dolfeyja]] |
| [[Godot Slime]] | ![[godot-1.png]] | ![[godot-2.png]] | ![[godot-3.png]] | ![[godot-4.png]] | [[Gokolm]] | [[Dasona]] | [[Soljord]] |
| [[Honey Slime]] | ![[honey-1.png]] | ![[honey-2.png]] | ![[honey-3.png]] | ![[honey-4.png]] | [[Dahallow]] | [[Krakala]] | [[Mantine]] |
| [[Lagoon Slime]] | ![[lagoon-1.png]] | ![[lagoon-2.png]] | ![[lagoon-3.png]] | ![[lagoon-4.png]] | [[Dahallow]] | [[Mantine]] | [[Felmyr]] |
| [[Marsh Slime]] | ![[marsh-1.png]] | ![[marsh-2.png]] | ![[marsh-3.png]] | ![[marsh-4.png]] | [[Oshela]] | [[Vikogyna]] | [[Barrowmaw]] |
| [[Sunflower Slime]] | ![[sunflower-1.png]] | ![[sunflower-2.png]] | ![[sunflower-3.png]] | ![[sunflower-4.png]] | [[Calcetron]] | [[Llasuki]] | [[Blanchister]] |
>>>>>>> origin/main
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant |
| ------------------------------------------------------ | --------- | --------- | --------- | -------------- |
| [[Ababa Slime]] | \- | \- | \- | \- |
| [[Bark Slime]] | \- | \- | \- | \- |
| [[Garden Slime]] | \- | \- | \- | \- |
| [[Godot Slime]] | \- | \- | \- | \- |
| [[Honey Slime]] | \- | \- | \- | \- |
| [[Lagoon Slime]] | \- | \- | \- | \- |
| [[Marsh Slime]] | \- | \- | \- | \- |
| [[Sunflower Slime]] | \- | \- | \- | \- |
<!-- SerializedQuery END -->