Jonathan Williams 449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex ... Conflicts: .gitignore		2014-05-27 02:23:22 -07:00
..
.externalToolBuilders	Fixed bug with missing default skill and kit page opening.	2014-04-13 01:36:34 -07: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://dev1.mineplex.com:7999/min/Mineplex	2014-05-27 02:23:22 -07:00
.classpath	Added Halloween Minigame	2013-10-22 15:46:31 +11:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Minecraft.Game.ClassCombat.iml	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00