Compare commits
3 commits
b02297f318
...
6041871e54
Author | SHA1 | Date | |
---|---|---|---|
6041871e54 | |||
10a719082b | |||
97ca4de23b |
4 changed files with 225 additions and 82 deletions
11
Edikoyo/.obsidian/types.json
vendored
Normal file
11
Edikoyo/.obsidian/types.json
vendored
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{
|
||||||
|
"types": {
|
||||||
|
"aliases": "aliases",
|
||||||
|
"cssclasses": "multitext",
|
||||||
|
"tags": "tags",
|
||||||
|
"art_variant1": "multitext",
|
||||||
|
"art_variant2": "multitext",
|
||||||
|
"art_variant3": "multitext",
|
||||||
|
"art_golden": "text"
|
||||||
|
}
|
||||||
|
}
|
266
Edikoyo/.obsidian/workspace.json
vendored
266
Edikoyo/.obsidian/workspace.json
vendored
|
@ -6,33 +6,10 @@
|
||||||
{
|
{
|
||||||
"id": "16de56932df8d2b5",
|
"id": "16de56932df8d2b5",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
|
"dimension": 77.27272727272727,
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "f84169dad44b3808",
|
"id": "65374afab15971d2",
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "Countries/Blanchister.md",
|
|
||||||
"mode": "source",
|
|
||||||
"source": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "987a006f259c3c08",
|
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "Countries/Dasona.md",
|
|
||||||
"mode": "source",
|
|
||||||
"source": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "afb42427bcca10d5",
|
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
|
@ -44,19 +21,18 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "6e9264aa36b7c209",
|
"id": "9bba1e7f22a41622",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "diff-view",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Cat.md",
|
"file": "content/Animals/Slimes/_index.md",
|
||||||
"mode": "source",
|
"staged": true
|
||||||
"source": false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "a12c575a3e4e2f21",
|
"id": "f61093bc90ac3a19",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
|
@ -68,7 +44,39 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "e18161b255f8c3cb",
|
"id": "b57aab6642ed017d",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/Ababa Slime.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"currentTab": 3
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "a776313f551069bd",
|
||||||
|
"type": "tabs",
|
||||||
|
"dimension": 22.727272727272727,
|
||||||
|
"children": [
|
||||||
|
{
|
||||||
|
"id": "c400fd62d021c702",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/Ababa Slime.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "d186fdb7d8783998",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
|
@ -78,9 +86,126 @@
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "3828af17ae2bbb6a",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Countries/_index.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "cd8543c15ea2f09f",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/_index.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "6ad99838c94a15dd",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/Ababa Slime.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "a289d6327d739306",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/_index.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "b704e930ac81712d",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/Ababa Slime.md",
|
||||||
|
"mode": "preview",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "efb1a9199c2e99b6",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/_index.md",
|
||||||
|
"mode": "preview",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "0b8bff69287ad9fb",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Animals/Slimes/_index.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "68af507ebd93d4fd",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "diff-view",
|
||||||
|
"state": {
|
||||||
|
"file": "content/Countries/_index.md",
|
||||||
|
"staged": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "bfd0d82c27739a48",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "diff-view",
|
||||||
|
"state": {
|
||||||
|
"file": "content/Countries/Blanchister.md",
|
||||||
|
"staged": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "0e473423f5963692",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "diff-view",
|
||||||
|
"state": {
|
||||||
|
"file": "Edikoyo/.obsidian/workspace.json",
|
||||||
|
"staged": false
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"currentTab": 5
|
"currentTab": 11
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "vertical"
|
"direction": "vertical"
|
||||||
|
@ -146,7 +271,6 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/_index.md",
|
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
|
@ -163,7 +287,6 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/_index.md",
|
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
}
|
}
|
||||||
|
@ -186,7 +309,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/_index.md"
|
"file": "conflict-files-obsidian-git.md"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -203,31 +326,24 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
"width": 300
|
"width": 523.5
|
||||||
},
|
},
|
||||||
"left-ribbon": {
|
"left-ribbon": {
|
||||||
"hiddenItems": {
|
"hiddenItems": {
|
||||||
"random-note:Open random note": false,
|
"switcher:Abrir selector rápido": false,
|
||||||
"switcher:Open quick switcher": false,
|
"graph:Abrir vista gráfica": false,
|
||||||
"graph:Open graph view": false,
|
"templates:Insertar plantilla": false,
|
||||||
"templates:Insert template": false,
|
"command-palette:Abrir paleta de comandos": false,
|
||||||
"command-palette:Open command palette": false,
|
"random-note:Abrir nota al azar": false,
|
||||||
"obsidian-git:Open Git source control": false
|
"obsidian-git:Open Git source control": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "e18161b255f8c3cb",
|
"active": "90b57f41c87f2b3b",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"Animals/Slimes/Ababa Slime.md",
|
"Animals/Slimes/Ababa Slime.md",
|
||||||
"Animals/Slimes/_index.md",
|
"conflict-files-obsidian-git.md",
|
||||||
"Animals/Slimes/Sunflower Slime.md",
|
"Images/Slimes/sunflower-4.png",
|
||||||
"Animals/Slimes/Marsh Slime.md",
|
"Images/Slimes/sunflower-3.png",
|
||||||
"Animals/Slimes/Lagoon Slime.md",
|
|
||||||
"Animals/Slimes/Honey Slime.md",
|
|
||||||
"Animals/Slimes/Godot Slime.md",
|
|
||||||
"Animals/Slimes/Bark Slime.md",
|
|
||||||
"Animals/Slimes/Garden Slime.md",
|
|
||||||
"Countries/Vosaka.md",
|
|
||||||
"Images/Slimes/garden-1.png",
|
|
||||||
"Images/Slimes/sunflower-2.png",
|
"Images/Slimes/sunflower-2.png",
|
||||||
"Images/Slimes/sunflower-1.png",
|
"Images/Slimes/sunflower-1.png",
|
||||||
"Images/Slimes/marsh-4.png",
|
"Images/Slimes/marsh-4.png",
|
||||||
|
@ -236,32 +352,38 @@
|
||||||
"Images/Slimes/marsh-1.png",
|
"Images/Slimes/marsh-1.png",
|
||||||
"Images/Slimes/lagoon-4.png",
|
"Images/Slimes/lagoon-4.png",
|
||||||
"Images/Slimes/lagoon-3.png",
|
"Images/Slimes/lagoon-3.png",
|
||||||
"Images/Slimes/lagoon-2.png",
|
"Animals/Slimes/Sunflower Slime.md",
|
||||||
"Images/Slimes/Untitled",
|
"Animals/Slimes/Marsh Slime.md",
|
||||||
"Images/Slimes/bark",
|
"Animals/Slimes/Lagoon Slime.md",
|
||||||
"Images/Slimes/garden",
|
"Animals/Slimes/Honey Slime.md",
|
||||||
"conflict-files-obsidian-git.md",
|
"Animals/Slimes/Godot Slime.md",
|
||||||
"Images/Slimes",
|
"Animals/Slimes/Garden Slime.md",
|
||||||
|
"Animals/Slimes/Bark Slime.md",
|
||||||
|
"Animals/Slimes/_index.md",
|
||||||
|
"Animals/Slimes/Untitled.md",
|
||||||
|
"Animals/_index.md",
|
||||||
|
"Countries/_index.md",
|
||||||
"Languages/Mokrixi.md",
|
"Languages/Mokrixi.md",
|
||||||
"Languages/Lacelian.md",
|
"Languages/Lacelian.md",
|
||||||
"Languages/Guo.md",
|
"Languages/Guo.md",
|
||||||
"Languages/Fayahi.md",
|
"Languages/Fayahi.md",
|
||||||
"Languages/Edikan.md",
|
|
||||||
"Languages/_index.md",
|
|
||||||
"Countries/_index.md",
|
|
||||||
"Countries/Dolfeyja.md",
|
|
||||||
"Countries/Dasona.md",
|
|
||||||
"Countries/Faelani.md",
|
|
||||||
"Countries/Gudoko.md",
|
|
||||||
"Countries/Lekia.md",
|
|
||||||
"Countries/Nakadon.md",
|
|
||||||
"Countries/Nonkur.md",
|
|
||||||
"Countries/Nasahra.md",
|
|
||||||
"Images/Slimes/ababa",
|
"Images/Slimes/ababa",
|
||||||
|
"Images/Slimes",
|
||||||
|
"Countries/Faelani.md",
|
||||||
|
"Countries/Dolfeyja.md",
|
||||||
|
"Countries/Felmyr.md",
|
||||||
|
"Countries/Vosaka.md",
|
||||||
|
"Countries/Vikogyna.md",
|
||||||
|
"Countries/Vanatn.md",
|
||||||
|
"Countries/Soljord.md",
|
||||||
|
"Countries/Seraphis.md",
|
||||||
|
"Images/Flags",
|
||||||
|
"Images/slimes/ababa",
|
||||||
"Images/slimes",
|
"Images/slimes",
|
||||||
"Countries/Faelani",
|
|
||||||
"Animals/Slimes",
|
"Animals/Slimes",
|
||||||
"Languages",
|
"Languages",
|
||||||
"Images/Flags"
|
"Images",
|
||||||
|
"Regions",
|
||||||
|
"Territories"
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -1,11 +1,17 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[ababa-1.png]]"
|
art_variant1:
|
||||||
art_variant2: "![[ababa-2.png]]"
|
- "![[ababa-1.png]]"
|
||||||
art_variant3: "![[ababa-3.png]]"
|
- "[[Batanoka]]"
|
||||||
|
art_variant2:
|
||||||
|
- "![[ababa-2.png]]"
|
||||||
|
- "[[Faelani]]"
|
||||||
|
art_variant3:
|
||||||
|
- "![[ababa-3.png]]"
|
||||||
|
- "[[Barrowmaw]]"
|
||||||
art_golden: "![[ababa-4.png]]"
|
art_golden: "![[ababa-4.png]]"
|
||||||
country_variant1: "[[Batanoka]]"
|
country_variant1: "[[Batanoka]]"
|
||||||
country_variant2: "[[Faelani]]"
|
country_variant2:
|
||||||
country_variant3: "[[Barrowmaw]]"
|
country_variant3:
|
||||||
---
|
---
|
||||||
|
|
||||||
# On the Ababa Slime
|
# On the Ababa Slime
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
|
|
||||||
<!-- 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 -->
|
<!-- 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", 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" 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 |
|
| 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]] |
|
| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | ![[ababa-4.png]] | [[Batanoka]] | [[Faelani]] | [[Barrowmaw]] |
|
||||||
|
@ -12,7 +18,5 @@
|
||||||
| [[Lagoon Slime]] | ![[lagoon-1.png]] | ![[lagoon-2.png]] | ![[lagoon-3.png]] | ![[lagoon-4.png]] | [[Dahallow]] | [[Mantine]] | [[Felmyr]] |
|
| [[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]] |
|
| [[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]] |
|
| [[Sunflower Slime]] | ![[sunflower-1.png]] | ![[sunflower-2.png]] | ![[sunflower-3.png]] | ![[sunflower-4.png]] | [[Calcetron]] | [[Llasuki]] | [[Blanchister]] |
|
||||||
|
>>>>>>> origin/main
|
||||||
<!-- SerializedQuery END -->
|
<!-- SerializedQuery END -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue