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 |
|
Aaron Brock
|
4b800340d8
|
Added things...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-09 18:52:40 -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 |
|
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 |
|
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 |
|
Aaron Brock
|
762772a079
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-07 03:28:38 -04:00 |
|
Aaron Brock
|
f61d6fc69d
|
Time to day!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-07 03:28:14 -04:00 |
|
Aaron Brock
|
63fb1a49d4
|
Moo
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-07 03:26:59 -04:00 |
|
Cheese
|
62cf373322
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 16:52:16 +10:00 |
|
Cheese
|
b0bbbf506a
|
utilfile
|
2015-07-07 16:51:57 +10:00 |
|
Aaron Brock
|
b65d75ab0d
|
Moo
|
2015-07-07 00:38:00 -04:00 |
|
Aaron Brock
|
af8d1bdc83
|
Moo
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-07 00:36:17 -04:00 |
|
Cheese
|
bcc7e1fb65
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 12:36:47 +10:00 |
|
Cheese
|
02c5dd0dfa
|
world deletion
|
2015-07-07 12:36:32 +10:00 |
|
Aaron Brock
|
d125bf8e8e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-06 22:27:13 -04:00 |
|
Cheese
|
769d50f1c7
|
removed test code
|
2015-07-07 12:22:37 +10:00 |
|
Aaron Brock
|
547d496853
|
Moo
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-06 22:22:14 -04:00 |
|
Cheese
|
a1ff9c75b2
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 10:44:37 +10:00 |
|
Cheese
|
804d669513
|
return types
|
2015-07-07 10:44:24 +10:00 |
|
libraryaddict
|
2bec753a34
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-07 12:30:37 +12:00 |
|
libraryaddict
|
bff3897fab
|
Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.
|
2015-07-07 12:30:20 +12:00 |
|
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 |
|