Commit Graph

12546 Commits

Author SHA1 Message Date
LCastr0
d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -03:00
Sam
8bddad44da Bridges hotfix 2017-03-24 16:46:14 +00:00
LCastr0
64ed3e2e1b Still trying with armor stands... 2017-03-24 13:45:36 -03:00
cnr
0ad69ebefc Revert "Merge branch update/bridges into develop"
This reverts commit 7e8f5b4939, reversing
changes made to 222e4267d2.
2017-03-23 23:24:00 -05:00
cnr
d95ed8d749 Disable /link and /unlink help messages 2017-03-23 23:22:33 -05:00
AlexTheCoder
3b2c50efa3 Remove magic values for PPC tag id and linked tag id 2017-03-23 23:18:29 -05:00
AlexTheCoder
1ff033de43 Refactor website link to use consumers instead of callbacks 2017-03-23 23:18:29 -05:00
AlexTheCoder
f6fdc1f817 Implement a method for administrators to remove the link between an in-game minecraft account and a forum account, and rewrite synchronization of tags to more effectively handle the intricacies of the API being utilized 2017-03-23 23:18:29 -05:00
AlexTheCoder
3ebfb453c5 Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag 2017-03-23 23:18:29 -05:00
cnr
e3c4d89d9a Disable 'Light em up' quest 2017-03-23 23:17:01 -05:00
cnr
5fa583109f Revert BungeeRotator US/EU merge
This reverts commits e59d744074 and
b8ac877fa3
2017-03-23 15:04:04 -05:00
Sam
ca1b185ba2 Improve the persistence system 2017-03-23 19:18:16 +00:00
cnr
9c504064c1 Force all players to reappear after win room 2017-03-22 22:41:08 -05:00
cnr
7e8f5b4939 Merge remote-tracking branch 'update/bridges' into develop 2017-03-22 22:37:43 -05:00
cnr
222e4267d2 Add UHC subtypes to server menu 2017-03-22 22:36:53 -05:00
Sam
401276d705 Missing isLive check 2017-03-22 23:04:50 +00:00
LCastr0
3b48a7caaf Update armorstand to make it never fall 2017-03-22 16:55:49 -03:00
LCastr0
49bc6b8663 Removed gravity 2017-03-22 14:42:11 -03:00
LCastr0
47b88b7734 Added Spring set, added awkward bunny morph, added items to menus 2017-03-22 14:37:42 -03:00
LCastr0
788326fe54 Tried with armorstands, still not working :( 2017-03-22 13:11:14 -03:00
Sam
1c620048ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-22 14:14:30 +00:00
LCastr0
9afa829f89 Created new gadget item for PPC 2017-03-21 15:56:05 -03:00
LCastr0
4cd25ad921 Merge branch 'update/aprilppc' into update/aprilchest 2017-03-20 19:23:33 -03:00
LCastr0
d55690f904 Changed colors 2017-03-20 19:22:50 -03:00
Sam
c4c7ebe1e6 Check for blocks already registering 2017-03-20 22:10:20 +00:00
LCastr0
8f7f52e222 Added lore and icon for Funeral Bouquet and corrected the price for spring items 2017-03-20 16:52:27 -03:00
LCastr0
33b933f465 Added lore and icon for Flower Power 2017-03-20 16:50:44 -03:00
LCastr0
540a0189b4 Added lore and icon for Flower Arrow 2017-03-20 16:49:20 -03:00
LCastr0
16f02d5bd4 Added killer bunny pet 2017-03-20 16:38:31 -03:00
LCastr0
5ad0bdcab1 Added Spring Arrow Trail, added Spring Death Effect, moved each gadget to it's own package, added Spring Double Jump 2017-03-20 16:33:21 -03:00
LCastr0
5d2681ec97 Fixed some issues with menus! 2017-03-20 16:33:20 -03:00
LCastr0
defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
LCastr0
df4d0b117b Possible fix for pet names not showing 2017-03-20 16:33:19 -03:00
LCastr0
f5a85f2a54 Spawns pet 2017-03-20 16:33:18 -03:00
LCastr0
13238eb4ad Added equipment pages 2017-03-20 16:32:34 -03:00
LCastr0
e297f844e6 Renamed classes 2017-03-20 16:32:34 -03:00
LCastr0
137220d58f Custom pets 2017-03-20 16:32:33 -03:00
Sarah
f8f7c04f58 Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top 2017-03-20 19:18:33 +01:00
Sam
f630f50f47 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-20 17:47:03 +00:00
LCastr0
afad64bec3 Fixed CME 2017-03-20 08:49:20 -03:00
LCastr0
75ad5b9d51 Flowers where player walks 2017-03-20 08:23:32 -03:00
cnr
441e2ab30f Disable 2x XP 2017-03-20 01:19:21 -05:00
Sam
95d919a654 Removed was werid disjointed code 2017-03-19 00:07:23 +00:00
Sam
05bd93cbdf Fixed Death Bomber achievement exploit 2017-03-19 00:01:11 +00:00
Sam
18538d918c And 2FA wow, this is why you skim read PRs 2017-03-18 23:51:13 +00:00
Sam
df8ed90138 Ops, forgot to enable reports. Eclipse is bad 2017-03-18 23:44:42 +00:00
Sam
2ca0d0ce14 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-18 23:36:11 +00:00
Sam
afe516e10c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-18 23:33:34 +00:00
Sam
f56b940a73 Super rough and ready persistence 2017-03-18 23:33:30 +00:00
LCastr0
e1d9a568c9 Added flower as a hat 2017-03-18 00:49:12 -03:00