Commit Graph

698 Commits

Author SHA1 Message Date
NewGarbo 67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo 441cf702c7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-19 07:22:09 +00:00
NewGarbo d5583b93f2 remove eclipse files 2016-02-19 07:14:13 +00:00
Shaun Bennett 7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
phobia d7ad2cdc58 moar undead fixes 2016-02-14 12:37:37 +11:00
phobia 24254635a8 Fixes to observer settings 2016-02-14 09:51:59 +11:00
Shaun Bennett 4f5625d63e Clans Alpha 1.0 changes 2016-02-05 18:42:22 -05:00
phobia 27e4ef784c WP Evade 2016-02-06 08:44:37 +11:00
phobia b0888208d1 More alphs bug fixes 2016-02-05 23:55:38 +11:00
phobia 6291decf87 Fixes to flame and broadsword 2016-02-05 11:42:39 +11:00
phobia 73d4ff2639 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-05 10:12:31 +11:00
phobia 6fd9cffb01 Clans alpha bug fixes 2016-02-05 10:12:18 +11:00
NewGarbo 6c7d08a8f9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-04 22:55:53 +00:00
NewGarbo e61b36f55c Fixed /c stuck timer taking 7 seconds instead of 2 minutes 2016-02-04 22:55:37 +00:00
phobia 5fd089c768 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-03 17:43:43 +11:00
phobia f011fdad5f Fixes to TntProtection 2016-02-03 15:10:56 +11:00
phobia 0e0582a1a7 Added safe zone protection for flame 2016-02-03 10:39:21 +11:00
NewGarbo 6fea76a8e4 finalized alpha patches 2016-02-02 21:38:38 +00:00
NewGarbo 23883148dd alpha fixes 2016-02-02 20:55:23 +00:00
NewGarbo cfbfb1fa3b raised war points for invasion to 25 2016-02-02 20:42:20 +00:00
phobia 59e564cdc6 Fixes to war point evasion 2016-02-02 23:18:05 +11:00
phobia f1c49fa5ee Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-02 22:13:38 +11:00
phobia 8a0f585432 Added fix to WarPoint evasion bug + 1 dmg bug 2016-02-02 22:11:52 +11:00
NewGarbo 84b887fe89 that's not needed 2016-02-01 19:53:59 +00:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
phobia 9c83c64d01 Fixed issues with Broadsword
Added max building height of 100
2016-01-30 21:34:06 +11:00
phobia 4612550ba5 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-01-30 19:24:42 +11:00
phobia aa0cfc7710 Fixes to TnTGeneration
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
Shaun Bennett c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
NewGarbo fe01c9b8d5 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-29 20:57:10 +00:00
NewGarbo d10266c4d1 sapling fix 2016-01-29 20:56:38 +00:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett 50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
NewGarbo 7860ca24c8 disallow all staff from using /we 2016-01-28 23:33:06 +00:00
NewGarbo 88c1391ba2 disallow sapling in dispensers (grrr working in two different branches is really strange) 2016-01-28 13:30:16 +00:00
NewGarbo b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00
NewGarbo ceeeb3bc45 no tnt from dispensers 2016-01-28 10:58:46 +00:00
NewGarbo e68dea65e1 stop dispensers being used for flint-andsteal, bonemeal etc etc 2016-01-25 17:46:39 +00:00
NewGarbo 18e892c4ec finally fixed that windblade dupe 2016-01-25 17:41:07 +00:00
NewGarbo 71bb1ed3d6 this is just really slowing down startup time by A LOT 2016-01-25 17:22:56 +00:00
NewGarbo 9d77632fcc allow clans moderators to use /cb 2016-01-25 17:18:00 +00:00
NewGarbo 2bf2050844 increased sapling cooldown to 20 minutes from one second. 2016-01-25 17:13:53 +00:00
NewGarbo 7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
NewGarbo d82a7b353f allow C.Mods to join all server regardless of home servers 2016-01-25 08:42:38 +00:00
NewGarbo 1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00
NewGarbo bf6f1a1701 sapling stuff messed up oops 2016-01-22 15:28:12 +00:00
NewGarbo 6638562866 npe fix 2016-01-22 15:21:20 +00:00
NewGarbo c4bbeb2535 more control over saplings 2016-01-22 14:55:50 +00:00
NewGarbo a377a09925 fixed wind blade dupe bug 2016-01-22 11:22:20 +00:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00