libraryaddict
|
70c76d976f
|
More changes
|
2015-10-16 22:10:13 +13: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 |
|
libraryaddict
|
3dda9352e7
|
Progress
|
2015-10-16 13:32:23 +13:00 |
|
libraryaddict
|
4205dc6c25
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
|
2015-10-15 12:34:34 +13: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 |
|
libraryaddict
|
58a86c5abb
|
That's the easy stuff done..
|
2015-10-13 19:49:15 +13:00 |
AlexTheCoder
|
e1d8b25e91
|
- Fix misc champs bugs
|
2015-10-13 01:24:57 -04: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 |
|
AlexTheCoder
|
0bd026f506
|
- Fixed merge issues
|
2015-10-12 18:04:35 -04:00 |
|
AlexTheCoder
|
f497eab633
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
|
2015-10-12 17:54:11 -04: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 |
|
Cheese
|
2b9a66e7b2
|
more ssm update
|
2015-10-12 16:32:23 +11: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 |
|
Cheese
|
6a173073a4
|
added flag to projectiles
work on cow kit
|
2015-10-12 14:39:14 +11:00 |
|
libraryaddict
|
dab258dcdd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Libraries/BungeeCord.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
|
2015-10-12 16:22:52 +13:00 |
|
Mysticate
|
3eb36a6581
|
Prevented farming
|
2015-10-11 22:43:21 -04:00 |
|
Mysticate
|
2abf3edad4
|
Made items for titanic cosmetics dyes.
|
2015-10-11 22:29:26 -04:00 |
|
Mysticate
|
b6d573a4d5
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
|
2015-10-11 22:25:25 -04:00 |
|
Mysticate
|
7a4ccdf680
|
Bug fixes
|
2015-10-11 22:17:34 -04:00 |
|
Cheese
|
e180e0ae78
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-12 12:29:05 +11:00 |
|
Mysticate
|
dda65b4c77
|
Fixed tnt exploding lobbies
|
2015-10-11 19:56:36 -04:00 |
|
Mysticate
|
20dd9c683b
|
Merge remote-tracking branch 'origin/master' into monster-maze
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
|
2015-10-11 10:52:45 -04:00 |
|
Mysticate
|
606937d227
|
Fixed flashbang glitch
|
2015-10-11 09:42:36 -04:00 |
|
Jonathan Williams
|
e6485a9009
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-10 23:02:36 -06:00 |