TShock/TShock — pull request #490 by nicatronTg (2013-07-01 14:56:12+00:00)
Title: TShock 4.1/4.2

Not sure what our official version is for the next build, but I think I'd be happy to build a release after @CoderCow gets in more commits and before the next version of Terraria.

Please don't accept this pull request until we're ready to kick the version to release.