Edikoyo/.obsidian/app.json

@@ -1 +1,3 @@
-{}
+{
+  "alwaysUpdateLinks": true
+}

Edikoyo/.obsidian/graph.json

@@ -17,6 +17,6 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
-  "scale": 1,
+  "scale": 0.6554983534946919,
   "close": false
 }

Edikoyo/.obsidian/plugins/obsidian-icon-folder/data.json

@@ -6,11 +6,11 @@
     "emojiStyle": "native",
     "iconColor": null,
     "recentlyUsedIcons": [
+      "LiShell",
       "LiUsers",
       "LiFlag",
       "LiImage",
-      "LiBuilding",
+      "LiBuilding"
-      "LiCat"
     ],
     "recentlyUsedIconsSize": 5,
     "rules": [],
@@ -51,5 +51,7 @@
   "Cities": "LiBuilding",
   "Images": "LiImage",
   "Images/Flags": "LiFlag",
-  "Species": "LiUsers"
+  "Species": "LiUsers",
+  "Animals/Slimes": "LiShell",
+  "Animals/Slimes/_index.md": "LiShell"
 }

Edikoyo/.obsidian/workspace.json

@@ -271,7 +271,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Animals/Slimes/Ababa Slime.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -288,7 +287,6 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Animals/Slimes/Ababa Slime.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -311,7 +309,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Animals/Slimes/Ababa Slime.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -340,24 +338,31 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "b57aab6642ed017d",
+  "active": "90b57f41c87f2b3b",
   "lastOpenFiles": [
-    "Animals/Slimes/_index.md",
     "Animals/Slimes/Ababa Slime.md",
-    "Animals/Slimes/Untitled.md",
     "conflict-files-obsidian-git.md",
+    "Images/Slimes/sunflower-4.png",
+    "Images/Slimes/sunflower-3.png",
+    "Images/Slimes/sunflower-2.png",
+    "Images/Slimes/sunflower-1.png",
+    "Images/Slimes/marsh-4.png",
+    "Images/Slimes/marsh-3.png",
+    "Images/Slimes/marsh-2.png",
+    "Images/Slimes/marsh-1.png",
+    "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",
-    "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/Lacelian.md",
     "Languages/Guo.md",
@@ -372,15 +377,7 @@
     "Countries/Vanatn.md",
     "Countries/Soljord.md",
     "Countries/Seraphis.md",
-    "Countries/Ovanos.md",
-    "Countries/Oshela.md",
     "Images/Flags",
-    "Countries/Nonkur.md",
-    "Countries/Nasahra.md",
-    "Countries/Nakadon.md",
-    "Countries/Mortham.md",
-    "Countries/Mantine.md",
-    "Countries/Llasuki.md",
     "Images/slimes/ababa",
     "Images/slimes",
     "Animals/Slimes",

Edikoyo/Animals/Slimes/Bark Slime.md

@@ -0,0 +1,9 @@
+---
+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]]"
+---

Edikoyo/Animals/Slimes/Garden Slime.md

@@ -0,0 +1,9 @@
+---
+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]]"
+---

Edikoyo/Animals/Slimes/Godot Slime.md

@@ -0,0 +1,9 @@
+---
+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]]"
+---

Edikoyo/Animals/Slimes/Honey Slime.md

@@ -0,0 +1,9 @@
+---
+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]]"
+---

Edikoyo/Animals/Slimes/Lagoon Slime.md

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

Edikoyo/Animals/Slimes/Marsh Slime.md

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

Edikoyo/Animals/Slimes/Sunflower Slime.md

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

Edikoyo/Animals/Slimes/_index.md

@@ -2,8 +2,21 @@
 <!-- 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 -->
 
+<<<<<<< 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
 <!-- SerializedQuery END -->

content/Animals/Slimes/Bark Slime.md

@@ -0,0 +1,11 @@
+---
+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]]'
+---
+
+

content/Animals/Slimes/Garden Slime.md

@@ -0,0 +1,11 @@
+---
+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]]'
+---
+
+

content/Animals/Slimes/Godot Slime.md

@@ -0,0 +1,11 @@
+---
+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]]'
+---
+
+

content/Animals/Slimes/Honey Slime.md

@@ -0,0 +1,11 @@
+---
+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]]'
+---
+
+

content/Animals/Slimes/Lagoon Slime.md

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

content/Animals/Slimes/Marsh Slime.md

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

content/Animals/Slimes/Sunflower Slime.md

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

content/Animals/Slimes/Untitled.md

@@ -1,4 +0,0 @@
----
----
-
-

content/Animals/Slimes/_index.md

@@ -7,7 +7,13 @@
 |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)|
-|[Untitled](Untitled.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)|
 
 <!-- SerializedQuery END -->