libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 ... Conflicts: Plugins/Libraries/BungeeCord.jar Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java		2015-10-12 16:22:52 +13:00
..
.externalToolBuilders	Fixed creating clan delay in clans/ClientClan.java	2014-11-28 14:06:41 -08:00
.settings	Updated Motd.	2015-08-28 23:17:14 -07:00
src/mineplex/core	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-12 16:22:52 +13:00
.classpath	Removed AccountCache.	2015-08-28 20:58:58 -07:00
.project	Added back buttons for sub menus.	2014-08-08 20:48:15 -05:00
Mineplex.Core.iml	BotSpam Module	2015-09-22 01:38:45 -04:00