Compare commits

..

No commits in common. "b579bccee5643325f13decd50ef3b8139794cd24" and "59eb24b4f381a8ae03dba864331a9ff93c240313" have entirely different histories.

11 changed files with 250 additions and 160 deletions

View file

@ -53,6 +53,5 @@
"Images/Flags": "LiFlag", "Images/Flags": "LiFlag",
"Species": "LiUsers", "Species": "LiUsers",
"Animals/Slimes": "LiShell", "Animals/Slimes": "LiShell",
"Animals/Slimes/_index.md": "LiShell", "Animals/Slimes/_index.md": "LiShell"
"Images/Slimes": "LiShell"
} }

View file

@ -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,75 @@
} }
}, },
{ {
"id": "e18161b255f8c3cb", "id": "b57aab6642ed017d",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Sunflower 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",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "source",
"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", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
@ -80,7 +124,77 @@
} }
}, },
{ {
"id": "99690ee270617d17", "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", "type": "leaf",
"state": { "state": {
"type": "diff-view", "type": "diff-view",
@ -91,7 +205,7 @@
} }
} }
], ],
"currentTab": 6 "currentTab": 11
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -157,6 +271,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Animals/Slimes/Sunflower Slime.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -173,6 +288,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Animals/Slimes/Sunflower Slime.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -194,7 +310,9 @@
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "outline", "type": "outline",
"state": {} "state": {
"file": "Animals/Slimes/Sunflower Slime.md"
}
} }
}, },
{ {
@ -210,32 +328,31 @@
} }
], ],
"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": "90b57f41c87f2b3b", "active": "b57aab6642ed017d",
"lastOpenFiles": [ "lastOpenFiles": [
"conflict-files-obsidian-git.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Marsh Slime.md", "Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md", "Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/Honey Slime.md", "Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Godot Slime.md", "Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Bark Slime.md",
"Animals/Slimes/Garden Slime.md", "Animals/Slimes/Garden Slime.md",
"Countries/Vosaka.md", "Animals/Slimes/Bark Slime.md",
"Images/Slimes/garden-1.png", "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", "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",
@ -244,31 +361,31 @@
"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/Untitled.md",
"Images/Slimes/bark", "Animals/_index.md",
"Images/Slimes/garden", "Countries/_index.md",
"Images/Slimes",
"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"
] ]
} }

View file

@ -1,14 +1,11 @@
--- ---
variant1: art_variant1: '![[ababa-1.png]]'
- '![[ababa-1.png]]' art_variant2: '![[ababa-2.png]]'
- '[[Batanoka]]' art_variant3: '![[ababa-3.png]]'
variant2: art_golden: '![[ababa-4.png]]'
- '![[ababa-2.png]]' country_variant1: '[[Batanoka]]'
- '[[Faelani]]' country_variant2: '[[Faelani]]'
variant3: country_variant3: '[[Barrowmaw]]'
- '![[ababa-3.png]]'
- '[[Barrowmaw]]'
golden: '![[ababa-4.png]]'
--- ---
# On the Ababa Slime # On the Ababa Slime

View file

@ -1,14 +1,11 @@
--- ---
variant1: art_variant1: '![[bark-1.png]]'
- '![[bark-1.png]]' art_variant2: '![[bark-2.png]]'
- '[[Dasona]]' art_variant3: '![[bark-3.png]]'
variant2: art_golden: '![[bark-4.png]]'
- '![[bark-2.png]]' country_variant1: '[[Dasona]]'
- '[[Gudoko]]' country_variant2: '[[Gudoko]]'
variant3: country_variant3: '[[Lekia]]'
- '![[bark-3.png]]'
- '[[Lekia]]'
golden: '![[bark-4.png]]'
--- ---

View file

@ -1,14 +1,11 @@
--- ---
variant1: art_variant1: '![[garden-1.png]]'
- '![[garden-1.png]]' art_variant2: '![[garden-2.png]]'
- '[[Dasona]]' art_variant3: '![[garden-3.png]]'
variant2: art_golden: '![[garden-4.png]]'
- '![[garden-2.png]]' country_variant1: '[[Dasona]]'
- '[[Soljord]]' country_variant2: '[[Soljord]]'
variant3: country_variant3: '[[Dolfeyja]]'
- '![[garden-3.png]]'
- '[[Dolfeyja]]'
golden: '![[garden-4.png]]'
--- ---

View file

@ -1,14 +1,11 @@
--- ---
variant1: art_variant1: '![[godot-1.png]]'
- '![[godot-1.png]]' art_variant2: '![[godot-2.png]]'
- '[[Gokolm]]' art_variant3: '![[godot-3.png]]'
variant2: art_golden: '![[godot-4.png]]'
- '![[godot-2.png]]' country_variant1: '[[Gokolm]]'
- '[[Dasona]]' country_variant2: '[[Dasona]]'
variant3: country_variant3: '[[Soljord]]'
- '![[godot-3.png]]'
- '[[Soljord]]'
golden: '![[godot-4.png]]'
--- ---

View file

@ -1,14 +1,11 @@
--- ---
variant1: art_variant1: '![[honey-1.png]]'
- '![[honey-1.png]]' art_variant2: '![[honey-2.png]]'
- '[[Dahallow]]' art_variant3: '![[honey-3.png]]'
variant2: art_golden: '![[honey-4.png]]'
- '![[honey-2.png]]' country_variant1: '[[Dahallow]]'
- '[[Krakala]]' country_variant2: '[[Krakala]]'
variant3: country_variant3: '[[Mantine]]'
- '![[honey-3.png]]'
- '[[Mantine]]'
golden: '![[honey-4.png]]'
--- ---

View file

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

View file

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

View file

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

View file

@ -1,19 +1,19 @@
--- ---
--- ---
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" 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", 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", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", 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 -->
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant| |Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
|------|---------|---------|---------|--------------| |------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
|[Ababa Slime](Ababa%20Slime.md)|-|-|-|-| |[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 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 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 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 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 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 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 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 --> <!-- SerializedQuery END -->