fooify
|
ca1177685f
|
totally WIP commit
|
2015-11-10 07:08:08 -08: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 |
|
AlexTheCoder
|
d654f1f4b1
|
- Fixed class edit in lobbies
- Fixed conflict between rave suit and assassin
|
2015-11-10 06:17:25 -05:00 |
|
libraryaddict
|
1a2c163ce2
|
Fix scoreboard out of bounds error
|
2015-11-11 00:03:08 +13: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 |
|
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 |
|
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 |
|
NewGarbo
|
1aef7fe0b9
|
bunch of fixes reported by qa in tutorials.
|
2015-11-09 20:46:38 +00:00 |
|
NewGarbo
|
f1fbe086d3
|
oh how fun, even more constructor errors!
|
2015-11-09 20:29:52 +00:00 |
|
NewGarbo
|
af6e28f14b
|
don't you worry Shaun, I gotcha back with fixing them constructor problems ;)
|
2015-11-09 20:29:27 +00:00 |
|
NewGarbo
|
c6ff845efa
|
arcade weird thingy
|
2015-11-09 20:28:41 +00:00 |
|
Shaun Bennett
|
8850737f71
|
Fix constructor issues
|
2015-11-09 15:22:15 -05:00 |
|
Shaun Bennett
|
0bb3f8adb1
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
# Plugins/.idea/dataSources.xml
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
|
2015-11-09 14:41:16 -05:00 |
|
Shaun Bennett
|
610b5dbeb2
|
More work on gui
|
2015-11-09 14:39:52 -05:00 |
|
Sarah
|
18ab3d0f5b
|
Mob shrinking and some Word fixes.
|
2015-11-09 15:40:49 +01: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 |
|
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 |
|
NewGarbo
|
0409d7ffef
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-09 08:48:12 +00:00 |
|
NewGarbo
|
4232a5675f
|
fixed bug with part 5 of the getting started tutorial (has to do with claiming events)
|
2015-11-09 08:45:34 +00:00 |
|
NewGarbo
|
8f507c4b9c
|
typo
|
2015-11-09 08:29:51 +00: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 |
|
Morten
|
3b641d46bb
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-11-08 14:33:53 +01:00 |
|
Morten
|
1958fa9f5e
|
quick save
|
2015-11-08 14:31:56 +01:00 |
|
libraryaddict
|
ce3af6cf9c
|
Update cb.jar
|
2015-11-09 00:15:28 +13:00 |
|
AlexTheCoder
|
9e24a5005f
|
- Completed CTF
|
2015-11-08 03:04:17 -05:00 |
|
AlexTheCoder
|
211298327f
|
- Fixed banners, begun work on patterns
|
2015-11-08 02:42:31 -05: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 |
|
AlexTheCoder
|
fb7fcccf24
|
- Reverting back to banners
|
2015-11-08 01:01:18 -05:00 |
|
libraryaddict
|
e039f2249c
|
Update cb
|
2015-11-08 18:02:36 +13: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 |
|
Shaun Bennett
|
3c82574386
|
Testing pushing/ignore this
|
2015-11-07 20:02:07 -05:00 |
|
Shaun Bennett
|
ffc389f9c7
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-07 19:58:12 -05:00 |
|