Compare commits

..

No commits in common. "bed4c6f3d01421223d680cdc3799be8c96fd69d3" and "5e21fac342320937ed4cf778484e8b5129a6eae5" have entirely different histories.

2 changed files with 73 additions and 132 deletions

View file

@ -6,51 +6,33 @@
{ {
"id": "16de56932df8d2b5", "id": "16de56932df8d2b5",
"type": "tabs", "type": "tabs",
"dimension": 16.366612111292962,
"children": [ "children": [
{ {
"id": "65374afab15971d2", "id": "f84169dad44b3808",
"type": "leaf",
"state": {
"type": "image",
"state": {
"file": "Images/slimes/ababa/ababa-1.png"
}
}
}
]
},
{
"id": "a776313f551069bd",
"type": "tabs",
"dimension": 83.63338788870703,
"children": [
{
"id": "c400fd62d021c702",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Animals/Slimes/Ababa Slime.md", "file": "Countries/Blanchister.md",
"mode": "source",
"source": true
}
}
},
{
"id": "d186fdb7d8783998",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "source", "mode": "source",
"source": false "source": false
} }
} }
}, },
{ {
"id": "3828af17ae2bbb6a", "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",
@ -62,19 +44,19 @@
} }
}, },
{ {
"id": "cd8543c15ea2f09f", "id": "6e9264aa36b7c209",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Animals/Slimes/_index.md", "file": "Animals/Cat.md",
"mode": "source", "mode": "source",
"source": false "source": false
} }
} }
}, },
{ {
"id": "6ad99838c94a15dd", "id": "a12c575a3e4e2f21",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
@ -86,7 +68,7 @@
} }
}, },
{ {
"id": "a289d6327d739306", "id": "e18161b255f8c3cb",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
@ -98,76 +80,31 @@
} }
}, },
{ {
"id": "b704e930ac81712d", "id": "6e65a1802f52d161",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Animals/Slimes/Ababa Slime.md", "file": "Countries/Vosaka.md",
"mode": "preview", "mode": "source",
"source": false "source": true
} }
} }
}, },
{ {
"id": "efb1a9199c2e99b6", "id": "6dd42c89cd0a32cf",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Animals/Slimes/_index.md", "file": "Countries/_index.md",
"mode": "preview",
"source": false
}
}
},
{
"id": "0b8bff69287ad9fb",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "source", "mode": "source",
"source": false "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/conflict-files-obsidian-git.md",
"staged": false
}
}
} }
], ],
"currentTab": 11 "currentTab": 7
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -233,6 +170,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Countries/_index.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -249,6 +187,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Countries/_index.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -270,7 +209,9 @@
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "outline", "type": "outline",
"state": {} "state": {
"file": "Countries/_index.md"
}
} }
}, },
{ {
@ -286,64 +227,65 @@
} }
], ],
"direction": "horizontal", "direction": "horizontal",
"width": 695.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": "0e473423f5963692", "active": "6dd42c89cd0a32cf",
"lastOpenFiles": [ "lastOpenFiles": [
"conflict-files-obsidian-git.md",
"Countries/_index.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Untitled.md",
"Countries/Faelani.md",
"Countries/Dolfeyja.md", "Countries/Dolfeyja.md",
"Countries/Felmyr.md", "Countries/Dasona.md",
"Countries/Vosaka.md", "Languages/Fayahi.md",
"Countries/Vikogyna.md", "Languages/Guo.md",
"Countries/Vanatn.md", "Countries/Faelani.md",
"Countries/Soljord.md", "Countries/Gudoko.md",
"Countries/Seraphis.md", "Countries/Lekia.md",
"Countries/Ovanos.md", "Countries/Nakadon.md",
"Countries/Oshela.md", "Languages/Mokrixi.md",
"Images/flags/nonkur.png",
"Images/flags/nasahra.png",
"Images/flags/nakadon.png",
"Images/flags/mortham.png",
"Images/flags/mantine.png",
"Images/flags/llasuki.png",
"Images/flags/lekia.png",
"Images/flags/lavaki.png",
"Images/flags/krakala.png",
"Images/flags/hanoka.png",
"Images/Flags",
"Countries/Nonkur.md", "Countries/Nonkur.md",
"Countries/Nasahra.md", "Countries/Nasahra.md",
"Countries/Nakadon.md", "Countries/Oshela.md",
"Languages/Lacelian.md",
"Countries/Soljord.md",
"Countries/Vikogyna.md",
"Countries/Vosaka.md",
"Countries/Vanatn.md",
"Countries/Seraphis.md",
"Countries/Ovanos.md",
"Countries/Mortham.md", "Countries/Mortham.md",
"Countries/Mantine.md", "Countries/Mantine.md",
"Countries/Llasuki.md", "Countries/Llasuki.md",
"Countries/Lekia.md",
"Countries/Lavaki.md", "Countries/Lavaki.md",
"Countries/Krakala.md", "Countries/Krakala.md",
"Countries/Hanoka.md", "Countries/Hanoka.md",
"Countries/Gudoko.md", "Countries/Gokolm.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/ababa",
"Images/slimes", "Images/slimes",
"Countries/Faelani",
"Images/Flags/barrowmaw.png",
"Animals/Slimes", "Animals/Slimes",
"Languages", "Languages",
"Images/Flags/vosaka.png",
"Images/Flags/vikogyna.png",
"Images/Flags/vanatn.png",
"Images/Flags/soljord.png",
"Images/Flags/seraphis.png",
"Images/Flags",
"Images/Flags",
"Images", "Images",
"Regions", "Regions",
"Territories", "Territories"
"Provinces"
] ]
} }

View file

@ -1,12 +1,11 @@
<!-- 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", 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 --> <!-- 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 | | 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]] |
| [[Animals/Slimes/Untitled.md\|Untitled]] | \- | \- | \- | \- | \- | \- | \- |
<!-- SerializedQuery END --> <!-- SerializedQuery END -->