Shaun Bennett 177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java		2015-10-18 12:35:31 -04:00
..
artifacts	Fix merge issues, fix observer command	2015-10-01 22:57:39 -04:00
libraries	Lots of bonus work, start adding Votifier plugin	2015-08-06 00:45:39 -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	Clans merge fixes	2015-10-13 22:24:15 -04:00
dataSources.xml	Clans War updates	2015-10-17 22:55:21 -04:00
encodings.xml	Fix IntellIJ Files	2015-08-03 05:50:02 -05:00
misc.xml	Removing the magical 3	2015-08-11 04:38:37 -05:00
modules.xml	Remove BungeeSigns again?	2015-10-01 14:01:36 -04: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