4c825cf80b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-08 22:48:33 +01:00
3bab7ffe44
Use attack name for Snowballs and Eggs
2016-08-08 22:48:13 +01:00
93e49bc8a6
Stop placing and dropping of skill items
2016-08-08 16:44:13 +01:00
280ff577fa
Metal Kit skill item placing and dropping
2016-08-07 01:25:48 +01:00
44274bcc64
Projectiles, Enchanted armor & StackOverFlows
...
Fixes an issue where players with enchanted armor would cause the server
to frezze for an extended amount of time due to a stackoverflow error
when hit by projectiles such as snowballs or eggs.
2016-08-07 01:23:03 +01:00
23b7064d43
Island ores bug
2016-08-04 16:56:13 +01:00
190ced7d97
Metal Kit tweaks
2016-08-04 16:55:52 +01:00
91cf391724
some adjustments to UHC Survivalgames
2016-08-04 00:33:24 -04:00
3610f78b37
Merge branch 'feature/thanks' into develop
2016-08-03 22:23:46 -04:00
e113bedea5
Fix accidentally refactoring "thanks" in strings
2016-08-03 15:11:31 -05:00
ad6c1dd970
Adjust some text wording
2016-08-03 14:55:33 -05:00
a61906acfa
Ignore "Testing" boostergroup when announcing activation
2016-08-03 14:24:49 -05:00
ca13b8f29e
Fix compile errors
2016-08-03 14:18:26 -05:00
1ae7f6cb25
Integrate the new ThankManager into Amplifiers
2016-08-03 14:03:12 -05:00
2b8754aa32
Metal Kit bug fixes
2016-08-02 23:34:12 +01:00
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
62a1968b01
Experimental Metal Kit
2016-08-02 01:13:16 +01:00
2c37af32ca
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-01 19:19:34 +01:00
8d0dc0ce08
Merge branch 'feature/party-v2' into develop
2016-07-28 21:19:52 -05:00
9c42f4c147
Use the proper boostergroup for amplifier thanks
2016-07-28 13:27:48 -05:00
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
dd38a1dd76
Merge branch 'update/clans' into develop
2016-07-27 20:40:35 -05:00
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
00c0e38b82
Kit upgrades now display
2016-07-27 23:02:40 +01:00
749fa36a5a
remove debug and check for Integer class
2016-07-27 16:47:08 -05:00
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
43c45f4094
add timer to dragon escape
2016-07-27 13:59:35 -05:00
8648581140
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-27 19:57:25 +01:00
3cddf35d12
Refactor out legacy ConfirmationPage
2016-07-27 13:52:03 -05:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
dc96258055
Merge branch 'feature/party-v2' into develop
2016-07-27 13:19:25 -05:00
0d46bc4609
Add Amplifier thank button
2016-07-27 13:17:36 -05:00
5180e46be7
Revert party chat symbol to "@". Change team chat symbol to "#".
2016-07-24 22:17:50 -05:00
4728a50ca9
Small message change
...
Avoids using two variables
2016-07-24 11:49:57 +01:00
ceccf2d2ac
Don't give the item when a game is in progress.
2016-07-23 22:36:53 -05:00
50de769e36
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-24 00:13:13 +01:00
03b3c1864d
Map crumble issue
...
Fixes an issue where the max distance of a map would not be calculated
correctly affecting the map crumble
2016-07-24 00:12:48 +01:00
b87c6cfff0
Fix git removing class
2016-07-21 17:27:41 -04:00
75cc75f40c
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 17:25:15 -04:00
0262452b6a
Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.
2016-07-21 13:59:35 -05:00
faece2c5f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-21 11:13:15 +01:00
e5cd38c11b
Revert enjin changes
2016-07-21 05:20:47 -04:00
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
b48f97fd2e
Fix stupid JOOQ issue and IntelliJ.
2016-07-21 03:46:18 -05:00
9a06cce0a0
Merge branch 'feature/party-v2' into develop
2016-07-20 16:41:50 -05:00
67a185acc9
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-20 15:52:59 -05:00
7e26480452
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-19 22:29:00 +01:00
3411a3b978
Throwable Dirt colliding issues
...
Fixes the falling dirt block colliding with the thrower.
2016-07-19 22:28:56 +01:00
8b552a69de
Removal of debug message
2016-07-19 21:45:03 +01:00
765958a421
Code cleanup for PerkDirtCannon
...
Cleans up some bad code in PerkDirtCannon and now removes the dirt
blocks on death.
2016-07-19 20:51:14 +01:00
Sam
xXVevzZXx
cnr
Shaun Bennett
TadahTech
AlexTheCoder