aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlee <alee14498@gmail.com>2018-03-08 15:40:39 -0500
committerAlee <alee14498@gmail.com>2018-03-08 15:40:39 -0500
commitbf8df5fb074c5855386d5533a652eddde6e34f7b (patch)
treef19cb088e877a524dcec0a3b822be98cc409f242
parent34176f8f755baccc18feb1a7d021121209af2b15 (diff)
parentae35e930a89f621aea3b183ca9822e8fddcc6824 (diff)
downloadpokeworld-website-bf8df5fb074c5855386d5533a652eddde6e34f7b.tar.gz
pokeworld-website-bf8df5fb074c5855386d5533a652eddde6e34f7b.tar.bz2
pokeworld-website-bf8df5fb074c5855386d5533a652eddde6e34f7b.zip
Merge branch 'master' of https://github.com/PokeWorld/pokeworld.github.io
-rw-r--r--CNAME2
-rw-r--r--pokebot/index.html5
-rw-r--r--typer/index.html2
3 files changed, 7 insertions, 2 deletions
diff --git a/CNAME b/CNAME
index 9501a8c..7e21d15 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-pokeworld.ml \ No newline at end of file
+www.digitalregion.ml \ No newline at end of file
diff --git a/pokebot/index.html b/pokebot/index.html
index f53b887..4b35275 100644
--- a/pokebot/index.html
+++ b/pokebot/index.html
@@ -28,8 +28,11 @@
<h2>The bot that powers our entire server.</h2>
<p>PokeBot is the bot that powers our server. It adds on to PokeCord's commands by allowing for team and gym support for the PokeWorld server. It is best used with Pokecord as it was built as an addon for Pokecord</p>
<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 then the random things we put on the main branch.</p>
+ <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)</h2>
+ <p>Our friends at travis 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>
<h2>Changelog</h2>
<ul>
<li>v0.3 - Fun Commands!</li>
diff --git a/typer/index.html b/typer/index.html
index af01792..63f999f 100644
--- a/typer/index.html
+++ b/typer/index.html
@@ -30,10 +30,12 @@
<h2>Download</h2>
<p>There is no hosted download site for Typer except for on our CI servers hosted by our friends at AppVeyor. Pick up a copy at <a href="https://ci.appveyor.com/project/jtsshieh/typer/build/artifacts">here</a> 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. Typer is only avaiable for Windows. Mac and linux might be supported in the future.</p>
<h2>Continuous Intergration Badges (AppVeyor and TravisCI)</h2>
+ <p>Our friends at appveyor an travis 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://ci.appveyor.com/project/jtsshieh/typer"><img src="https://ci.appveyor.com/api/projects/status/bya2hsb9x1ajq274?svg=true"></a>
<a href="https://travis-ci.org/PokeWorld/Typer"><img src="https://travis-ci.org/PokeWorld/Typer.svg?branch=master"></a>
<h2>Changelog</h2>
<ul>
+ <li>v0.2 - Preset and interval options</li>
<li>v0.1 - First release!</li>
</ul>
</div>