Mini-Chiss
|
26463ba75d
|
Treasure changes :O
|
2015-02-09 20:24:20 +13:00 |
|
Shaun Bennett
|
c285fae035
|
Merge remote-tracking branch 'origin/master'
|
2015-02-06 23:40:14 -05:00 |
|
Shaun Bennett
|
b85494a037
|
Show player skins in friend gui
|
2015-02-06 23:40:06 -05:00 |
|
Shaun Bennett
|
ed8638ae9f
|
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
|
2015-02-06 23:39:22 -05:00 |
|
libraryaddict
|
219ac93dc4
|
Don't allow the server to increment the mapcount information.
|
2015-02-07 16:06:53 +13:00 |
|
libraryaddict
|
c61f97d0eb
|
Why didn't this get included in that previous commit..
|
2015-02-07 03:54:19 +13:00 |
|
libraryaddict
|
8851cccff4
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-07 03:53:17 +13:00 |
|
libraryaddict
|
68d1ba4507
|
Add API to create walls of maps to create a giant image. Please use responsibly.
|
2015-02-07 03:52:19 +13:00 |
|
Shaun Bennett
|
de1d2d4688
|
Just ignore this commit. Nothing fancy here!
|
2015-02-06 00:42:17 -05:00 |
|
Shaun Bennett
|
36b43af2c2
|
Fix inconsistency in friends gui
|
2015-02-06 00:14:46 -05:00 |
|
Shaun Bennett
|
48db23c862
|
Fix for enderchests closing after being opened, go shaun!
|
2015-02-06 00:10:17 -05:00 |
|
Shaun Bennett
|
922f2d5ee9
|
Merge remote-tracking branch 'origin/master'
|
2015-02-05 23:20:45 -05:00 |
|
Shaun Bennett
|
fcb3d20778
|
Move tablist stuff to portal, show current server on tablist
|
2015-02-05 23:20:39 -05:00 |
|
Shaun Bennett
|
2f64b5f401
|
1.8 tablist fix - spigot needs to be updated!
|
2015-02-05 23:09:20 -05:00 |
|
Chiss
|
417122b7a7
|
reduced rate that smash crystal spawns
|
2015-02-06 14:47:34 +11:00 |
|
Chiss
|
09b78fccd7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-06 14:16:26 +11:00 |
|
Chiss
|
14fc6f2145
|
Chest Update
|
2015-02-06 14:16:10 +11:00 |
|
Shaun Bennett
|
f8885e4c5c
|
Merge remote-tracking branch 'origin/master'
|
2015-02-05 21:36:19 -05:00 |
|
Shaun Bennett
|
d878e3940e
|
War state, handle time better, ability to have a server timezone (see ClanManager)
|
2015-02-05 21:36:07 -05:00 |
|
libraryaddict
|
25548046d8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-05 23:42:41 +13:00 |
|
libraryaddict
|
f549402712
|
Modify wizards to use | for bossbar displays
|
2015-02-05 23:42:26 +13:00 |
|
Chiss
|
79cde8f5cf
|
fixed util textbottom for 1.8.2
|
2015-02-05 21:39:42 +11:00 |
|
libraryaddict
|
64b79424d7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-05 22:34:34 +13:00 |
|
libraryaddict
|
6f8d39b630
|
Fixed spiders climbing liquids
|
2015-02-05 22:34:06 +13:00 |
|
Chiss
|
dbd6f449eb
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
|
2015-02-05 11:37:35 +11:00 |
|
Chiss
|
c7d4b14f4c
|
Revert "Revert "Work on treasure............""
This reverts commit 49bfe385bf.
|
2015-02-05 11:34:29 +11:00 |
|
libraryaddict
|
ea30645d42
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-04 18:37:32 +13:00 |
|
libraryaddict
|
55b9435877
|
Change event used to track player's in bungee
|
2015-02-04 18:36:44 +13:00 |
|
Shaun Bennett
|
0f23533f41
|
Fix typos in EnemyData
|
2015-02-03 23:18:42 -05:00 |
|
Shaun Bennett
|
2060b74343
|
War death handling, more war logic, other fixes
|
2015-02-03 19:35:53 -05:00 |
|
Shaun Bennett
|
b0be5b2510
|
Time code for war, server time command
|
2015-02-03 16:48:26 -05:00 |
|
Shaun Bennett
|
3b324448b5
|
Fix errors in war manager
|
2015-02-03 14:19:22 -05:00 |
|
Shaun Bennett
|
939c6189a7
|
Merge energy and war with master
|
2015-02-03 14:16:07 -05:00 |
|
Shaun Bennett
|
bb197ff629
|
Merge War and Energy
|
2015-02-03 14:14:52 -05:00 |
|
Shaun Bennett
|
b0a2e655c1
|
Changes to IntellIJ Files
|
2015-02-03 14:12:52 -05:00 |
|
Shaun Bennett
|
6cefeb1b74
|
More work on War
|
2015-02-03 14:02:45 -05:00 |
|
libraryaddict
|
87f038d21d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-03 22:03:26 +13:00 |
|
libraryaddict
|
e91d76960c
|
Add a toggleable friends GUI - Chat to Inventory and back
|
2015-02-03 22:03:07 +13:00 |
|
Jonathan Williams
|
f1930ed7c1
|
Only record bungee stats for your region...servermonitor
|
2015-02-01 00:56:18 -08:00 |
|
libraryaddict
|
9118aef60f
|
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
|
2015-02-01 16:03:29 +13:00 |
|
libraryaddict
|
01fa5b5882
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-01 12:19:51 +13:00 |
|
libraryaddict
|
ea24bc1d87
|
Prevent treasure chests being opened from interfering with portals, ladders, etc.
|
2015-02-01 12:19:33 +13:00 |
|
Jonathan Williams
|
56fd245032
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-01-31 14:19:45 -08:00 |
|
Jonathan Williams
|
9d3f5f9bc8
|
Fixed reconnect for bungee connection in StatusHistoryRepository
Added error catching to ServerMonitor so it doesn't stall program.
|
2015-01-31 14:19:33 -08:00 |
|
libraryaddict
|
f9cbab6fd8
|
SuperSmash no longer restores hunger unless you damage a player, not a entity
|
2015-02-01 09:47:00 +13:00 |
|
libraryaddict
|
4f9f0afa29
|
BlockToss can no longer pickup blocks next to ladders
|
2015-02-01 09:40:36 +13:00 |
|
libraryaddict
|
6f369cbcdb
|
Sort players in spectator menu by name
|
2015-02-01 08:25:38 +13:00 |
|
libraryaddict
|
eccc2f2fb0
|
Fixed bug with dropping gadget items interfering with games and being set in the wrong slot with the wrong name
|
2015-02-01 08:04:19 +13:00 |
|
Chiss
|
0c2054ac32
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-01-30 20:49:51 +11:00 |
|
Chiss
|
f03c9d5bab
|
Fixed damage rate on barrage
|
2015-01-30 20:48:46 +11:00 |
|