Mineplex2018-withcommit/Plugins/Mineplex.Hub
Cheese e36b0440a4 Merge branch 'bench'
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10: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 'bench' 2015-07-08 13:55:01 +10: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