Keir 6f82f8349d Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report ... # Conflicts: # Plugins/.idea/modules.xml # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java		2015-12-16 14:07:56 +00:00
..
.externalToolBuilders	Clans to buildable state.	2014-11-27 22:34:20 -08:00
src/mineplex/game/clans	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-12-16 14:07:56 +00: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