1
0
Fork 0

Pull Edikoyo-Main into Edikoyo-n04 #1

Merged
n04 merged 107 commits from Edikoyo/EdikoyoWiki:main into main 2024-09-07 23:41:19 +00:00
29 changed files with 35289 additions and 223 deletions
Showing only changes of commit 03c6524fa1 - Show all commits

1527
Edikoyo/.obsidian/icons/flags/Dratana.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Faelani.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Falaka.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Felmyr.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Gokolm.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Gudoko.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Hanoka.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Krakala.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Lavaki.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Lekia.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Llasuki.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Mantine.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Mortham.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Nakadon.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Nasahra.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Nonkur.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Oshela.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Ovanos.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Seraphis.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Soljord.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Vanatn.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Vikogyna.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

1527
Edikoyo/.obsidian/icons/flags/Vosaka.svg vendored Normal file

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 87 KiB

View file

@ -6,11 +6,11 @@
"emojiStyle": "native", "emojiStyle": "native",
"iconColor": null, "iconColor": null,
"recentlyUsedIcons": [ "recentlyUsedIcons": [
"LiShell", "FlVosaka",
"LiUsers", "FlVikogyna",
"LiFlag", "FlVanatn",
"LiImage", "FlSoljord",
"LiBuilding" "FlSeraphis"
], ],
"recentlyUsedIconsSize": 5, "recentlyUsedIconsSize": 5,
"rules": [], "rules": [],
@ -54,5 +54,28 @@
"Species": "LiUsers", "Species": "LiUsers",
"Animals/Slimes": "LiShell", "Animals/Slimes": "LiShell",
"Animals/Slimes/_index.md": "LiShell", "Animals/Slimes/_index.md": "LiShell",
"Images/Slimes": "LiShell" "Images/Slimes": "LiShell",
"Countries/Dratana.md": "FlDratana",
"Countries/Faelani.md": "FlFaelani",
"Countries/Falaka.md": "FlFalaka",
"Countries/Felmyr.md": "FlFelmyr",
"Countries/Gokolm.md": "FlGokolm",
"Countries/Gudoko.md": "FlGudoko",
"Countries/Hanoka.md": "FlHanoka",
"Countries/Krakala.md": "FlKrakala",
"Countries/Lavaki.md": "FlLavaki",
"Countries/Lekia.md": "FlLekia",
"Countries/Llasuki.md": "FlLlasuki",
"Countries/Mortham.md": "FlMortham",
"Countries/Mantine.md": "FlMantine",
"Countries/Nakadon.md": "FlNakadon",
"Countries/Nasahra.md": "FlNasahra",
"Countries/Nonkur.md": "FlNonkur",
"Countries/Oshela.md": "FlOshela",
"Countries/Ovanos.md": "FlOvanos",
"Countries/Seraphis.md": "FlSeraphis",
"Countries/Soljord.md": "FlSoljord",
"Countries/Vanatn.md": "FlVanatn",
"Countries/Vikogyna.md": "FlVikogyna",
"Countries/Vosaka.md": "FlVosaka"
} }

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,180 +68,31 @@
} }
}, },
{ {
"id": "b57aab6642ed017d", "id": "e18161b255f8c3cb",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Animals/Slimes/_index.md", "file": "Animals/Slimes/Ababa Slime.md",
"mode": "preview", "mode": "source",
"source": false "source": false
} }
} }
}, },
{ {
"id": "8132219ace7c9b44", "id": "99690ee270617d17",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "conflict-files-obsidian-git.md", "file": "Countries/Llasuki.md",
"mode": "source", "mode": "source",
"source": false "source": false
} }
} }
} }
], ],
"currentTab": 4 "currentTab": 6
},
{
"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",
"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": 11
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -283,7 +158,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "conflict-files-obsidian-git.md", "file": "Countries/Llasuki.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -300,7 +175,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "conflict-files-obsidian-git.md", "file": "Countries/Llasuki.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -323,7 +198,7 @@
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {
"file": "conflict-files-obsidian-git.md" "file": "Countries/Llasuki.md"
} }
} }
}, },
@ -340,32 +215,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": "99690ee270617d17",
"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 +249,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,14 +1,14 @@
--- ---
art_variant1: variant1:
- '![[lagoon-1.png]]' - '![[lagoon-1.png]]'
- '[[Dahallow]]' - '[[Dahallow]]'
art_variant2: variant2:
- '![[lagoon-2.png]]' - '![[lagoon-2.png]]'
- '[[Mantine]]' - '[[Mantine]]'
art_variant3: variant3:
- '![[lagoon-3.png]]' - '![[lagoon-3.png]]'
- '[[Felmyr]]' - '[[Felmyr]]'
art_golden: '![[lagoon-4.png]]' golden: '![[lagoon-4.png]]'
--- ---

View file

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

View file

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

View file

