n04/EdikoyoWiki-n04
1
0
Fork 0
forked from Edikoyo/EdikoyoWiki
Code Pull requests Activity

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
Conversation 0 Commits 107 Files changed 326 +41 -25
19 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1ed121744e - Show all commits

2
Edikoyo/.obsidian/workspace.json vendored
View file

@ -218,7 +218,6 @@
"active": "e18161b255f8c3cb", "active": "e18161b255f8c3cb",
"lastOpenFiles": [ "lastOpenFiles": [
"Animals/Slimes/Ababa Slime.md", "Animals/Slimes/Ababa Slime.md",
"30.md",
"Animals/Slimes/_index.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",
@ -227,6 +226,7 @@
"Animals/Slimes/Godot Slime.md", "Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Garden Slime.md", "Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md", "Animals/Slimes/Bark Slime.md",
"30.md",
"Countries/Felmyr.md", "Countries/Felmyr.md",
"Countries/Llasuki.md", "Countries/Llasuki.md",
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",

1
Edikoyo/Animals/Slimes/Ababa Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Cold type: Cold
requestor: n04_ux
--- ---
# On the Ababa Slime # On the Ababa Slime

1
Edikoyo/Animals/Slimes/Bark Slime.md
View file

@ -13,4 +13,5 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: Ategon
--- ---

1
Edikoyo/Animals/Slimes/Garden Slime.md
View file

@ -13,4 +13,5 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: Ategon
--- ---

1
Edikoyo/Animals/Slimes/Godot Slime.md
View file

@ -13,4 +13,5 @@ golden:
- Everywhere - Everywhere
rarity: Uncommon rarity: Uncommon
type: Stone type: Stone
requestor: PracticalNPC
--- ---

1
Edikoyo/Animals/Slimes/Honey Slime.md
View file

@ -13,4 +13,5 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: SarahClick
--- ---

1
Edikoyo/Animals/Slimes/Lagoon Slime.md
View file

@ -13,4 +13,5 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Water type: Water
requestor: Ategon
--- ---

1
Edikoyo/Animals/Slimes/Marsh Slime.md
View file

@ -12,4 +12,5 @@ golden:
- "![[marsh-4.png]]" - "![[marsh-4.png]]"
rarity: Common rarity: Common
type: Nature type: Nature
requestor: Ategon
--- ---

1
Edikoyo/Animals/Slimes/Sunflower Slime.md
View file

@ -13,4 +13,5 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: GGlitchedOut
--- ---

24
Edikoyo/Animals/Slimes/_index.md
View file

@ -1,14 +1,14 @@
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity", type as "Type", variant1[1] as "Variant 1 Country", variant2[1] as "Variant 2 Country", variant3[1] as "Variant 3 Country" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity", type as "Type", variant1[1] as "Variant 1 Country", variant2[1] as "Variant 2 Country", variant3[1] as "Variant 3 Country" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> <!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
| Slimes | Regional Variant 1 | Regional Variant 2 | Regional Variant 3 | Rarity | Type | Variant 1 Country | Variant 2 Country | Variant 3 Country | | Slimes | Regional Variant 1 | Regional Variant 2 | Regional Variant 3 | Rarity |
| ------------------------------------------------------ | --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- | -------- | ------ | ------------------------------------- | ----------------------------------- | ----------------------------------------- | | ------------------------------------------------------ | --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- | -------- |
| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | Common | Cold | [[Batanoka]] | [[Faelani]] | [[Barrowmaw]] | | [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | Common |
| [[Bark Slime]] | ![[bark-1.png]] | ![[bark-2.png]] | ![[bark-3.png]] | Common | Nature | [[Dasona]] | [[Gudoko]] | [[Lekia]] | | [[Bark Slime]] | ![[bark-1.png]] | ![[bark-2.png]] | ![[bark-3.png]] | Common |
| [[Garden Slime]] | ![[garden-1.png]] | ![[garden-2.png]] | ![[garden-3.png]] | Common | Nature | [[Dasona]] | [[Soljord]] | [[Dolfeyja]] | | [[Garden Slime]] | ![[garden-1.png]] | ![[garden-2.png]] | ![[garden-3.png]] | Common |
| [[Godot Slime]] | ![[godot-1.png]] | ![[godot-2.png]] | ![[godot-3.png]] | Uncommon | Stone | [[Gokolm]] | [[Dasona]] | [[Soljord]] | | [[Godot Slime]] | ![[godot-1.png]] | ![[godot-2.png]] | ![[godot-3.png]] | Uncommon |
| [[Honey Slime]] | ![[honey-1.png]] | ![[honey-2.png]] | ![[honey-3.png]] | Common | Nature | [[Dahallow]] | [[Krakala]] | [[Mantine]] | | [[Honey Slime]] | ![[honey-1.png]] | ![[honey-2.png]] | ![[honey-3.png]] | Common |
| [[Lagoon Slime]] | ![[lagoon-1.png]] | ![[lagoon-2.png]] | ![[lagoon-3.png]] | Common | Water | [[Dahallow]] | [[Mantine]] | [[Felmyr]] | | [[Lagoon Slime]] | ![[lagoon-1.png]] | ![[lagoon-2.png]] | ![[lagoon-3.png]] | Common |
| [[Marsh Slime]] | ![[marsh-1.png]] | ![[marsh-2.png]] | ![[marsh-3.png]] | Common | Nature | [[Oshela]] | [[Vikogyna]] | [[Barrowmaw]] | | [[Marsh Slime]] | ![[marsh-1.png]] | ![[marsh-2.png]] | ![[marsh-3.png]] | Common |
| [[Sunflower Slime]] | ![[sunflower-1.png]] | ![[sunflower-2.png]] | ![[sunflower-3.png]] | Common | Nature | [[Calcetron]] | [[Llasuki]] | [[Blanchister]] | | [[Sunflower Slime]] | ![[sunflower-1.png]] | ![[sunflower-2.png]] | ![[sunflower-3.png]] | Common |
<!-- SerializedQuery END --> <!-- SerializedQuery END -->

1
content/Animals/Slimes/Ababa Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Cold type: Cold
requestor: n04_ux
--- ---
# On the Ababa Slime # On the Ababa Slime

1
content/Animals/Slimes/Bark Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: Ategon
--- ---

1
content/Animals/Slimes/Garden Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: Ategon
--- ---

1
content/Animals/Slimes/Godot Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Uncommon rarity: Uncommon
type: Stone type: Stone
requestor: PracticalNPC
--- ---

1
content/Animals/Slimes/Honey Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: SarahClick
--- ---

1
content/Animals/Slimes/Lagoon Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Water type: Water
requestor: Ategon
--- ---

1
content/Animals/Slimes/Marsh Slime.md
View file

@ -12,6 +12,7 @@ golden:
- '![[marsh-4.png]]' - '![[marsh-4.png]]'
rarity: Common rarity: Common
type: Nature type: Nature
requestor: Ategon
--- ---

1
content/Animals/Slimes/Sunflower Slime.md
View file

@ -13,6 +13,7 @@ golden:
- Everywhere - Everywhere
rarity: Common rarity: Common
type: Nature type: Nature
requestor: GGlitchedOut
--- ---

24
content/Animals/Slimes/_index.md
View file

@ -1,19 +1,19 @@
--- ---
--- ---
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity", type as "Type", variant1[1] as "Variant 1 Country", variant2[1] as "Variant 2 Country", variant3[1] as "Variant 3 Country" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity", type as "Type", variant1[1] as "Variant 1 Country", variant2[1] as "Variant 2 Country", variant3[1] as "Variant 3 Country" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> <!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", variant1[0] as "Regional Variant 1", variant2[0] as "Regional Variant 2", variant3[0] as "Regional Variant 3", rarity as "Rarity" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
|Slimes|Regional Variant 1|Regional Variant 2|Regional Variant 3|Rarity|Type|Variant 1 Country|Variant 2 Country|Variant 3 Country| |Slimes|Regional Variant 1|Regional Variant 2|Regional Variant 3|Rarity|
|------|------------------|------------------|------------------|------|----|-----------------|-----------------|-----------------| |------|------------------|------------------|------------------|------|
|[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\Slimes\ababa-1.png)|![ababa-2.png](..\..\Images\Slimes\ababa-2.png)|![ababa-3.png](..\..\Images\Slimes\ababa-3.png)|Common|Cold|[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)| |[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\Slimes\ababa-1.png)|![ababa-2.png](..\..\Images\Slimes\ababa-2.png)|![ababa-3.png](..\..\Images\Slimes\ababa-3.png)|Common|
|[Bark Slime](Bark%20Slime.md)|![bark-1.png](..\..\Images\Slimes\bark-1.png)|![bark-2.png](..\..\Images\Slimes\bark-2.png)|![bark-3.png](..\..\Images\Slimes\bark-3.png)|Common|Nature|[Dasona](..\..\Countries\Dasona.md)|[Gudoko](..\..\Countries\Gudoko.md)|[Lekia](..\..\Countries\Lekia.md)| |[Bark Slime](Bark%20Slime.md)|![bark-1.png](..\..\Images\Slimes\bark-1.png)|![bark-2.png](..\..\Images\Slimes\bark-2.png)|![bark-3.png](..\..\Images\Slimes\bark-3.png)|Common|
|[Garden Slime](Garden%20Slime.md)|![garden-1.png](..\..\Images\Slimes\garden-1.png)|![garden-2.png](..\..\Images\Slimes\garden-2.png)|![garden-3.png](..\..\Images\Slimes\garden-3.png)|Common|Nature|[Dasona](..\..\Countries\Dasona.md)|[Soljord](..\..\Countries\Soljord.md)|[Dolfeyja](..\..\Countries\Dolfeyja.md)| |[Garden Slime](Garden%20Slime.md)|![garden-1.png](..\..\Images\Slimes\garden-1.png)|![garden-2.png](..\..\Images\Slimes\garden-2.png)|![garden-3.png](..\..\Images\Slimes\garden-3.png)|Common|
|[Godot Slime](Godot%20Slime.md)|![godot-1.png](..\..\Images\Slimes\godot-1.png)|![godot-2.png](..\..\Images\Slimes\godot-2.png)|![godot-3.png](..\..\Images\Slimes\godot-3.png)|Uncommon|Stone|[Gokolm](..\..\Countries\Gokolm.md)|[Dasona](..\..\Countries\Dasona.md)|[Soljord](..\..\Countries\Soljord.md)| |[Godot Slime](Godot%20Slime.md)|![godot-1.png](..\..\Images\Slimes\godot-1.png)|![godot-2.png](..\..\Images\Slimes\godot-2.png)|![godot-3.png](..\..\Images\Slimes\godot-3.png)|Uncommon|
|[Honey Slime](Honey%20Slime.md)|![honey-1.png](..\..\Images\Slimes\honey-1.png)|![honey-2.png](..\..\Images\Slimes\honey-2.png)|![honey-3.png](..\..\Images\Slimes\honey-3.png)|Common|Nature|[Dahallow](..\..\Countries\Dahallow.md)|[Krakala](..\..\Countries\Krakala.md)|[Mantine](..\..\Countries\Mantine.md)| |[Honey Slime](Honey%20Slime.md)|![honey-1.png](..\..\Images\Slimes\honey-1.png)|![honey-2.png](..\..\Images\Slimes\honey-2.png)|![honey-3.png](..\..\Images\Slimes\honey-3.png)|Common|
|[Lagoon Slime](Lagoon%20Slime.md)|![lagoon-1.png](..\..\Images\Slimes\lagoon-1.png)|![lagoon-2.png](..\..\Images\Slimes\lagoon-2.png)|![lagoon-3.png](..\..\Images\Slimes\lagoon-3.png)|Common|Water|[Dahallow](..\..\Countries\Dahallow.md)|[Mantine](..\..\Countries\Mantine.md)|[Felmyr](..\..\Countries\Felmyr.md)| |[Lagoon Slime](Lagoon%20Slime.md)|![lagoon-1.png](..\..\Images\Slimes\lagoon-1.png)|![lagoon-2.png](..\..\Images\Slimes\lagoon-2.png)|![lagoon-3.png](..\..\Images\Slimes\lagoon-3.png)|Common|
|[Marsh Slime](Marsh%20Slime.md)|![marsh-1.png](..\..\Images\Slimes\marsh-1.png)|![marsh-2.png](..\..\Images\Slimes\marsh-2.png)|![marsh-3.png](..\..\Images\Slimes\marsh-3.png)|Common|Nature|[Oshela](..\..\Countries\Oshela.md)|[Vikogyna](..\..\Countries\Vikogyna.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)| |[Marsh Slime](Marsh%20Slime.md)|![marsh-1.png](..\..\Images\Slimes\marsh-1.png)|![marsh-2.png](..\..\Images\Slimes\marsh-2.png)|![marsh-3.png](..\..\Images\Slimes\marsh-3.png)|Common|
|[Sunflower Slime](Sunflower%20Slime.md)|![sunflower-1.png](..\..\Images\Slimes\sunflower-1.png)|![sunflower-2.png](..\..\Images\Slimes\sunflower-2.png)|![sunflower-3.png](..\..\Images\Slimes\sunflower-3.png)|Common|Nature|[Calcetron](..\..\Countries\Calcetron.md)|[Llasuki](..\..\Countries\Llasuki.md)|[Blanchister](..\..\Countries\Blanchister.md)| |[Sunflower Slime](Sunflower%20Slime.md)|![sunflower-1.png](..\..\Images\Slimes\sunflower-1.png)|![sunflower-2.png](..\..\Images\Slimes\sunflower-2.png)|![sunflower-3.png](..\..\Images\Slimes\sunflower-3.png)|Common|
<!-- SerializedQuery END --> <!-- SerializedQuery END -->