Safwat Halaby
6995af05fe
Merge pull request #2735 from SafwatHalaby/mathias2
...
Attempt 2 - Fixed a few crafting recipes
2015-12-12 18:58:07 +02:00
Mathias
671e81966b
Fixed a few crafting recipes
2015-12-12 18:39:01 +02:00
Safwat Halaby
1dd12c07a8
Merge pull request #2732 from Gargaj/patch-5
...
Nether wart only ages to 3
2015-12-12 11:13:17 +02:00
Gargaj
115865f845
Nether wart only ages to 3
...
See http://minecraft.gamepedia.com/Nether_Wart
2015-12-12 00:46:01 +01:00
worktycho
afb9ea126c
Merge pull request #2721 from bmintz/patch-1
...
Put the entire "automatic compile" script in a code block for security
2015-12-11 00:22:20 +00:00
Benjamin Mintz
2503691c8e
Merge branch 'master' into patch-1
2015-12-10 18:07:03 -06:00
Gargaj
56e7329f29
Test for correct coordinates when fishing
...
Fun fact: this was able to actually deadlock the server depending on where you were standing :)
2015-12-10 18:06:36 -06:00
Benjamin Mintz
65c89f052b
Put the entire compile.sh script in a code block for security
...
This makes sure that sh will error out if the connection is interrupted.
See here: https://www.seancassidy.me/dont-pipe-to-your-shell.html
2015-12-10 18:06:16 -06:00
Alexander Harkness
4b10146b2e
Merge pull request #2727 from Gargaj/patch-4
...
Test for correct coordinates when fishing
2015-12-10 21:04:45 +00:00
Gargaj
d05fdbdee9
Test for correct coordinates when fishing
...
Fun fact: this was able to actually deadlock the server depending on where you were standing :)
2015-12-10 20:54:55 +01:00
Julian Laubstein
2b2e0f3b2c
Merge pull request #2720 from cuberite/OreNestsFix
...
Fixed opposite condition in OreNests finisher.
2015-12-09 14:02:50 +01:00
Mattes D
b8fe09901b
Fixed opposite condition in OreNests finisher.
2015-12-09 08:03:33 +01:00
Mattes D
ac8504a6ef
Merge pull request #2706 from Gargaj/deadcreeper
...
Stop creepers from exploding even if they just died
2015-12-09 07:47:06 +01:00
Gargaj
86ea2ee50c
stop creepers from exploding even if they just died
2015-12-08 22:34:32 +01:00
Julian Laubstein
d75ab544f4
Small spelling issues fixed
2015-12-08 21:58:53 +01:00
Mattes D
68e575c917
Merge pull request #2713 from Gargaj/patch-2
...
Tilling dirt should send block update
2015-12-06 13:40:45 +01:00
Gargaj
41761624c2
Tilling dirt should send block update
...
There are BUD switches that are built on this (https://www.youtube.com/watch?v=Bk_ChvmtCNY ) but more prominently, torches placed on dirt blocks should pop off when the dirt block is tilled.
2015-12-06 12:59:38 +01:00
Safwat Halaby
4d730c63b3
Merge pull request #2714 from Gargaj/patch-3
...
Spawn chickens from eggs as babies
2015-12-06 08:01:40 +02:00
Gargaj
4132ff495c
Spawn chickens from eggs as babies
...
This actually works now with the breeding patch (would also close https://github.com/cuberite/cuberite/pull/2366 )
2015-12-05 15:54:34 +01:00
worktycho
a5ff59d6b6
Merge pull request #2694 from SafwatHalaby/documentation
...
Update COMPILING.md
2015-12-04 12:40:02 +00:00
Safwat Halaby
33729ec084
Update COMPILING.md
2015-12-03 23:48:41 +02:00
Mattes D
f9a3eb0278
Merge pull request #2704 from Gargaj/patch-1
...
Fix wolf collars
2015-12-03 16:20:48 +01:00
Gargaj
7a7cc1e66f
fix wolf collars
...
I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue)
2015-12-03 15:13:03 +01:00
Mattes D
ef7c6ea7e7
Merge pull request #2707 from Gargaj/rabbitstew
...
Merge cItemMushroomSoupHandler into cItemFoodHandler
2015-12-03 15:12:07 +01:00
Julian Laubstein
f35e5e1d75
Merge pull request #2711 from cuberite/FixFreeBSDBuild
...
Use C++11 auto instead of per-platform types.
2015-12-03 14:58:01 +01:00
Gargaj
72b2ab6406
Merge mushroom soup into generic food handler
...
...and fix eating the bowl when eating rabbit stew
2015-12-03 14:55:32 +01:00
Mattes D
03a972ec55
Use C++11 auto instead of per-platform types.
...
Closes #2686 .
2015-12-03 14:39:36 +01:00
Mattes D
213419a4cc
Merge pull request #2699 from SafwatHalaby/breedDocs
...
Breeding documentation
2015-12-03 13:57:58 +01:00
Mattes D
3fb3566484
Merge pull request #2422 from cuberite/PieceStructuresGen
...
Added PieceStructures generator.
2015-12-03 13:07:23 +01:00
Mattes D
3de22f5183
Changed Nether defaults to use PieceStructures.
2015-12-01 11:39:02 +01:00
Mattes D
2c3d933349
Added more details to the cubeset format documentation.
2015-12-01 10:35:08 +01:00
Mattes D
b8fbba5eb9
Added PieceStructures generator.
2015-12-01 10:35:07 +01:00
Safwat Halaby
dbda48ead4
Added documentation for breeding code
2015-11-30 12:05:38 +02:00
Safwat Halaby
1a9c023d6c
Merge pull request #2696 from Gargaj/breeding
...
Implement aging + breeding
2015-11-30 08:58:02 +02:00
Gargaj
4ae3b64b07
implement breeding
2015-11-29 20:14:28 +01:00
NiLSPACE
93afb6398d
Updated DumpInfo plugin
2015-11-29 17:28:02 +01:00
Mattes D
ac0a360915
Merge pull request #2693 from cuberite/NormalizeOrePocketConfigNames
...
Normalized OrePockets generator config names.
2015-11-28 16:57:41 +01:00
Mattes D
851ee6a27f
Normalized OrePockets generator config names.
...
All INI values use AllInitialCapsStyle, no underscores.
2015-11-27 12:44:42 +01:00
Julian Laubstein
d6ad5245b3
Merge pull request #2670 from cuberite/OrePockets
...
Added OrePockets and DirtPockets finish gens.
2015-11-25 16:52:32 +01:00
Mattes D
326f5e04f7
OrePockets finisher is now configurable.
2015-11-25 15:06:32 +01:00
Mattes D
f2a8d5c047
Added OrePockets and DirtPockets finish gens.
2015-11-25 09:22:20 +01:00
worktycho
5f2c226e1a
Merge pull request #2687 from Gargaj/signfix
...
Fix escaped characters in signs
2015-11-24 21:15:13 +00:00
Gargaj
1fb89a5409
fix escaped characters in signs ( fixes #1736 , fixes #2170 )
2015-11-24 19:51:39 +01:00
Alexander Harkness
ae850e7b79
Merge pull request #2688 from bendl/master
...
Fixed 'Install on DigitalOcean' link in README.md
2015-11-24 18:42:32 +00:00
Ben Lancaster
d2af54992d
Fixed 'Install on DigitalOcean' link in README.md
2015-11-24 18:32:57 +00:00
Julian Laubstein
412e5155a2
Merge pull request #2685 from dave-tucker/fxenum
...
Add enum for Sound and Particle Effects
2015-11-24 15:43:05 +01:00
Dave Tucker
83870f9fc0
Add enum for Sound and Particle Effects
...
Fixes #2603
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-24 13:21:40 +00:00
worktycho
2d408e8647
Merge pull request #2645 from Gargaj/followedarray
...
Allow multiple followable items
2015-11-23 22:57:59 +00:00
Gargaj
853e6e6882
change from single followable item to multiple
2015-11-23 22:20:31 +01:00
Julian Laubstein
5d5f5c9fba
Fixed display of helpmessage
2015-11-23 18:20:37 +01:00
