libraryaddict
55f97ef984
More fixes, along with a fix for Block Hunt
2015-10-19 06:21:16 +13:00
Shaun Bennett
0a3f942575
Fix compile issue
2015-10-18 12:42:56 -04:00
Shaun Bennett
177e482dbc
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -04:00
AlexTheCoder
0094fa31f0
- Accidentally edited classpath - oops
2015-10-18 06:17:44 -04:00
AlexTheCoder
547c8ca726
- Bugfixes
2015-10-18 06:14:54 -04:00
Jonathan Williams
9e7629b1fe
Added 43k player chest benefit.
...
Updated MOTD.
2015-10-18 00:21:01 -05:00
AlexTheCoder
12319169a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
Shaun Bennett
523378aae7
Clans War updates
2015-10-17 22:55:21 -04:00
Cheese
d901cfa12c
buildies can join full
2015-10-18 10:54:34 +11:00
libraryaddict
6f91827d57
Vector to Vector3f, updated Maze to 1.8
2015-10-18 12:40:01 +13:00
libraryaddict
02bf202d52
1.8 update
2015-10-17 13:21:03 +13:00
Shaun Bennett
589c05f8c0
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
2015-10-16 14:25:31 -04:00
libraryaddict
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
libraryaddict
14a524cf54
Stuff
2015-10-17 00:08:30 +13: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
libraryaddict
f71cb80bd0
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/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
Jonathan Williams
172bd65c57
Monster Maze motd.
2015-10-16 04:22:54 -05:00
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
Ty Sayers
590b8e4d25
Merge pull request #69 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '36050b41bccf1fac5f5631c84db6fee37b02bc48':
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 15:09:50 -05:00
Ty Sayers
36050b41bc
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-10-14 16:08:22 -04:00
Ty Sayers
98ec99cffc
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 16:06:34 -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
Shaun Bennett
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -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
88709f85b6
Merge with master
2015-10-13 18:13:01 -04: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
