Shaun Bennett
|
e8dcc4a3e2
|
Merge branch 'develop' into clans/beta
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
|
2016-03-23 11:02:20 +11:00 |
|
Shaun Bennett
|
309b5464f2
|
Clean up Account Repository, attempt to load account ID from cache
|
2016-03-23 10:21:02 +11:00 |
Ben
|
bcfe4a42c0
|
changerooonis
|
2016-03-11 00:41:28 +00:00 |
|
Shaun Bennett
|
3447354814
|
Dual 1.9 Fixes
|
2016-03-02 12:58:30 -06:00 |
|
Shaun Bennett
|
82d51a896f
|
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
|
2016-02-19 19:54:06 -06:00 |
md_5
|
bb4091c7a6
|
Use Maven for Compilation
|
2016-01-20 11:20:58 +11:00 |
|
NewGarbo
|
b47665e115
|
lots of work on outposts,
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
|
2016-01-02 14:02:50 +00:00 |
|
Shaun Bennett
|
e8b0e5dd8e
|
Fix IntellIJ Files
|
2015-12-13 23:51:47 -05:00 |
Jonathan Williams
|
dcf3c1ea88
|
Deleted and added new Cache since renaming was jacked up.
|
2015-12-13 23:14:17 -05:00 |