Ty Sayers b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/.idea/compiler.xml Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java Plugins/Mineplex.Hub/.classpath Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java		2015-09-29 18:09:52 -04:00
..
perks	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 18:09:52 -04:00
AbbreviatedKit.java	More SSM Changes	2015-01-30 11:08:23 +11:00
Kit.java	gave twitch same perms as youtubers	2015-07-23 16:29:42 +02: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	Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.	2015-07-07 12:30:20 +12: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