Chiss 38639fb58f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java		2014-12-04 13:34:08 +11:00
..
addons	Merge remote-tracking branch 'origin/master'	2014-11-15 05:04:57 -06:00
command	Add Tab handling for MultiCommandBase and "game set" command	2014-11-13 18:22:00 -06:00
events	Misisng ifles	2014-05-03 16:16:52 +10:00
game	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-04 13:34:08 +11:00
gui	Don't bother with these checks in ItemLayout	2014-11-28 09:30:57 +13:00
kit	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-04 13:34:08 +11:00
managers	Refactored IRelation method names	2014-12-03 13:06:50 -08:00
ore	Prepared SSM for 200 player Game (added hunger)	2013-09-21 13:34:14 +10:00
player	Initial Commit	2013-08-27 08:14:08 -07:00
scoreboard	Added TabTitle	2014-10-09 10:35:54 +11:00
shop	Cleaned warning.	2013-09-03 14:10:14 -07:00
stats	Achievement bug fixes	2014-11-12 20:56:57 -05:00
world	Antistack replacement	2014-11-23 19:51:23 -06:00
Arcade.java	Removed use of Gem Boosters	2014-12-01 02:27:39 -08:00
ArcadeFormat.java	Initial Commit	2013-08-27 08:14:08 -07:00
ArcadeManager.java	Refactored IRelation method names	2014-12-03 13:06:50 -08:00
ArcadeRepository.java	Reverted database connection pooling because it caused severe login delays.	2014-11-05 14:39:22 -08:00
GameFactory.java	Register Search and Destroy in GameFactory	2014-11-27 01:08:40 +13:00
GameType.java	Register game SearchAndDestroy	2014-11-27 01:08:39 +13:00
TournamentType.java	Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking	2014-09-05 04:00:51 -04:00