cleanup

7 files changed, 11 insertions, 57 deletions

diff --git a/pokeworld/about/index.html b/pokeworld/about/index.html
index 3f8e15b..e719948 100644
--- a/pokeworld/about/index.html
+++ b/pokeworld/about/index.html
@@ -17,7 +17,6 @@
                     <ul>
                       <li><a href="../">Home</a></li>
                       <li><a href="../pokebot">Pokebot</a></li>
-                      <li><a href="../thedex">TheDex</a></li>
                       <li class="current"><a href="#">About</a></li>
                       <li><a href="../rules">Rules</a></li>
                     </ul>
@@ -33,8 +32,6 @@
             <p>We are currently working on a few projects. These include: PokeBot, Typer, and this website.</p>
             <h4><a href="../pokebot" style="color:white">PokeBot</a></h4>
             <p>The project that inspired us to keep on going. This is the Discord bot that powers our server; from moderation, to fun commands.</p>
-            <h4><a href="../typer" style="color:white">Typer</a></h4>
-            <p>The program that presses the keys for you.</p>
             <h4>Website</h4>
             <p>Well, you are here now. The website is our portal to everything related to PokeWorld!</p>
             <p>And the website design was made by Alee (Owner of AleeCorp Network)</p>
diff --git a/pokeworld/index.html b/pokeworld/index.html
index 84b185b..36d0103 100644
--- a/pokeworld/index.html
+++ b/pokeworld/index.html
@@ -17,7 +17,6 @@
                     <ul>
                        <li class="current"><a href="#">Home</a></li>
                        <li><a href="./pokebot">Pokebot</a></li>
-                       <li><a href="./thedex">TheDex</a></li>
                        <li><a href="./about">About</a></li>
                        <li><a href="./rules">Rules</a></li>
                     </ul>
diff --git a/pokeworld/pokebot/commands/index.html b/pokeworld/pokebot/commands/index.html
index 1c1cef7..12a2e7a 100644
--- a/pokeworld/pokebot/commands/index.html
+++ b/pokeworld/pokebot/commands/index.html
@@ -17,7 +17,6 @@
                     <ul>
                       <li><a href="./../">Home</a></li>
                       <li class="current"><a href="#">Pokebot</a></li>
-                      <li><a href="./../thedex">TheDex</a></li>
                       <li><a href="./../about">About</a></li>
                       <li><a href="./../rules">Rules</a></li>
                     </ul>
@@ -58,6 +57,7 @@
                 <li>lswarns - List the warns that have been placed on you.</li>
                 <li>purge [number] - Remove a specified amount of messages from the guild.</li>
                 <li>setLogs [channel id] - Sets the preferred channel to send log messages in.</li>
+                <li>setSuggestions [channel id] - Set's the Suggestions Channel.<li>
                 <li>softban [@user, reason] - Kicks the user for the specified reason, then deletes the messages they sent.</li>
                 <li>(PokeWorld) timeout [@user] - Mutes the user.</li>
                 <li>warn [@user, reason] - Warns a user for the specified reason. This gets recorded in the database.</li>
@@ -80,12 +80,16 @@
                 <li>forcedrop - Forces the person to drop their gyms. (mod only)</li>
                 <li>join [team name] - Joins a Pokemon team!</li>
                 <li>leave - Leaves your current Pokemon team.</li>
+                <li>lsitem [pokemon]|[credits]|[other] - List an item to the marketplace.</li>
                 <li>tradegym [@user] - Gives your gym to the mentioned user.</li>
             </ul>
             <h3>Utility</h3>
             <ul>
+                <li>character [...text] - Gets the decimal and hexadecimal of (a) character(s)</li>
+                <li>git - Gives the user a link to the git.</li>
+                <li>invite - Gives the user a link to invite the bot.</li>
                 <li>nick [nickname] - Changes your nickname to the args specified.</li>
-                <li>(PokeWorld) suggest [suggestion] - Suggest something to the community moderators for the server. They can accept it or decline it, and community members can vote.</li>
+                <li>suggest [suggestion] - Suggest something to the community moderators for the server. They can accept it or decline it, and community members can vote.</li>
                 <li>uptime - View how long the bot has been online.</li>
                 <li>userinfo [Optional: @user] - View your user information, or that of another user.</li>
             </ul>
diff --git a/pokeworld/pokebot/index.html b/pokeworld/pokebot/index.html
index 7f0570c..47bbfcb 100644
--- a/pokeworld/pokebot/index.html
+++ b/pokeworld/pokebot/index.html
@@ -17,7 +17,6 @@
                     <ul>
                       <li><a href="../">Home</a></li>
                       <li class="current"><a href="#">Pokebot</a></li>
