Edikoyo/.obsidian/workspace.json

@@ -90,9 +90,20 @@
                 "source": true
               }
             }
+          },
+          {
+            "id": "6dd42c89cd0a32cf",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "Edikoyo/.obsidian/workspace.json",
+                "staged": false
+              }
+            }
           }
         ],
-        "currentTab": 6
+        "currentTab": 7
       }
     ],
     "direction": "vertical"
@@ -158,7 +169,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Countries/Vosaka.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -175,7 +185,6 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Countries/Vosaka.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -197,9 +206,7 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {
-                "file": "Countries/Vosaka.md"
-              }
+              "state": {}
             }
           },
           {
@@ -227,8 +234,16 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "6e65a1802f52d161",
+  "active": "6dd42c89cd0a32cf",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "Countries/Vosaka.md",
+    "Images/slimes/ababa/ababa-3.png",
+    "Images/slimes/ababa/ababa-4.png",
+    "Images/slimes/ababa/ababa-2.png",
+    "Images/slimes/ababa/ababa-1.png",
+    "Images/slimes/ababa",
+    "Images/slimes",
     "Countries/Vikogyna.md",
     "Countries/Vanatn.md",
     "Countries/Soljord.md",
@@ -253,8 +268,6 @@
     "Countries/Dolfeyja.md",
     "Countries/Dratana.md",
     "Countries/Drenvale.md",
-    "Countries/Vosaka.md",
-    "Countries/_index.md",
     "Countries/Faelani",
     "Images/Flags/barrowmaw.png",
     "Animals/Slimes",
@@ -264,16 +277,10 @@
     "Images/Flags/vanatn.png",
     "Images/Flags/soljord.png",
     "Images/Flags/seraphis.png",
-    "Images/Flags/ovanos.png",
-    "Images/Flags/oshela.png",
-    "Images/Flags/nonkur.png",
-    "Images/Flags/nasahra.png",
     "Images/Flags",
     "Images/Flags",
     "Images",
     "Regions",
-    "Territories",
-    "Provinces",
-    "Plants"
+    "Territories"
   ]
 }

Edikoyo/Animals/Slimes/Ababa Slime.md

@@ -1,3 +1,13 @@
+---
+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]]"
+---
+
 # On the Ababa Slime
 
 Instances of the “Ababa” Slime are found within many historical scripts from many different cultures. 

Edikoyo/Animals/Slimes/_index.md

@@ -1,2 +1,11 @@
 
-[[Ababa Slime]]
+<!-- 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 -->
+
+<!-- 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 -->
+
+| 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]] |
+<!-- SerializedQuery END -->
+
+

Edikoyo/Countries/_index.md

@@ -36,3 +36,4 @@
 | [[Vosaka]]           | \-                                                 | \-                   | \-         | \-                             | \-                              |
 <!-- SerializedQuery END -->
 
+	

content/Animals/Slimes/Ababa Slime.md

@@ -1,4 +1,11 @@
 ---
+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]]'
 ---
 
 # On the Ababa Slime

content/Animals/Slimes/_index.md

@@ -1,4 +1,12 @@
 ---
 ---
 
-[Ababa Slime](Ababa%20Slime.md)
+<!-- 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 -->
+<!-- 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 -->
+
+|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\ababa-1.png)|![ababa-2.png](..\..\Images\slimes\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\slimes\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\slimes\ababa\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|Faelani|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
+
+<!-- SerializedQuery END -->
+

content/conflict-files-obsidian-git.md

@@ -0,0 +1,22 @@
+---
+---
+
+# Conflicts
+
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[Additional Instructions](conflict-files-obsidian-git.md#additional-instructions) available below file list
+
+* Not a file: Edikoyo/.obsidian/workspace.json
+
+# Additional Instructions
+
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+````diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+````