AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-07-15 18:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
508 Commits 38 Branches 58 Tags
896af4198afa6a0bc81317f78141842507f17bc0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Lawson 896af4198a ... 2013-09-03 16:49:48 -04:00
Steven Lawson d1ffbe0412 Merge branch 'waiting' into staging 2013-09-03 16:41:21 -04:00
Steven Lawson 8f70fa2c82 Merge branch 'untested' into staging 2013-09-03 16:41:12 -04:00
Steven Lawson a89948f76d Javascript support 2013-09-03 16:35:11 -04:00
StevenLawson 41cca7cd6a Working on schematic uploader. 
Sorry for not branching out on this, but its almost done.
 2013-09-03 15:20:28 -04:00
StevenLawson 0067e2cc65 Added socket parameter for access to remote IP. 
Started on schematic module.
 2013-09-03 10:28:56 -04:00
StevenLawson 88103cefc2 Some more tweaks to WebHelp. 2013-08-28 11:26:08 -04:00
Steven Lawson 3819c57adf Finished file serving module (default). 
Added config options.
 2013-08-27 20:20:11 -04:00
StevenLawson c3f8bd33ff Added file module, for public file serving. 2013-08-27 15:09:07 -04:00
StevenLawson baf7a3b2c1 Merge branch 'master' into nanohttpd 2013-08-27 13:56:21 -04:00
StevenLawson 74bfdad389 ... 2013-08-27 13:55:03 -04:00
StevenLawson 08a9329864 Web help refinement. 2013-08-27 13:49:45 -04:00
StevenLawson be87075337 Rename help module. 2013-08-27 12:40:59 -04:00
StevenLawson ada803cd7d Web help roughly implemented. 2013-08-27 12:39:28 -04:00
StevenLawson 0f31ea2953 Make it thread safe. 2013-08-27 09:01:12 -04:00
StevenLawson 3ca46853ac Merge branch 'master' into nanohttpd 2013-08-27 08:02:32 -04:00
StevenLawson ee6b93e208 Playing the memory reduction game - lets reduce the use of "new". 2013-08-27 07:46:25 -04:00
StevenLawson 3e5e11197f Merge branch 'master' into nanohttpd 2013-08-27 07:18:43 -04:00
Steven Lawson 174043fa58 Getting HTTP server framework ready... 2013-08-26 21:48:04 -04:00
Steven Lawson dfb6df63c8 Use NanoHTTPD instead, more stable. 2013-08-26 20:39:30 -04:00
Steven Lawson 7a6cc55640 Clean up EntryType 2013-08-26 19:09:39 -04:00
Steven Lawson 5c61ff27b0 Formatting 2013-08-26 18:44:18 -04:00
Steven Lawson 143b323854 Implement weather and time control in /adminworld. 2013-08-23 21:22:13 -04:00
Steven Lawson 1f32455e06 A few more adminworld checks. 2013-08-23 16:59:31 -04:00
Steven Lawson f5e21f69fd More guest list changes. 2013-08-23 16:29:46 -04:00
StevenLawson bf7877addc Finish guest list. 2013-08-23 14:43:58 -04:00
Steven Lawson 6d0b8362b7 Merge branch 'master' into adminworld 
Conflicts:
	appinfo.properties
	buildnumber.properties
 2013-08-22 17:08:52 -04:00
