Mineplex2018-withcommit/Plugins/Mineplex.Game.Clans
Shaun Bennett 177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -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 remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-18 12:35:31 -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