Keir Nellyer
|
390b2878dc
|
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
|
2016-04-07 14:28:30 +01:00 |
|
git
|
0284fed2a9
|
Update patch
|
2016-02-28 13:12:59 +13:00 |
|
Keir Nellyer
|
99150db2d7
|
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
|
2016-02-22 19:02:54 +00:00 |
|
md_5
|
81f9ca0bc2
|
Fix mysql
|
2016-02-19 20:10:01 +11:00 |
|
md_5
|
d575266522
|
Fix sentry
|
2016-02-19 19:44:36 +11:00 |
|
md_5
|
f7b8dada6d
|
Add Sentry to BungeeCord too.
|
2016-02-07 21:40:51 +11:00 |
|
Keir Nellyer
|
eb329ec845
|
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
|
2016-02-01 22:38:51 +00:00 |
|
md_5
|
e887bbf543
|
Pooling with later jedis versions doesn't work on Bungee.
|
2016-02-01 18:13:50 +11:00 |
|
Keir Nellyer
|
b547ad5f89
|
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
|
2016-01-31 23:38:58 +00:00 |
|
md_5
|
cc1ecbe0b8
|
Add Eclipse magic.
|
2016-02-01 10:24:49 +11:00 |
|
Keir Nellyer
|
9601eabfeb
|
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
|
2016-01-31 17:38:08 +00:00 |
|
md_5
|
478b92db44
|
Add example maven settings.xml
|
2016-01-31 09:44:46 +11:00 |
|
Keir Nellyer
|
3fc11e5c8a
|
For some reason this didn't get committed with the previous stuff.
|
2016-01-27 21:54:34 +00:00 |
|
Shaun Bennett
|
0a5791a92f
|
Go back to compile scope, need to talk to md_5 about this
|
2016-01-20 13:13:20 -05:00 |
|
Shaun Bennett
|
037a2f8353
|
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
|
2016-01-20 13:04:31 -05:00 |
|
Shaun Bennett
|
8977735baf
|
Include a version.properties in maven build
|
2016-01-20 11:57:21 -05:00 |
|
md_5
|
bb4091c7a6
|
Use Maven for Compilation
|
2016-01-20 11:20:58 +11:00 |
|