Steven Lawson 10f905ea36 Got rid of varargs in logger, possible cause of exceptions. 2013-08-22 16:56:17 -04:00
Steven Lawson e64fd42855 Added TFM_CustomWorld superclass. 2013-08-21 20:07:14 -04:00
Steven Lawson 467d1d2d3a Merge branch 'master' into adminworld 2013-08-21 18:38:17 -04:00
Steven Lawson 6ba8dcaa58 Logger fixes. 2013-08-21 17:42:21 -04:00
Steven Lawson a3cf53f5b1 Merge branch 'master' into adminworld 2013-08-20 20:51:23 -04:00
Steven Lawson 23907ef7e4 Use plugin/server loggers. 2013-08-20 20:44:39 -04:00
Steven Lawson 485945047b More logger tweaks. 2013-08-20 20:04:06 -04:00
Steven Lawson 5c32c66390 Finish getting rid of old command blocker. 2013-08-18 16:45:35 -04:00
Steven Lawson 4494a4c039 Config migration, stage 3 2013-08-18 15:52:32 -04:00
Steven Lawson f53b67abf1 Config migration, stage 2 2013-08-18 15:27:17 -04:00
Steven Lawson 2827ca98a7 Config migration, stage 1 2013-08-18 14:52:46 -04:00
Steven Lawson 64b1e568b3 Deprecated old config vars 2013-08-17 18:28:55 -04:00
Steven Lawson 3e57696a21 Delegate to TFM_ConfigEntry 2013-08-17 18:24:40 -04:00
Steven Lawson fd1bd995ed Another version of TFM_ConfigEntry... 2013-08-17 18:07:57 -04:00
Steven Lawson 9fe05add7f Added weather parameter to framework. 2013-08-16 21:36:25 -04:00
Steven Lawson 25fbb0c05a Merge branch 'master' into adminworld 2013-08-15 17:45:41 -04:00
Steven Lawson f646a5122a Fixed wilee's glitch. 2013-08-15 17:44:09 -04:00
Steven Lawson af4071c582 Framework for new adminworld commands. 2013-08-15 17:40:35 -04:00
Steven Lawson 86ee0e96d2 Add TFM_Util.isRemoveCommand 2013-08-15 17:36:55 -04:00
StevenLawson 8ce0defb52 Readd Command_premium.java 2013-08-14 09:32:14 -04:00
StevenLawson ec6e8431e3 Revert "Added /premium" 
This reverts commit 0964871e8b.
 2013-08-14 09:28:19 -04:00
Steven Lawson 422a7716f3 /nf tweaks. 2013-08-13 21:39:12 -04:00
Steven Lawson f1ab8296e4 Tweaks to jumppad physics. 2013-08-13 16:54:20 -04:00
StevenLawson f9cbf11abb JumpPads cleanup 2013-08-13 14:53:33 -04:00
StevenLawson b0090a5412 More tweaks to nonuke and spam prevention. 2013-08-13 13:42:43 -04:00
StevenLawson b94efb525f Added timeout check to nonuke, so lag doesn't ban people. 2013-08-13 13:22:29 -04:00
StevenLawson 5c8f98089e Merge branch 'master' into mg_untested 2013-08-13 12:29:12 -04:00
StevenLawson 23032e6f9a Added NickFilter. 2013-08-13 09:51:20 -04:00
StevenLawson ad5a236bc2 PlayerMoveEvent optimization. 2013-08-13 08:36:33 -04:00
Steven Lawson e23db244a5 Add teleport listener to AdminWorld monitor. 2013-08-12 22:01:28 -04:00
Steven Lawson eb4622fc28 AdminWorld tweaks. 2013-08-12 21:33:21 -04:00
StevenLawson 0a2d5c8258 Reworked /dtoggle. 2013-08-12 14:49:33 -04:00
StevenLawson c1d0c01524 Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 2013-08-12 14:19:33 -04:00
StevenLawson a59e6added Tweaks to Command_tag 2013-08-12 14:19:17 -04:00
StevenLawson 4b91de7414 More AdminWorld tweaks. 2013-08-12 12:51:30 -04:00
StevenLawson c636ee043a Merge branch 'mg_incomplete' of https://github.com/TotalFreedom/TotalFreedomMod into mg_incomplete 2013-08-12 12:41:12 -04:00
StevenLawson 6a5306dd7a More AdminWorld tweaks. 2013-08-12 12:38:46 -04:00
StevenLawson 699d366efb Revert accidental change of this file. 2013-08-12 10:11:04 -04:00
StevenLawson 41ed416a51 Merge branch 'master' into mg_incomplete 2013-08-12 10:05:01 -04:00
StevenLawson 074630f720 Finished adminworld, still needs testing. 2013-08-12 10:03:12 -04:00
StevenLawson bea480c1f1 Merge branch 'master' into mg_incomplete 
Conflicts:
	appinfo.properties
	buildnumber.properties
 2013-08-12 08:14:55 -04:00
Steven Lawson 326c3f6a2b Incomplete features: 
-Adminworld
-Better entity wiping
 2013-08-11 22:02:18 -04:00
