Commit Graph

9570 Commits

Author SHA1 Message Date
Shaun Bennett
2e80838376 Update ClaimTips lore 2016-08-03 14:25:07 -05:00
Shaun Bennett
a61906acfa Ignore "Testing" boostergroup when announcing activation 2016-08-03 14:24:49 -05:00
Shaun Bennett
ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett
1ae7f6cb25 Integrate the new ThankManager into Amplifiers 2016-08-03 14:03:12 -05:00
cnr
3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder
fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
Sam
2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
Keir Nellyer
c327309a65 Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future 2016-08-02 16:46:14 +01:00
Shaun Bennett
f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
md_5
dad453bd84 Remove Sentry - Unused 2016-08-02 11:42:16 +10:00
Sam
62a1968b01 Experimental Metal Kit 2016-08-02 01:13:16 +01:00
AlexTheCoder
4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
Sam
bd00ac8446 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-01 19:34:40 +01:00
Sam
2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +01:00
Sam
4085453f0f Ninja Dash stopping/not working on rails 2016-08-01 18:47:17 +01:00
Sam
71f9fd97d6 End Effect change
Reduced the amount of TNT thrown and reduced the velocity at which they
are fired.
2016-08-01 18:46:35 +01:00
Sam
8f96b15454 Ninja Dash damage radius fix 2016-08-01 17:18:01 +01:00
Sam
84a4aa5157 Reduce Shuriken damage 2016-07-31 13:47:28 +01:00
Sam
1fde433c50 More changes and fixes 2016-07-30 22:53:36 +01:00
AlexTheCoder
cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder
d12d353c20 Fix pronoun in message autoreply 2016-07-30 17:36:03 -04:00
AlexTheCoder
2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder
fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder
d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
AlexTheCoder
9e2ba8c653 Fix fissure applying to anvils 2016-07-30 09:36:38 -04:00
Sam
063e05c0f3 Move subtle changes and fixes 2016-07-29 19:07:24 +01:00
AlexTheCoder
ecb56bf450 Fix players being able to use de-blink to teleport between worlds 2016-07-29 13:35:09 -04:00
Keir Nellyer
635e07c5a2 This wasn't meant to be included in the last commit 2016-07-29 15:09:21 +01:00
Keir Nellyer
bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
Keir Nellyer
806ec2460a Add Gameplay report category for gameplay related reports 2016-07-29 13:20:06 +01:00
Keir Nellyer
43c94e95b3 PC-875 Players should only be banned after 3 abusive reports (currently is set to 1) 2016-07-29 12:58:08 +01:00
Keir Nellyer
9c76fec54e PC-874 Show label for report closure reason when closing a report 2016-07-29 12:56:14 +01:00
AlexTheCoder
96e0625548 Fix mislabeling of shop item in user display 2016-07-29 03:15:22 -04:00
cnr
d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
TadahTech
9529789159 Remove 3 second chat delay. 2016-07-28 22:54:04 -05:00
AlexTheCoder
62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
cnr
8d0dc0ce08 Merge branch 'feature/party-v2' into develop 2016-07-28 21:19:52 -05:00
AlexTheCoder
f53503f16a Move code in sync runnable 2016-07-28 21:07:29 -04:00
AlexTheCoder
dddfb4420c Fix players being allowed to recall through worlds 2016-07-28 21:05:25 -04:00
AlexTheCoder
841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder
16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder
97d5d21a55 Fix lightning orb duping 2016-07-28 19:43:43 -04:00
AlexTheCoder
853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder
3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
AlexTheCoder
47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
AlexTheCoder
f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
LCastr0
ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
LCastr0
8e58e12d43 Merge pull request #171 from Mineplex-LLC/develop
Merging... Again :/
2016-07-28 19:51:22 -03:00
Sam
9b71f8c30b Typo in KitBarrage 2016-07-28 22:49:58 +01:00
Sam
6c11037460 First QA testing session feedback 2016-07-28 22:39:05 +01:00