Mini-Chiss
6ef3215516
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 13:25:41 +02:00
Mini-Chiss
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
Shaun Bennett
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
Shaun Bennett
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
Mini-Chiss
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Shaun Bennett
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
Shaun Bennett
94c00cdb72
Adding some comments
2015-08-13 04:05:28 -05:00
Shaun Bennett
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
Shaun Bennett
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
Shaun Bennett
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
Shaun Bennett
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
Shaun Bennett
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
Shaun Bennett
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
Jonathan Williams
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
Jonathan Williams
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
Jonathan Williams
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
Mysticate
ed7dbddf4a
Redid how kits are done.
2015-08-13 00:12:28 -04:00
Mysticate
d7e28e9eb8
You can no longer have the option to Evolve if you kill while dead.
2015-08-12 13:28:31 -04:00
Mini-Chiss
4f163af909
fixed a uid problem with maps
2015-08-12 18:36:29 +02:00
Mysticate
a7da10cb34
You no longer remain "charging" when you die.
2015-08-12 12:12:26 -04:00
Mysticate
ad94b63903
Blaze and Enderman now take water damage.
2015-08-12 10:46:12 -04:00
Mysticate
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
Mini-Chiss
fcfb2559b8
players cannot grab slime :O
2015-08-12 14:41:33 +02:00
Mini-Chiss
d1302e8dc3
fixed full msg
2015-08-12 12:42:59 +02:00
Mini-Chiss
5293e24469
fixed text
2015-08-12 11:58:40 +02:00
Mini-Chiss
cd5c7e7110
fixed kb
2015-08-12 11:23:19 +02:00
Shaun Bennett
37e5e97020
Fix experience reward displaying as game
2015-08-12 03:08:40 -05:00
Shaun Bennett
f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
Shaun Bennett
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
Mini-Chiss
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
Mini-Chiss
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
Mini-Chiss
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
Sarah
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
Sarah
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
Mini-Chiss
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
Mini-Chiss
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
Sarah
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
Mini-Chiss
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
Sarah
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
Sarah
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
Mini-Chiss
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
Mini-Chiss
e8963cc2af
fixed paintbrush
2015-08-12 08:10:43 +02:00
Mini-Chiss
2ed388552b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 07:59:39 +02:00
Shaun Bennett
99a94251fd
Fixes
2015-08-12 00:56:20 -05:00
Shaun Bennett
8e4ae35256
Merge remote-tracking branch 'remotes/origin/master' into Bonus
2015-08-12 00:56:04 -05:00
Shaun Bennett
4549c810d4
Fix for voting
2015-08-11 22:59:59 -05:00
Mini-Chiss
a7cc3e1aa6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-11 21:13:59 +02:00
