Ty Sayers 227a077dba Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java		2015-08-29 15:53:42 -07:00
..
src/mineplex/game/clans/core	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 15:53:42 -07:00
.classpath	Commit left-over changes to merge and pull.	2015-08-29 15:44:29 -07:00
.project	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