Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

This commit is contained in:
Zack Piispanen 2013-09-17 18:45:17 -04:00
commit 77e845d340
2 changed files with 10 additions and 1 deletions

9
.travis.yml Normal file
View file

@ -0,0 +1,9 @@
language: c
install:
- sudo apt-get install mono-devel mono-gmcs nunit-console
script:
- xbuild ./TShockAPI/TShockAPI.csproj
notifications:
irc: irc.rizon.net#tshock
hipchat:
secure: hpRLWiHF2j6O2qJOVs++aqAmryN6G5kY0SF26/rKCpQ7klhMlDZIgI1V1dbkKqlculFtW1neS0EBJyV9lmcV5b26H+KhlZYGN0j7q1VcOTM3rvtU6wW0Ap22uRLl2RrnA4kEsgDAsNouPOkyLZ19hlHAISlsId6G4+Rfqg6k+zQ=

View file

@ -1,4 +1,4 @@
# TShock
# TShock [![Build Status](https://travis-ci.org/NyxStudios/TShock.png?branch=general-devel)](https://travis-ci.org/NyxStudios/TShock)
TShock is a server modification for Terraria, written in C#, and based upon the [Terraria Server API](https://github.com/Deathmax/TerrariaAPI-Server). It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.