Commit graph

3219 commits

Author SHA1 Message Date
Lucas Nicodemus
18e955a306 \ 2015-08-07 07:40:39 -06:00
Lucas Nicodemus
c004fec56c Version tick: 4.3.8 2015-08-07 07:34:56 -06:00
Lucas Nicodemus
80064859f8 Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2015-08-07 07:33:20 -06:00
Lucas Nicodemus
c073100c0a Update Submodule; Update to API 1.21 2015-08-07 07:32:40 -06:00
Lucas Nicodemus
3f06e713c0 Update the changelog 2015-08-05 18:06:51 -06:00
Tyler Watson
0c4e476c2e update submodule 2015-08-04 23:11:43 +10:00
Lucas Nicodemus
95ef7c9d85 Fix #1063 2015-07-30 16:43:45 -06:00
Lucas Nicodemus
9af4980b60 /auth now forcekicks if auth is disabled
Update submodule
2015-07-30 16:10:59 -06:00
Enerdy
2320613a1d Add GetItemFromTag(), null check on item names. 2015-07-29 15:27:16 +01:00
White
4c605c0afd Submodule update 2015-07-28 15:06:09 +09:30
White
7b98aeec89 Submodule update 2015-07-27 12:01:05 +09:30
White
b93857850c Updated submodule 2015-07-27 11:52:30 +09:30
Enerdy
d590fc8ec7 Update Submodule 2015-07-27 02:22:47 +01:00
White
a039d9a95e Updated submodule for creep checks 2015-07-25 13:14:03 +09:30
White
c7711b2906 Allow[Hallow/Corruption/Crimson]Creep in config now work
Fixes #1043
2015-07-25 13:06:21 +09:30
Lucas Nicodemus
835f507672 Version tick: 4.3.7 2015-07-24 11:51:35 -06:00
Lucas Nicodemus
7dd801282e Update submodule 2015-07-24 11:47:05 -06:00
Lucas Nicodemus
9e617e04f2 Update submodule from @CJKay's fixes 2015-07-24 08:59:41 -06:00
Lucas Nicodemus
516898ec87 Update submodule to support -world and -autocreate 2015-07-24 08:33:38 -06:00
Lucas Nicodemus
b7fedc173b Update to 1.3.0.7 2015-07-23 15:01:01 -06:00
Lucas Nicodemus
97f0bd5aac Tick to 4.20 2015-07-23 10:49:49 -06:00
Lucas Nicodemus
8c130f177c Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2015-07-23 10:34:55 -06:00
Lucas Nicodemus
45ed4237a7 Version tick: 4.3.6 2015-07-23 10:34:33 -06:00
Lucas Nicodemus
ae9326cdd0 Update submodule to latest changes 2015-07-23 10:33:48 -06:00
Lucas Nicodemus
c7ff200f1a Updated changelog such wow much omg 2015-07-23 10:33:21 -06:00
Tyler Watson
7717f6d9d5 Removed -world handling from inside TShock
Seriously, when has it ever been a good idea to handle TSAPI commandline
mechanisms from a plugin?  TSAPI related command line parameters need to
be handled from inside TSAPI.
2015-07-23 18:41:18 +10:00
Enerdy
f6f2ebdd96 Update Submodule 2015-07-21 16:16:32 +01:00
White
1825a822a0 Merge pull request #1033 from NyxStudios/proj-permissions
Fix more projectile permission checks.
2015-07-21 12:54:14 +09:30
Enerdy
fb2cd670fa Update submodule (now on 1.3.0.6) 2015-07-20 23:05:35 +01:00
White
4371ad4d9a Logging out is now safe in SSC. Fixes #1037 2015-07-20 23:25:33 +09:30
White
dfc28c8522 Updated submodule 2015-07-20 21:41:53 +09:30
White
344149893d Updated submodule 2015-07-20 19:13:55 +09:30
Enerdy
ff78bf6b44 Update Submodule 2015-07-20 00:29:40 +01:00
Lucas Nicodemus
400138ae16 Update submodule 2015-07-18 19:43:16 -06:00
Lucas Nicodemus
c69e96c727 Update submodule 2015-07-18 18:44:57 -06:00
Lucas Nicodemus
97835cd338 Merge pull request #1030 from Celant/general-devel
Move most startup arguments to TShock from API
2015-07-18 18:43:33 -06:00
Enerdy
0b99aceeb9 Add projectile 465 to list of projectile ignores, fix another previously added ignore. 2015-07-18 21:30:16 +01:00
Enerdy
a1731a8701 Update Newtonsoft.Json.dll to 7.0.1 for .NET 4.5 2015-07-18 16:46:19 +01:00
George
320d725136 Merge remote-tracking branch 'upstream/general-devel' into general-devel
Conflicts:
	TerrariaServerAPI
2015-07-18 12:24:29 +01:00
White
b4f6581851 Submodule update 2015-07-18 20:36:10 +09:30
George
0c46a2ddcf Move three startup args back to ServerApi 2015-07-18 11:02:50 +01:00
George
941f619e42 Merge branch 'general-devel' of https://github.com/Celant/TShock into general-devel 2015-07-18 10:18:41 +01:00
White
ad21ba8da8 Merge pull request #1027 from Denwey/general-devel
Target Dummies no longer get butchered by /butcher. Fixes #1025
2015-07-18 10:49:42 +09:30
Denwey Tharkt
e8ce773fdb Target Dummies no longer get butchered by /butcher. Fixes #1025 2015-07-17 20:38:56 -03:00
George
8cf78be440 Move all startup arguments to TShock from API 2015-07-17 22:52:40 +01:00
George
1fa6728e00 Move all startup arguments to TShock from API 2015-07-17 22:40:18 +01:00
Ijwu
6f0a23c8fc Merge pull request #1017 from Patrikkk/general-devel
Add HandlePlaceObject
2015-07-17 13:35:24 -04:00
White
cd903c8db2 Update submodule 2015-07-17 23:14:14 +09:30
White
07d4b397e2 Remove obsolete cloud save parameter 2015-07-17 13:49:20 +09:30
White
3e75ec8a52 Fixes #1019 2015-07-17 13:45:55 +09:30