Commit Graph

1011 Commits

Author SHA1 Message Date
cnr
66136a035b Change scoreboard tag for Event Moderator
This ensures that they're sorted next to Sr Mods in the tab list
2017-05-03 18:30:36 -07:00
LCastr0
3268a49f82 Fixed more conflicts 2017-04-30 12:05:30 -03:00
LCastr0
91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
Sarah
fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
LCastr0
95f50604c0 Fixed colors 2017-04-27 18:29:55 -03:00
LCastr0
246c0c1788 Added wools to the top of the castle 2017-04-27 16:28:09 -03:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
LCastr0
12f7659195 Added king particle 2017-04-25 00:16:32 -03:00
AlexTheCoder
fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
LCastr0
1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
AlexTheCoder
2d61dffaea Implement an easter egg hunt of epic proportions 2017-04-11 19:57:10 -04:00
samczsun
8e92317b9c So that's why Tim closed inventories 2017-04-06 00:35:49 -05:00
samczsun
db59c32b5e PC-1028 2017-04-06 00:34:34 -05:00
samczsun
f03df67219 PC-830 2017-04-06 00:34:34 -05:00
cnr
64d5fe3c80 Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
2017-04-06 00:33:41 -05:00
Sam
03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
cnr
850b7b1aad Merge remote-tracking branch 'update/aprilppc' into develop 2017-03-31 00:50:55 -05:00
LCastr0
e8d6c321cd Merge branch 'develop' into update/aprilppc 2017-03-31 00:40:38 -03:00
samczsun
99534e19c5 PC-599 2017-03-29 23:30:49 -05:00
LCastr0
235288af56 Changed wing shape again 2017-03-27 17:35:05 -03:00
LCastr0
1c1af8b81e Changed shape of bee wings 2017-03-26 08:09:58 -03:00
LCastr0
9ee6960038 Added bee wings 2017-03-26 01:25:08 -03:00
LCastr0
bff837ca9b Fixed morph and possible fix for balloons, added lore and icon for particle effect 2017-03-25 18:36:12 -03:00
LCastr0
d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -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
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
LCastr0
75ad5b9d51 Flowers where player walks 2017-03-20 08:23:32 -03:00
Sam
2ca0d0ce14 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-18 23:36:11 +00:00
Sam
b1a1faacb1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-17 17:03:55 +00:00
samczsun
f6884fccd8 Change update protocol 2017-03-17 00:20:56 -05:00
Sam
b35a9582df Optimise PlayParticle 2017-03-14 17:07:36 +00:00
LCastr0
c54cd066ef Merge branch 'develop' into update/stpatrickscosmetics 2017-03-12 20:54:48 -03:00
samczsun
4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -06:00
LCastr0
ec5de0ef12 Merging issues 2017-03-06 17:10:29 -03:00
LCastr0
4a496ea4c1 Added particle for when opening the chests 2017-03-03 22:34:21 -03:00
samczsun
9669e960a7 Autorotate maps 2017-03-01 23:58:20 -06:00
samczsun
60d9bd5d21 Move api to config file 2017-02-24 00:46:04 -06:00
LCastr0
e731a91e40 Leprechaun pet 2017-02-23 17:35:50 -03:00
Sam
2657a98e70 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-17 18:16:36 +00:00
Sam
d56cd59df0 Quests and a whole host of wacky changes 2017-02-17 18:16:17 +00:00
samczsun
ecb42d91fe Fix bugs 2017-02-16 02:04:34 -06:00
samczsun
cd387284bf Ignore armorstands for fleshhook/snowball 2017-02-16 02:03:25 -06:00
samczsun
16ba7b984b Use proper GameProfile serializer 2017-02-16 02:03:25 -06:00
Sam
3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
Nate Mortensen
1780923501 Fix Frost Barrier not activating
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.

This commit fixes the issue by allowing UtilShapes to take
negative values.
2017-02-08 22:32:57 -06:00
LCastr0
b5130181a2 Merging errors 2017-02-01 11:25:47 -02:00
LCastr0
0ce741a5fb Small wings for cupid pet 2017-01-28 21:38:14 -02:00
LCastr0
2cfd51e38e Heart shaped wings 2017-01-27 17:40:35 -02:00
LCastr0
e2de60971e Fixed uneven butterfly wing 2017-01-27 10:29:18 -02:00
Sam
7200572583 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-26 20:10:48 +00:00