Shaun Bennett d8acb0aae6 Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2015-06-02 20:45:53 -05:00
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src	Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events	2015-06-02 20:45:53 -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