Shaun Bennett bf1f62057c Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta ... Conflicts: Plugins/.idea/misc.xml Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java		2015-08-24 22:15:08 -05:00
..
.externalToolBuilders	Clans to buildable state.	2014-11-27 22:34:20 -08:00
.settings	Created Clans project.	2014-11-12 05:13:16 -08:00
src/mineplex/game/clans	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta	2015-08-24 22:15:08 -05:00
.classpath	Fixes for GoldManager	2015-07-19 21:04:59 -07:00
.project	Clans to buildable state.	2014-11-27 22:34:20 -08:00
Mineplex.Game.Clans.iml	Marge with twiggys code, work on slime splitting	2015-06-04 00:21:09 -05:00
plugin.yml	Clans to buildable state.	2014-11-27 22:34:20 -08:00