Compare commits

..

No commits in common. "166df7f2216628657711050104252e89bab144c2" and "b579bccee5643325f13decd50ef3b8139794cd24" have entirely different histories.

5 changed files with 90 additions and 217 deletions

View file

@ -6,10 +6,33 @@
{ {
"id": "16de56932df8d2b5", "id": "16de56932df8d2b5",
"type": "tabs", "type": "tabs",
"dimension": 77.27272727272727,
"children": [ "children": [
{ {
"id": "65374afab15971d2", "id": "f84169dad44b3808",
"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",
@ -21,18 +44,19 @@
} }
}, },
{ {
"id": "9bba1e7f22a41622", "id": "6e9264aa36b7c209",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "diff-view", "type": "markdown",
"state": { "state": {
"file": "content/Animals/Slimes/_index.md", "file": "Animals/Cat.md",
"staged": true "mode": "source",
"source": false
} }
} }
}, },
{ {
"id": "f61093bc90ac3a19", "id": "a12c575a3e4e2f21",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
@ -44,87 +68,7 @@
} }
}, },
{ {
"id": "b57aab6642ed017d", "id": "e18161b255f8c3cb",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "preview",
"source": false
}
}
},
{
"id": "8132219ace7c9b44",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
}
}
}
],
"currentTab": 4
},
{
"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",
@ -136,77 +80,7 @@
} }
}, },
{ {
"id": "a289d6327d739306", "id": "99690ee270617d17",
"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",
@ -217,7 +91,7 @@
} }
} }
], ],
"currentTab": 11 "currentTab": 6
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -283,7 +157,6 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "conflict-files-obsidian-git.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -300,7 +173,6 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "conflict-files-obsidian-git.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -322,9 +194,7 @@
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {}
"file": "conflict-files-obsidian-git.md"
}
} }
}, },
{ {
@ -340,32 +210,32 @@
} }
], ],
"direction": "horizontal", "direction": "horizontal",
"width": 523.5 "width": 300
}, },
"left-ribbon": { "left-ribbon": {
"hiddenItems": { "hiddenItems": {
"switcher:Abrir selector rápido": false, "random-note:Open random note": false,
"graph:Abrir vista gráfica": false, "switcher:Open quick switcher": false,
"templates:Insertar plantilla": false, "graph:Open graph view": false,
"command-palette:Abrir paleta de comandos": false, "templates:Insert template": false,
"random-note:Abrir nota al azar": false, "command-palette:Open command palette": false,
"obsidian-git:Open Git source control": false "obsidian-git:Open Git source control": false
} }
}, },
"active": "8132219ace7c9b44", "active": "90b57f41c87f2b3b",
"lastOpenFiles": [ "lastOpenFiles": [
"Animals/Slimes/_index.md",
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Sunflower Slime.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/Garden Slime.md",
"Animals/Slimes/Bark Slime.md", "Animals/Slimes/Bark Slime.md",
"Animals/Slimes/Ababa Slime.md", "Animals/Slimes/Garden Slime.md",
"Images/Slimes/sunflower-4.png", "Countries/Vosaka.md",
"Images/Slimes/sunflower-3.png", "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",
@ -374,30 +244,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",
"Animals/Slimes/Untitled.md", "Images/Slimes/lagoon-2.png",
"Animals/_index.md", "Images/Slimes/Untitled",
"Countries/_index.md", "Images/Slimes/bark",
"Images/Slimes/garden",
"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",
"Images/Slimes/ababa", "Languages/Edikan.md",
"Images/Slimes", "Languages/_index.md",
"Countries/Faelani.md", "Countries/_index.md",
"Countries/Dolfeyja.md", "Countries/Dolfeyja.md",
"Countries/Felmyr.md", "Countries/Dasona.md",
"Countries/Vosaka.md", "Countries/Faelani.md",
"Countries/Vikogyna.md", "Countries/Gudoko.md",
"Countries/Vanatn.md", "Countries/Lekia.md",
"Countries/Soljord.md", "Countries/Nakadon.md",
"Countries/Seraphis.md", "Countries/Nonkur.md",
"Images/Flags", "Countries/Nasahra.md",
"Images/slimes/ababa", "Images/Slimes/ababa",
"Images/slimes", "Images/slimes",
"Countries/Faelani",
"Animals/Slimes", "Animals/Slimes",
"Languages", "Languages",
"Images", "Images/Flags"
"Regions",
"Territories"
] ]
} }

View file

@ -1,12 +1,12 @@
--- ---
variant1: art_variant1:
- "![[lagoon-1.png]]" - "![[lagoon-1.png]]"
- "[[Dahallow]]" - "[[Dahallow]]"
variant2: art_variant2:
- "![[lagoon-2.png]]" - "![[lagoon-2.png]]"
- "[[Mantine]]" - "[[Mantine]]"
variant3: art_variant3:
- "![[lagoon-3.png]]" - "![[lagoon-3.png]]"
- "[[Felmyr]]" - "[[Felmyr]]"
golden: "![[lagoon-4.png]]" art_golden: "![[lagoon-4.png]]"
--- ---

