Keir ef6fd0eaa3 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2015-12-05 00:05:05 +00:00
..
artifacts	Add Clans.core to hub build (IntelliJ)	2015-11-27 23:14:54 -05:00
libraries	War/War Points Update	2015-11-16 14:37:32 -05:00
runConfigurations	Updated jOOQ and database tables	2015-02-18 18:51:36 -05:00
scopes	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
.name	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
codeStyleSettings.xml	Field updates, War updates, bug fixes	2015-08-26 12:26:27 -07:00
compiler.xml	Merge master	2015-11-28 23:55:00 -05:00
dataSources.xml	Add chunk to unclaim map	2015-11-17 18:33:21 -05:00
encodings.xml	More work on gui	2015-11-09 14:39:52 -05:00
misc.xml	Fix compiler and misc	2015-11-12 17:55:00 -05:00
modules.xml	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-12-05 00:05:05 +00:00
uiDesigner.xml	Created Sneaky Assassins and started work on the kits	2014-05-27 21:38:22 -04:00
vcs.xml	Enabled Git in IntelliJ	2014-05-28 19:29:05 -04:00