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
..
command	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-12 16:22:52 +13:00
BackupTask.java	Auto backups for MapParser. (Only tested on mac)	2014-10-15 15:04:44 -05:00
BlockData.java	initial push of Wither Assault	2014-11-14 14:14:31 +11:00
GameType.java	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-17 14:54:19 -07:00
MapData.java	Parser changes	2014-08-20 12:06:24 +10:00
MapParser.java	modified hideme a little :)	2015-11-02 14:37:12 +11:00
Parse.java	map parser update	2015-01-27 13:59:28 +11:00
Ticker.java	Champs Balance Update	2014-07-07 16:23:55 -07:00
TickEvent.java	Champs Balance Update	2014-07-07 16:23:55 -07:00
WorldManager.java	More work on 1.8 update	2015-04-23 08:28:19 -04:00