Commit Graph

475 Commits

Author SHA1 Message Date
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
Dan Jones
1f87c05547 Changed madgeek1540 to madgeek1450
Just noticed a little typing error in the developer's StringList, so I decided to fix it :)
2013-06-10 11:51:55 +02:00
Jerom van der Sar
a2a6e39db9 Minor changes, added /creative -a, formatting fixes, updated version number 2013-06-10 08:24:53 +02:00
Jerom van der Sar
c6ca262472 Merge pull request #39 from WickedGamingUK/patch-5
Fixed survival -a
2013-06-09 13:29:41 -07:00
Dan Jones
c96bdea066 Fixed survival -a
I was a numpty and forgot to change the gamemode it changed people to.
2013-06-09 22:26:06 +02:00
Jerom van der Sar
893c7c2991 Merge pull request #38 from WickedGamingUK/patch-4
Added survival -a
2013-06-09 12:59:56 -07:00
Dan Jones
201d27e070 Added survival -a (Allman Style) 2013-06-09 21:52:13 +02:00
Jerom van der Sar
36ceb7007a Added Disaster839 as a developer. 2013-06-09 14:11:22 +03:00
Jerom van der Sar
6519ead121 Added Acidic, Wild and Hex to the developer list 2013-06-03 23:08:31 +02:00
Jerom van der Sar
95805dd9c1 Merge pull request #30 from Wild1145/patch-7
Added blocks to /wildcard
2013-06-02 13:03:27 -07:00
Ryan
6768854eda Added new blocked wildcards
This is to stop people from being able to abuse admin or going rogue as easily
2013-06-02 18:17:33 +02:00
Jerom van der Sar
83176ba0b9 Merge pull request #26 from Wilee999/pull2
Added /rb (/rollback alias)
2013-06-01 14:39:30 -07:00
Jerom van der Sar
4a2b58bf97 Merge pull request #28 from Wilee999/pull4
/nuke will now tempban you.
2013-06-01 14:38:12 -07:00
Wilee999
79fc01eae7 /nuke will now tempban you. 2013-05-31 19:54:36 -06:00
Wilee999
d1d220f618 Added /rb (/rollback alias) 2013-05-30 16:38:27 -06:00
Wilee999
f6943b9754 This /stop message works better. 2013-05-29 20:57:01 -06:00
Jerom van der Sar
2977167bd3 Merge pull request #24 from Wilee999/master
Fixed /blockcmd in /purgeall
2013-05-28 23:03:29 -07:00
Wilee999
ad9e901aa0 Fixed /blockcmd in /purgeall 2013-05-27 19:57:53 -07:00
Jerom van der Sar
4f6e4e2e87 Merge pull request #23 from Wild1145/patch-6
Blocked /clearhistory
2013-05-26 11:32:53 -07:00
Ryan
d8ae364300 Patched exploit found in commands
This will fix the issue with world edit history erasing, please push and compile ASAP as Mark would like this patched :)
2013-05-26 14:18:16 +02:00
Jerom van der Sar
7f9661ec11 Merge pull request #14 from Wild1145/patch-1
Blocked /rl
2013-05-22 07:40:51 -07:00
Jerome van der Sar
8d59ba59f4 Prepend Rollback entries, this ensures the last entries get restored first, instead of last 2013-05-20 15:40:04 +02:00
Jerom van der Sar
6a7e866a53 Merge pull request #19 from Wild1145/patch-5
Fixed /gtfo
2013-05-19 14:30:56 -07:00
Ryan
63508addf4 /Gtfo bug fix 2013-05-19 23:28:57 +02:00
Jerom van der Sar
b8ab56bed5 Incremented version number 2013-05-17 23:00:27 +02:00