582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05:00
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
5af8d747b3
Merge remote-tracking branch 'origin/develop' into develop
2016-01-20 15:07:48 -05:00
269cd710fc
Fix wrong group id for spigot excludes
2016-01-20 15:07:39 -05:00
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05:00
7715df8e6a
Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop
...
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-20 12:24:33 -06:00
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
c7bb380a56
Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop
...
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
Fix small memory leak in Mineplexer.
2016-01-20 12:23:13 -06:00
0a5791a92f
Go back to compile scope, need to talk to md_5 about this
2016-01-20 13:13:20 -05:00
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
8977735baf
Include a version.properties in maven build
2016-01-20 11:57:21 -05:00
8017da9413
Delete JedisTest
2016-01-20 10:25:31 -05:00
63637e0ddb
Add IntellIJ files to gitignore
2016-01-20 10:19:25 -05:00
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00
b22f452b1f
Gladiators, added stats
2016-01-18 11:36:16 +00:00
297e9baf41
Evolution, added stats
2016-01-18 11:34:43 +00:00
f3d27c9d93
Draw my thing, added stats
2016-01-18 11:32:40 +00:00
3d88f5aaae
Dragons, added stats
2016-01-18 11:11:32 +00:00
ba50b5fdb1
Dragon Riders, added default registery
2016-01-18 11:09:19 +00:00
c3d9be2123
Dragon Escape Teams, added stats
2016-01-18 11:05:09 +00:00
85f4ee50f0
Dragon Escape, added stats + implemented kit display for stats
2016-01-18 11:04:12 +00:00
66f484760e
Death Tag, added stats
2016-01-18 10:53:56 +00:00
96d16932dd
Christmas Chaos, added stats
2016-01-18 10:50:04 +00:00
dc44207d7a
Champ TDM, added stats
2016-01-18 10:48:10 +00:00
4e09aa4c34
Champ Dominate,added stats
2016-01-18 10:45:48 +00:00
f79acaaa2a
Champ CTF,added stats
2016-01-18 10:43:46 +00:00
Shaun Bennett
Virizion
Cheese
Teddy
md_5
fooify