Commit graph

3850 commits

Author SHA1 Message Date
Lucas Nicodemus
e40ea381ce
Merge branch 'general-devel' into newer-bans 2017-12-02 18:52:45 -07:00
Chris
915e0e88ea
Merge pull request #1517 from Pryaxis/gpl
Add succinct GPL disclaimer. Fixes #1430.
2017-12-03 12:20:40 +10:30
Lucas Nicodemus
204f4c3f4f Add succinct GPL disclaimer. Fixes #1430. 2017-12-02 18:09:24 -07:00
Lucas Nicodemus
6b2c9c47c3 Update chagnelog with ban stuff 2017-12-02 17:38:43 -07:00
Lucas Nicodemus
ec2a542564 Remove silly string join since snoons is right
> String.Join(" ", str1, str2) is far less clear than str1 + " " + str2
2017-12-01 23:27:51 -07:00
Lucas Nicodemus
d10c8d65f6 Removed minor comment
Turns out that ServerConsole gets a name if caller is unknown.
2017-12-01 23:20:34 -07:00
Lucas Nicodemus
9dee0aee7d Rewrote the /ban add sub command
/ban add now replaces add, addtemp, and addip.
New syntax: /ban add <target> [time] [reason]

Examples:
- /ban add Shank 10d Rewrote the ban system.
- /ban add Ash
- /ban add 127.0.0.1 5d Go work on homework.

Note that if you want to specify a reason and a permaban, you need
to use 0 (zero) as the duration.

Examples:
- /ban add Ash 0 Love ya.
- /ban add Shank 0 Hacking.

