Aaron Brock
|
5f73e50b2a
|
fix
|
2015-07-14 04:05:06 -04:00 |
|
Aaron Brock
|
6c01e0a9ea
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-14 03:38:52 -04:00 |
|
Aaron Brock
|
ca27591485
|
Added ChestComponent
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-14 03:36:41 -04:00 |
|
Cheese
|
f2cc2a2c86
|
youtubers wont get kicked by mac
|
2015-07-14 10:16:42 +10:00 |
|
Cheese
|
cb05049c4a
|
youtubes can turn off vel in hubs
|
2015-07-14 10:08:41 +10:00 |
|
Cheese
|
5797f6bc00
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-14 09:58:22 +10:00 |
|
Cheese
|
1425875f7c
|
art assets
|
2015-07-14 09:56:58 +10:00 |
|
Jonathan Williams
|
f652ad8448
|
Removing ancient projects that are no longer used.
|
2015-07-13 13:41:57 -05:00 |
|
Mysticate
|
3b00be33ee
|
Merge remote-tracking branch 'origin/master' into BombLobbers
|
2015-07-13 12:15:11 -04:00 |
|
Mysticate
|
df60659786
|
Core edits
|
2015-07-13 12:14:25 -04:00 |
|
Aaron Brock
|
d5a144f377
|
Teams
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-13 07:02:33 -04:00 |
|
Mysticate
|
616c444c16
|
Added some things and stuff
|
2015-07-12 18:15:33 -04:00 |
|
Mysticate
|
0a09ae29f3
|
Merge remote-tracking branch 'origin/master' into BombLobbers
|
2015-07-12 18:14:25 -04:00 |
|
Mysticate
|
d0180910e9
|
Added two new kits.
|
2015-07-11 10:25:04 -04:00 |
|
Aaron Brock
|
7377094e86
|
stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-11 03:51:19 -04:00 |
|
Aaron Brock
|
6bacbce463
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-11 02:57:33 -04:00 |
|
Aaron Brock
|
7c571e20d4
|
Switched to '/' to DIRECTORY_SEPARATOR
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-11 02:54:27 -04:00 |
|
Mysticate
|
0353b8571d
|
Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers
|
2015-07-10 16:41:29 -04:00 |
|
Jonathan Williams
|
96a93b6786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-10 15:32:25 -05:00 |
|
Jonathan Williams
|
7684e1837d
|
Added new support staff to whitelist.
|
2015-07-10 15:31:38 -05:00 |
|
Mysticate
|
f812fd0530
|
Please push please
|
2015-07-10 16:31:37 -04:00 |
|
Cheese
|
361d090171
|
server config
|
2015-07-10 17:38:04 +10:00 |
|
Cheese
|
233d3f0144
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-10 17:31:35 +10:00 |
|
Aaron Brock
|
31d6cbd7ce
|
Meh
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-10 02:46:12 -04:00 |
|
Jonathan Williams
|
581d58c313
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 18:34:20 -05:00 |
|
Aaron Brock
|
4b800340d8
|
Added things...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-09 18:52:40 -04:00 |
|
Jonathan Williams
|
f8b3431305
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 11:08:22 -05:00 |
|
Jonathan Williams
|
a20a9ba9e7
|
Fixed issue and updated bungee motd manager.
|
2015-07-09 11:07:43 -05:00 |
|
Jonathan Williams
|
77a63f72cc
|
Updated staff server white list.
|
2015-07-09 11:07:16 -05:00 |
|
Jonathan Williams
|
ecd8e3d7b0
|
Increased wait time for redis.
|
2015-07-09 11:07:00 -05:00 |
|
Mysticate
|
9e07be51c7
|
Bug fixes
|
2015-07-09 12:03:56 -04:00 |
|
Aaron Brock
|
b4b0d6fa6f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-09 01:30:48 -04:00 |
|
Aaron Brock
|
d6fd7f4dd9
|
sutff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-09 01:30:28 -04:00 |
|
Mysticate
|
1b3d7f1c20
|
Fixed and added things
|
2015-07-08 23:57:48 -04:00 |
|
Cheese
|
49daf597b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 12:47:57 +10:00 |
|
Cheese
|
7d073fdc0d
|
fixed skywars icon
changed LOSSES to GAMESPLAYED for consistency
|
2015-07-09 12:47:40 +10:00 |
|
Sarah
|
068b7bdd47
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-07-09 03:48:44 +02:00 |
|
Sarah
|
5babd8a41a
|
Fix number formatting for different system locale
|
2015-07-09 03:45:57 +02:00 |
|
libraryaddict
|
7e3fdef2e8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-08 18:43:56 +12:00 |
|
libraryaddict
|
1f250bf951
|
MineWare: Add current progress
|
2015-07-08 18:43:37 +12:00 |
|
Ben Sihota
|
ca880371a6
|
Merge remote-tracking branch 'origin/master'
|
2015-07-07 21:19:43 -07:00 |
|
Cheese
|
480a29b874
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-08 13:55:16 +10:00 |
|
Cheese
|
e36b0440a4
|
Merge branch 'bench'
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
|
2015-07-08 13:55:01 +10:00 |
|
Ben Sihota
|
ffbee4a9aa
|
Add more details to /game
Fix NPE with /game set
|
2015-07-07 18:20:27 -07:00 |
|
libraryaddict
|
2ad2c20aaf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-08 10:24:59 +12:00 |
|
libraryaddict
|
9eff5b7245
|
Perks: Forgot to include this in last commit, no harm done.
|
2015-07-08 07:51:33 +12:00 |
|
Jonathan Williams
|
7bf440f786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 05:18:15 -04:00 |
|
Cheese
|
0bf9628195
|
removed unneeded test file
|
2015-07-07 19:01:53 +10:00 |
|
Cheese
|
35ccb04ea0
|
wipe player data on join
|
2015-07-07 18:11:43 +10:00 |
|
Cheese
|
8cd5d9f7d0
|
fixed worldconfig parsing
|
2015-07-07 17:50:36 +10:00 |
|