aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_pages/about.html11
-rw-r--r--admin/config.yml2
2 files changed, 11 insertions, 2 deletions
diff --git a/_pages/about.html b/_pages/about.html
index f6ba755..392aff3 100644
--- a/_pages/about.html
+++ b/_pages/about.html
@@ -5,4 +5,13 @@ permalink: /about
---
<br>
<h1>About PokeWorld</h1>
-<p>PokeWorld is a discord server made by jtsshieh, TheEdgeNK and Alee</p> \ No newline at end of file
+<p>PokeWorld is a discord server made by jtsshieh, TheEdgeNK and Alee</p>
+<br>
+<h1>History</h1>
+<p>PokéWorld started as a community created by now-moderator Sylv early in 2018. The goal of this server on Discord was to be a Pokécord community who helped each other progress in the bot, and allowed for competitive play to take place. TheEdgeNK, Alee, and jtsshieh were tasked with creating a Discord bot that could help certain aspects of competitive play take place, such as the now-implemented gym system and work-in-progress clan system.</p>
+
+<p>During this period of time, there were some disagreements between bot developers and general server staff. This provoked TheEdgeNK, Alee, and jtsshieh to make their own version of PokéWorld that would have the bot to enhance the experience of players, along with welcoming moderators and admins. Some server staff also came with them to the new server, which was called PokéWorld (very creative).</p>
+
+<p>Over time, the old PokéWorld began to decline and more people started joining the new PokéWorld, which eventually rendered the old PokéWorld dead. The old staff team from PokéWorld 0.1 and PokéWorld came together and decided to adapt the two staff teams together in the new, successful server. Little controversy occurred after that, and development continued on the bot.</p>
+
+<p>A decent amount of progress was made, including finishing the gym system and plans being made for clans and leagues. People were enjoying the project and then we decided to make the bot available for public use. Servers could use the moderation functions of the bot while we were still working on making certain Pokécord integrations work for all servers. Unfortunately, developers of the project hit roadblocks in real life with some family issues and overwhelming schoolwork, so the host server died. Due to this, the project was cancelled...until now.</p> \ No newline at end of file
diff --git a/admin/config.yml b/admin/config.yml
index fe40ec2..fd3d200 100644
--- a/admin/config.yml
+++ b/admin/config.yml
@@ -3,7 +3,7 @@
backend:
name: github
repo: UniverseDevGroup/pokeworld-website
- branch: master # Branch to update (optional; defaults to master)
+ branch: master
media_folder: 'assets/uploads'
display_url: http://universedevgroup.net
publish_mode: editorial_workflow