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 |
|
Julian Laubstein
|
9d07be62d3
|
Changed static_cast to FloorC
|
2015-11-23 18:10:58 +01:00 |
|
Alexander Harkness
|
68218f6ae6
|
Merge pull request #2683 from Gargaj/patch-1
add Golden Carrot
|
2015-11-23 16:47:33 +00:00 |
|
Gargaj
|
2971758df3
|
add Golden Carrot
Yay!
|
2015-11-23 17:39:40 +01:00 |
NiLSPACE
|
002019e9ad
|
Merge pull request #2680 from cuberite/vhE
Converted some height validations to use cChunkDef::IsValidHeight()
|
2015-11-23 11:55:34 +01:00 |
|
Julian Laubstein
|
b87e0b6b15
|
Adjusted height validation using cChunkDef::IsValidHeight()
|
2015-11-23 03:17:32 +01:00 |
|
Julian Laubstein
|
07adddb810
|
Merge pull request #2678 from cuberite/ln
Adjusted in help messages for consistency
|
2015-11-23 02:48:35 +01:00 |
|
Julian Laubstein
|
2d8b265133
|
Added dash to helpstring output
|
2015-11-23 02:12:19 +01:00 |
|
Julian Laubstein
|
c32b5fcaa9
|
Removed dashes in help messages for consistency
|
2015-11-23 02:12:19 +01:00 |
|
Julian Laubstein
|
0bedfc58b2
|
Merge pull request #2679 from cuberite/vh
Added cChunkDef::IsValidWidth()
|
2015-11-23 02:09:55 +01:00 |
|
Julian Laubstein
|
62b41c351c
|
Added cChunkDef::IsValidWidth()
|
2015-11-23 01:30:48 +01:00 |
|
Safwat Halaby
|
be9e353f13
|
Merge pull request #2676 from SafwatHalaby/revert
Revert "Changed description to "Cuberite - Minecraft in C++!""
|
2015-11-22 18:27:54 +02:00 |
|
Safwat Halaby
|
5fae7a0eee
|
Revert "Changed description to "Cuberite - Minecraft in C++!""
This reverts commit f4406c047e.
|
2015-11-22 16:30:33 +02:00 |
|
Safwat Halaby
|
df4b9eb4fc
|
Merge pull request #2673 from SafwatHalaby/sh
compile.sh is now sh-compatible. (Unix, etc.)
|
2015-11-21 19:24:01 +02:00 |
|
Safwat Halaby
|
37921990a2
|
compile.sh is now sh-compatible. (Unix, etc.)
|
2015-11-21 18:59:02 +02:00 |
|
Safwat Halaby
|
628ce5e394
|
Merge pull request #2672 from SafwatHalaby/readme
Readme update - organized the installation methods
|
2015-11-21 18:32:39 +02:00 |
|
Safwat Halaby
|
c14ebd64c4
|
Readme update - organized the installation methods
|
2015-11-21 16:36:24 +02:00 |
|
Mattes D
|
19d38291fb
|
Merge pull request #2671 from SafwatHalaby/compile
compile.sh - Automatically choose master branch
|
2015-11-21 14:52:01 +01:00 |
|
Safwat Halaby
|
acedc7f6d1
|
compile.sh - Automatically choose master branch
|
2015-11-21 15:50:25 +02:00 |
|
Alexander Harkness
|
38a01cec75
|
Merge pull request #2660 from cuberite/worktycho-patch-2
Fix musl + clang 3.6 compile error
|
2015-11-20 16:53:12 +00:00 |
|
Julian Laubstein
|
2dcc55b6b6
|
Merge pull request #2663 from SafwatHalaby/minor
Changed server description to "Cuberite - Minecraft in C++!"
|
2015-11-20 09:32:26 +01:00 |