Merge branch 'general-devel' into mintaka

This commit is contained in:
Lucas Nicodemus 2016-12-12 11:05:34 -07:00 committed by GitHub
commit 8e411b0db9

View file

@ -6,6 +6,10 @@
TShock is a server modification for Terraria, written in C#, and based upon the [Terraria Server API](https://github.com/NyxStudios/TerrariaAPI-Server). It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.
## :star: Quick Start
https://tshock.readme.io/docs/getting-started
## Features
* MySQL support
@ -23,7 +27,7 @@ TShock is a server modification for Terraria, written in C#, and based upon the
Feeling like helping out? Want to find an awesome server? Some awesome plugins?
* [Website & Forums](https://tshock.co/xf/)
* [Wiki](https://tshock.atlassian.net/wiki/display/TSHOCKPLUGINS/Home)
* [Contribute to our docs on readme.io](https://tshock.readme.io/)
* [Join our chat (supports IRC, XMPP, iOS, Android, Web)](http://chat.tshock.co/)
Please see the contributing file before sending pull requests.