Ty Sayers a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Database/src/mineplex/database/Account.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java		2015-08-22 15:18:51 -04:00
..
artifacts	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events	2015-08-14 19:44:56 +12: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	Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix	2015-07-15 21:43:35 -05:00
compiler.xml	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events	2015-08-14 19:44:56 +12: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	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-22 15:18:51 -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