@ -6,14 +6,62 @@
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant| |Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|
|------|---------|---------|---------|--------------| |------|---------|---------|---------|--------------|
|[Ababa Slime](Ababa%20Slime.md)|-|-|-|-| |[Ababa Slime](Ababa%20Slime.md)|<ul><li>
|[Bark Slime](Bark%20Slime.md)|-|-|-|-| ![ababa-1.png](..\..\Images\Slimes\ababa-1.png)</li><li>
|[Garden Slime](Garden%20Slime.md)|-|-|-|-| [Batanoka](..\..\Countries\Batanoka.md)</li></ul>|<ul><li>
|[Godot Slime](Godot%20Slime.md)|-|-|-|-| ![ababa-2.png](..\..\Images\Slimes\ababa-2.png)</li><li>
|[Honey Slime](Honey%20Slime.md)|-|-|-|-| [Faelani](..\..\Countries\Faelani.md)</li></ul>|<ul><li>
|[Lagoon Slime](Lagoon%20Slime.md)|-|-|-|-| ![ababa-3.png](..\..\Images\Slimes\ababa-3.png)</li><li>
|[Marsh Slime](Marsh%20Slime.md)|-|-|-|-| [Barrowmaw](..\..\Countries\Barrowmaw.md)</li></ul>|![ababa-4.png](..\..\Images\Slimes\ababa-4.png)|
|[Sunflower Slime](Sunflower%20Slime.md)|-|-|-|-| |[Bark Slime](Bark%20Slime.md)|<ul><li>
![bark-1.png](..\..\Images\Slimes\bark-1.png)</li><li>
[Dasona](..\..\Countries\Dasona.md)</li></ul>|<ul><li>
![bark-2.png](..\..\Images\Slimes\bark-2.png)</li><li>
[Gudoko](..\..\Countries\Gudoko.md)</li></ul>|<ul><li>
![bark-3.png](..\..\Images\Slimes\bark-3.png)</li><li>
[Lekia](..\..\Countries\Lekia.md)</li></ul>|![bark-4.png](..\..\Images\Slimes\bark-4.png)|
|[Garden Slime](Garden%20Slime.md)|<ul><li>
![garden-1.png](..\..\Images\Slimes\garden-1.png)</li><li>
[Dasona](..\..\Countries\Dasona.md)</li></ul>|<ul><li>
![garden-2.png](..\..\Images\Slimes\garden-2.png)</li><li>
[Soljord](..\..\Countries\Soljord.md)</li></ul>|<ul><li>
![garden-3.png](..\..\Images\Slimes\garden-3.png)</li><li>
[Dolfeyja](..\..\Countries\Dolfeyja.md)</li></ul>|![garden-4.png](..\..\Images\Slimes\garden-4.png)|
|[Godot Slime](Godot%20Slime.md)|<ul><li>
![godot-1.png](..\..\Images\Slimes\godot-1.png)</li><li>
[Gokolm](..\..\Countries\Gokolm.md)</li></ul>|<ul><li>
![godot-2.png](..\..\Images\Slimes\godot-2.png)</li><li>
[Dasona](..\..\Countries\Dasona.md)</li></ul>|<ul><li>
![godot-3.png](..\..\Images\Slimes\godot-3.png)</li><li>
[Soljord](..\..\Countries\Soljord.md)</li></ul>|![godot-4.png](..\..\Images\Slimes\godot-4.png)|
|[Honey Slime](Honey%20Slime.md)|<ul><li>
![honey-1.png](..\..\Images\Slimes\honey-1.png)</li><li>
[Dahallow](..\..\Countries\Dahallow.md)</li></ul>|<ul><li>
![honey-2.png](..\..\Images\Slimes\honey-2.png)</li><li>
[Krakala](..\..\Countries\Krakala.md)</li></ul>|<ul><li>
![honey-3.png](..\..\Images\Slimes\honey-3.png)</li><li>
[Mantine](..\..\Countries\Mantine.md)</li></ul>|![honey-4.png](..\..\Images\Slimes\honey-4.png)|
|[Lagoon Slime](Lagoon%20Slime.md)|<ul><li>
![lagoon-1.png](..\..\Images\Slimes\lagoon-1.png)</li><li>
[Dahallow](..\..\Countries\Dahallow.md)</li></ul>|<ul><li>
![lagoon-2.png](..\..\Images\Slimes\lagoon-2.png)</li><li>
[Mantine](..\..\Countries\Mantine.md)</li></ul>|<ul><li>
![lagoon-3.png](..\..\Images\Slimes\lagoon-3.png)</li><li>
[Felmyr](..\..\Countries\Felmyr.md)</li></ul>|![lagoon-4.png](..\..\Images\Slimes\lagoon-4.png)|
|[Marsh Slime](Marsh%20Slime.md)|<ul><li>
![marsh-1.png](..\..\Images\Slimes\marsh-1.png)</li><li>
[Oshela](..\..\Countries\Oshela.md)</li></ul>|<ul><li>
![marsh-2.png](..\..\Images\Slimes\marsh-2.png)</li><li>
[Vikogyna](..\..\Countries\Vikogyna.md)</li></ul>|<ul><li>
![marsh-3.png](..\..\Images\Slimes\marsh-3.png)</li><li>
[Barrowmaw](..\..\Countries\Barrowmaw.md)</li></ul>|![marsh-4.png](..\..\Images\Slimes\marsh-4.png)|
|[Sunflower Slime](Sunflower%20Slime.md)|<ul><li>
![sunflower-1.png](..\..\Images\Slimes\sunflower-1.png)</li><li>
[Calcetron](..\..\Countries\Calcetron.md)</li></ul>|<ul><li>
![sunflower-2.png](..\..\Images\Slimes\sunflower-2.png)</li><li>
[Llasuki](..\..\Countries\Llasuki.md)</li></ul>|<ul><li>
![sunflower-3.png](..\..\Images\Slimes\sunflower-3.png)</li><li>
[Blanchister](..\..\Countries\Blanchister.md)</li></ul>|![sunflower-4.png](..\..\Images\Slimes\sunflower-4.png)|
<!-- SerializedQuery END --> <!-- SerializedQuery END -->