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 |
|
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 |
|
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 |
|
Shaun Bennett
|
af1d91913b
|
Clans gui work
|
2015-11-07 19:58:03 -05:00 |
|
Cheese
|
cc2e5bc6e4
|
minestrike update!
|
2015-11-08 11:30:19 +11:00 |
|
NewGarbo
|
9a70d33b17
|
Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI.
|
2015-11-07 20:26:43 +00: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 |
|
libraryaddict
|
627ce08113
|
Add info on note particle
|
2015-11-07 21:35:26 +13:00 |
|
Shaun Bennett
|
e1f56a5d5a
|
Merge remote-tracking branch 'origin/master'
|
2015-11-07 01:10:34 -05:00 |
|
Shaun Bennett
|
ec7600a4a2
|
Giveaway tweaks
|
2015-11-07 01:10:27 -05:00 |
|
Cheese
|
c922c3248c
|
disabled trick or treat
|
2015-11-07 13:36:16 +11:00 |
|
Cheese
|
f4bf685e96
|
removed halloween hub
removed titan giveaway and pumpkins
|
2015-11-07 13:20:29 +11: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 |
|
libraryaddict
|
d3d448ccfe
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
|
2015-11-07 04:47:37 +13: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 |
|