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
LCastr0
d8b68e4716
Multi colored circle
2017-03-17 20:01:48 -03:00
LCastr0
92f5214c91
Added spring halo particle
2017-03-17 19:39:41 -03:00
Sam
ace17be1ca
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-03-17 17:05:02 +00:00
Sam
b1a1faacb1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges
2017-03-17 17:03:55 +00:00
Sam
8e5a5695d5
Fix early game revive
2017-03-17 17:03:53 +00:00
cnr
b464cab213
Add former St Patricks cosmetic names as alternatives
2017-03-17 00:52:41 -05:00
samczsun
5349f53bfe
Fix St Patricks Chest info
2017-03-17 00:50:14 -05:00
cnr
a0764443a8
Merge branch 'update/stpatrickscosmetics' into develop
2017-03-17 00:49:51 -05:00
samczsun
f6884fccd8
Change update protocol
2017-03-17 00:20:56 -05:00
samczsun
866b7bf63b
Better help message
2017-03-17 00:20:56 -05:00
samczsun
a1bad6d07e
QoL improvements
2017-03-17 00:20:55 -05:00
samczsun
e4cd809ce4
Teamspeak integration
2017-03-17 00:20:55 -05:00
LCastr0
561d4108c2
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-16 22:52:07 -03:00
LCastr0
2070f7b347
Fixed lore for taunts
2017-03-16 20:09:51 -03:00
LCastr0
3303f89c02
Added St Patrick's Chest to titles trackers
2017-03-16 20:07:10 -03:00
LCastr0
e3974b9228
Fixed lores
2017-03-16 19:56:52 -03:00
cnr
d64f50b98e
Don't combine require() and a method accessor
2017-03-16 01:13:54 -05:00
cnr
78b6846cf6
Add Titles to chests
2017-03-16 00:58:53 -05:00
samczsun
94009cd652
Final changes
2017-03-15 23:16:09 -05:00
samczsun
035f4637ba
Tracks in chests!
2017-03-15 23:16:08 -05:00
samczsun
d1993465a6
Add to online player if they're online
2017-03-15 23:16:08 -05:00
samczsun
ca5b4386f3
Nevermind, make a new command
2017-03-15 23:16:08 -05:00
samczsun
1cb118d3e5
Allow force giving items
2017-03-15 23:16:08 -05:00
samczsun
db2feeac42
Reorganize tracks, add BotB track
2017-03-15 23:16:07 -05:00
cnr
e5d2ad34eb
Merge branch 'update/stpatrickscosmetics' into develop
2017-03-15 23:15:10 -05:00
AlexTheCoder
572e461eb2
Remove stray debug text
2017-03-15 23:14:19 -05:00
AlexTheCoder
2dce455f93
Update Carl animation to use shards instead of coins
2017-03-15 23:14:19 -05:00
AlexTheCoder
2881071c74
Patch Carl reward animation not cleaning up and update the votifier server to use uuid as the key for the status repository
2017-03-15 23:14:18 -05:00
samczsun
4778d28be4
Allow overriding enabled team armor
2017-03-15 23:13:42 -05:00
Sarah
4f9cf987bd
Change block rates and add Rate command
2017-03-15 21:30:48 +01:00
Sarah
1a061f6e2f
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/compass/CompassAddon.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java
Rot starts at 2 minutes, Rings take 3 Minutes to rot, Top Island rots now, rings rot now
2017-03-15 17:38:07 +01:00
Sam
eb23d793e3
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-14 21:06:16 +00:00
Sam
15d691370d
Configuration for bridges
2017-03-14 21:05:52 +00:00
Sam
b35a9582df
Optimise PlayParticle
2017-03-14 17:07:36 +00:00
LCastr0
a3861d43c4
Fixes costume throwing items without complete set
2017-03-14 13:32:49 -03:00
Sam
dae2eea01a
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges
2017-03-14 16:08:57 +00:00
Sam
c8a9cffcdf
Edit the documentation for per player world borders
2017-03-14 16:08:31 +00:00
Sam
a49b19ee0c
Removal of kit progression from bridges
2017-03-14 16:08:16 +00:00