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	Refactored IRelation method names	2014-12-03 13:06:50 -08:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/minecraft/game/classcombat	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta	2015-08-24 22:15:08 -05:00
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Minecraft.Game.ClassCombat.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00