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
3 changed files with 23 additions and 22 deletions
Showing only changes of commit f955814776 - Show all commits

View file

@ -6,11 +6,11 @@
"emojiStyle": "native",
"iconColor": null,
"recentlyUsedIcons": [
"SlSunflower1",
"SlMarsh1",
"SlLagoon1",
"SlHoney1",
"SlGodot1",
"SlGarden1"
"SlGodot1"
],
"recentlyUsedIconsSize": 5,
"rules": [],
@ -84,5 +84,6 @@
"Animals/Slimes/Godot Slime.md": "SlGodot1",
"Animals/Slimes/Honey Slime.md": "SlHoney1",
"Animals/Slimes/Lagoon Slime.md": "SlLagoon1",
"Animals/Slimes/Marsh Slime.md": "SlMarsh1"
"Animals/Slimes/Marsh Slime.md": "SlMarsh1",
"Animals/Slimes/Sunflower Slime.md": "SlSunflower1"
}

View file

@ -85,7 +85,7 @@
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Bark Slime.md",
"file": "Animals/Slimes/_index.md",
"mode": "source",
"source": false
}
@ -158,7 +158,7 @@
"state": {
"type": "backlink",
"state": {
"file": "Animals/Slimes/Bark Slime.md",
"file": "Animals/Slimes/_index.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -175,7 +175,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "Animals/Slimes/Bark Slime.md",
"file": "Animals/Slimes/_index.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -198,7 +198,7 @@
"state": {
"type": "outline",
"state": {
"file": "Animals/Slimes/Bark Slime.md"
"file": "Animals/Slimes/_index.md"
}
}
},
@ -227,20 +227,20 @@
"obsidian-git:Open Git source control": false
}
},
"active": "fdbd8ce5e8a10389",
"active": "99690ee270617d17",
"lastOpenFiles": [
"Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md",
"Countries/Felmyr.md",
"Countries/Llasuki.md",
"conflict-files-obsidian-git.md",
"Animals/Slimes/_index.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",
"Countries/Vosaka.md",
"Images/Slimes/garden-1.png",
"Images/Slimes/sunflower-2.png",

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 -->
<!-- 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 |
| ------------------- | ------------------------------------------------------------ | ---------------------------------------------------------- | -------------------------------------------------------------- | -------------------- |
| [[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]] | <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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| 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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| [[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]] |
| [[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]] |
<!-- SerializedQuery END -->