libraryaddict 3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java		2015-11-03 14:57:25 +13:00
..
.externalToolBuilders	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Map Parser	2014-06-15 10:12:08 +10:00
src/mineplex/mapparser	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-11-03 14:57:25 +13:00
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Map Parser	2014-06-15 10:12:08 +10:00
Mineplex.MapParser.iml	Treasure fixes	2015-02-10 21:15:44 -05:00
plugin.yml	Fixed CME	2014-06-15 15:10:19 +10:00