Commit Graph

1033 Commits

Author SHA1 Message Date
Graphica
2c6112347a Add Bob Ross Morph 2017-05-30 22:49:30 -05:00
cnr
b9af3a8dfb Sort CMA in the tab list next to Mod 2017-05-29 22:49:01 -05:00
Alexander Meech
e501982712 Update cma scoreboard id 2017-05-29 22:48:25 -05:00
Alexander Meech
2895397aec Implement CMA rank 2017-05-29 22:48:25 -05:00
cnr
4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05:00
cnr
fd1cd148cb Implement Alien Event service calls on Hub/Arcade 2017-05-24 20:52:24 -05:00
Sam
9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
Sam
500367b473 Premtive hotfix 2017-05-17 20:15:11 -06:00
Sam
d493a61d3d Polish the hub event 2017-05-13 17:13:47 +01:00
Sam
ff07d38d00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-12 23:04:47 +01:00
Sam
6ecbf85dc8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 22:22:01 +01:00
Sam
abb983ac04 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 17:34:55 +01:00
samczsun
c8a1035591 Comped accounts 2017-05-11 19:29:31 -07:00
LCastr0
92eaf4f8d8 Merge branch 'develop' into update/mayitems 2017-05-09 23:31:43 -03:00
Sam
f6cb654e12 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-04 20:20:59 +01:00
Sam
ee0971443e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-04 17:32:16 +01:00
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
Sam
bd52e63dc3 More alien stuff 2017-05-03 20:48:19 +01:00
LCastr0
4e56d2133b Merge branch 'develop' into update/mayitems 2017-05-02 19:13:43 -03:00
Sam
0f1cea013c Guardian changes 2017-05-01 14:05:18 +01:00
LCastr0
8ec6ebd060 Fix particles being sent to everyone 2017-04-30 18:42:16 -03:00
LCastr0
0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03: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
e45e3be4e8 Added first kit selector 2017-04-27 20:01:29 -03: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