Closes #1510
2017-12-01 23:12:06 -07:00
Chris
51154c9bc9
Merge pull request #1509 from mistzzt/fix-item-frame
Fix item frame not working properly
2017-11-28 18:54:03 +10:30
Ziteng Wang
744c812323 Fix item frame not working properly 2017-11-20 14:51:42 -08:00
Ivan
51ff8483cd Merge pull request #1499 from koneko-nyan/patch-1
Add region renaming support
2017-10-22 16:10:19 +02:00
koneko-nyan
6606c7a7b7 Merge branch 'general-devel' into patch-1 2017-10-13 09:30:08 +02:00
koneko-nyan
9d12461f8d Fix some spaces 2017-10-13 09:12:56 +02:00
Ivan
e5af787264 Merge pull request #1500 from Innectic/general-devel
Put github-related files where they belong
2017-10-07 00:38:56 +02:00
Innectic
70019002c9
Add issue template 2017-10-06 12:58:17 -07:00
Innectic
7f9d76f71f
Put Github files where they belong
Closes #1495
2017-10-06 12:52:33 -07:00
Ziteng Wang
ff106c39b8 Merge pull request #1496 from ProfessorXZ/group-renaming
Fixes #1420
2017-10-04 10:27:54 -07:00
Ziteng Wang
91e8077573 Merge branch 'general-devel' into group-renaming 2017-10-04 10:09:46 -07:00
Ziteng Wang
7f8381e56d Merge pull request #1497 from Pryaxis/new-commands
Switch to msbuild commands
2017-10-04 10:09:24 -07:00
Ziteng Wang
5781bc8b07 Merge branch 'general-devel' into new-commands 2017-10-04 10:04:57 -07:00
Lucas Nicodemus
2abb377e75 Merge pull request #1481 from Leeleo3x/fix-build
Add more HintPaths for OTAPI
2017-10-04 09:29:18 -06:00
koneko-nyan
aaa84d1ba9 Add 'rename' sub-command to /region 2017-10-02 17:45:57 +02:00
koneko-nyan
30475be268 Add RegionRename 2017-10-02 17:42:22 +02:00
koneko-nyan
f5f516d409 Add a CHANGELOG.md entry 2017-10-02 17:39:07 +02:00
koneko-nyan
d652fd6c83 Add OnRegionRenamed hook 2017-10-02 17:36:50 +02:00
ProfessorXZ
639ffb3c7c Fix GroupManager.RenameGroup() overwriting unsaved config changes 2017-09-28 16:43:20 +02:00
Lucas Nicodemus
4f3fa06028 Merge branch 'general-devel' into fix-build 2017-09-25 12:40:26 -06:00
Lucas Nicodemus
2046768ca1 Merge branch 'general-devel' into new-commands 2017-09-25 12:30:29 -06:00
Lucas Nicodemus
6f8d795a65 Switch to msbuild commands
Fixes #1494
2017-09-25 12:28:59 -06:00
Lucas Nicodemus
ec435e266e Make our string based error handling more explicit
(Please, someone, please, get rid of this).
2017-09-25 12:18:41 -06:00
ProfessorXZ
08e182f59e All GroupManager.RenameGroup() database calls are now done in a transaction
As pointed out by @hakusaro, in order to prevent any damage during the process all database calls need to be done in a transaction. Transactions allow us to rollback from a pending state in case something goes wrong.
2017-09-23 22:41:41 +02:00
ProfessorXZ
02806a2429 Added support for renaming groups. Fixes #1420 2017-09-21 10:51:37 +02:00
Ivan
623815b9f6 Merge pull request #1486 from bartico6/issue-1485
Add "less than 2gb ram" warning
2017-09-20 21:17:16 +02:00
quake1337
d396dc5cbb Add CHANGELOG.md entry 2017-09-20 18:42:36 +02:00
quake1337
7d5a74330a Ate one newline. 2017-09-20 17:42:32 +02:00
quake1337
a00950e480 Merge branch 'issue-1485' of https://github.com/bartico6/TShock into issue-1485 2017-09-20 17:40:19 +02:00
quake1337
4aa81a3d30 Add changes requested by @hakusaro 2017-09-20 17:39:38 +02:00
quake1337
f4775a1e1e Merge branch 'general-devel' into issue-1485 2017-09-20 10:31:39 +03:00
quake1337
e6ec63a90e Add @ijwu's changes + add /proc/meminfo trick for linux 2017-09-20 09:27:28 +02:00
Ivan
a3762177c3 Merge pull request #1493 from koneko-nyan/patch-1
Fix #1492
2017-09-19 21:28:37 +02:00
koneko-nyan
65582ceaec Update CHANGELOG.md 2017-09-19 21:22:56 +02:00
koneko-nyan
51cdf0f23a Merge branch 'general-devel' into patch-1 2017-09-19 21:20:16 +02:00
Lucas Nicodemus
90600c83f6 Merge pull request #1479 from Pryaxis/add-pr
Add PR template file
2017-09-19 13:16:17 -06:00
koneko-nyan
c8549db087 Update Commands.cs
(time % 1.0) * 60.0 can be equal to 59.8, then it gets rounded to undesirable 60 displayed in the time format
2017-09-19 21:00:15 +02:00
Patrikk
c4452c6d13 Merge pull request #1491 from ProfessorXZ/professorx
Fixes #1469
2017-09-16 01:48:45 +02:00
ProfessorXZ
5a04b66514 Make Utils.GetBuffDescription actually return the buff's description & properly read 'buffTime' from the stream. Fixes #1469 2017-09-08 21:59:13 +02:00
quake1337
68437f0a22 Add "less than 2gb ram" warning 2017-08-14 14:39:22 +02:00
Ivan
9dce68e6e2 Merge pull request #1477 from deadsurgeon42/user-equatable
Implement IEquatable<User> for User class
2017-08-05 21:50:26 +02:00
Ivan
a9e1d835b8 Merge branch 'general-devel' into user-equatable 2017-08-05 21:46:39 +02:00
Ivan
5f78bbb63f Merge pull request #1484 from bartico6/general-devel
Change field visibility
2017-08-04 13:47:26 +02:00
quake1337
031ef517e3 Change field visibility 2017-08-04 12:52:07 +02:00