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
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/minecraft/game/core	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
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Minecraft.Game.Core.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00