-                      <li><a href="../thedex">TheDex</a></li>
                       <li><a href="../about">About</a></li>
                       <li><a href="../rules">Rules</a></li>
                     </ul>
@@ -31,12 +30,13 @@
             <h2>Download</h2>
             <p>If you are looking for all the newest features but don't care about how stable it is, pick up a copy on our <a href="https://github.com/PokeWorld/PokeBot">GitHub</a>. Otherwise, you can get a <a href="https://github.com/PokeWorld/PokeBot/releases">release</a> which are proven to be a lot more stable than the random things we put on the main branch.</p>
             <p></p>
-            <h2>Continuous Intergration Badges (TravisCI, CircleCI)</h2>
-            <p>Our friends at travis and circleci have tested the compiling of commands to look for bugs. The badge shows if it has passed or failed the test.</p>
-            <a href="https://travis-ci.org/PokeWorld/PokeBot"><img src="https://travis-ci.org/PokeWorld/PokeBot.svg?branch=master"></a>
-            <a href="https://circleci.com/gh/PokeWorld/PokeBot"><img src="https://circleci.com/gh/PokeWorld/PokeBot.svg?style=svg"></a>
             <h2>Changelog</h2>
             <ul>
+              <li>v1.2 - More major crashing fixes.</li>
+              <li>v1.2.5 - More major crashing fixes and listing items.</li>
+              <li>v1.1 - Major Fixes.</li>
+              <li>v1.0.1 - Fixes and cleanup.</li>
+              <li>v1.0 - Economy!</li>
               <li>v0.3.5 - A bunch of BugFixes and forcedrop command.</li>
               <li>v0.3 - Fun Commands!</li>
               <li>v0.2.5 - Trading Gyms!</li>
diff --git a/pokeworld/rules/index.html b/pokeworld/rules/index.html
index 279a6ad..ba1ad4f 100644
--- a/pokeworld/rules/index.html
+++ b/pokeworld/rules/index.html
@@ -17,7 +17,6 @@
                     <ul>
                       <li><a href="../">Home</a></li>
                       <li><a href="../pokebot">Pokebot</a></li>
-                      <li><a href="../thedex">TheDex</a></li>
                       <li><a href="../about">About</a></li>
                       <li class="current"><a href="#">Rules</a></li>
                     </ul>
diff --git a/pokeworld/thedex/index.html b/pokeworld/thedex/index.html
deleted file mode 100644
index cd58529..0000000
--- a/pokeworld/thedex/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<!-- The style is based from the ACN website !-->
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width">
-        <title>PokeWorld | Typer</title>
-        <link rel="stylesheet" href="../css/style.css">
-    </head>
-    <body>
-        <header>
-            <div class="container">
-                <div id="branding">
-                    <h1>PokeWorld</h1>
-                </div>
-                <nav>
-                    <ul>
-                      <li><a href="../">Home</a></li>
-                      <li><a href="../pokebot">Pokebot</a></li>
-                      <li class="current"><a href="#">TheDex</a></li>
-                      <li><a href="../about">About</a></li>
-                      <li><a href="../rules">Rules</a></li>
-                    </ul>
-                </nav>
-            </div>
-        </header>
-        <div class="container">
-            <h1>TheDex</h1>
-            <h2>Giving you the Pokemon information, right at your fingertips</h2>
-            <p>TheDex is an executable Pokedex for computers running at least Windows Vista.</p>
-            <h2>Download</h2>
-            <p>There is no hosted download site for Typer except GitHub releases to get the latest version. It is already compiled into an executable file for use. Once you download it, open it like you usually would open an executable by double clicking it. TheDex is only avaiable for Windows. Mac and linux might be supported in the future.</p>
-            <h2>Changelog</h2>
-            <ul>
-              <li>v0.1 - First release!</li>
-            </ul>
-        </div>
-        <footer>
-            <p>PokeWorld by: Alee, TheEdgeNK and jtsshieh, Copyright &copy; 2018</p>
-            <a href = "https://discord.gg/YqEUBGr">
-                <img src="https://img.shields.io/discord/417088992329334792.svg?colorB=7289DA&label=discord&style=flat-square">
-            </a>
-        </footer>
-    </body>
-</html>
diff --git a/pokeworld/thedex/thedexbannerlogo.png b/pokeworld/thedex/thedexbannerlogo.png
deleted file mode 100644
index caf2746..0000000
--- a/pokeworld/thedex/thedexbannerlogo.png
+++ /dev/null