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	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 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	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07: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