Mineplex2018-withcommit/Plugins/.idea
Keir 6f82f8349d Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
#	Plugins/.idea/modules.xml
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-16 14:07:56 +00:00
..
artifacts Cosmetic Menu Update 2015-12-14 00:28:28 -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 Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
dataSources.xml More Fixes 2015-12-15 14:45:12 -05:00
encodings.xml More work on gui 2015-11-09 14:39:52 -05:00
misc.xml Update IntelliJ to Java 8 2015-12-08 05:45:26 -05:00
modules.xml Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-12-16 14:07:56 +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