libraryaddict
adc5769890
Fix wither not accessible for ranks, fix wither having weird naming in inventories
2014-12-24 04:07:28 +13:00
Jonathan Williams
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05:00
Jonathan Williams
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Chiss
4bfd34034b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 22:19:50 +11:00
Chiss
8c2d879036
added ownership of legend particle for legends.
2014-12-23 22:17:39 +11:00
Jonathan Williams
d2e078f890
Fixed ranks for MPS
2014-12-23 06:04:42 -05:00
Jonathan Williams
fb841c3831
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
Jonathan Williams
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
Shaun Bennett
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
Jonathan Williams
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
Jonathan Williams
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
Jonathan Williams
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
Chiss
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
Jonathan Williams
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
Shaun Bennett
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
Shaun Bennett
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
Shaun Bennett
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
Jonathan Williams
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
Jonathan Williams
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Chiss
0659f497c0
frost lord update
2014-12-23 15:00:32 +11:00
Chiss
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
Chiss
825b25e8d1
fixed my bug in miniplugin
2014-12-23 11:29:48 +11:00
Chiss
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
Chiss
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
Chiss
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
Jonathan Williams
b83a81ec7e
Fixed little conflict issue.
2014-12-22 09:25:02 -05:00
Jonathan Williams
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
Jonathan Williams
d920439ec5
Clans update. Laying groundwork for energy
2014-12-22 09:22:10 -05:00
Chiss
4a50e3ae62
Merge branch 'chissbrokethis'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
Chiss
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
Chiss
1a56f074b3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-22 10:22:13 +11:00
Chiss
eba54c6b8a
Removed hub snake parkour
2014-12-22 10:21:58 +11:00
Jonathan Williams
52cc0862d7
Memory leak fix for CUSTOM TAG
2014-12-18 18:29:33 -05:00
Shaun Bennett
4c4ba34d39
Merge pull request #5 from feature/chatslow to master
...
* commit '9ef0ea629c57b148d815b93a455f9817ce512960':
Added changes from master to Chat
Chat Slow Command
2014-12-17 20:08:32 -06:00
Shaun Bennett
9ef0ea629c
Added changes from master to Chat
2014-12-17 20:07:39 -06:00
Shaun Bennett
899add5fcd
Merging changes from master
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
2014-12-17 20:07:11 -06:00
Chiss
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
Chiss
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
Chiss
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
Shaun Bennett
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
Shaun Bennett
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
Shaun Bennett
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
Chiss
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
libraryaddict
e1db8d6a5d
Why was I missing a entitytype import..
2014-12-17 18:37:58 +13:00
libraryaddict
26d92f0381
Add missing class
2014-12-17 18:33:43 +13:00
libraryaddict
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
libraryaddict
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
Shaun Bennett
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
Chiss
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
