Morten 2ef32a14df Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex ... # Conflicts: # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java		2015-11-10 17:15:23 +01: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 http://184.154.0.242:7990/scm/min/mineplex	2015-11-10 17:15:23 +01: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.ClassCombat.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00