Commit Graph

4037 Commits

Author SHA1 Message Date
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
Mini-Chiss
d41ab3432f remove paintbrush when moved away 2015-08-11 21:13:45 +02:00
libraryaddict
72adf21bff Gadget Paintball: Add particles on impact, change block break effect to stone break sound. 2015-08-12 06:23:13 +12:00
fooify
07bdbdde46 minor grammar issue 2015-08-11 09:55:10 -07:00
fooify
ddc663cc75 remove duplicate method 2015-08-11 09:52:04 -07:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Mini-Chiss
18843c2cc6 Merge branch 'Bonus' 2015-08-11 17:05:59 +02:00
Mini-Chiss
83a010c215 enabled summer sale msg 2015-08-11 17:05:41 +02:00
Mini-Chiss
89dab7ec85 some little fixes 2015-08-11 16:33:32 +02:00
Sarah
f7d9476191 Hidden egg fix 2015-08-11 13:53:36 +02:00
Sarah
5c7d140521 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-11 13:49:53 +02:00
Sarah
e25558fc91 Animation improvements. 2015-08-11 13:49:06 +02:00
Mini-Chiss
cfcfbbed3b removed double gem 2015-08-11 13:34:32 +02:00
Mini-Chiss
49d54d4dd3 doesnt count rank thingy as reward if no rank. yknow 2015-08-11 13:22:58 +02:00
Mini-Chiss
b348c62a3f Merge branch 'EventGameUpdates' 2015-08-11 13:01:33 +02:00