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
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-10-18 12:35:31 -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.Core.Common.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00