Sam
|
7eb148cc59
|
Ultimate colour change
|
2016-09-03 18:24:44 +01:00 |
|
AlexTheCoder
|
09a535466a
|
Fix clan banner being removed from support server information
|
2016-09-03 11:37:45 -04:00 |
|
AlexTheCoder
|
aabde6ba90
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes
|
2016-09-03 11:35:57 -04:00 |
|
Shaun Bennett
|
e57d009341
|
Remove unused import!
|
2016-09-03 01:11:50 -04:00 |
|
Shaun Bennett
|
586a768c7b
|
Fix enjin listener else bug
|
2016-09-03 00:59:15 -04:00 |
|
Shaun Bennett
|
17409d0bd2
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
|
2016-09-03 00:57:22 -04:00 |
|
Shaun Bennett
|
0ea1d3eca2
|
Fix enjin listener else bug
|
2016-09-03 00:56:36 -04:00 |
|
cnr
|
c9358d8c5a
|
Add power play to support server
|
2016-09-02 19:10:30 -05:00 |
|
LCastr0
|
b335039749
|
Merge pull request #193 from Mineplex-LLC/develop
PPC Changes from Connor
|
2016-09-02 17:32:02 -03:00 |
|
Keir Nellyer
|
a5efacc12f
|
PC-955 Fix closing gui showing incorrect suspect name
|
2016-09-02 14:31:38 +01:00 |
|
cnr
|
2bce540c5d
|
Disable Antihack in the staff server
|
2016-09-02 02:51:34 -05:00 |
|
cnr
|
374142e63f
|
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
|
2016-09-02 00:42:51 -05:00 |
|
TadahTech
|
e2f974e1e6
|
Add sounds and messages to basketball.
|
2016-09-02 00:40:23 -05:00 |
|
cnr
|
ae0d30558c
|
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
|
2016-09-02 00:12:12 -05:00 |
|
AlexTheCoder
|
9abbe1bfb9
|
Update support whitelist and op list
|
2016-09-02 00:10:36 -05:00 |
|
cnr
|
f6db5393a3
|
Merge branch 'project-cosmetics' into develop
|
2016-09-02 00:08:23 -05:00 |
|
cnr
|
71b880793f
|
Implement power play logging and initial rewards
|
2016-09-02 00:01:49 -05:00 |
|
AlexTheCoder
|
22ddacd21b
|
Update support whitelist and op list
|
2016-09-01 23:01:34 -04:00 |
|
TadahTech
|
9e0bb6ff96
|
Tweak invite starting index.
Disable NextBestGame in an MPS
|
2016-09-01 20:59:28 -05:00 |
|
TadahTech
|
d8486abbfd
|
Fix minor best game issues.
|
2016-09-01 20:05:53 -05:00 |
|
Keir Nellyer
|
78048ac279
|
PC-947 Add bypass for handling reports created or made against for developer
|
2016-09-01 18:21:50 +01:00 |
|
Keir Nellyer
|
d39dae748c
|
PC-947 Don't allow staff members to handle reports created by or made against them
|
2016-09-01 17:55:36 +01:00 |
|
TadahTech
|
a6360249b7
|
Use party if a player has it.
|
2016-09-01 08:47:43 -05:00 |
|
TadahTech
|
6f3d7dcd29
|
Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have
|
2016-09-01 08:45:43 -05:00 |
|
TadahTech
|
41936e0efc
|
Remove users from the map.
|
2016-09-01 08:31:16 -05:00 |
|
TadahTech
|
fdc54e1dd1
|
Fix BestGame not cancelling for parties.
|
2016-09-01 08:29:51 -05:00 |
|
cnr
|
05f640266f
|
Fix basketball scoring infinite loop
|
2016-09-01 06:36:47 -05:00 |
|
TadahTech
|
107a296239
|
Fuck you intellij
|
2016-09-01 05:49:59 -05:00 |
|
TadahTech
|
53846acbf6
|
Dont let Minestrike use NextBestGame
|
2016-09-01 05:39:47 -05:00 |
|
TadahTech
|
9fcee07427
|
Fix people getting stuck in chests.
|
2016-09-01 05:34:37 -05:00 |
|
TadahTech
|
68743cf73c
|
Mavs changes.
|
2016-09-01 03:24:38 -05:00 |
|
TadahTech
|
46053e82e1
|
Mavs changes.
|
2016-09-01 02:35:31 -05:00 |
|
TadahTech
|
c0c75ea375
|
Allow team selecting to work on the mavs hub.
|
2016-08-31 23:46:29 -05:00 |
|
cnr
|
9cd5b73432
|
Merge branch 'update/basketball-game' into develop
|
2016-08-31 23:19:51 -05:00 |
|
cnr
|
55086efd91
|
Merge branch 'feature/shadowmute' into develop
|
2016-08-31 23:16:57 -05:00 |
|
LCastr0
|
8e8719070c
|
Changes Omega Chest to not be craftable
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
|
2016-08-31 23:26:41 -03:00 |
|
Sam
|
57292414c6
|
Gems for winners
|
2016-08-31 22:55:13 +01:00 |
|
Keir Nellyer
|
725892e93b
|
PC-957 Show warning message when a user's report is marked as abusive
|
2016-08-31 16:38:35 +01:00 |
|
Keir Nellyer
|
8f28ab3f0d
|
PC-949 /reportclose argument "<conclusion>" should be "<reason>"
|
2016-08-31 16:30:55 +01:00 |
|
Sam
|
0b7fdc01eb
|
Initial balence change
|
2016-08-31 16:30:50 +01:00 |
|
Keir Nellyer
|
97e06053d1
|
PC-948 Don't send handler to server if they are already connected to it
|
2016-08-31 16:25:14 +01:00 |
|
Keir Nellyer
|
04432d44d7
|
This can be an in-line return
|
2016-08-31 15:04:15 +01:00 |
|
Sam
|
6a139d5c55
|
Tiny code improvement
|
2016-08-31 13:28:48 +01:00 |
|
Sam
|
7599630328
|
Pyromancer Ultimate name change
|
2016-08-31 13:27:07 +01:00 |
|
Sam
|
8d222aafec
|
Fix increasing loop in Overtime
|
2016-08-31 13:26:54 +01:00 |
|
Sam
|
1bfebf358f
|
Add Overtime
|
2016-08-31 12:07:50 +01:00 |
|
Sam
|
47df09b770
|
Handle null sound
|
2016-08-31 12:07:35 +01:00 |
|
Sam
|
b1faecea49
|
Kit Fire incorrect values
|
2016-08-31 12:07:25 +01:00 |
|
Keir Nellyer
|
41bae9d5f8
|
Add bottom margin so that big chat logs do not collide with footer
|
2016-08-31 10:45:38 +01:00 |
|
Keir Nellyer
|
a7d224b7e4
|
Fix reports duplicating themselves and causing massive issues
|
2016-08-30 23:18:12 +01:00 |
|