libraryaddict a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events ... Conflicts: Plugins/.idea/misc.xml Plugins/.idea/modules.xml Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java Plugins/Mineplex.Database/src/mineplex/database/Routines.java Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java		2015-08-14 19:44:56 +12: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 branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events	2015-08-14 19:44:56 +12: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