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
..
artifacts	Food Dupe Fix	2015-09-28 20:42:14 -04:00
libraries	Lots of bonus work, start adding Votifier plugin	2015-08-06 00:45:39 -05:00
runConfigurations	Updated jOOQ and database tables	2015-02-18 18:51:36 -05:00
scopes	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
.name	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
codeStyleSettings.xml	Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames.	2015-07-14 11:56:13 +01:00
compiler.xml	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-12 16:22:52 +13:00
dataSources.xml	Titan giveaway work	2015-10-09 22:14:10 -04:00
encodings.xml	Fix IntellIJ Files	2015-08-03 05:50:02 -05:00
misc.xml	Removing the magical 3	2015-08-11 04:38:37 -05:00
modules.xml	Remove BungeeSigns again?	2015-10-01 14:01:36 -04:00
uiDesigner.xml	Created Sneaky Assassins and started work on the kits	2014-05-27 21:38:22 -04:00
vcs.xml	Enabled Git in IntelliJ	2014-05-28 19:29:05 -04:00