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 |
|
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 |
|
Jonathan Williams
|
c43ee95c55
|
Added 1.8 hooks for disguise setName and getName
Refactored method names in some disguise classes.
|
2014-12-15 21:46:14 -05:00 |
|
Chiss
|
1907014db4
|
disguise wither update
|
2014-12-16 13:28:59 +11:00 |
|
Chiss
|
2e7d101850
|
added material/data for gametypes
|
2014-12-16 12:26:37 +11:00 |
|
libraryaddict
|
75cf80652c
|
Remove customnametrue from horse mount
|
2014-12-16 01:36:42 +13:00 |
|
Chiss
|
d7eb01e8f0
|
fixed CC Bug :D
|
2014-12-15 15:49:52 +11:00 |
|
Jonathan Williams
|
e02bcd8b84
|
Revert the revert of the revert.
|
2014-12-14 22:58:49 -05:00 |
|
Chiss
|
d1be64d7e7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
|
2014-12-15 14:56:09 +11:00 |
|
Chiss
|
95081a8ab7
|
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
|
2014-12-15 14:33:38 +11:00 |
|
Jonathan Williams
|
4482e46250
|
Changed int to atomic for concurrency
|
2014-12-14 21:53:55 -05:00 |
|
Jonathan Williams
|
eefa4de838
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-14 20:50:35 -05:00 |
|
Jonathan Williams
|
2a58b822a0
|
Safeguard on connecting vlaues.
|
2014-12-14 20:50:19 -05:00 |
|
Chiss
|
d0f8a6a063
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-15 12:26:25 +11:00 |
|
Chiss
|
9136165d4f
|
fixed christmas elf name
pet names now have limited range
|
2014-12-15 12:24:40 +11:00 |
|
Jonathan Williams
|
9fb2231d76
|
Added connecting clients as a factor for status snapshot.
Added online check for DonationManager rewarding local info.
|
2014-12-14 02:32:52 -05:00 |
|
Jonathan Williams
|
5b67e2182a
|
Added disguise to Pet Manager for eventual wither disguised pet.
|
2014-12-14 02:30:39 -05:00 |
|
Chiss
|
78a34b1517
|
hopefully fixed a bug where pumpking king despawned.
removed 11 disc from loot
|
2014-12-13 11:55:12 +11:00 |
|
libraryaddict
|
9a16616e6c
|
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
|
2014-12-12 12:40:23 +13:00 |
|
Chiss
|
6b1fa91565
|
Xmas Updates
|
2014-12-11 12:42:06 +11:00 |
|
Chiss
|
86b9d8342f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
|
2014-12-11 11:27:47 +11:00 |
|
Chiss
|
358d5fde44
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-10 22:38:19 +11:00 |
|
Chiss
|
450d3eb923
|
merge
|
2014-12-10 22:38:08 +11:00 |
|
Jonathan Williams
|
c4fee8e681
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Hub/.classpath
|
2014-12-10 03:34:53 -08:00 |
|
Jonathan Williams
|
ea034812b9
|
Fixed path finder crap in UtilEnt
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
|
2014-12-10 03:32:35 -08:00 |
|
Chiss
|
db8e0484ab
|
missing files + new pet
|
2014-12-10 18:23:22 +11:00 |
|
Chiss
|
0aba82eee6
|
fixed some eclipse java6 stuff with mail
Christmas game update
|
2014-12-10 15:38:57 +11:00 |
|
Chiss
|
bee81ff455
|
lowered coin rewards
|
2014-12-09 20:23:56 +11:00 |
|
Chiss
|
828fabb80a
|
Initial Christmas Chaos update
|
2014-12-09 20:04:59 +11:00 |
|
Chiss
|
ef8e5104f1
|
SnD Kits
minor bug fixes
|
2014-12-08 17:28:18 +11:00 |
|
Chiss
|
64c8edc292
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-08 17:25:03 +11:00 |
|
Shaun Bennett
|
0759a373da
|
Fix treasure chest hologram
|
2014-12-07 01:25:36 -06:00 |
|