forked from Edikoyo/EdikoyoWiki
vault backup: 2024-09-07 08:27:06
This commit is contained in:
parent
c82b808fcb
commit
59eb24b4f3
10 changed files with 97 additions and 81 deletions
24
Edikoyo/.obsidian/workspace.json
vendored
24
Edikoyo/.obsidian/workspace.json
vendored
|
|
@ -49,7 +49,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "Animals/Slimes/Sunflower Slime.md",
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
|
|
@ -271,7 +271,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "Animals/Slimes/Sunflower Slime.md",
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
|
|
@ -288,7 +288,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "Animals/Slimes/Sunflower Slime.md",
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
}
|
}
|
||||||
|
|
@ -311,7 +311,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md"
|
"file": "Animals/Slimes/Sunflower Slime.md"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -342,8 +342,15 @@
|
||||||
},
|
},
|
||||||
"active": "b57aab6642ed017d",
|
"active": "b57aab6642ed017d",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"conflict-files-obsidian-git.md",
|
"Animals/Slimes/Marsh Slime.md",
|
||||||
|
"Animals/Slimes/Lagoon Slime.md",
|
||||||
|
"Animals/Slimes/Honey Slime.md",
|
||||||
|
"Animals/Slimes/Godot Slime.md",
|
||||||
|
"Animals/Slimes/Garden Slime.md",
|
||||||
|
"Animals/Slimes/Bark Slime.md",
|
||||||
"Animals/Slimes/Ababa Slime.md",
|
"Animals/Slimes/Ababa Slime.md",
|
||||||
|
"Animals/Slimes/_index.md",
|
||||||
|
"conflict-files-obsidian-git.md",
|
||||||
"Images/Slimes/sunflower-4.png",
|
"Images/Slimes/sunflower-4.png",
|
||||||
"Images/Slimes/sunflower-3.png",
|
"Images/Slimes/sunflower-3.png",
|
||||||
"Images/Slimes/sunflower-2.png",
|
"Images/Slimes/sunflower-2.png",
|
||||||
|
|
@ -355,13 +362,6 @@
|
||||||
"Images/Slimes/lagoon-4.png",
|
"Images/Slimes/lagoon-4.png",
|
||||||
"Images/Slimes/lagoon-3.png",
|
"Images/Slimes/lagoon-3.png",
|
||||||
"Animals/Slimes/Sunflower Slime.md",
|
"Animals/Slimes/Sunflower Slime.md",
|
||||||
"Animals/Slimes/Marsh Slime.md",
|
|
||||||
"Animals/Slimes/Lagoon Slime.md",
|
|
||||||
"Animals/Slimes/Honey Slime.md",
|
|
||||||
"Animals/Slimes/Godot Slime.md",
|
|
||||||
"Animals/Slimes/Garden Slime.md",
|
|
||||||
"Animals/Slimes/Bark Slime.md",
|
|
||||||
"Animals/Slimes/_index.md",
|
|
||||||
"Animals/Slimes/Untitled.md",
|
"Animals/Slimes/Untitled.md",
|
||||||
"Animals/_index.md",
|
"Animals/_index.md",
|
||||||
"Countries/_index.md",
|
"Countries/_index.md",
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
---
|
---
|
||||||
art_variant1:
|
variant1:
|
||||||
- "![[ababa-1.png]]"
|
- "![[ababa-1.png]]"
|
||||||
- "[[Batanoka]]"
|
- "[[Batanoka]]"
|
||||||
art_variant2:
|
variant2:
|
||||||
- "![[ababa-2.png]]"
|
- "![[ababa-2.png]]"
|
||||||
- "[[Faelani]]"
|
- "[[Faelani]]"
|
||||||
art_variant3:
|
variant3:
|
||||||
- "![[ababa-3.png]]"
|
- "![[ababa-3.png]]"
|
||||||
- "[[Barrowmaw]]"
|
- "[[Barrowmaw]]"
|
||||||
art_golden: "![[ababa-4.png]]"
|
golden: "![[ababa-4.png]]"
|
||||||
---
|
---
|
||||||
|
|
||||||
# On the Ababa Slime
|
# On the Ababa Slime
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[bark-1.png]]"
|
variant1:
|
||||||
art_variant2: "![[bark-2.png]]"
|
- "![[bark-1.png]]"
|
||||||
art_variant3: "![[bark-3.png]]"
|
- "[[Dasona]]"
|
||||||
art_golden: "![[bark-4.png]]"
|
variant2:
|
||||||
country_variant1: "[[Dasona]]"
|
- "![[bark-2.png]]"
|
||||||
country_variant2: "[[Gudoko]]"
|
- "[[Gudoko]]"
|
||||||
country_variant3: "[[Lekia]]"
|
variant3:
|
||||||
|
- "![[bark-3.png]]"
|
||||||
|
- "[[Lekia]]"
|
||||||
|
golden: "![[bark-4.png]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[garden-1.png]]"
|
variant1:
|
||||||
art_variant2: "![[garden-2.png]]"
|
- "![[garden-1.png]]"
|
||||||
art_variant3: "![[garden-3.png]]"
|
- "[[Dasona]]"
|
||||||
art_golden: "![[garden-4.png]]"
|
variant2:
|
||||||
country_variant1: "[[Dasona]]"
|
- "![[garden-2.png]]"
|
||||||
country_variant2: "[[Soljord]]"
|
- "[[Soljord]]"
|
||||||
country_variant3: "[[Dolfeyja]]"
|
variant3:
|
||||||
|
- "![[garden-3.png]]"
|
||||||
|
- "[[Dolfeyja]]"
|
||||||
|
golden: "![[garden-4.png]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[godot-1.png]]"
|
variant1:
|
||||||
art_variant2: "![[godot-2.png]]"
|
- "![[godot-1.png]]"
|
||||||
art_variant3: "![[godot-3.png]]"
|
- "[[Gokolm]]"
|
||||||
art_golden: "![[godot-4.png]]"
|
variant2:
|
||||||
country_variant1: "[[Gokolm]]"
|
- "![[godot-2.png]]"
|
||||||
country_variant2: "[[Dasona]]"
|
- "[[Dasona]]"
|
||||||
country_variant3: "[[Soljord]]"
|
variant3:
|
||||||
|
- "![[godot-3.png]]"
|
||||||
|
- "[[Soljord]]"
|
||||||
|
golden: "![[godot-4.png]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[honey-1.png]]"
|
variant1:
|
||||||
art_variant2: "![[honey-2.png]]"
|
- "![[honey-1.png]]"
|
||||||
art_variant3: "![[honey-3.png]]"
|
- "[[Dahallow]]"
|
||||||
art_golden: "![[honey-4.png]]"
|
variant2:
|
||||||
country_variant1: "[[Dahallow]]"
|
- "![[honey-2.png]]"
|
||||||
country_variant2: "[[Krakala]]"
|
- "[[Krakala]]"
|
||||||
country_variant3: "[[Mantine]]"
|
variant3:
|
||||||
|
- "![[honey-3.png]]"
|
||||||
|
- "[[Mantine]]"
|
||||||
|
golden: "![[honey-4.png]]"
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[lagoon-1.png]]"
|
art_variant1:
|
||||||
art_variant2: "![[lagoon-2.png]]"
|
- "![[lagoon-1.png]]"
|
||||||
art_variant3: "![[lagoon-3.png]]"
|
- "[[Dahallow]]"
|
||||||
|
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]]"
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[marsh-1.png]]"
|
art_variant1:
|
||||||
art_variant2: "![[marsh-2.png]]"
|
- "![[marsh-1.png]]"
|
||||||
art_variant3: "![[marsh-3.png]]"
|
- "[[Oshela]]"
|
||||||
|
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]]"
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,14 @@
|
||||||
---
|
---
|
||||||
art_variant1: "![[sunflower-1.png]]"
|
art_variant1:
|
||||||
art_variant2: "![[sunflower-2.png]]"
|
- "![[sunflower-1.png]]"
|
||||||
art_variant3: "![[sunflower-3.png]]"
|
- "[[Calcetron]]"
|
||||||
|
art_variant2:
|
||||||
|
- "![[sunflower-2.png]]"
|
||||||
|
- "[[Llasuki]]"
|
||||||
|
art_variant3:
|
||||||
|
- "![[sunflower-3.png]]"
|
||||||
art_golden: "![[sunflower-4.png]]"
|
art_golden: "![[sunflower-4.png]]"
|
||||||
country_variant1: "[[Calcetron]]"
|
country_variant1:
|
||||||
country_variant2: "[[Llasuki]]"
|
country_variant2:
|
||||||
country_variant3: "[[Blanchister]]"
|
country_variant3:
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,15 @@
|
||||||
|
|
||||||
<!-- 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 -->
|
<!-- 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", 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", 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 -->
|
||||||
|
|
||||||
<<<<<<< HEAD
|
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant |
|
||||||
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant |
|
| ------------------------------------------------------ | --------- | --------- | --------- | -------------- |
|
||||||
| ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------- |
|
| [[Ababa Slime]] | \- | \- | \- | \- |
|
||||||
| [[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]] |
|
| [[Bark Slime]] | \- | \- | \- | \- |
|
||||||
| [[Animals/Slimes/Untitled.md\|Untitled]] | \- | \- | \- | \- |
|
| [[Garden Slime]] | \- | \- | \- | \- |
|
||||||
=======
|
| [[Godot Slime]] | \- | \- | \- | \- |
|
||||||
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant | Country Variant 1 | Country Variant 2 | Country Variant 3 |
|
| [[Honey Slime]] | \- | \- | \- | \- |
|
||||||
| ------------------------------------------------------ | --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- | ------------------------------------- | ----------------------------------- | ----------------------------------------- |
|
| [[Lagoon Slime]] | \- | \- | \- | \- |
|
||||||
| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | ![[ababa-4.png]] | [[Batanoka]] | [[Faelani]] | [[Barrowmaw]] |
|
| [[Marsh Slime]] | \- | \- | \- | \- |
|
||||||
| [[Bark Slime]] | ![[bark-1.png]] | ![[bark-2.png]] | ![[bark-3.png]] | ![[bark-4.png]] | [[Dasona]] | [[Gudoko]] | [[Lekia]] |
|
| [[Sunflower Slime]] | \- | \- | \- | \- |
|
||||||
| [[Garden Slime]] | ![[garden-1.png]] | ![[garden-2.png]] | ![[garden-3.png]] | ![[garden-4.png]] | [[Dasona]] | [[Soljord]] | [[Dolfeyja]] |
|
|
||||||
| [[Godot Slime]] | ![[godot-1.png]] | ![[godot-2.png]] | ![[godot-3.png]] | ![[godot-4.png]] | [[Gokolm]] | [[Dasona]] | [[Soljord]] |
|
|
||||||
| [[Honey Slime]] | ![[honey-1.png]] | ![[honey-2.png]] | ![[honey-3.png]] | ![[honey-4.png]] | [[Dahallow]] | [[Krakala]] | [[Mantine]] |
|
|
||||||
| [[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]] |
|
|
||||||
| [[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