Shaun Bennett b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java		2015-08-10 03:24:59 -05:00
..
addons	http://pastebin.com/BRhT7pZP	2015-07-22 23:31:07 -04:00
command	Fixing some bugs and disallow MPS while disguised.	2015-08-07 07:39:40 +02:00
events	Misisng ifles	2014-05-03 16:16:52 +10:00
game	and wizards!	2015-08-09 18:46:02 +02:00
gui	DINGO ATE MY BABY	2015-08-04 17:33:23 +02:00
kit	reduced invis in OITQ	2015-08-03 18:53:00 +02:00
managers	Merge remote-tracking branch 'remotes/origin/master' into Bonus	2015-08-10 03:24:59 -05:00
ore	ore changes	2015-06-26 10:36:45 +10:00
player	Initial Commit	2013-08-27 08:14:08 -07:00
scoreboard	Fising last character bug.	2015-07-24 15:44:36 +02:00
shop	DEVP-66 Refactor commonly used classes to Java conventions	2015-02-26 00:07:07 -05:00
stats	fixed cases where negative stats were being uploaded	2015-08-05 08:56:52 +02:00
world	Improving Map System: GameTypes can have more mapSources now.	2015-07-14 13:22:59 +02:00
Arcade.java	hub update part 1	2015-08-07 21:45:38 +02:00
ArcadeFormat.java	Initial Commit	2013-08-27 08:14:08 -07:00
ArcadeManager.java	converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity	2015-08-02 11:50:26 +02:00
GameType.java	made it so games can set another game as its 'kit source' so games can share kit unlocks	2015-08-03 11:38:16 +02:00
TournamentType.java	Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking	2014-09-05 04:00:51 -04:00