View file

@ -1,12 +1,12 @@
--- ---
variant1: art_variant1:
- "![[marsh-1.png]]" - "![[marsh-1.png]]"
- "[[Oshela]]" - "[[Oshela]]"
variant2: art_variant2:
- "![[marsh-2.png]]" - "![[marsh-2.png]]"
- "[[Vikogyna]]" - "[[Vikogyna]]"
variant3: art_variant3:
- "![[marsh-3.png]]" - "![[marsh-3.png]]"
- "[[Barrowmaw]]" - "[[Barrowmaw]]"
golden: "![[marsh-4.png]]" art_golden: "![[marsh-4.png]]"
--- ---

View file

@ -1,12 +1,14 @@
--- ---
variant1: art_variant1:
- "![[sunflower-1.png]]" - "![[sunflower-1.png]]"
- "[[Calcetron]]" - "[[Calcetron]]"
variant2: art_variant2:
- "![[sunflower-2.png]]" - "![[sunflower-2.png]]"
- "[[Llasuki]]" - "[[Llasuki]]"
variant3: art_variant3:
- "![[sunflower-3.png]]" - "![[sunflower-3.png]]"
- "[[Blanchister]]" art_golden: "![[sunflower-4.png]]"
golden: "![[sunflower-4.png]]" country_variant1:
country_variant2:
country_variant3:
--- ---

View file

@ -2,14 +2,14 @@
<!-- 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", 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", 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", 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 -->
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant | | 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]] | | [[Ababa Slime]] | \- | \- | \- | \- |
| [[Bark Slime]] | <ul><li>![[bark-1.png]]</li><li>[[Dasona]]</li></ul> | <ul><li>![[bark-2.png]]</li><li>[[Gudoko]]</li></ul> | <ul><li>![[bark-3.png]]</li><li>[[Lekia]]</li></ul> | ![[bark-4.png]] | | [[Bark Slime]] | \- | \- | \- | \- |
| [[Garden Slime]] | <ul><li>![[garden-1.png]]</li><li>[[Dasona]]</li></ul> | <ul><li>![[garden-2.png]]</li><li>[[Soljord]]</li></ul> | <ul><li>![[garden-3.png]]</li><li>[[Dolfeyja]]</li></ul> | ![[garden-4.png]] | | [[Garden Slime]] | \- | \- | \- | \- |
| [[Godot Slime]] | <ul><li>![[godot-1.png]]</li><li>[[Gokolm]]</li></ul> | <ul><li>![[godot-2.png]]</li><li>[[Dasona]]</li></ul> | <ul><li>![[godot-3.png]]</li><li>[[Soljord]]</li></ul> | ![[godot-4.png]] | | [[Godot Slime]] | \- | \- | \- | \- |
| [[Honey Slime]] | <ul><li>![[honey-1.png]]</li><li>[[Dahallow]]</li></ul> | <ul><li>![[honey-2.png]]</li><li>[[Krakala]]</li></ul> | <ul><li>![[honey-3.png]]</li><li>[[Mantine]]</li></ul> | ![[honey-4.png]] | | [[Honey Slime]] | \- | \- | \- | \- |
| [[Lagoon Slime]] | <ul><li>![[lagoon-1.png]]</li><li>[[Dahallow]]</li></ul> | <ul><li>![[lagoon-2.png]]</li><li>[[Mantine]]</li></ul> | <ul><li>![[lagoon-3.png]]</li><li>[[Felmyr]]</li></ul> | ![[lagoon-4.png]] | | [[Lagoon Slime]] | \- | \- | \- | \- |
| [[Marsh Slime]] | <ul><li>![[marsh-1.png]]</li><li>[[Oshela]]</li></ul> | <ul><li>![[marsh-2.png]]</li><li>[[Vikogyna]]</li></ul> | <ul><li>![[marsh-3.png]]</li><li>[[Barrowmaw]]</li></ul> | ![[marsh-4.png]] | | [[Marsh Slime]] | \- | \- | \- | \- |
| [[Sunflower Slime]] | <ul><li>![[sunflower-1.png]]</li><li>[[Calcetron]]</li></ul> | <ul><li>![[sunflower-2.png]]</li><li>[[Llasuki]]</li></ul> | <ul><li>![[sunflower-3.png]]</li><li>[[Blanchister]]</li></ul> | ![[sunflower-4.png]] | | [[Sunflower Slime]] | \- | \- | \- | \- |
<!-- SerializedQuery END --> <!-- SerializedQuery END -->