Shaun Bennett
|
556d5adcd9
|
Change /global to /globalpacket (fixes conflict with announcement command)
|
2015-10-24 17:46:25 -04:00 |
|
Shaun Bennett
|
0d56eefd44
|
Titan/Rewards adjustments
|
2015-10-24 13:40:17 -04:00 |
|
Shaun Bennett
|
40afcaf26b
|
Global Packet Commands
|
2015-10-23 15:07:53 -04:00 |
|
Cheese
|
af208da953
|
Merge branch 'alex-testrank'
|
2015-10-23 18:10:59 +11:00 |
|
Cheese
|
d9d0254e46
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-23 17:30:59 +11:00 |
|
Shaun Bennett
|
e3e7dd4694
|
Titan rewards from mythical chests
|
2015-10-23 02:08:31 -04:00 |
|
AlexTheCoder
|
1512d87f9e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
|
2015-10-23 00:28:32 -04:00 |
|
William Burns
|
e6bec41ca8
|
Fix "code too large" error.
|
2015-10-21 20:29:44 +01:00 |
|
Jonathan Williams
|
c719d693dd
|
Added delete benefit call for repository.
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
|
2015-10-21 01:15:09 -05:00 |
|
Cheese
|
768ef4eb97
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-21 13:00:16 +11:00 |
|
Jonathan Williams
|
3ef33bd9c5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-19 01:32:23 -05:00 |
|
Jonathan Williams
|
5e307da15a
|
Fix for inventory failure.
|
2015-10-19 01:32:12 -05:00 |
|
Shaun Bennett
|
6d7f15cd6d
|
Fix hub time after light flicker
|
2015-10-18 18:52:16 -04:00 |
|
Cheese
|
c7a5be9570
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-19 09:03:46 +11:00 |
|
Jonathan Williams
|
9e7629b1fe
|
Added 43k player chest benefit.
Updated MOTD.
|
2015-10-18 00:21:01 -05:00 |
|
Cheese
|
d901cfa12c
|
buildies can join full
|
2015-10-18 10:54:34 +11:00 |
|
Cheese
|
41b6fdc74e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-16 21:47:35 +11:00 |
|
Cheese
|
32489388c6
|
removed bug fix that caused SG break
|
2015-10-16 21:47:22 +11:00 |
|
Jonathan Williams
|
172bd65c57
|
Monster Maze motd.
|
2015-10-16 04:22:54 -05:00 |
|
Jonathan Williams
|
62b209fede
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-16 01:57:30 -05:00 |
|
Jonathan Williams
|
d00fa856f3
|
Fixed Pets so they work correctly.
Also fixed legend benefits.
Fixed chest pet rewards.
|
2015-10-16 01:57:19 -05:00 |
|
Cheese
|
016cea15f3
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-16 15:01:59 +11:00 |
|
Mysticate
|
b8eb924ffa
|
Fixed timing out. Yay. I'm done. G'night
|
2015-10-16 00:00:08 -04:00 |
|
Cheese
|
577c67cacd
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-16 14:18:35 +11:00 |
|
Mysticate
|
b15b81a7e2
|
Spacing
|
2015-10-15 23:09:23 -04:00 |
|
Mysticate
|
f0a22d5c36
|
Fixed hammer throw
|
2015-10-15 23:02:51 -04:00 |
|
Mysticate
|
f0e0d41c42
|
Fixed two things.
|
2015-10-15 22:23:49 -04:00 |
|
Cheese
|
6cc33fd6c6
|
Merge branch 'thanos-bug-fixes'
|
2015-10-16 12:53:43 +11:00 |
|
Cheese
|
24089000f0
|
Merge branch 'monster-maze' of ssh://184.154.0.242:7999/min/Mineplex into monster-maze
|
2015-10-16 12:51:25 +11:00 |
|
Mysticate
|
41511dce7b
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-15 21:19:24 -04:00 |
|
Cheese
|
1c52bd4f64
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-14 14:34:51 +11:00 |
|
Cheese
|
86bad0be30
|
mods can check other players skills
|
2015-10-14 14:34:30 +11:00 |
|
Shaun Bennett
|
0df637b80a
|
Run punishBot in main server thread
|
2015-10-13 22:56:14 -04:00 |
|
Shaun Bennett
|
39d88e8060
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/botspam/BotSpamManager.java
|
2015-10-13 22:26:11 -04:00 |
|
Mysticate
|
a049d7666f
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-13 22:14:19 -04:00 |
|
Cheese
|
45cd2a38e1
|
admins can botspam
|
2015-10-14 11:55:59 +11:00 |
|
Shaun Bennett
|
cb0d82174e
|
Apply botspam to chat messages as well
|
2015-10-13 17:41:25 -04:00 |
|
Cheese
|
1842eae7f0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-13 23:22:58 +11:00 |
|
Cheese
|
d105ea5d7e
|
botspam addition
|
2015-10-13 23:19:48 +11:00 |
|
Jonathan Williams
|
a292fdb3c5
|
Added failsafe for ServerMonitor.
|
2015-10-12 22:26:24 -05:00 |
|
Cheese
|
f5b80c941c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-13 11:58:27 +11:00 |
|
Cheese
|
e8388437b6
|
botspam now checks for chat as well
|
2015-10-13 11:58:14 +11:00 |
|
Cheese
|
981002e3dc
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-13 11:23:38 +11:00 |
|
Cheese
|
3e5ac58ae9
|
helpers!
|
2015-10-13 11:23:00 +11:00 |
|
Cheese
|
37639a413c
|
fixed skill stuff
|
2015-10-13 11:22:10 +11:00 |
|
Mysticate
|
be96842de5
|
Ultra
|
2015-10-12 17:02:34 -04:00 |
|
AlexTheCoder
|
dceba51060
|
- Fix random blockhunt bug with mounts and infestor
|
2015-10-12 03:09:40 -04:00 |
|
AlexTheCoder
|
bbb863ba92
|
- Merge conflict patch
|
2015-10-12 02:36:10 -04:00 |
|
Shaun Bennett
|
1aecc9505c
|
Add region to titan, new MOTD
|
2015-10-12 01:30:31 -04:00 |
|
AlexTheCoder
|
bef942f6da
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
|
2015-10-12 00:47:56 -04:00 |
|