Jonathan Williams
727427165f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-26 08:49:49 -07:00
Jonathan Williams
26ed7ebb94
Fixes to redis
...
Fixes for stat handler.
2015-07-26 08:49:35 -07:00
Mini-Chiss
2b240f3dfa
removed visdata debug
2015-07-25 17:16:20 +02:00
Mini-Chiss
9fa8c6ac45
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-07-25 10:48:06 +02:00
Jonathan Williams
6d367e3cee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:38:54 -07:00
Jonathan Williams
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
Jonathan Williams
a1ce1ed45d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:31:01 -07:00
Jonathan Williams
84be48f264
Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
...
Added conversion of stats to new stat table via StatHandler.
Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
Mini-Chiss
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
Mysticate
335eb5eacd
Fixed report link
2015-07-23 13:35:06 -04:00
Mini-Chiss
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
Mysticate
91db076053
Fixed lobbers icon in stats
2015-07-23 09:28:35 -04:00
Mysticate
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
Mysticate
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
Mysticate
e55ca81d48
Reverted Trainee to Helper due to popular demand.
2015-07-20 15:45:16 -04:00
Mysticate
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
Mysticate
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
Mysticate
6edc923002
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-19 15:43:13 -04:00
Mysticate
1e1cf6403d
Added achievements
2015-07-14 13:31:41 -04:00
Cheese
f2cc2a2c86
youtubers wont get kicked by mac
2015-07-14 10:16:42 +10:00
Cheese
cb05049c4a
youtubes can turn off vel in hubs
2015-07-14 10:08:41 +10:00
Mysticate
0a09ae29f3
Merge remote-tracking branch 'origin/master' into BombLobbers
2015-07-12 18:14:25 -04:00
Mysticate
1b3d7f1c20
Fixed and added things
2015-07-08 23:57:48 -04:00
Cheese
7d073fdc0d
fixed skywars icon
...
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
Cheese
e36b0440a4
Merge branch 'bench'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
Cheese
cca26165cd
swapped sale back to 50%
2015-07-06 11:42:54 +10:00
libraryaddict
2c249e37b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-06 07:07:56 +12:00
libraryaddict
e16cb4cef7
Disguise: Initite armorstand vector
2015-07-06 07:07:41 +12:00
Shaun Bennett
abaa0ddee8
Level for Bobby
2015-07-05 13:30:16 -05:00
Cheese
7182205fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-05 15:13:33 +10:00
Cheese
8d2b1650af
world component for MCPE
2015-07-05 15:13:18 +10:00
libraryaddict
e002e4af18
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
2015-07-05 13:37:07 +12:00
Cheese
556e524e18
changed notifications back to 75% sale
2015-07-02 16:14:47 +10:00
Jonathan Williams
2069524f15
Merge remote-tracking branch 'remotes/origin/foo'
2015-06-29 18:14:07 -04:00
Jonathan Williams
bbb661d686
Fixed up BenefitManager.
2015-06-29 18:07:06 -04:00
fooify
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
Jonathan Williams
d426c24970
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-29 06:14:30 -04:00
Cheese
da3c5eeaaf
40k b enefit
2015-06-29 20:14:15 +10:00
Jonathan Williams
9f384b0d3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-29 06:02:57 -04:00
Cheese
48f5fa118a
fixed a few sky bugs
2015-06-29 14:26:00 +10:00
Cheese
0ea388379a
reduced win req for skywars ach
...
enabled beenfit for 40k reward
2015-06-28 15:16:05 +10:00
Jonathan Williams
65a10461cd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
2015-06-27 02:29:07 -05:00
Jonathan Williams
9a4bcd29a1
Fixed Sparks problems...
2015-06-27 02:26:29 -05:00
fooify
333c54cff9
Merge branch 'master' into foo
2015-06-26 10:07:13 -07:00
Shaun Bennett
8ef52ea103
Mineplex Gold Rush 2.0
2015-06-26 10:50:37 -05:00
Cheese
c0bc522614
split achievement text over 2 lines
2015-06-26 19:32:18 +10:00
Cheese
1aa0832bb9
SkyWars to Skywars
2015-06-26 17:55:49 +10:00
Jonathan Williams
f906f08a18
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 02:34:36 -05:00
Shaun Bennett
7c698f65cf
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
2015-06-26 02:31:35 -05:00
Jonathan Williams
c78ef9d93d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 02:30:01 -05:00
