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
42 changed files with 22 additions and 20 deletions
Showing only changes of commit 5b8bcffed4 - Show all commits

View file

@ -97,7 +97,7 @@
"state": {
"type": "image",
"state": {
"file": "Images/Slimes/ababa/ababa-3.png"
"file": "Images/Slimes/garden-1.png"
}
}
}
@ -168,6 +168,7 @@
"state": {
"type": "backlink",
"state": {
"file": "Images/Slimes/garden-1.png",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -184,6 +185,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "Images/Slimes/garden-1.png",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -206,7 +208,7 @@
"state": {
"type": "outline",
"state": {
"file": "conflict-files-obsidian-git.md"
"file": "Images/Slimes/garden-1.png"
}
}
},
@ -235,14 +237,24 @@
"obsidian-git:Open Git source control": false
}
},
"active": "90b57f41c87f2b3b",
"active": "fdbd8ce5e8a10389",
"lastOpenFiles": [
"Images/Slimes",
"Images/Slimes/ababa/ababa-3.png",
"Images/Slimes/honey-4.png",
"Images/Slimes/honey-3.png",
"Images/Slimes/honey-2.png",
"Images/Slimes/honey-1.png",
"Images/Slimes/godot-4.png",
"Images/Slimes/godot-3.png",
"Images/Slimes/godot-2.png",
"Images/Slimes/godot-1.png",
"Images/Slimes/bark-1.png",
"Images/Slimes/ababa-1.png",
"Images/Slimes/ababa-3.png",
"Images/Slimes/Untitled",
"Images/Slimes/bark",
"Images/Slimes/garden",
"conflict-files-obsidian-git.md",
"Images/Slimes/ababa/ababa-2.png",
"Images/Slimes/ababa/ababa-1.png",
"Images/Slimes/ababa/ababa-4.png",
"Images/Slimes",
"Languages/Mokrixi.md",
"Languages/Lacelian.md",
"Languages/Guo.md",
@ -270,18 +282,8 @@
"Images/Slimes/ababa",
"Images/slimes",
"Countries/Faelani",
"Images/Flags/barrowmaw.png",
"Animals/Slimes",
"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",
"Regions",
"Territories"
"Images/Flags"
]
}

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -6,7 +6,7 @@
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
|------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
|[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\Slimes\ababa\ababa-1.png)|![ababa-2.png](..\..\Images\Slimes\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\Slimes\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\Slimes\ababa\ababa-4.png)|[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)|![ababa-4.png](..\..\Images\Slimes\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
|[Untitled](Untitled.md)|-|-|-|-|-|-|-|
<!-- SerializedQuery END -->

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB