Aaron Brock
|
b4349a164b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-05 19:48:56 -04:00 |
|
Aaron Brock
|
45146aa75b
|
Stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-05 19:48:35 -04:00 |
|
Cheese
|
79cb4ee114
|
fixed ready
|
2015-07-06 09:48:00 +10:00 |
|
Cheese
|
b618c7b255
|
IS THE WORLD READY PLEASE
|
2015-07-06 09:46:49 +10:00 |
|
Cheese
|
5339b792ac
|
moved files
|
2015-07-06 09:18:35 +10:00 |
|
Aaron Brock
|
2e328520a0
|
Renamed from dir from bench to gameengine
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-05 19:09:34 -04:00 |
|
Aaron Brock
|
bac505f2cd
|
Edited some things
|
2015-07-05 18:49:42 -04:00 |
|
libraryaddict
|
2c249e37b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-06 07:07:56 +12:00 |
|
libraryaddict
|
e16cb4cef7
|
Disguise: Initite armorstand vector
|
2015-07-06 07:07:41 +12:00 |
|
libraryaddict
|
3d0dda382b
|
Stacker: Fixed an infinite loop
|
2015-07-06 07:07:19 +12:00 |
|
Shaun Bennett
|
abaa0ddee8
|
Level for Bobby
|
2015-07-05 13:30:16 -05:00 |
|
Aaron Brock
|
7b73f73561
|
Switched updateTypes to use the key instead of the value.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-05 03:58:46 -04:00 |
|
Aaron Brock
|
085f9f16ca
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-05 03:52:45 -04:00 |
|
Aaron Brock
|
b8b12d7f17
|
LobbyComponent.php added
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-05 03:52:35 -04:00 |
|
Cheese
|
c7d758c8d8
|
fixed UpdateEvent
added WorldComponent
|
2015-07-05 17:50:18 +10:00 |
|
Cheese
|
e24890d292
|
fixed some buggies
|
2015-07-05 15:26:56 +10:00 |
|
Cheese
|
bde58fcad9
|
debug file
|
2015-07-05 15:14:24 +10:00 |
|
Cheese
|
7182205fde
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-05 15:13:33 +10:00 |
|
Cheese
|
8d2b1650af
|
world component for MCPE
|
2015-07-05 15:13:18 +10:00 |
|
libraryaddict
|
4a71823d55
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-05 13:37:22 +12:00 |
|
libraryaddict
|
e002e4af18
|
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
|
2015-07-05 13:37:07 +12:00 |
|
Aaron Brock
|
514fe4a18a
|
Added some stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-04 20:59:15 -04:00 |
|
Aaron Brock
|
00b5c6f3d4
|
Fixing/adding some things.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-04 03:01:56 -04:00 |
|
libraryaddict
|
abbf6957b0
|
Update craftbukkit to fix maps and cursors in 1.8
|
2015-07-04 09:08:08 +12:00 |
|
libraryaddict
|
27c7e7be03
|
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
|
2015-07-04 09:07:29 +12:00 |
|
libraryaddict
|
fbf2935b19
|
Don't display dead players
|
2015-07-04 09:07:14 +12:00 |
|
Shaun Bennett
|
384d1814d7
|
Scoreboard teams display clan relationships
|
2015-07-03 15:12:46 -05:00 |
|
libraryaddict
|
c021c6cc19
|
Added missing but not forgotten MapCommand
|
2015-07-04 07:12:50 +12:00 |
|
Aaron Brock
|
73ffc97cc9
|
A more complete BenchSchedule.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-03 14:14:24 -04:00 |
|
libraryaddict
|
24294237ea
|
Add /map command
|
2015-07-04 04:11:35 +12:00 |
|
libraryaddict
|
89a4541275
|
If inventory is empty, add clans map
|
2015-07-04 04:09:18 +12:00 |
|
libraryaddict
|
c75f22b5e0
|
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2015-07-04 03:44:59 +12:00 |
|
Jonathan Williams
|
cf035eeb37
|
Fixed Bungee issues with new redis configs.
|
2015-07-03 02:17:27 -04:00 |
|
Aaron Brock
|
f2f038f1cc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-03 01:03:06 -04:00 |
|
Aaron Brock
|
060a928dd5
|
Added bench time stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-03 01:02:16 -04:00 |
|
libraryaddict
|
68f7bd533d
|
Clans Map stuff
|
2015-07-03 14:23:37 +12:00 |
|
Cheese
|
556e524e18
|
changed notifications back to 75% sale
|
2015-07-02 16:14:47 +10:00 |
|
Aaron Brock
|
61d2247cee
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-01 22:12:42 -04:00 |
|
Aaron Brock
|
6d05e40df2
|
Things
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 22:11:57 -04:00 |
|
Cheese
|
42580c09d5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-02 12:06:04 +10:00 |
|
Cheese
|
aa072d7f58
|
improved updateevent
|
2015-07-02 12:05:48 +10:00 |
|
Aaron Brock
|
0920c27040
|
Stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 21:59:38 -04:00 |
|
Aaron Brock
|
dec7d55fb0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-01 20:12:07 -04:00 |
|
Aaron Brock
|
a240181650
|
More stuff...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 20:11:07 -04:00 |
|
Cheese
|
1e26ebe0bd
|
disabled ice forming
|
2015-07-02 10:09:39 +10:00 |
|
fooify
|
70d351adae
|
fix getting snowballs from bedrock
|
2015-07-01 16:58:16 -07:00 |
|
Cheese
|
607a94f985
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-02 09:41:47 +10:00 |
|
Cheese
|
0100ca1b8c
|
fixed a derp bug
|
2015-07-02 09:41:33 +10:00 |
|
fooify
|
e7b51ac1c1
|
add jnr_dev to updaterank
|
2015-07-01 16:40:15 -07:00 |
|
fooify
|
d1e4306684
|
fix this agaaaaain
|
2015-07-01 16:38:10 -07:00 |
|