Shaun Bennett 6a0584d419 Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java		2015-06-08 15:03:51 -05:00
..
.externalToolBuilders	Fixed creating clan delay in clans/ClientClan.java	2014-11-28 14:06:41 -08:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/core	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events	2015-06-08 15:03:51 -05:00
.classpath	Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths	2015-02-25 13:56:32 +13:00
.project	Added back buttons for sub menus.	2014-08-08 20:48:15 -05:00
Mineplex.Core.iml	Treasure fixes	2015-02-10 21:15:44 -05:00