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
..
.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 branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 18:09:52 -04: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