Shaun Bennett 0f83263871 Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java		2016-01-19 11:01:11 -05:00
..
.externalToolBuilders	Clans to buildable state.	2014-11-27 22:34:20 -08:00
.settings	lots of changes that i can't remember at this point	2015-12-23 18:22:20 +00:00
src/mineplex/game/clans	Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial	2016-01-19 11:01:11 -05:00
.classpath	lots of changes that i can't remember at this point	2015-12-23 18:22:20 +00:00
.project	Clans to buildable state.	2014-11-27 22:34:20 -08:00
Mineplex.Game.Clans.iml	Setup new module for intellij, fix field ore	2015-08-29 16:56:26 -07:00
plugin.yml	Clans to buildable state.	2014-11-27 22:34:20 -08:00