diff --git a/Edikoyo/.obsidian/plugins/obsidian-icon-folder/data.json b/Edikoyo/.obsidian/plugins/obsidian-icon-folder/data.json index 76a84e0..b64ba09 100644 --- a/Edikoyo/.obsidian/plugins/obsidian-icon-folder/data.json +++ b/Edikoyo/.obsidian/plugins/obsidian-icon-folder/data.json @@ -53,5 +53,6 @@ "Images/Flags": "LiFlag", "Species": "LiUsers", "Animals/Slimes": "LiShell", - "Animals/Slimes/_index.md": "LiShell" + "Animals/Slimes/_index.md": "LiShell", + "Images/Slimes": "LiShell" } \ No newline at end of file diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index ebd277d..ea75b64 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -54,9 +54,21 @@ "source": false } } + }, + { + "id": "8132219ace7c9b44", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "conflict-files-obsidian-git.md", + "mode": "source", + "source": false + } + } } ], - "currentTab": 3 + "currentTab": 4 }, { "id": "a776313f551069bd", @@ -271,7 +283,7 @@ "state": { "type": "backlink", "state": { - "file": "Animals/Slimes/_index.md", + "file": "conflict-files-obsidian-git.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -288,7 +300,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "Animals/Slimes/_index.md", + "file": "conflict-files-obsidian-git.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -311,7 +323,7 @@ "state": { "type": "outline", "state": { - "file": "Animals/Slimes/_index.md" + "file": "conflict-files-obsidian-git.md" } } }, @@ -340,8 +352,10 @@ "obsidian-git:Open Git source control": false } }, - "active": "b57aab6642ed017d", + "active": "8132219ace7c9b44", "lastOpenFiles": [ + "Animals/Slimes/_index.md", + "conflict-files-obsidian-git.md", "Animals/Slimes/Sunflower Slime.md", "Animals/Slimes/Marsh Slime.md", "Animals/Slimes/Lagoon Slime.md", @@ -350,8 +364,6 @@ "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", diff --git a/content/Animals/Slimes/Ababa Slime.md b/content/Animals/Slimes/Ababa Slime.md index b0686d1..0f096b7 100644 --- a/content/Animals/Slimes/Ababa Slime.md +++ b/content/Animals/Slimes/Ababa Slime.md @@ -1,11 +1,14 @@ --- -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]]' +variant1: +- '![[ababa-1.png]]' +- '[[Batanoka]]' +variant2: +- '![[ababa-2.png]]' +- '[[Faelani]]' +variant3: +- '![[ababa-3.png]]' +- '[[Barrowmaw]]' +golden: '![[ababa-4.png]]' --- # On the Ababa Slime diff --git a/content/Animals/Slimes/Bark Slime.md b/content/Animals/Slimes/Bark Slime.md index 0179d32..93b81cc 100644 --- a/content/Animals/Slimes/Bark Slime.md +++ b/content/Animals/Slimes/Bark Slime.md @@ -1,11 +1,14 @@ --- -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/content/Animals/Slimes/Garden Slime.md b/content/Animals/Slimes/Garden Slime.md index 621b31d..dab578a 100644 --- a/content/Animals/Slimes/Garden Slime.md +++ b/content/Animals/Slimes/Garden Slime.md @@ -1,11 +1,14 @@ --- -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/content/Animals/Slimes/Godot Slime.md b/content/Animals/Slimes/Godot Slime.md index 483c96b..ad8d619 100644 --- a/content/Animals/Slimes/Godot Slime.md +++ b/content/Animals/Slimes/Godot Slime.md @@ -1,11 +1,14 @@ --- -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/content/Animals/Slimes/Honey Slime.md b/content/Animals/Slimes/Honey Slime.md index 2aecc5d..26a593a 100644 --- a/content/Animals/Slimes/Honey Slime.md +++ b/content/Animals/Slimes/Honey Slime.md @@ -1,11 +1,14 @@ --- -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/content/Animals/Slimes/Lagoon Slime.md b/content/Animals/Slimes/Lagoon Slime.md index 4a45169..1c7420c 100644 --- a/content/Animals/Slimes/Lagoon Slime.md +++ b/content/Animals/Slimes/Lagoon Slime.md @@ -1,11 +1,14 @@ --- -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/content/Animals/Slimes/Marsh Slime.md b/content/Animals/Slimes/Marsh Slime.md index fcd4b43..ce0e1a7 100644 --- a/content/Animals/Slimes/Marsh Slime.md +++ b/content/Animals/Slimes/Marsh Slime.md @@ -1,11 +1,14 @@ --- -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/content/Animals/Slimes/Sunflower Slime.md b/content/Animals/Slimes/Sunflower Slime.md index 08a0d44..3faa704 100644 --- a/content/Animals/Slimes/Sunflower Slime.md +++ b/content/Animals/Slimes/Sunflower Slime.md @@ -1,11 +1,16 @@ --- -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: null +country_variant2: null +country_variant3: null --- diff --git a/content/Animals/Slimes/_index.md b/content/Animals/Slimes/_index.md index e182b4f..77ec3fb 100644 --- a/content/Animals/Slimes/_index.md +++ b/content/Animals/Slimes/_index.md @@ -1,19 +1,19 @@ --- --- - - + + -|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-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)| -|[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)| -|[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)| -|[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)| -|[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)| -|[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)| -|[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)| -|[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)| +|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant| +|------|---------|---------|---------|--------------| +|[Ababa Slime](Ababa%20Slime.md)|-|-|-|-| +|[Bark Slime](Bark%20Slime.md)|-|-|-|-| +|[Garden Slime](Garden%20Slime.md)|-|-|-|-| +|[Godot Slime](Godot%20Slime.md)|-|-|-|-| +|[Honey Slime](Honey%20Slime.md)|-|-|-|-| +|[Lagoon Slime](Lagoon%20Slime.md)|-|-|-|-| +|[Marsh Slime](Marsh%20Slime.md)|-|-|-|-| +|[Sunflower Slime](Sunflower%20Slime.md)|-|-|-|-|