diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index 282fd95..9a20146 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -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", diff --git a/Edikoyo/Animals/Slimes/Ababa Slime.md b/Edikoyo/Animals/Slimes/Ababa Slime.md index f6d40f4..bd6cd25 100644 --- a/Edikoyo/Animals/Slimes/Ababa Slime.md +++ b/Edikoyo/Animals/Slimes/Ababa Slime.md @@ -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 diff --git a/Edikoyo/Animals/Slimes/Bark Slime.md b/Edikoyo/Animals/Slimes/Bark Slime.md index b967e4b..15a4562 100644 --- a/Edikoyo/Animals/Slimes/Bark Slime.md +++ b/Edikoyo/Animals/Slimes/Bark Slime.md @@ -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]]" --- diff --git a/Edikoyo/Animals/Slimes/Garden Slime.md b/Edikoyo/Animals/Slimes/Garden Slime.md index 4d67c31..e19b59d 100644 --- a/Edikoyo/Animals/Slimes/Garden Slime.md +++ b/Edikoyo/Animals/Slimes/Garden Slime.md @@ -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]]" --- diff --git a/Edikoyo/Animals/Slimes/Godot Slime.md b/Edikoyo/Animals/Slimes/Godot Slime.md index fd3194d..a2f093c 100644 --- a/Edikoyo/Animals/Slimes/Godot Slime.md +++ b/Edikoyo/Animals/Slimes/Godot Slime.md @@ -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]]" --- diff --git a/Edikoyo/Animals/Slimes/Honey Slime.md b/Edikoyo/Animals/Slimes/Honey Slime.md index 31014ea..53bac82 100644 --- a/Edikoyo/Animals/Slimes/Honey Slime.md +++ b/Edikoyo/Animals/Slimes/Honey Slime.md @@ -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]]" --- diff --git a/Edikoyo/Animals/Slimes/Lagoon Slime.md b/Edikoyo/Animals/Slimes/Lagoon Slime.md index e54d4d9..27e747e 100644 --- a/Edikoyo/Animals/Slimes/Lagoon Slime.md +++ b/Edikoyo/Animals/Slimes/Lagoon Slime.md @@ -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]]" --- diff --git a/Edikoyo/Animals/Slimes/Marsh Slime.md b/Edikoyo/Animals/Slimes/Marsh Slime.md index d1ef476..3054e09 100644 --- a/Edikoyo/Animals/Slimes/Marsh Slime.md +++ b/Edikoyo/Animals/Slimes/Marsh Slime.md @@ -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]]" --- diff --git a/Edikoyo/Animals/Slimes/Sunflower Slime.md b/Edikoyo/Animals/Slimes/Sunflower Slime.md index 77692c0..f1371b3 100644 --- a/Edikoyo/Animals/Slimes/Sunflower Slime.md +++ b/Edikoyo/Animals/Slimes/Sunflower Slime.md @@ -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: --- diff --git a/Edikoyo/Animals/Slimes/_index.md b/Edikoyo/Animals/Slimes/_index.md index a08be94..689daef 100644 --- a/Edikoyo/Animals/Slimes/_index.md +++ b/Edikoyo/Animals/Slimes/_index.md @@ -1,22 +1,15 @@ - - + + -<<<<<<< HEAD -| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant | -| ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------- | -| [[Ababa Slime]] | | | | ![[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]] | \- | \- | \- | \- |