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
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/core/common	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	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