Ty Sayers 13f47ad903 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java		2015-07-24 13:59:01 -05: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	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-07-24 13:59:01 -05:00
.classpath	Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths	2015-02-25 13:56:32 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Hub.iml	Changes to IntellIJ Files	2015-02-03 14:12:52 -05:00
plugin.yml	Initial Commit	2013-08-27 08:14:08 -07:00