libraryaddict 1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java		2015-03-18 00:04:41 +13:00
..
perks	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames	2015-03-18 00:04:41 +13:00
AbbreviatedKit.java	More SSM Changes	2015-01-30 11:08:23 +11:00
Kit.java	Smash Update	2015-01-29 11:54:59 +11:00
KitAvailability.java	Achievement Kits (3 games)	2014-10-24 19:05:57 +11:00
KitSorter.java	Achievement Kits (3 games)	2014-10-24 19:05:57 +11:00
NullKit.java	Initial Commit	2013-08-27 08:14:08 -07:00
Perk.java	Initial Commit	2013-08-27 08:14:08 -07:00
SmashKit.java	SSM Zombie + Spider Update	2015-01-30 14:42:39 +11:00
SmashPerk.java	Smash Update	2015-01-29 11:54:59 +11:00