NewGarbo 1e4b3442fa Conflicts: ... Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java		2015-10-24 20:45:39 +01:00
..
.externalToolBuilders	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/hub	Conflicts:	2015-10-24 20:45:39 +01:00
.classpath	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 18:09:52 -04:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Hub.iml	Setup new module for intellij, fix field ore	2015-08-29 16:56:26 -07:00
plugin.yml	Initial Commit	2013-08-27 08:14:08 -07:00