4d05bd5c50
Player count for chiss
2015-12-10 20:53:38 -05:00
16f39c1e71
Pushing changes to go help william
2015-12-10 20:51:34 -05:00
f8d7aeb5ea
before revert
2015-12-11 01:32:32 +00:00
dda5ac6728
work
2015-12-11 01:20:36 +00:00
626a812844
Many changes
2015-12-11 00:40:54 +00:00
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
a9e6224eca
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:21:33 -05:00
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -05:00
7b4f5d5b75
Christmas chest in gui
2015-12-10 19:19:20 -05:00
72a8aaf556
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:18:49 -05:00
44a244caf4
Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics
2015-12-11 01:10:54 +01:00
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +01:00
a6a4c8be36
Cosmetic Update
...
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
2015-12-11 01:05:32 +01:00
d16d9a36e9
Use Account ID from client manager instead of PlayerCache
2015-12-10 17:25:39 -05:00
ab16bf89e5
Merge remote-tracking branch 'origin/master'
2015-12-10 17:04:25 -05:00
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
4cf33eef05
Tutorial changes!
2015-12-10 21:32:14 +00:00
624e8bbe89
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-10 20:56:03 +00:00
0bd276c16a
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
2015-12-10 20:53:01 +00:00
8d7b03e3f6
Added the ability to have title AND subtitle per TutorialText.
2015-12-10 20:52:41 +00:00
2951088005
Tutorial changes/additions.
2015-12-10 20:48:13 +00:00
3586642414
Added back the tutorial.
2015-12-10 19:32:25 +00:00
af7c058f22
Lots of bug fixes / additions since the testing 12/9/15.
2015-12-10 19:06:07 +00:00
1ee1e7a04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-10 20:02:39 +13:00
eaf3937004
Fix the damage while walking on falling block
2015-12-10 20:02:12 +13:00
fabf3dab59
updated blocksearch
2015-12-10 13:12:01 +11:00
87a834c01b
FIX
2015-12-10 00:03:57 +00:00
90896073d4
debug
2015-12-10 00:03:17 +00:00
cea2716851
fight man
2015-12-09 23:59:20 +00:00
05bd55f720
iter
2015-12-09 23:53:04 +00:00
b8a2304edd
work
2015-12-09 23:39:00 +00:00
3ad0a3db6e
fix
2015-12-09 23:14:08 +00:00
17c989d941
Less per-player arena stuff
2015-12-09 22:39:04 +00:00
513db5dd8d
doing byes
2015-12-09 21:33:31 +00:00
852be97bae
Work
2015-12-09 20:16:16 +00:00
7749401e62
Show UUID when clicking on a username (temporary).
2015-12-09 20:05:24 +00:00
8459cf0f95
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-09 18:13:26 +00:00
54157024f7
Committing current progress, can't afford to lose this again
2015-12-09 18:06:04 +00:00
a5c46545df
fixing timer being shown.
2015-12-09 14:44:22 +01:00
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
c021fbf9ed
Bounce baby bounce.
2015-12-08 23:27:38 +00:00
d709071feb
Much fix, many wow.
2015-12-08 23:20:42 +00:00
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
26c5c419f8
fixed a bug where old displayName would be used after name was updated.
2015-12-09 08:38:05 +11:00
fba88ec231
mount stuff is fixed
2015-12-09 08:19:55 +11:00
a83ede3caa
Handling slow movers
2015-12-08 21:14:19 +00:00
7bdbd5a6af
Woo almost done!
2015-12-08 21:10:27 +00:00
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
0b8e0409b6
Merge pull request #92 in MIN/mineplex from update-SSM to master
...
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
SSM kit description change, grammar mistake
SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
9ce7b25482
Prevent escaping in id string.
2015-12-08 18:37:05 +00:00
d598f83ec0
More progress
2015-12-08 18:17:43 +00:00
504a49278c
SSM kit description change, grammar mistake
2015-12-08 16:35:49 +00:00
2bf1012fa4
SSM Pig bomb bug fix
2015-12-08 16:34:07 +00:00
f8f95c64e5
Fixing arena moving
2015-12-08 15:10:29 +00:00
a1915e324c
Some java 8 code
2015-12-08 08:42:45 -05:00
4e2a422f27
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-08 13:13:18 +00:00
2b12016e14
Progress
2015-12-08 13:12:30 +00:00
addb2c8c0e
Fix java 8 compiler issue
2015-12-08 08:02:40 -05:00
cdc602a435
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:55:57 +00:00
89e8a7a2b5
Merge pull request #91 in MIN/mineplex from clans-beta to master
...
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
Fix excludes
2015-12-08 04:51:58 -06:00
b22c64ca6a
Fix excludes
2015-12-08 05:51:21 -05:00
ffbf76a125
Merge pull request #90 in MIN/mineplex from clans-beta to master
...
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
Update IntelliJ to Java 8
2015-12-08 04:46:47 -06:00
a84f580719
Update IntelliJ to Java 8
2015-12-08 05:45:26 -05:00
99cf7ea22c
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:44:43 +00:00
e6d995008e
Arenas
2015-12-08 10:44:24 +00:00
c22a206a0e
Added some documentation (mainly declaring variable types).
2015-12-08 10:38:44 +00:00
fe1f763374
changed order blocks will be added to the list
2015-12-08 15:26:32 +11:00
b1536547d3
Cosmetic Update 2
...
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
2015-12-08 00:50:08 +01:00
529eab5aef
Improved the report php code, made it more object orientated.
...
Commented out debug code.
2015-12-07 23:43:29 +00:00
719297ebb1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-08 10:31:25 +11:00
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
43192317ad
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-07 23:20:21 +00:00
55f0453897
Start of re-write
2015-12-07 23:20:03 +00:00
0619fb857f
fixing invisibility.
2015-12-07 23:44:02 +01:00
d38ce9ef1e
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-12-07 18:54:53 +00:00
8ff034fb5d
Merge pull request #89 in MIN/mineplex from clans-beta to master
...
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
Winter MOTD, Stat fixes (maybe?!)
made use ability teleport player back to where they should be
Forgot to push these changes last update!
fixed tnt blowing up in claims when offline
fixed task not getting cleanup up after /skiptutorial
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
Fix heavy attribute, disable claim visualizer
Disable subtasks for now
Clans alpha 0.17
clan claim visualizer
fixed infinite claims
2015-12-07 12:22:10 -06:00
eed6966a5b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-07 13:21:17 -05:00
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05:00
31d05cdb3b
Fix error from last commit (git forced me to commit unfinished files due to the merge).
2015-12-07 18:13:48 +00:00
67b3fe1d23
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00:00
ffbb057d23
Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-07 11:25:17 -06:00
eed944597c
Commit PHP code.
2015-12-07 17:05:58 +00:00
7984c0ac31
Add !
2015-12-07 06:12:49 -05:00
a39b11ce67
slowed meteors
2015-12-07 21:56:00 +11:00
1fe6b5489a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 21:53:49 +11:00
d318a5cf87
interacto!
2015-12-07 21:53:34 +11:00
c6c012031f
Less ugly formatting
2015-12-07 04:44:19 -05:00
4354133de9
Add Minecraft timings to /lag
2015-12-07 04:40:34 -05:00
6e67f34db1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 20:39:46 +11:00
e1efcabfbf
chat sale msgs
2015-12-07 20:39:31 +11:00
3cdf8c4b08
Merge remote-tracking branch 'origin/master'
2015-12-07 04:23:33 -05:00
2afbe23a7c
Load songs from update folder
2015-12-07 04:23:26 -05:00
7b11baf24b
Christmas sale bossbars
2015-12-07 20:20:49 +11:00
8c4615203c
sale message
2015-12-07 20:07:20 +11:00
ed3bea8e85
DONE!
2015-12-07 18:36:05 +11:00
5c632a1e3a
sharper target
2015-12-07 18:20:12 +11:00
1a0d90a495
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 18:06:43 +11:00
fea637db80
fixed some freeze
2015-12-07 18:06:26 +11:00
ecde1dd314
Merge remote-tracking branch 'origin/master'
2015-12-07 02:06:09 -05:00
44a5bcb793
remove titan chest message, update pumkin message, holiday MB/DMT words
2015-12-07 02:06:00 -05:00
d75d7a2c8f
snowfight finish
2015-12-07 17:56:35 +11:00
1e441ac017
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 17:37:04 +11:00
1ada06af91
rewrote lots!
2015-12-07 17:36:45 +11:00
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
5486d8acf6
more prep
2015-12-07 13:42:59 +11:00
97fe633e4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 13:25:48 +11:00
54ec0e39bb
more polisshhhh on snowfight
...
enabled xmas chests
2015-12-07 13:25:32 +11:00
488895ea53
Note block player
2015-12-06 21:12:10 -05:00
cbafb2ba91
fixes
2015-12-07 13:04:45 +11:00
0c397d6a81
simplified kits and intro
2015-12-07 13:02:26 +11:00
c36182b8d4
Cosmetic Update
...
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition
Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
2015-12-07 02:53:14 +01:00
b2a595b01b
snwo fight changes
2015-12-07 12:02:53 +11:00
072856be7d
teleportations.
2015-12-06 23:19:53 +01:00
6f16eeead7
missin files
2015-12-07 08:48:55 +11:00
10d26ca32b
timer fixes.
2015-12-06 22:41:04 +01:00
64f8ee7280
fixing some timings.
2015-12-06 21:48:21 +01:00
425463d339
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-06 19:11:13 +00:00
a9c7f088f3
made use ability teleport player back to where they should be
2015-12-06 19:10:18 +00:00
e21bd37b92
Add connection host for Jedis.
2015-12-06 19:05:20 +00:00
fa6418769b
YT name change
2015-12-06 21:26:02 +11:00
ccb6456110
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
2015-12-06 18:09:24 +11:00
35c362b8bf
small youtuber perms
2015-12-06 18:08:36 +11:00
b7b5235f59
Fix error
2015-12-06 00:57:43 -05:00
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
040e94f1fb
bouncy
2015-12-06 16:32:45 +11:00
618105b4c8
Add minimum rank to Announcement Command
2015-12-06 00:15:49 -05:00
8d831d5228
Fix END_PORTAL bug causing gui's to break
2015-12-06 00:06:31 -05:00
9c7eea86b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 14:56:18 +11:00
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
11e1e53a36
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-05 21:36:19 -05:00
d5a9a92913
Forgot to push these changes last update!
2015-12-05 21:36:07 -05:00
b98944b0a0
Handle attach entity
2015-12-06 14:38:00 +13:00
d5606f55ea
Modified CustomTagFix to support player name titles
2015-12-06 10:18:35 +13:00
9bd7869e22
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-05 01:08:21 +00:00
2e72e46242
Add report preferences to exclusive preferences.
2015-12-05 01:05:43 +00:00
ef6fd0eaa3
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-05 00:05:05 +00:00
d7497ec098
Fixed Micro Battle icon not appearing in stats menu
2015-12-04 15:56:48 -08:00
49c735e43c
removed duplicate code
2015-12-05 10:34:06 +11:00
ddf6037fc4
Wrote standalone chatsnap handler and implemented required changes in Core.
2015-12-04 23:30:27 +00:00
4a53667539
gadget restructure
...
converted frost lord and titan particles into 4 subcategories.
2015-12-05 10:22:00 +11:00
c19baf5750
Make periodic handler message display close command and clicking it suggests the command.
2015-12-04 22:08:44 +00:00
35534afd4a
overall runtime.
2015-12-04 19:54:02 +01:00
1bb40b21d3
Tutorial/Phase Time.
2015-12-04 19:49:28 +01:00
5d59b1a015
fixed tnt blowing up in claims when offline
2015-12-04 18:32:46 +00:00
bca65116ab
fixed task not getting cleanup up after /skiptutorial
2015-12-04 18:23:23 +00:00
f57f4ed0aa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-04 12:10:10 -05:00
e158704534
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
2015-12-04 15:58:51 +00:00
bb382a969c
Fix heavy attribute, disable claim visualizer
2015-12-04 08:02:38 -05:00
3b125dc8a5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
2015-12-04 11:12:19 +00:00
2435ebba13
Disable subtasks for now
2015-12-04 05:16:14 -05:00
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
e01d30b920
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-04 13:19:07 +11:00
ef2511434d
tuber arnk
2015-12-04 13:18:23 +11:00
fc68ce9b78
Merge pull request #87 in MIN/mineplex from virizion_utils to master
...
* commit '9951701ded301c47bcc203c12001ef866204b78c':
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:05:15 -06:00
9951701ded
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:51:11 -05:00
b1bd2ff5ac
Gravity's icon changed to ENDER_PORTAL_FRAME
2015-12-03 16:50:27 -08:00
91aaf5f2fb
world's smallest bugfix - admin->co-host
2015-12-03 16:45:30 -08:00
348f2d8e4c
Merge remote-tracking branch 'origin/master' into foo
2015-12-03 16:31:16 -08:00
8717f962e6
Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
Added missing MountData and SingleEntityMountData files.
Mount bug fix.
Added method to edit NoAI field on entities.
Implemented new mount data system replacing instead of entities as data.
We only need to add the "Go Back" page once...
TitanMount fixes
2015-12-03 17:15:21 -06:00
39daf969fd
clan claim visualizer
2015-12-03 22:29:36 +00:00
19254fc4a0
Prepare Timer flag.
2015-12-03 18:06:27 +01:00
584a02ae3e
fixed infinite claims
2015-12-03 10:30:06 +00:00
fc0cae8e0f
Merge pull request #85 in MIN/mineplex from virizion_utils to master
...
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 18:53:30 -06:00
27f335779a
adding tutorial sounds and flag for it.
2015-12-02 19:39:44 +01:00
e9fd661311
disabled koth
2015-12-02 18:25:53 +00:00
8fea5afdce
fixed message on tick (might be cause of laggg)
2015-12-02 06:56:58 +00:00
92c1abf221
a few last touches
2015-12-02 06:04:53 +00:00
8db5ffe5c7
forcejoin command for ADMIN+ and fixed auto tree replanting.
2015-12-02 05:54:00 +00:00
3a4e453ac3
made it so that you can only use /reset in safe zones
2015-12-02 05:18:04 +00:00
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
bf92af647a
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 00:00:32 -05:00
b04f139883
Fixed advertisement being able to be bypassed by spec and instant join
2015-12-01 19:26:52 -08:00
338e0f1892
fixed naming pets non-alphanumeric characters
2015-12-01 16:23:07 -08:00
b8e2086928
changes to tutorial
2015-12-02 00:19:48 +00:00
ba27d94158
fixed skiptutorial message not displaying
2015-12-01 23:23:11 +00:00
cffb6bd62f
bunch o' changes
2015-12-01 23:01:41 +00:00
9508556d57
Refactor.
2015-12-01 22:47:51 +00:00
a7d6026c07
made skip tutorial messages be seen whilst in tutorial
2015-12-01 22:33:47 +00:00
69cb395f5a
made entire clan know about disband
2015-12-01 22:30:05 +00:00
35ae89ab1f
fixed players from being able to eat their carrot in the making money task
2015-12-01 19:37:53 +00:00
ea099d7a82
fixed some annoying bugs and fixed certain messages not showing in tutorial
2015-12-01 18:41:33 +00:00
fbf9c8eb0c
made certain messages visible in tutorial that are actually required to be seen
2015-12-01 13:37:34 +00:00
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
633697dc7a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 23:49:32 -06:00
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
51023a7630
cosmetic cooldown fix
2015-12-01 15:38:54 +11:00
48ae23ebff
changed reference to premium ranks
2015-11-30 19:58:41 -08:00
06ef964000
removed important debug thing
2015-11-30 19:33:03 -08:00
ed96c8e3b3
fixed ssm enderman always facing south on teleport
2015-11-30 19:27:34 -08:00
208eaf3a01
cosmetics recharge slowdown
2015-12-01 11:38:52 +11:00
c98b427fde
Added missing MountData and SingleEntityMountData files.
...
For some reason, git decided that it was a good idea to remove these two
files from the index...
2015-12-01 00:46:20 +01:00
1a1fa684e4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-01 10:44:39 +11:00
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
Shaun Bennett
Shaun Bennett
William Burns
xGamingDudex
libraryaddict
Cheese
Keir
Sarah
NewGarbo
Teddy
fooify
Virizion
Jonathan Williams