Shaun Bennett 4183f0ce07 Merge remote-tracking branch 'origin/clans-beta' into clans-beta ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java		2015-11-17 18:05:17 -05: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-11-17 18:05:17 -05: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