JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,608 Commits 1 Branch 0 Tags 481 MiB
b5149d2da7
Commit Graph

2032 Commits

Author SHA1 Message Date
Cheese
d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Keir
07b6c7cde7 Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side. 2015-11-20 22:38:00 +00:00
Keir
435f2b643d Fix fetching player report stats. 2015-11-20 22:20:56 +00:00
Keir
470ff67f86 Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system. 2015-11-20 22:03:57 +00:00
Keir
fc6e1fe003 Notify the handler of a report (if any) when the report they are handling is purged. 2015-11-20 21:10:03 +00:00
AlexTheCoder
386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams
700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Keir
80c87fa1fc Make reports timeout after 15 minutes of inactivity. 2015-11-20 00:51:21 +00:00
Cheese
3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Shaun Bennett
3820035762 Cleaning up duplicate code/small optimizations (untested) 2015-11-19 14:35:59 -05:00
Keir
cb5672b94c Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-18 20:34:24 +00:00
NewGarbo
5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
Shaun Bennett
1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master 
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
 2015-11-18 10:15:33 -06:00
William Burns
a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns
04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns
2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns
e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
NewGarbo
f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
William Burns
e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
Keir
6ee40aa1ce No longer close reports when the player quits, instead alert the handler and alert again when (and if) the player re-joins if the report is still active. 2015-11-17 15:08:35 +00:00
Keir
a1713ca866 If someone is currently handling a report, re-direct all messages relating to that report to them. 2015-11-17 14:21:05 +00:00
William Burns
0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Cheese
adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
Jonathan Williams
ac792dcd02 Removed some unnecessary code in updateRank and opened up all ranks to be used. 2015-11-15 18:33:43 -06:00
AlexTheCoder
217509b75a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
 2015-11-15 18:58:20 -05:00
AlexTheCoder
ecaa4a49b4 - Fix for stats 2015-11-15 17:48:00 -05:00
NewGarbo
24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00:00
NewGarbo
c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
Jonathan Williams
daee44d262 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-14 02:01:24 -06:00
Jonathan Williams
4a73bce586 Added gadget and projectileUser logging. 2015-11-14 00:36:34 -06:00
Cheese
259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
Keir
bf81c26874 Only notify staff when a report count reaches a certain amount (3 for hacking, 1 for chat abuse). 2015-11-13 01:27:34 +00:00
Keir
a6d3ba10c2 Show the handler of the report a message every 10 seconds whilst they are handling a report. Any part of the message is clickable and when clicked shows the close report GUI. 
Jazz-up messages sent to players.
Rename Category to ReportCategory.
 2015-11-13 01:23:33 +00:00
Shaun Bennett
bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett
639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett
0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Cheese
3122397f7a Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2015-11-13 09:19:44 +11:00
Shaun Bennett
6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
AlexTheCoder
bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
AlexTheCoder
a8b27e66d1 - Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit 
- Fixed items ever being lost from treasurechests
 2015-11-12 00:06:21 -05:00
Shaun Bennett
875c399c9f Merge branch 'master' into clans-beta 2015-11-11 21:31:03 -05:00
Keir
27d5c76376 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-12 02:01:01 +00:00
libraryaddict
25f299b490 Fix interact types 2015-11-12 14:34:12 +13:00
Keir
3c419b3217 Small fixes from last commit. 2015-11-12 00:24:31 +00:00
Keir
6295a8ce08 Closing a report will now display a GUI in which the closer can decide on the result of the report. Some of these options will yield additional options, such as punishment options if a report is indeed valid. 
Store count of a players accepted, denied and abusive reports.
The previous partially implemented reputation system has been removed, at least for now.
 2015-11-12 00:02:38 +00:00
