Commit graph

3661 commits

Author SHA1 Message Date
Adilson Carvalho
ad03215986 Added GPL header on all code files when missing 2016-10-16 17:33:19 -02:00
Adilson Carvalho
49b4effe74 Changed year to 2016 on all GPL headers 2016-10-16 17:06:02 -02:00
Lucas Nicodemus
90c6f4ab22 Update changelog with @Simon311's changes 2016-10-16 09:31:23 -06:00
Lucas Nicodemus
c2a656b8fb Merge pull request #1304 from Simon311/general-devel
Ensure that players can not connect once the server started shutting down
2016-10-16 09:14:42 -06:00
Simon
5be85b9864 Ensure that players can not connect once the server started shutting down 2016-10-16 13:58:05 +03:00
Rodrigo
0ec49ab593 Merge pull request #1303 from Simon311/general-devel
Fix /"
2016-10-16 11:55:45 +01:00
Simon
60a8362e27 Add ToLower() back 2016-10-16 12:42:05 +03:00
Lucas Nicodemus
3416f20d49 Please send PRs that have text in the description 2016-10-16 01:07:04 -06:00
Simon
b16b9e70f2 Add brackets 2016-10-16 09:48:46 +03:00
Simon
54915bcf47 Fix /" 2016-10-16 08:58:55 +03:00
Lucas Nicodemus
bba0d72a29 Can't chmod a file before it exists 2016-10-15 14:33:38 -06:00
Lucas Nicodemus
b20e2060a2 Move decryption of secret key file into create release script 2016-10-15 14:27:17 -06:00
ProfessorXZ
ec4152df81 Separated the Flower Boots check into multiple if statements 2016-10-15 22:19:57 +02:00
ProfessorXZ
fb2fc6772e Fixes #1021 2016-10-15 22:19:57 +02:00
Lucas Nicodemus
b433e2f232 Tell travis not to use sudo 2016-10-15 13:31:12 -06:00
Lucas Nicodemus
b064b3a078 Update private key file for NyxStudios/TShock repo 2016-10-15 13:09:24 -06:00
Lucas Nicodemus
2f6a6921aa Ignore ssh private key files 2016-10-15 12:57:56 -06:00
Lucas Nicodemus
d4ab183e70 Try to turn off strict host key checking 2016-10-15 12:57:04 -06:00
Lucas Nicodemus
d6747e9e4d Tell openssl to actually go to where the key is to decrypt 2016-10-15 12:51:02 -06:00
Lucas Nicodemus
7626e18348 Update create_release with new instructions for existing key 2016-10-15 12:48:09 -06:00
Lucas Nicodemus
c4788fec12 Add private key 2016-10-15 12:47:26 -06:00
Lucas Nicodemus
cf69fc6860 Relative path link xbuild 2016-10-15 11:43:00 -06:00
Lucas Nicodemus
0cbc45ce9a Update travis.yml to run create_release 2016-10-15 11:39:07 -06:00
Lucas Nicodemus
4fcabd5272 Merge branch 'general-devel' of github.com:nicatronTg/TShock into general-devel 2016-10-15 11:37:33 -06:00
Lucas Nicodemus
bbe0462b41 Update create release script for travis 2016-10-15 11:37:02 -06:00
Lucas Nicodemus
f35d84213b Put the logo in the readme 2016-10-14 21:25:10 -06:00
Lucas Nicodemus
f993c03f5b Merge pull request #1302 from NyxStudios/auth-rewrite
Auth rewrite. Closes #1064.
2016-10-14 17:42:13 -06:00
Enerdy
dcaae17ffe Fix that one missing message & Update CHANGELOG.md 2016-10-15 00:39:13 +01:00
Enerdy
a49a7f35cc Fully remove 'auth-verify' because it was unclassy 2016-10-15 00:34:32 +01:00
Enerdy
97b6f08523 'auth' no longer kicks superadmins when disabled 2016-10-15 00:31:57 +01:00
Enerdy
2320a913b4 Mark pointless permission as obsolete 2016-10-14 23:13:25 +01:00
Enerdy
b6267bbaa7 Auth system now checks if a superadmin exists
The 'auth-verify' command was also removed and its alias was added to 'auth', which now does both things.
2016-10-14 23:07:29 +01:00
Lucas Nicodemus
1c9faa84a8 Merge pull request #1293 from NyxStudios/new-contributing-guidelines
Add new contributing guidelines
2016-10-13 12:45:28 -06:00
White
0f86c6bf0f Submodule update for wyverns build 2016-10-13 12:49:45 +10:30
Lucas Nicodemus
0e97f299ee Gonna be completely honest I forgot
I started typing this commit message and then forgot what it was.
I'm sure it's related to what wolfje said though.
2016-10-10 18:21:19 -06:00
Lucas Nicodemus
cff0ecbc60 Add submodule init note change (thanks @levi-middleton) 2016-10-10 17:09:17 -06:00
Lucas Nicodemus
8a593f9504 Add note about taking suggestions 2016-10-10 17:06:37 -06:00
Lucas Nicodemus
9d2b655505 Update contributing with new pr-wanted & suggestion stuff 2016-10-10 16:58:23 -06:00
Lucas Nicodemus
c4cf2d496d Changed the taken account message to be more clear
Thanks to Gameroom, Kirbyrocket, ProfessorX, etc. for drawing attention to this.
2016-10-09 21:04:53 -06:00
Lucas Nicodemus
f8039c8f80 Rest API uses 'permissions' on /v2/groups/update
Arguably this should be a change to a new API version, but the
current functionality is broken so this just kinda fixes that.

Fixes #1292
2016-10-05 08:28:01 -06:00
Lucas Nicodemus
8cac17442d Revert "Experiment: Can travis run create_release.py?"
This reverts commit e0e1de98d0.
2016-10-04 09:16:26 -06:00
Lucas Nicodemus
e0e1de98d0 Experiment: Can travis run create_release.py? 2016-10-04 09:11:48 -06:00
White
93cc71a753 Fixed a typo in the changelog and ticked assembly version 2016-10-04 21:04:08 +10:30
White
d72bbb31a6 Changelog update 2016-10-04 21:02:27 +10:30
Lucas Nicodemus
4d641cd9c8 Update submodule for vitamin fixes 2016-10-04 04:14:36 -06:00
Lucas Nicodemus
c3855cb95f Update submodule for 1.25 2016-10-03 21:45:08 -06:00
Lucas Nicodemus
bcf8cb644f API Version Tick: 1.25
Fixes compatibility with new API revision
2016-10-03 21:40:13 -06:00
Lucas Nicodemus
5c1d5ae586 Use WorldPosition instead of ChestPosition
Fixes build with 90d732b840 (I'm 99% sure WorldPosition is what we want to use but could be wrong)
2016-10-03 21:05:39 -06:00
White
09fceeb73b Submodule update 2016-10-04 13:27:12 +10:30
ProfessorXZ
9948239cbf Fixed MagicalIceBlock checks 2016-09-30 20:43:13 +02:00