Commit Graph

8817 Commits

Author SHA1 Message Date
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
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
2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +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
AlexTheCoder
ecb56bf450 Fix players being able to use de-blink to teleport between worlds 2016-07-29 13:35:09 -04: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
LCastr0
ab52965e44 Power Play button inside Carl, and the power play manager 2016-07-28 18:07:10 -03:00
cnr
a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
Shaun Bennett
9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
AlexTheCoder
f0be7794f5 Lower skeleton king passive rate 2016-07-28 06:16:20 -04:00
AlexTheCoder
4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder
c30d30b2e7 Fixes event mobs getting stuck outside 2016-07-28 05:33:37 -04:00
TadahTech
ab9bf2f405 Fixes possible bug with party leaders not seeing chat.
Adds pling when you received an invite.
2016-07-28 03:40:24 -05:00
AlexTheCoder
639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder
aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder
b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
AlexTheCoder
d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr
05e59ae9cc Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
This reverts commit 917b83250d.
2016-07-27 19:03:04 -05:00
Sam
00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx
749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
cnr
646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00