Virizion
7a82cf04f0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-11 23:02:16 -05:00
Shaun Bennett
402530d671
Merge pull request #94 in MIN/mineplex from william-gladiators to master
...
* commit '0d4bd91b573ca251d15471b6454452bd4ebca195':
lag detection thing
Scoreboard change and breaking blocks.
Couple of fixes
2015-12-11 18:57:52 -06:00
Shaun Bennett
c470ad880d
Merge pull request #77 in MIN/mineplex from foo to master
...
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
Fixed Micro Battle icon not appearing in stats menu
Gravity's icon changed to ENDER_PORTAL_FRAME
world's smallest bugfix - admin->co-host
Fixed advertisement being able to be bypassed by spec and instant join
fixed naming pets non-alphanumeric characters
changed reference to premium ranks
removed important debug thing
fixed ssm enderman always facing south on teleport
fixed bacon blast exloding blocks
fixed shield smash and fissure affecting spectators
fixed slab issue with Assassin's Flash
Re-fixed Barbarian bug
Fixed SG Barbarian bug
SSM bug fix: magma cube flame dash doesn't make player invisible
fixed several smash bugs and one global issue
Slightly bumped Monster Maze jump time value
fixed bridge bug "Death Bomber counts suicides as well"
typo fix in legendary aura description
Update achievement kit reference text
Fixed tnt bug (SG)
...
2015-12-11 18:57:18 -06:00
William Burns
0d4bd91b57
lag detection thing
2015-12-11 22:47:07 +00:00
Sarah
09e5aed6e7
Adding some descriptions.
2015-12-11 22:06:23 +01:00
xGamingDudex
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
xGamingDudex
9af6fd6904
Merge branch 'project-cosmetics' of
...
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
2015-12-11 18:06:35 +01:00
William Burns
6456d7bd66
Scoreboard change and breaking blocks.
2015-12-11 16:55:15 +00:00
William Burns
1dcbf5f7fd
Couple of fixes
2015-12-11 16:34:04 +00:00
xGamingDudex
ba087d119a
Small tweaks
2015-12-11 17:31:05 +01:00
Keir
a1f1667647
Fix "Player.php" filename case.
2015-12-11 12:28:38 +00:00
Keir
4b122b16ae
Fix formatting.
...
Fix "Player.php" filename case.
2015-12-11 12:28:12 +00:00
Cheese
2ffd1d4595
BOB ROSS
2015-12-11 23:11:33 +11:00
Cheese
d5612a8f27
added a hint to how many more coal you need to your next prize.
2015-12-11 23:09:06 +11:00
Cheese
39f5f70a5f
fixing up coal things
2015-12-11 22:43:34 +11:00
Shaun Bennett
1a922da1c3
Merge pull request #93 in MIN/mineplex from william-gladiators to master
...
* commit 'ac6d3c2c8fb8cc39ae6fb99bd5f3d62478653479': (56 commits)
fix
i lied.
final push goodnight
title + debug
remove tutorial and no flicker
Reverting
before revert
work
Many changes
Tutorial changes!
Added the ability to have title AND subtitle per TutorialText.
Tutorial changes/additions.
Added back the tutorial.
Lots of bug fixes / additions since the testing 12/9/15.
FIX
debug
fight man
iter
work
fix
...
2015-12-11 05:27:44 -06:00
Shaun Bennett
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
Cheese
7c432461c9
changed coal item rewards to 3 tier :)
2015-12-11 22:25:14 +11:00
Cheese
e01a5369fd
set bonuses
...
item gadget gui update
2015-12-11 21:53:39 +11:00
Cheese
40c2fdc3fc
fixed suits
2015-12-11 21:11:35 +11:00
Cheese
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
Cheese
7fc08f34a7
fixed typo
2015-12-11 20:34:01 +11:00
Cheese
f717a5f8cc
more set stuff
2015-12-11 20:30:41 +11:00
Cheese
0cda29e135
improved cosmetic set implementation
2015-12-11 20:08:36 +11:00
Cheese
a6f664006f
set display in gui
2015-12-11 20:01:54 +11:00
Cheese
d8a5edf9e9
fixed up gui items
2015-12-11 19:24:19 +11:00
Cheese
61a8d2825e
gadget gui overhaul
2015-12-11 19:20:13 +11:00
William Burns
523c1875ef
fix
2015-12-11 06:58:11 +00:00
Jonathan Williams
95a81ef368
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-11 01:26:20 -05:00
Cheese
66011cde8c
fixed player count
2015-12-11 17:25:23 +11:00
Jonathan Williams
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -05:00
Jonathan Williams
b5c157c123
Changed PlayerCache to Cache
2015-12-11 01:24:16 -05:00
Cheese
98e91d29f6
more cosmetic stuff :)
2015-12-11 17:21:54 +11:00
Cheese
7f8c9c02bc
and the mounts
2015-12-11 16:38:44 +11:00
Cheese
fe7ce40783
finished cosmetic names
2015-12-11 16:31:15 +11:00
Cheese
05a80b23a1
converting gadget text. (kill me now)
2015-12-11 16:07:02 +11:00
Cheese
88f44a293b
candy!
2015-12-11 15:31:35 +11:00
Cheese
3447de9a92
Merge branch 'master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
2015-12-11 15:20:50 +11:00
Cheese
a5b28422cd
cosmetics
2015-12-11 15:19:20 +11:00
libraryaddict
9a4006df27
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 17:18:07 +13:00
libraryaddict
c5f0624bf7
Add build file
2015-12-11 17:17:52 +13:00
Shaun Bennett
4588091c5b
Merge remote-tracking branch 'origin/master'
2015-12-10 23:15:42 -05:00
Shaun Bennett
21c8a66917
Fix imports
2015-12-10 23:15:35 -05:00
libraryaddict
3cd187ff04
Move LineFormat.java
2015-12-11 16:57:21 +13:00
Shaun Bennett
bc46518a05
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 22:54:53 -05:00
Shaun Bennett
1ab13d2ef5
Treasure Shards!
2015-12-10 22:52:15 -05:00
libraryaddict
4cfa7c436b
Add missing file
2015-12-11 16:48:40 +13:00
Virizion
14b5a9453a
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 22:18:00 -05:00
Virizion
68360c6705
shortened if
2015-12-10 22:17:10 -05:00
William Burns
a760dba783
i lied.
2015-12-11 02:59:16 +00:00