Shaun Bennett
e66bebcfb1 Give all treaure items when opening the chest 2015-11-11 18:13:47 -05:00
NewGarbo
ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
Keir
9573751a87 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-11 19:24:34 +00:00
Keir
727da2c6b5 Embarrassing typo. 2015-11-11 19:23:10 +00:00
Keir
f2e88c1c54 Only allow 1 player at a time to handle a report. 2015-11-11 19:05:29 +00:00
Keir
d7ba2e4731 Fix infinite gson loop by separating dependencies. 2015-11-11 16:12:28 +00:00
libraryaddict
b915131407 Fix some armorstands and interaction bugs 2015-11-12 04:26:55 +13: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
Cheese
ef2411b7d5 Merge branch 'master' into minestrike-update 2015-11-11 13:43:36 +11:00
libraryaddict
3e6d73221b Disabled a fix 2015-11-11 15:21:17 +13:00
Cheese
a47752cfe2 disabled usage of /minecraft: commands in 1..8 2015-11-11 12:49:19 +11: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
Cheese
59a054eeba fixed merge erorr 2015-11-11 07:52:02 +11:00
Cheese
520eb55b88 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-11 07:43:50 +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
fooify
394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify
ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
Keir
217ac78d49 Alter "accountPreferences" table to include a new column "showUserReports". 2015-11-10 11:38:13 +00: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
AlexTheCoder
e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05: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
Keir
03a5954224 Handle saving and loading of the ShowUserReports setting. 2015-11-09 18:35:03 +00:00
Shaun Bennett
ec3427bcc0 Giveaway manager bug fix 2015-11-09 04:08:26 -05:00
NewGarbo
7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00: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
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
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
AlexTheCoder
dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
libraryaddict
c4d6bcba02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-08 17:56:34 +13:00
Cheese
cc2e5bc6e4 minestrike update! 2015-11-08 11:30:19 +11:00
Shaun Bennett
addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
Shaun Bennett
bf97cf5d77 Remove debug code 2015-11-07 13:53:34 -05:00
libraryaddict
79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
Shaun Bennett
ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Shaun Bennett
4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
AlexTheCoder
fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
Keir
783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
Keir
fd2a543418 Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently). 
Fix variable names in ReportManager.
 2015-11-06 16:46:10 +00:00
libraryaddict
cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
NewGarbo
b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
Keir
0c0b3708c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-06 01:34:13 +00:00
Keir
e449e47b9a Document ReportNotification. 2015-11-06 01:33:46 +00:00
AlexTheCoder
87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder
61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder
9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
NewGarbo
7f03ca0936 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
 2015-11-03 21:19:17 +00:00
NewGarbo
78ab895a14 Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. 
Made it so that players using the broadsword's effects cannot attack anything.

Added small smoke particle to UtilParticle.

Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.

Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.

Removed some debug messages thrown around the code.
 2015-11-03 19:49:14 +00:00
Keir
72b650086d Instantiating a page shouldn't cause it to automatically open. 2015-11-03 17:03:09 +00:00
Keir
bd6ce21cf7 Make use of foreign keys in table creation and drop "INDEX" statements (foreign keys are auto-indexed). 2015-11-03 16:40:31 +00:00
Keir
6054bfaac4 Do all database operations asynchronously. 2015-11-03 15:37:39 +00:00
Keir
9030b4f264 Remove unused column 'date'. 2015-11-03 15:27:32 +00:00
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
 2015-11-03 14:57:25 +13:00
Shaun Bennett
4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
Keir
95c38b1939 Don't use static instances. 2015-11-02 23:30:06 +00:00
Jonathan Williams
8838ea75e4 Some code cleanup for tasks. 2015-11-02 09:37:11 -06:00
Jonathan Williams
3b38302429 Optimized TaskManager task locks and calls. 
Run all player messages on the main thread.
 2015-11-02 09:35:35 -06:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
Keir
4b5ddf5385 Disable SQL create table queries until they are approved. 2015-11-01 19:14:29 +00:00
Keir
d09ed2a823 Small changes and missed changes from last commit. 2015-11-01 16:47:54 +00:00
Keir
93a5ebf0eb Pass server name to ReportManager. 2015-11-01 16:44:02 +00:00
NewGarbo
baa4a744fb Fixed a whole load of bugs: 
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
 2015-10-31 23:11:12 +00:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Cheese
23be8aa1dd removed unncessary stuff 
balanced rewards
 2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
libraryaddict
301b8012ff Final commit 2015-10-30 19:30:17 +13:00
libraryaddict
ea1e4b79f7 Changes from SnD branch 2015-10-30 19:25:02 +13:00
libraryaddict
ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
Keir
ec5cbbe684 This method is not required, "Plugin" is protected, not private as I previously assumed. 2015-10-30 01:05:45 +00:00
Keir
e266acaf44 Store report categories with a TINYINT to save space and increase lookup performance. 2015-10-29 23:33:23 +00:00
Keir
e8c01a1733 Cleanup imports. 2015-10-29 23:29:38 +00:00
AlexTheCoder
0be51d5629 - Even more bugfixes 2015-10-29 16:48:51 -04:00
Keir
1857afa826 Log report category to database. 
Allow report to easily be handled by clicking text to fire the reporthandle command.
 2015-10-29 17:51:17 +00:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
libraryaddict
0486404c4b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-10-28 14:38:34 +13:00
libraryaddict
5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
Keir
dd321439a6 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-10-27 22:40:23 +00:00
Keir
4ceb8f20aa Make ReportNotification capable of sending json messages. 2015-10-27 22:26:02 +00:00