Commit Graph

2399 Commits

Author SHA1 Message Date
Jerom van der Sar
37e78dceec Merge branch origin/master 2013-07-12 21:54:43 +02:00
Jerom van der Sar
8f6d71fffb Bleeding - Fixed empty commands
Empty commands would always run the first alphabetically sorted TFM command.
2013-07-12 21:51:03 +02:00
Steven Lawson
3935bcf09f Merge pull request #6 from TotalFreedom/master
Update primary repository
2013-07-12 04:04:17 -07:00
Steven Lawson
b9bd046105 Changed WorldEdit API access method. 2013-07-11 20:35:09 -04:00
Steven Lawson
1fcda4a8fc Merge remote-tracking branch 'origin/untested' 2013-07-11 18:40:42 -04:00
Steven Lawson
f8e62a9893 Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 2013-07-11 18:22:12 -04:00
Steven Lawson
aaf96d00a9 Revert to old login logic. Ban messages weren't working right. 2013-07-11 18:21:23 -04:00
unknown
4903f009b3 Add Pet Protection.
Cleaned up config file a bit.
2013-07-11 14:51:08 -04:00
Steven Lawson
3dc51715c5 Update LICENSE.md 2013-07-11 12:50:23 -04:00
Steven Lawson
f2aaba17de Update README.md 2013-07-11 12:48:25 -04:00
Steven Lawson
fa1c9a255c Update and rename LICENCE.md to LICENSE.md 2013-07-11 08:43:48 -04:00
Steven Lawson
3c80aaa7c4 Update CONTRIBUTING.md 2013-07-11 08:18:10 -04:00
Steven Lawson
279f69e3de Merge pull request #52 from Wild1145/patch-1
Fine by me.
2013-07-11 04:36:13 -07:00
Steven Lawson
22bf0c2f62 Removed Command_minecraft and TFM_ServiceChecker.
Restored old Mojang status checker in /status.
Owner of xpaw.ru requested that 3rd party applications not use his API.
Batch formatting fix.
2013-07-10 21:46:29 -04:00
Jerom van der Sar
f21e50e002 Fixed bug in /halt 2013-07-10 23:47:21 +02:00
Jerom van der Sar
6d9e9406ec Moved to more specific User-Agent in the service Checker 2013-07-10 23:32:31 +02:00
Steven Lawson
cd16c7fb10 Mark wanted /list -a to show how awesome he was.
Or something like that. Don't do this for other people, please.
2013-07-08 20:51:23 -04:00
Steven Lawson
11c945c504 Update to 1.6.2 API. 2013-07-08 20:37:02 -04:00
Steven Lawson
c70e3ad8fd Added DisguiseCraft API functionality. 2013-07-07 21:42:03 -04:00
Ryan
f63805cca2 Removed some ziptool stuff
Well as it was removed from here, it may aswell just be removed from this file too :)
2013-07-07 23:39:02 +01:00
Jerom van der Sar
5868540cbb Optionally ends with 'y', who knew? 2013-07-06 19:09:32 +02:00
Jerom van der Sar
8ca518528f Whoops, fixed the description of /whohas 2013-07-05 14:02:43 +02:00
Jerom van der Sar
4cbbf10871 Blocked command aliases from being executed when that command is blocked, removed debug message 2013-07-05 13:50:10 +02:00
Jerom van der Sar
93914370a1 Added /whohas 2013-07-04 23:32:11 +02:00
Jerom van der Sar
ee87d1147d Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod
Conflicts:
	appinfo.properties
	buildnumber.properties
	src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
2013-07-04 22:51:31 +02:00
Jerom van der Sar
44f72815e1 Added configurable blocked commands 2013-07-04 22:46:51 +02:00
Steven Lawson
391e417882 Move server interface where it belongs. 2013-07-04 12:22:02 -04:00
Steven Lawson
0dca359e4c A few little fixes.
Make /cake give the cake achievement.
Fix /lockup.
Colorful MOTD, more MOTD options.
2013-07-04 12:10:08 -04:00
Steven Lawson
15fbd0e1f3 Got rid of dispatchCommand usage (where possible).
Added TFM_WorldEditBridge.
2013-07-03 16:11:57 -04:00
Steven Lawson
1d9e6ae931 Merge pull request #50 from Wilee999/master
Blocked /butcher and //butcher on mark's request
2013-07-02 19:41:16 -07:00
Wilee999
a0cf0e9352 oops 2013-07-02 19:40:18 -07:00
Wilee999
797de66e10 removed 2013-07-02 19:36:59 -07:00
Steven Lawson
d40d5b461d Cleaned up Command_setl. Don't use server.dispatchCommand for things that can be done with the existing API!
Fixed depreciation warnings on compile.
2013-07-02 19:08:31 -04:00
Jerom van der Sar
8751e0454c Cleaned up /purgeall and /halt 2013-07-02 22:31:05 +02:00
Wilee999
3f29f788d5 Bye bye /butcher! 2013-07-02 12:50:59 -07:00
Steven Lawson
5c2e67ae1d Merge pull request #49 from Wilee999/master
Made /mp an admin command on mark's request
2013-07-02 12:43:53 -07:00
Wilee999
61db5de20d Reverted last commit. 2013-07-02 12:42:06 -07:00
Wilee999
ed9204c735 might as well add this 2013-07-02 11:59:15 -07:00
Wilee999
9fc237390e grr 2013-07-02 11:58:41 -07:00
Steven Lawson
ba22aedc58 Batch formatting fix. 2013-07-02 14:31:22 -04:00
Jerom van der Sar
44fb26b27f Updated to Bukkit 1.6 2013-07-02 14:05:29 +02:00
Jerom van der Sar
fab341608b Improved mojang service checker, now using xpaw.ru, migrated to /minecraft 2013-07-01 10:04:43 +02:00
Jerome van der Sar
4f6a0ca5d3 Blocked TNT Minecarts from being placed 2013-06-23 15:17:12 +02:00
Jerom van der Sar
f3684cc2ce Whoops! 2013-06-22 20:12:58 +02:00
Jerome van der Sar
772b7e43f7 Added license 2013-06-22 19:59:52 +02:00
Jerom van der Sar
c308c9a268 Oopsies. 2013-06-18 19:52:41 +03:00
Jerom van der Sar
fcb424a793 Minor changes to CONTRIBUTING.md 2013-06-18 16:34:35 +02:00
Jerom van der Sar
be1acb4e03 Disaster839 is without a capital, who knew? 2013-06-11 22:48:38 +03:00
Jerom van der Sar
386989fa69 Added contribution info 2013-06-11 17:59:04 +02:00
Jerom van der Sar
4c7cd9cb23 Merge pull request #40 from WickedGamingUK/patch-6
Changed madgeek1540 to madgeek1450
2013-06-10 06:46:51 -07:00