Commit Graph

5000 Commits

Author SHA1 Message Date
Shaun Bennett
e0284e2eb0 Loot for World Events 2015-06-29 22:32:40 -05:00
Cheese
e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
Cheese
a92fddc4a1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-30 10:13:03 +10:00
Jonathan Williams
24b2d35dda Removed unnecessary files for POcket. 2015-06-29 20:11:09 -04:00
Cheese
63ef877d46 removed stuff 2015-06-30 10:01:32 +10:00
Cheese
6976b48645 update 2015-06-30 09:57:24 +10:00
Jonathan Williams
78c5b63e85 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 19:43:58 -04:00
Jonathan Williams
59f0053419 Implemented Updater for PE 2015-06-29 19:43:35 -04:00
Ty Sayers
cd4bebbeee Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-06-29 19:27:23 -04:00
Ty Sayers
1992205393 Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up. 2015-06-29 19:27:05 -04:00
Jonathan Williams
2069524f15 Merge remote-tracking branch 'remotes/origin/foo' 2015-06-29 18:14:07 -04:00
Jonathan Williams
5249fcc279 Removed Pocket log from source control. 2015-06-29 18:13:30 -04:00
Jonathan Williams
bbb661d686 Fixed up BenefitManager. 2015-06-29 18:07:06 -04:00
Ty Sayers
d2f633f572 Fix attribute name positioning bug as well as duplicated attributes on randomly generated items. Fix misleading description of item attributes Conquering/Protection. Fix bug with unwanted entities spawning and targetting players in safe Spawn zones. Fix bug with WindBlade occasionally killing users via fall damage after a long flight even though close to the ground. Fix bug with MagneticBlade not properly pulling entities other than players. Fix bug with AlligatorsTooth not properly granting certain effects such as water breathing. 2015-06-29 16:38:51 -04:00
fooify
4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Jonathan Williams
d426c24970 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:14:30 -04:00
Cheese
da3c5eeaaf 40k b enefit 2015-06-29 20:14:15 +10:00
Jonathan Williams
1ef8c587ee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:06:09 -04:00
Cheese
fb5ff723fc deletd players and world 2015-06-29 20:03:33 +10:00
Jonathan Williams
9f384b0d3e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:02:57 -04:00
Cheese
7b998df002 renamed 2015-06-29 19:59:46 +10:00
Cheese
55db8822a7 MCPE code 2015-06-29 19:57:48 +10:00
Cheese
48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese
2963f7a61c stacker wont give too many msgs 2015-06-29 10:13:33 +10:00
Cheese
b0f8369bcd lowered block falling speed.
fixed a bug where some chests didnt fall
2015-06-29 10:09:36 +10:00
Cheese
0ea388379a reduced win req for skywars ach
enabled beenfit for 40k reward
2015-06-28 15:16:05 +10:00
Cheese
ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Shaun Bennett
d07c319581 Saving some work 2015-06-27 22:22:02 -05:00
Cheese
08e4ef199e added twitch to dguisecmd 2015-06-28 12:53:18 +10:00
Cheese
faca14dd23 fixed disguise permission 2015-06-28 12:50:27 +10:00
Cheese
840ebabf2a added delay on mad scientist eggSpawn
fixed Exp bug
2015-06-27 20:39:05 +10:00
Jonathan Williams
65a10461cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
2015-06-27 02:29:07 -05:00
Jonathan Williams
9a4bcd29a1 Fixed Sparks problems... 2015-06-27 02:26:29 -05:00
Cheese
1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese
4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese
d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese
754026f403 chicken teleport fix
scientist minion name fix
2015-06-27 12:18:12 +10:00
Cheese
4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese
270a2e4107 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-27 11:24:33 +10:00
Cheese
4e06a1aae3 fixed a few skywars bugs
improved warning for bridges
2015-06-27 11:24:01 +10:00
fooify
4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
fooify
333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Shaun Bennett
8ef52ea103 Mineplex Gold Rush 2.0 2015-06-26 10:50:37 -05:00
Cheese
9a0ac821a2 fixed stat bug 2015-06-26 19:44:13 +10:00
Cheese
c0bc522614 split achievement text over 2 lines 2015-06-26 19:32:18 +10:00
Cheese
750769d03a fixed gem thing 2015-06-26 19:12:34 +10:00
Cheese
62a7fd6a99 you now get levels for kills/assists
fixed scoreboard bug
2015-06-26 19:12:11 +10:00
Cheese
b0019242e7 skywars scoreboard fix 2015-06-26 19:02:34 +10:00
Jonathan Williams
8c427bee24 Fix _gameDisplay bug.
Fix Skywars quickmenu link.
2015-06-26 03:57:39 -05:00
Jonathan Williams
8f2c0cf9d8 Fix file names. 2015-06-26 03:15:16 -05:00