Sarah
|
5482d1dc40
|
Fixing "kicked for Flying"
|
2016-01-08 12:17:28 +01:00 |
|
Sarah
|
db2cddc443
|
Fixing Join/Quit messages
|
2016-01-05 19:10:40 +01:00 |
|
Sarah
|
dd6d7b1b96
|
updating denial message
|
2016-01-02 16:45:15 +01:00 |
|
Morten
|
7e1b0b9110
|
Love you Sarah <3
|
2016-01-02 03:19:39 +01:00 |
|
Sarah
|
a06a0060aa
|
Fixing Disguise File
|
2016-01-02 01:53:19 +01:00 |
|
Sarah
|
a30c2b0d75
|
update /Disguise for Hub as well
|
2016-01-02 00:53:56 +01:00 |
|
Sarah
|
8ef1a524c1
|
updating /disguise
|
2015-12-31 12:01:24 +01:00 |
|
Shaun Bennett
|
55cdf4148a
|
Merge branch 'develop'
|
2015-12-29 03:21:03 -06:00 |
|
Shaun Bennett
|
16ee74885e
|
Add maintenance line
|
2015-12-29 02:52:53 -06:00 |
|
Shaun Bennett
|
7ad12d0a6b
|
Show Host Rank in private servers
|
2015-12-29 00:50:20 -06:00 |
|
Shaun Bennett
|
7104f1363a
|
Give YT rank access to extra preferences
|
2015-12-29 00:34:18 -06:00 |
|
Shaun Bennett
|
c680d91b56
|
Nerf TypeWars gems (again)
|
2015-12-25 03:12:04 -06:00 |
|
Shaun Bennett
|
dd8e91e463
|
Update MOTD
|
2015-12-25 03:03:53 -06:00 |
|
Shaun Bennett
|
25d36b546a
|
Remove unnecessary files
|
2015-12-25 01:53:00 -06:00 |
|
Shaun Bennett
|
d08cfa0c4c
|
Holiday Gifts
|
2015-12-25 01:51:36 -06:00 |
|
libraryaddict
|
1d4a5e5804
|
Clean up imports, set resource pack on clans.
|
2015-12-24 07:47:05 +13:00 |
|
libraryaddict
|
000b1f85b7
|
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
|
2015-12-24 07:41:55 +13:00 |
|
libraryaddict
|
67bdc6832f
|
Tentative beginnings for clans resource packs
|
2015-12-24 07:40:49 +13:00 |
|
Shaun Bennett
|
2ccd7a5de0
|
Fix Type Wars stat icon
|
2015-12-21 13:20:04 -05:00 |
|
Shaun Bennett
|
7a72762c78
|
Update MOTD
|
2015-12-21 12:56:37 -05:00 |
|
Shaun Bennett
|
c63014b51f
|
Type-Wars merge
|
2015-12-21 12:49:10 -05:00 |
|
Sarah
|
a5436d63c0
|
Updating Holiday Achievements
|
2015-12-21 18:45:26 +01:00 |
|
Sarah
|
7c66bdbbde
|
Updating Stats GUI
|
2015-12-21 18:25:44 +01:00 |
|
Sarah
|
010b1b0a5d
|
Achievements....
|
2015-12-21 18:08:11 +01:00 |
|
Sarah
|
6e3274ff2f
|
changing Category
|
2015-12-21 18:06:00 +01:00 |
|
Sarah
|
f15c318e5c
|
adding PM message.
|
2015-12-21 18:02:25 +01:00 |
|
Sarah
|
082b5e156c
|
fixing Kit NPEs
|
2015-12-21 17:48:17 +01:00 |
|
Sarah
|
ff5761cc1d
|
Fixing ending Stats.
|
2015-12-21 17:44:15 +01:00 |
|
Sarah
|
590da2128c
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
|
2015-12-21 17:43:51 +01:00 |
|
Shaun Bennett
|
5469289d82
|
Wrong iterator!
|
2015-12-21 06:57:56 -05:00 |
|
Shaun Bennett
|
fae2a5d2bf
|
Update game display
|
2015-12-21 04:40:30 -05:00 |
|
Shaun Bennett
|
a235103066
|
Merge pull request #106 in MIN/mineplex from update-menu to develop
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
|
2015-12-21 03:36:46 -06:00 |
|
Shaun Bennett
|
f4050fb1ff
|
Adjust GUI, fix beta button
|
2015-12-21 04:35:57 -05:00 |
|
Shaun Bennett
|
99285b2ac8
|
Merge remote-tracking branch 'remotes/origin/type-wars' into develop
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
|
2015-12-21 03:50:55 -05:00 |
|
Mysticate
|
0f5be6444b
|
Yo shaun debug this m8 ty
|
2015-12-21 02:23:59 -05:00 |
|
Sarah
|
816da0f633
|
Fixing Gems
|
2015-12-20 12:00:32 +01:00 |
|
Sarah
|
f1188529f2
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 13:09:26 +01:00 |
|
Sarah
|
c56cd0d56e
|
adjusting some timings
|
2015-12-19 13:08:53 +01:00 |
|
Sarah
|
35966d88cf
|
Fixing Tutorial Minion
|
2015-12-19 13:05:39 +01:00 |
|
Sarah
|
7327d9463f
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 13:00:49 +01:00 |
|
Sarah
|
8a54388480
|
fixing last commit
|
2015-12-19 13:00:12 +01:00 |
|
Sarah
|
32a0dd6668
|
adding Tutorial notification
|
2015-12-19 12:59:37 +01:00 |
|
Sarah
|
152e759c10
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 12:56:05 +01:00 |
|
Sarah
|
7cb002ca86
|
Adding Tutorial notification
|
2015-12-19 12:55:28 +01:00 |
|
Sarah
|
f8bffc9f88
|
nuke delay and Stats
|
2015-12-19 12:45:06 +01:00 |
|
Sarah
|
b3afa0094e
|
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
|
2015-12-19 00:59:15 +01:00 |
|
Sarah
|
dab2416ccd
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 00:49:16 +01:00 |
|
Sarah
|
6c5e3d7509
|
Fixing visibility.
|
2015-12-19 00:48:42 +01:00 |
|
William Burns
|
c2e88c2794
|
Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
|
2015-12-18 18:16:32 +00:00 |
|
William Burns
|
13cfc0e12a
|
Updated to a better check
|
2015-12-18 18:16:20 +00:00 |
|