Jonathan Williams
514445557b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:32:13 -05:00
Chiss
dfd17b1793
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-12 21:29:46 +11:00
Chiss
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
Jonathan Williams
52fad77297
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:21:45 -05:00
Jonathan Williams
771c7cba0a
Changed playercount back to current +1
2014-12-12 05:21:23 -05:00
Shaun Bennett
e19c76575b
Merge pull request #7 from feature/animated-motd to master
...
* commit '56bc8dc2325d00cbd95247bcc1d270ba0ed703a1':
Trying to do some hacky things!
2014-12-12 04:19:38 -06:00
Shaun Bennett
56bc8dc232
Trying to do some hacky things!
2014-12-12 04:18:47 -06:00
Shaun Bennett
14c6c1ca4b
Merge pull request #6 from feature/animated-motd to master
...
* commit 'b65ca5f7dd8e07d2d65e59d08a7d907d29b172d6':
Update bungee cord, comment out debug stuff
Fix icon animation + some more tweaks
Some adjustments
Motd stuff for xmas update
pushing this for my laptop. not final code!
2014-12-12 02:54:30 -06:00
Shaun Bennett
b65ca5f7dd
Update bungee cord, comment out debug stuff
2014-12-12 02:53:56 -06:00
Chiss
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
Shaun Bennett
7b42bd661f
Fix icon animation + some more tweaks
2014-12-12 01:13:02 -06:00
Shaun Bennett
ac02201262
Some adjustments
2014-12-12 00:48:08 -06:00
Shaun Bennett
30a7eea628
Motd stuff for xmas update
2014-12-12 00:28:29 -06: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
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
Chiss
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
Shaun Bennett
93dc3c9090
pushing this for my laptop. not final code!
2014-12-11 09:17:19 -06:00
Chiss
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
libraryaddict
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +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
libraryaddict
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
libraryaddict
2a13255af3
Turn christmas chaos game horses into reindeer
2014-12-11 07:23:47 +13:00
Chiss
068a0901f9
xmas updatre
2014-12-11 00:16:15 +11:00
Jonathan Williams
91954d43df
Added DataWatcher Vector support.
2014-12-10 03:42:31 -08: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
11e09b202c
Fixed PullWhileLeashed bug and ghost bug.
2014-12-10 03:34:05 -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
6de278bb4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-09 20:24:07 +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
Jonathan Williams
625d517058
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-08 00:55:43 -08:00
Jonathan Williams
342c44affc
Fixed a bunch of clans bugs
2014-12-08 00:55:20 -08:00
Chiss
50358c0c30
removed EULA breach in bridges private blocks
2014-12-08 18:23:47 +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
Jonathan Williams
60a46d5adf
Replaced Dwarf Toss with Block Toss in Clans.
2014-12-06 04:23:26 -08:00
Shaun Bennett
4a7b6bd33f
Blame chips
2014-12-06 01:10:08 -06:00
Shaun Bennett
7402eb2f91
Merge remote-tracking branch 'origin/master'
2014-12-06 01:00:40 -06:00
Shaun Bennett
b99da44873
Disable mail and notifications
2014-12-06 01:00:02 -06:00
Shaun Bennett
1276e0c0d5
Chat Slow Command
2014-12-05 21:33:31 -06:00
libraryaddict
41a1ff5842
Merge pull request #4 from blockhunt to master
...
* commit '048aa40590b2d64b9219d2459ab865e3f273117e':
Remove comments and add comments
Read merge message
2014-12-05 08:26:37 -06:00
libraryaddict
048aa40590
Remove comments and add comments
2014-12-06 03:25:53 +13:00
libraryaddict
307d280534
Read merge message
2014-12-06 02:22:52 +13:00
Jonathan Williams
21e80af6cb
Fixed Cosmetic menu buttons
...
Removed map in wrong location
Removed message for removing armor.
2014-12-05 01:15:25 -08:00