Steven Lawson 38b1035020 Added Command_trail. 
+1 points for no external changes.
 2013-08-10 15:50:45 -04:00
Steven Lawson 1ae6eb8a5a Consolidate loggers. 2013-08-10 15:50:07 -04:00
Steven Lawson 2c4eca8551 Remove deprecated methods and variables. 2013-08-10 13:17:32 -04:00
Steven Lawson f23c61d0b3 Rework Command_health 2013-08-10 12:39:50 -04:00
Steven Lawson c10e0deb8b Added formatting parameters to project configuration. 2013-08-09 20:17:08 -04:00
Steven Lawson d4dfe06ec0 Formatting cleanup. 
Added ignore for unchecked cast warning.
 2013-08-09 20:11:17 -04:00
Steven Lawson 4813b8ae27 Fix water/lava buckets not working. 2013-08-06 19:12:26 -04:00
Steven Lawson e8d36b31f7 Fix typo. 2013-08-05 22:55:59 -04:00
Steven Lawson b2eec1ef01 Rework command interface for rollback. 2013-08-05 22:05:01 -04:00
Steven Lawson 3bcc4fd7a7 Fix compile error. 2013-08-05 19:41:42 -04:00
StevenLawson e0efb63123 Reworked rollback manager. 2013-08-05 15:26:21 -04:00
StevenLawson 028d1a07b2 Minor change to CommandBlockSetEvent handler. 
Remove import and add fully qualified name to clairify what's happening here.
 2013-08-05 13:31:10 -04:00
Steven Lawson 218fd21774 Some cleanup. More to come. 2013-08-03 16:08:16 -04:00
Steven Lawson 0901c02c7e Merge branch 'mg_dev' 2013-07-30 21:47:50 -04:00
Steven Lawson a4e9bc76a3 Add "Reason: " text to kick. 2013-07-30 21:47:29 -04:00
Steven Lawson be8314cf63 Added TFM_GameRuleHandler for easy setting of game rule parameters. 2013-07-29 21:09:20 -04:00
StevenLawson f21c7aa5c5 Added reason to GTFO. Untested. 2013-07-29 14:44:18 -04:00
StevenLawson 3f61e05609 Make "/fr purge" clear the auto-unfreeze task timer. 
With credit to Wild for bringing it up on his fork, but he did it wrong :P
 2013-07-29 13:37:31 -04:00
StevenLawson fe93d1ce07 Added /logs [off] for unregistering connection. 2013-07-29 13:20:08 -04:00
StevenLawson 5132bb6550 Removed old commented out code. 2013-07-29 08:29:16 -04:00
Steven Lawson 6b7a5d8d70 Add /debug command. What can possibly go wrong. 2013-07-28 20:50:57 -04:00
Steven Lawson 6a4a11a2f4 Merge remote-tracking branch 'origin/debug' 2013-07-28 19:50:05 -04:00
Steven Lawson cbe7cdc474 Cleanup Command_droptoggle. 2013-07-28 17:49:41 -04:00
Steven Lawson 07f4bf82ea Incomplete - /debug command 2013-07-28 17:31:41 -04:00
Steven Lawson 1ab74dae05 Forgot to set task variable. 2013-07-28 13:15:51 -04:00
Steven Lawson 8ac91f7097 Reworked all Scheduler usage - now using BukkitRunnables. 
Added /logs command.
A few other fixes...
 2013-07-27 17:49:25 -04:00
Steven Lawson c482349f47 TFM_CommandBlockerNew cleanup. 2013-07-26 19:48:18 -04:00
Steven Lawson 2079e0ea66 Added event handling for command block changes. 
Recoded TFM_CommandBlocker as TFM_CommandBlockerNew, will replace after evaulation.
 2013-07-21 22:48:34 -04:00
Steven Lawson 0e477f8437 Merge branch 'master' of https://github.com/StevenLawson/TotalFreedomMod 2013-07-20 19:44:01 -04:00
Steven Lawson c3fc085adc Fix for Bukkit NPE in /enchant. 2013-07-20 19:38:27 -04:00
Steven Lawson aad8f17455 Give TFM commands priority over other plugins. 2013-07-20 16:06:46 -04:00