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	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Map Parser	2014-06-15 10:12:08 +10:00
src/mineplex/mapparser	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	Map Parser	2014-06-15 10:12:08 +10:00
Mineplex.MapParser.iml	Treasure fixes	2015-02-10 21:15:44 -05:00
plugin.yml	Fixed CME	2014-06-15 15:10:19 +10:00