Keir
|
d7ba2e4731
|
Fix infinite gson loop by separating dependencies.
|
2015-11-11 16:12:28 +00:00 |
|
Keir
|
9c45a48a26
|
Add confirmation message when a report is successful.
|
2015-11-11 15:05:36 +00:00 |
|
Keir
|
2722aeaaec
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-11 14:53:49 +00:00 |
|
Keir
|
191fa0ec53
|
Actually fetch the showUserReports value from the database.
|
2015-11-11 14:53:22 +00:00 |
|
Jonathan Williams
|
27ef2c0bbb
|
Fixed UtilEnt.Leash method.
|
2015-11-11 04:36:10 -06:00 |
|
Jonathan Williams
|
0e6146d5c9
|
Added expire to Stacker throw.
|
2015-11-11 04:32:56 -06:00 |
|
libraryaddict
|
3e6d73221b
|
Disabled a fix
|
2015-11-11 15:21:17 +13:00 |
|
Cheese
|
4dd9b0967a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 12:50:07 +11:00 |
|
Cheese
|
a47752cfe2
|
disabled usage of /minecraft: commands in 1..8
|
2015-11-11 12:49:19 +11:00 |
|
libraryaddict
|
ee286c2676
|
Disable /minecraft commands
|
2015-11-11 13:49:06 +13:00 |
|
libraryaddict
|
7559d1feb5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-11 11:45:40 +13:00 |
|
libraryaddict
|
f18c55cbd9
|
Fix schedulers
|
2015-11-11 11:45:17 +13:00 |
|
Keir
|
f1c8564263
|
Fix preference inventory.
|
2015-11-10 21:40:35 +00:00 |
|
Keir
|
7d63a95ec9
|
Remove ALTER statement, modifications have been done.
|
2015-11-10 21:22:21 +00:00 |
|
Keir
|
fa9530b5bf
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-10 21:06:03 +00:00 |
|
Cheese
|
4eaa165826
|
such format
|
2015-11-11 07:54:13 +11:00 |
|
Cheese
|
b3125e40ff
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 07:43:01 +11:00 |
|
Keir
|
a81da156ac
|
Load show user reports value from database.
|
2015-11-10 16:08:16 +00:00 |
|
Keir
|
e59b5c2549
|
Actually show the report toggle action.
|
2015-11-10 16:07:32 +00:00 |
|
Keir
|
ff65231912
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-10 11:38:29 +00:00 |
|
Keir
|
217ac78d49
|
Alter "accountPreferences" table to include a new column "showUserReports".
|
2015-11-10 11:38:13 +00:00 |
|
libraryaddict
|
6983af944f
|
Fix a craftbukkit bug
|
2015-11-11 00:25:20 +13:00 |
|
libraryaddict
|
37fdf53a51
|
Fixed champion's Illusion crash
|
2015-11-11 00:21:28 +13:00 |
|
Keir
|
e00c11ae28
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-10 11:17:49 +00:00 |
|
libraryaddict
|
1a2c163ce2
|
Fix scoreboard out of bounds error
|
2015-11-11 00:03:08 +13:00 |
|
Jonathan Williams
|
6e90052480
|
Updated StaffServer to 1.8
|
2015-11-10 02:01:39 -06:00 |
|
Cheese
|
0a9c97c32a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 18:05:01 +11:00 |
|
Shaun Bennett
|
2707173a8b
|
Merge with 1.8 Branch
|
2015-11-10 01:48:33 -05:00 |
|
Keir
|
47c509c975
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
|
2015-11-09 22:55:00 +00:00 |
|
Cheese
|
83248a8fec
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 09:11:27 +11:00 |
|
Cheese
|
0ae5330634
|
squid changes
|
2015-11-10 09:11:10 +11:00 |
|
Keir
|
03a5954224
|
Handle saving and loading of the ShowUserReports setting.
|
2015-11-09 18:35:03 +00:00 |
|
Jonathan Williams
|
5c89124eb6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-09 03:25:02 -06:00 |
|
Jonathan Williams
|
ba7d5bbcdc
|
Fixed Arcade!
|
2015-11-09 03:24:20 -06:00 |
|
Shaun Bennett
|
ec3427bcc0
|
Giveaway manager bug fix
|
2015-11-09 04:08:26 -05:00 |
|
Shaun Bennett
|
05b52614fe
|
Forgot to remove debug code for testing
|
2015-11-09 03:49:12 -05:00 |
|
Shaun Bennett
|
2eaa326929
|
Merge remote-tracking branch 'origin/master'
|
2015-11-09 03:27:50 -05:00 |
|
Shaun Bennett
|
2c54e9e59a
|
Giveaway extras
|
2015-11-09 03:27:42 -05:00 |
|
Jonathan Williams
|
fb4978305f
|
Fixed up EnjinTranslator
Added extra overload for inventoryManager if you have the accountId already.
|
2015-11-09 02:26:45 -06:00 |
|
Shaun Bennett
|
2a7b272de3
|
Merge remote-tracking branch 'origin/master'
|
2015-11-09 01:55:36 -05:00 |
|
Jonathan Williams
|
283a774e03
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-09 00:04:55 -06:00 |
|
Jonathan Williams
|
4915ebc5ad
|
Added Purchase logging manager for Enjin.
Added extra callback method for SaveRank.
|
2015-11-09 00:04:38 -06:00 |
|
Jonathan Williams
|
ff936784d3
|
Remove debug code.
|
2015-11-08 17:27:00 -06:00 |
|
Jonathan Williams
|
e86623c8d0
|
Disabled TrickOrTreatManager to test for Lobby lockups.
|
2015-11-08 17:26:43 -06:00 |
|
Jonathan Williams
|
fd3ccf7ce0
|
Fix Bungee lobby balancer code.
|
2015-11-08 17:25:54 -06:00 |
|
libraryaddict
|
d466005c35
|
Fix custom names not changing
|
2015-11-09 05:08:08 +13:00 |
|
libraryaddict
|
752d8152d2
|
Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
Fix for some preferences not applying correctly.
|
2015-11-08 08:23:20 -06:00 |
|
libraryaddict
|
1999e09e69
|
Update CB
|
2015-11-09 02:44:16 +13:00 |
|
libraryaddict
|
ce3af6cf9c
|
Update cb.jar
|
2015-11-09 00:15:28 +13:00 |
|
libraryaddict
|
e039f2249c
|
Update cb
|
2015-11-08 18:02:36 +13:00 |
|