Commit Graph

11560 Commits

Author SHA1 Message Date
samczsun
db59c32b5e PC-1028 2017-04-06 00:34:34 -05:00
samczsun
422bbcce2c PC-1025 2017-04-06 00:34:34 -05:00
samczsun
a97ba5d1fd PC-941 2017-04-06 00:34:34 -05:00
samczsun
f03df67219 PC-830 2017-04-06 00:34:34 -05:00
samczsun
873cd9c2a5 PC-802 2017-04-06 00:34:34 -05:00
samczsun
4f77413523 PC-265 2017-04-06 00:34:34 -05:00
cnr
a1fc6bd20f Merge remote-tracking branch 'bugfix/bridges' into develop 2017-04-06 00:33:47 -05:00
cnr
64d5fe3c80 Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
2017-04-06 00:33:41 -05:00
LCastr0
888c26c12d Changed icon of bunny pet 2017-04-05 19:03:12 -03:00
Sam
cbf7985773 Colour the message 2017-04-05 22:58:06 +01:00
Sam
c1b83b1065 Braces 2017-04-05 21:46:22 +01:00
Sam
047ed81eea Add a message when a player dies pregame 2017-04-05 21:38:04 +01:00
Sam
1f1ad4c441 Change Diamond ore drops to diamonds 2017-04-05 21:35:04 +01:00
Sam
4552fc2e9b Fix loot module NPE 2017-04-05 21:14:12 +01:00
Sarah
acd588ff1a Add lucky/unlucky tracks to Skyfall 2017-04-05 04:40:52 +02:00
Sarah
e4b79a3731 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
Sarah
616e2dad0f Fix selection of air blocks when searching for top layer blocks
add some Supply Drop loot
dd /Boost command, fix AntiCheat
don't put duplicates in supply drop
don't crumble rings before the game begins
don't crumble middle rings
2017-04-05 04:15:48 +02:00
LCastr0
27d7226712 Fixed flowers dropping after chest is opened 2017-04-04 22:58:43 -03:00
LCastr0
cb5b0a3c83 Changed the icon of the death effect 2017-04-04 18:00:47 -03:00
LCastr0
2c09bb584a Fixed Spring Set lore 2017-04-04 17:33:02 -03:00
LCastr0
424e0fe0a4 Fixed spring chests being purchasable even if locked or if player had all the items 2017-04-04 17:29:45 -03:00
LCastr0
957004f97a Added 'Found in X' lore 2017-04-04 17:28:11 -03:00
LCastr0
83d141eddc Changed price of Spring Halo particle 2017-04-04 17:25:16 -03:00
LCastr0
a7be020c9d Locked rabbit as adult 2017-04-04 17:23:43 -03:00
Sam
b85214c7f0 Fix the "wooden pillar" bug with supply drops 2017-04-04 21:12:39 +01:00
LCastr0
3bc4125b76 Removed custom pet from this update 2017-04-04 15:47:02 -03:00
Sam
9ad8e18175 More persistence senanagins 2017-04-03 20:16:03 +01:00
Sam
b86ad77e0b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:53:40 +01:00
Sam
bc1050e387 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:48:35 +01:00
cnr
6534561893 Disable April Fools manager 2017-04-01 23:59:47 -05:00
samczsun
ef21106da0 Fix memory leak in CompassModule 2017-04-01 16:20:59 -05:00
Sam
b88f9fc642 Change the skin to Topplemop 2017-04-01 02:11:11 -05:00
Sam
6adc1b265d Missed a file... 2017-04-01 02:11:11 -05:00
Sam
5bba8d2a5b Show how many they have found when clicking on a head 2017-04-01 02:11:11 -05:00
Sam
80eb8db8e2 Remove unused global variable 2017-04-01 02:11:11 -05:00
Sam
e71bab8cea Use a better DB schema 2017-04-01 02:11:11 -05:00
Sam
da29654807 April Fools Treasure Hunt 2017-04-01 02:11:11 -05:00
Sam
bd841762d1 Run skin getting on the main thread 2017-04-01 02:11:11 -05:00
Sam
016860b615 Replace NPCs with Pirates 2017-04-01 02:11:11 -05:00
Sam
4053e43964 Add a manual toggle 2017-04-01 02:11:11 -05:00
Sam
4b22355348 Add more fun stuff 2017-04-01 02:11:11 -05:00
Sam
52323f6119 Add more replacement words 2017-04-01 02:11:11 -05:00
Sam
e74486c1bc Add even more priate speak 2017-04-01 02:11:11 -05:00
Sam
4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam
66cea341a5 Use regex and remove "g" 2017-04-01 02:11:11 -05:00
Sam
03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
Sam
4947b01f93 Convert itemstacks to craftbukkit versions 2017-03-31 20:24:45 +01:00
cnr
850b7b1aad Merge remote-tracking branch 'update/aprilppc' into develop 2017-03-31 00:50:55 -05:00
Alexander Meech
10a1f71558 Add RustyDawgT to featured creators 2017-03-31 00:50:14 -05:00
LCastr0
ed39d5daa7 Reverted rename 2017-03-31 01:16:30 -03:00