Commit Graph

3440 Commits

Author SHA1 Message Date
Aaron Brock
b89cc7818c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-06 19:45:52 -04:00
Aaron Brock
0c406ea760 Added STUFF AND THINGS!!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-06 19:45:28 -04:00
Shaun Bennett
6c8c3946a3 Revert "Add IntelliJ IDE library files"
This reverts commit 71d696278d.
2015-07-06 17:06:29 -05:00
Ben Sihota
71d696278d Add IntelliJ IDE library files 2015-07-06 13:48:47 -07:00
Aaron Brock
844aa44dc4 Added Spectate stuff!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-06 02:03:05 -04:00
Aaron Brock
ac20f55391 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 22:45:47 -04:00
Aaron Brock
3f202d39ae LobbyCountdown stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 22:45:14 -04:00
Cheese
cca26165cd swapped sale back to 50% 2015-07-06 11:42:54 +10:00
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
Aaron Brock
73ffc97cc9 A more complete BenchSchedule.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-03 14:14:24 -04: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
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
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
Aaron Brock
88241fa4d5 Added some stuff and things
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 18:36:05 -04:00
Aaron Brock
28927a5965 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-01 02:19:10 -04:00
Aaron Brock
7d55221515 Some game stuff I don't know why this no work!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 02:12:19 -04:00
Aaron Brock
e3b0ee9ae3 Switched it so it enables my game
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 02:02:51 -04:00