Chiss 38639fb58f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java		2014-12-04 13:34:08 +11:00
..
.externalToolBuilders	Refactored IRelation method names	2014-12-03 13:06:50 -08:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/minecraft/game/classcombat	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-04 13:34:08 +11:00
.classpath	Updated to latest spigot with 1.8 support.	2014-09-03 03:46:24 -07:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Minecraft.Game.ClassCombat.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00