Mini-Chiss
|
2f571aed25
|
fixed bugs from my vel fixes, WHOOPS. normalisation :(
|
2015-08-03 18:19:31 +02:00 |
|
Jonathan Williams
|
a623cc16ce
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 09:37:12 -05:00 |
|
Mini-Chiss
|
40e2b6216e
|
oops, was right before, reverting change.
|
2015-08-03 16:30:38 +02:00 |
|
Mini-Chiss
|
f350e4efe5
|
further fixed gem stuff!
|
2015-08-03 16:25:31 +02:00 |
|
Mini-Chiss
|
67fd0e2c1d
|
fixed MPS awards formatting
|
2015-08-03 16:24:43 +02:00 |
|
Mini-Chiss
|
ab670a03fb
|
fixed logic error that was displaying gems wrong
|
2015-08-03 16:23:50 +02:00 |
|
Mini-Chiss
|
e10d26dae1
|
reduced respawn time in OITQ
removed respawn msg for short respawn times
|
2015-08-03 16:18:59 +02:00 |
|
Mini-Chiss
|
ccdb859f11
|
lowered mythical change a little :)
|
2015-08-03 16:11:11 +02:00 |
|
Shaun Bennett
|
e200ddd777
|
Merge branch 'master' into Bonus
# Conflicts:
# Plugins/.idea/misc.xml
|
2015-08-03 08:32:45 -05:00 |
|
Jonathan Williams
|
90ea3d4cff
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 08:14:20 -05:00 |
|
Jonathan Williams
|
ab20d35917
|
Wipe personal server groups on restart of monitor.
Cleanup of unused code.
|
2015-08-03 08:08:51 -05:00 |
|
Mini-Chiss
|
5e06f16c0d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 15:08:40 +02:00 |
|
William Burns
|
817b8b03f6
|
Whitelist fixes etc.
|
2015-08-03 13:40:13 +01:00 |
|
Sarah
|
fc412b0782
|
Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG.
|
2015-08-03 14:36:51 +02:00 |
|
William Burns
|
0c5cc25634
|
Stuff
|
2015-08-03 12:48:17 +01:00 |
|
Jonathan Williams
|
eb16cd755a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 05:55:57 -05:00 |
|
Jonathan Williams
|
37b779f108
|
Fixes for servers.
|
2015-08-03 05:55:33 -05:00 |
|
William Burns
|
5b598009b9
|
Merge branch 'master' into MPS-Maps
|
2015-08-03 11:53:03 +01:00 |
|
William Burns
|
bf292ecd39
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Plugins/.idea/encodings.xml
# Plugins/.idea/modules.xml
|
2015-08-03 11:51:46 +01:00 |
|
Shaun Bennett
|
bd9d222cff
|
Fix IntellIJ Files
|
2015-08-03 05:50:02 -05:00 |
|
William Burns
|
44ee735f4a
|
Merge branch 'master' into MPS-Maps
|
2015-08-03 11:46:38 +01:00 |
|
William Burns
|
4ad19e4579
|
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
|
2015-08-03 10:52:00 +01:00 |
|
Mini-Chiss
|
7c028ae936
|
fixed skywars teams icon in MPS
|
2015-08-03 11:44:13 +02:00 |
|
Mini-Chiss
|
bb2e15c4fd
|
made it so games can set another game as its 'kit source' so games can share kit unlocks
|
2015-08-03 11:38:16 +02:00 |
|
William Burns
|
1ca3c8527a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 10:01:06 +01:00 |
|
Mini-Chiss
|
8d7b7f8c8b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 10:56:54 +02:00 |
|
Mini-Chiss
|
1d0bfbdf2d
|
fixed team sheep displaying in UHC lobby
|
2015-08-03 10:56:23 +02:00 |
|
Jonathan Williams
|
6c0666c59b
|
Fix for server groups / teams.
|
2015-08-03 03:20:27 -05:00 |
|
Mini-Chiss
|
b26e01649b
|
removed requirement for ach kit
|
2015-08-03 10:13:46 +02:00 |
|
Mini-Chiss
|
eac8a3cd1c
|
fixed OITQ kit being unobtainable
|
2015-08-03 10:12:37 +02:00 |
|
Mini-Chiss
|
a87b3a9284
|
fixed kits not sharing for team vers
|
2015-08-03 10:10:29 +02:00 |
|
Mini-Chiss
|
8ec271bd82
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 10:06:30 +02:00 |
|
Mini-Chiss
|
472409dc4b
|
fixed broadcast formatting
|
2015-08-03 10:06:15 +02:00 |
|
Jonathan Williams
|
302252f193
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 02:56:31 -05:00 |
|
Jonathan Williams
|
af0d769d3d
|
Fixed skywars quick shop.
Fixed issue with skywars not opening.
Fixed chest size for MPS
|
2015-08-03 02:56:24 -05:00 |
|
Mini-Chiss
|
5bb2f80b8e
|
fixed text
|
2015-08-03 09:54:34 +02:00 |
|
William Burns
|
6ccc897841
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-03 08:53:38 +01:00 |
|
Mini-Chiss
|
72c473ad6b
|
removed annoying mineplex thing from subtext in news
|
2015-08-03 09:51:10 +02:00 |
|
Jonathan Williams
|
530c40ad0c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-03 02:07:31 -05:00 |
|
Jonathan Williams
|
adcd91bf61
|
Servers with more than 40 max slots always send to largest server.
Fixed space in Solo lore.
|
2015-08-03 02:07:23 -05:00 |
|
Mini-Chiss
|
2e1bccb3ad
|
DUN ALLOW overful
|
2015-08-03 09:02:28 +02:00 |
|
Mini-Chiss
|
6a1e5d6bfc
|
changed item text
|
2015-08-03 08:23:49 +02:00 |
|
Jonathan Williams
|
c32074e733
|
Fixed MPS/Event server guis so they open up like old.
Changed sticks to player heads in solo/team selection.
|
2015-08-03 00:53:06 -05:00 |
|
Jonathan Williams
|
bfaa0e6849
|
Fixed event/mps hardcode.
|
2015-08-02 23:51:43 -05:00 |
|
Ty Sayers
|
58933fc855
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-08-02 21:19:00 -04:00 |
|
Ty Sayers
|
944a4a9535
|
Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.
|
2015-08-02 21:18:24 -04:00 |
|
Jonathan Williams
|
3b090d369d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-02 19:41:49 -05:00 |
|
Jonathan Williams
|
a561bbbf12
|
Added hardcode for EVENT/MPS :D
|
2015-08-02 19:41:42 -05:00 |
|
Shaun Bennett
|
38cc318387
|
Update JOOQ, downcast BigInteger to Long in stats for now
|
2015-08-02 19:36:24 -05:00 |
|
Shaun Bennett
|
cadd21c18b
|
More bonus work
|
2015-08-02 19:12:39 -05:00 |
|