Merge conflict
commit 3e5d92b653e6a98704a62aff2db4b828d333362e
Author: Mohammad Rafiq Bin Mohd Rashid <mohammadrafiq567@gmail.com>
Date: Wed Jan 29 16:37:51 2025 +0800
added one shot character
Merge branch 'main' of https://aenyrathia.wiki/
commit 7567cd3597a1f1f8831b5af5f606bf63f2e1b9cd
Author: Mohammad Rafiq Bin Mohd Rashid <mohammadrafiq567@gmail.com>
Date: Mon Jan 20 10:49:35 2025 +0800
Revert "changed files: M .gitignore Characters.md Characters/Major NPCs.md Characters/Major NPCs/Dregdul.md Characters/Player Characters.md Characters/Player Characters/Arche Kagekiyo.md Characters/Player Characters/Saziver Copper-Fern.md Characters/Player Characters/Senzorin Talos.md Characters/Player Characters/Zel'eon Talos.md Home.md Home/Aenyrathia_World_Map_v1.png Home/favicon-32x32.png Home/logo.png Home/map-heightmap.png Home/map.png Home/sitemap.xml Lore.md Lore/Gods/Ruatis.md Lore/Locations/Aenyrathia/Desh.md Lore/Locations/Aenyrathia/Desh/Alwahd.md Lore/Locations/Aenyrathia/Desh/Ilrinia.md Lore/Locations/Aenyrathia/Desh/Miskatonic University.md Lore/Locations/Aenyrathia/Enoch.md Lore/Locations/Aenyrathia/Ibuth.md Lore/Locations/Aenyrathia/Ibuth/Bear Mountains.md Lore/Locations/Aenyrathia/Ibuth/Mosskach.md Lore/Locations/Aenyrathia/Kharoq.md Lore/Locations/Aenyrathia/Miramor.md Lore/Locations/Aenyrathia/Siddia.md Lore/Magic and Technology/Orichalcum.md Lore/Organisations/Council of Arcaneum.md Lore/Organisations/EchoTech.md Lore/Organisations/The New Dawn.md Lore/Organisations/The Peakers.md Lore/Species/Aasimar.md Lore/Species/Cyrrans.md Lore/Species/Dwarf.md Lore/Species/Gh'borin.md Lore/Species/Gnomes.md Lore/Species/Humans.md Lore/Species/Orcs.md Lore/Species/Rah'Zuhari.md Lore/Species/Sun Elves.md Lore/Species/Tiefling.md Lore/Species/Vyrkani.md Player Resources.md Player Resources/House Rules.md Story So Far.md Story So Far/Session 01 (30 March 2024).md Story So Far/Session 02 (06 April 2024).md Story So Far/Session 03 (20 April 2024).md Story So Far/Session 04 (11 May 2024).md Story So Far/Session 05 (19 May 2024).md Story So Far/Session 06 (26 May 2024).md Story So Far/Session 07 (30 May 2024).md Story So Far/Session 08 (1 June 2024).md Story So Far/Session 09 (6 July 2024).md Story So Far/Session 10 (13 July 2024).md Story So Far/Session 10.1 (20 July 2024).md Story So Far/Session 10.2 (27 July 2024).md Story So Far/Session 11 (10 August 2024).md Story So Far/Session 12 (17 August 2024).md Story So Far/Session 13 (31 August 2024).md, A .obsidian/app.json .obsidian/appearance.json .obsidian/community-plugins.json .obsidian/core-plugins-migration.json .obsidian/core-plugins.json .obsidian/graph.json .obsidian/plugins/obsidian-git/data.json .obsidian/plugins/obsidian-git/main.js .obsidian/plugins/obsidian-git/manifest.json .obsidian/plugins/obsidian-git/obsidian_askpass.sh .obsidian/plugins/obsidian-git/styles.css .obsidian/plugins/obsidian-style-settings/data.json .obsidian/plugins/obsidian-style-settings/main.js .obsidian/plugins/obsidian-style-settings/manifest.json .obsidian/plugins/obsidian-style-settings/styles.css .obsidian/themes/AnuPpuccin/manifest.json .obsidian/themes/AnuPpuccin/theme.css .obsidian/workspace-mobile.json .obsidian/workspace.json Characters/Major NPCs/Dalen Blackwell.md, D Characters/Player Characters/Senzorin Talos SWASHBUCKLER.md Story So Far/Session 14 (21 September 2024).md Story So Far/Session 15 (27 October 2024).md Story So Far/Session 16 (31 December 2024).md Story So Far/Session 17 (10 January 2025).md"
This reverts commit 954d72e9f2c4f2d1733b7d67f9fe589fc6e71948, reversing
changes made to cbaca10602cc22b8721aee23f67bf2b9ea65a8d1.
changed files: M .gitignore Characters.md Characters/Major NPCs.md Characters/Major NPCs/Dregdul.md Characters/Player Characters.md Characters/Player Characters/Arche Kagekiyo.md Characters/Player Characters/Saziver Copper-Fern.md Characters/Player Characters/Senzorin Talos.md Characters/Player Characters/Zel'eon Talos.md Home.md Home/Aenyrathia_World_Map_v1.png Home/favicon-32x32.png Home/logo.png Home/map-heightmap.png Home/map.png Home/sitemap.xml Lore.md Lore/Gods/Ruatis.md Lore/Locations/Aenyrathia/Desh.md Lore/Locations/Aenyrathia/Desh/Alwahd.md Lore/Locations/Aenyrathia/Desh/Ilrinia.md Lore/Locations/Aenyrathia/Desh/Miskatonic University.md Lore/Locations/Aenyrathia/Enoch.md Lore/Locations/Aenyrathia/Ibuth.md Lore/Locations/Aenyrathia/Ibuth/Bear Mountains.md Lore/Locations/Aenyrathia/Ibuth/Mosskach.md Lore/Locations/Aenyrathia/Kharoq.md Lore/Locations/Aenyrathia/Miramor.md Lore/Locations/Aenyrathia/Siddia.md Lore/Magic and Technology/Orichalcum.md Lore/Organisations/Council of Arcaneum.md Lore/Organisations/EchoTech.md Lore/Organisations/The New Dawn.md Lore/Organisations/The Peakers.md Lore/Species/Aasimar.md Lore/Species/Cyrrans.md Lore/Species/Dwarf.md Lore/Species/Gh'borin.md Lore/Species/Gnomes.md Lore/Species/Humans.md Lore/Species/Orcs.md Lore/Species/Rah'Zuhari.md Lore/Species/Sun Elves.md Lore/Species/Tiefling.md Lore/Species/Vyrkani.md Player Resources.md Player Resources/House Rules.md Story So Far.md Story So Far/Session 01 (30 March 2024).md Story So Far/Session 02 (06 April 2024).md Story So Far/Session 03 (20 April 2024).md Story So Far/Session 04 (11 May 2024).md Story So Far/Session 05 (19 May 2024).md Story So Far/Session 06 (26 May 2024).md Story So Far/Session 07 (30 May 2024).md Story So Far/Session 08 (1 June 2024).md Story So Far/Session 09 (6 July 2024).md Story So Far/Session 10 (13 July 2024).md Story So Far/Session 10.1 (20 July 2024).md Story So Far/Session 10.2 (27 July 2024).md Story So Far/Session 11 (10 August 2024).md Story So Far/Session 12 (17 August 2024).md Story So Far/Session 13 (31 August 2024).md, A .obsidian/app.json .obsidian/appearance.json .obsidian/community-plugins.json .obsidian/core-plugins-migration.json .obsidian/core-plugins.json .obsidian/graph.json .obsidian/plugins/obsidian-git/data.json .obsidian/plugins/obsidian-git/main.js .obsidian/plugins/obsidian-git/manifest.json .obsidian/plugins/obsidian-git/obsidian_askpass.sh .obsidian/plugins/obsidian-git/styles.css .obsidian/plugins/obsidian-style-settings/data.json .obsidian/plugins/obsidian-style-settings/main.js .obsidian/plugins/obsidian-style-settings/manifest.json .obsidian/plugins/obsidian-style-settings/styles.css .obsidian/themes/AnuPpuccin/manifest.json .obsidian/themes/AnuPpuccin/theme.css .obsidian/workspace-mobile.json .obsidian/workspace.json Characters/Major NPCs/Dalen Blackwell.md, D Characters/Player Characters/Senzorin Talos SWASHBUCKLER.md Story So Far/Session 14 (21 September 2024).md Story So Far/Session 15 (27 October 2024).md Story So Far/Session 16 (31 December 2024).md Story So Far/Session 17 (10 January 2025).md
commit cbaca10602cc22b8721aee23f67bf2b9ea65a8d1
Author: Mohammad Rafiq Bin Mohd Rashid <mohammadrafiq567@gmail.com>
Date: Mon Jan 20 10:10:34 2025 +0800
Session 18 WIP
changed files: M .gitignore Characters/Major NPCs/Dregdul.md Characters/Major NPCs.md Characters/Player Characters/Arche Kagekiyo.md Characters/Player Characters/Saziver Copper-Fern.md Characters/Player Characters/Senzorin Talos.md Characters/Player Characters/Zel'eon Talos.md Characters/Player Characters.md Characters.md Lore/Locations/Aenyrathia/Desh.md Lore/Locations/Aenyrathia/Enoch.md Lore/Locations/Aenyrathia/Ibuth/Bear Mountains.md Lore/Locations/Aenyrathia/Ibuth/Mosskach.md Lore/Locations/Aenyrathia/Ibuth.md Lore/Locations/Aenyrathia/Kharoq.md Lore/Locations/Aenyrathia/Miramor.md Lore/Locations/Aenyrathia/Siddia.md Lore/Magic and Technology/Orichalcum.md Lore/Organisations/EchoTech.md Lore/Organisations/The New Dawn.md Lore/Species/Orcs.md Story So Far/Session 13 (31 August 2024).md Story So Far.md, A .obsidian/app.json .obsidian/appearance.json .obsidian/community-plugins.json .obsidian/core-plugins-migration.json .obsidian/core-plugins.json .obsidian/graph.json .obsidian/plugins/obsidian-git/data.json .obsidian/plugins/obsidian-git/main.js .obsidian/plugins/obsidian-git/manifest.json .obsidian/plugins/obsidian-git/styles.css .obsidian/plugins/obsidian-style-settings/data.json .obsidian/plugins/obsidian-style-settings/main.js .obsidian/plugins/obsidian-style-settings/manifest.json .obsidian/plugins/obsidian-style-settings/styles.css .obsidian/themes/AnuPpuccin/manifest.json .obsidian/themes/AnuPpuccin/theme.css .obsidian/workspace-mobile.json .obsidian/workspace.json Characters/Major NPCs/Dalen Blackwell.md, D Characters/Player Characters/Senzorin Talos SWASHBUCKLER.md Story So Far/Session 14 (21 September 2024).md Story So Far/Session 15 (27 October 2024).md Story So Far/Session 16 (31 December 2024).md Story So Far/Session 17 (10 January 2025).md Story So Far/Session 18 (18 January 2025).md
Merge branch 'main' of https://aenyrathia.wiki/
My dumbass did not pull before writing lore.
commit e1bed948e8bfd49aeb1b356150dc681971d581b7
Author: Mohammad Rafiq <mohammadrafiq567@gmail.com>
Date: Thu Sep 12 18:09:38 2024 +0800
Laying groundwork
