Masy98
|
2feee3b316
|
Merge branch 'master' into blocks
Conflicts:
src/Items/ItemHandler.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
|
2014-09-26 18:32:31 +02:00 |
|
Howaner
|
96e03fc3ea
|
Added extra mushroom handler.
|
2014-09-12 19:34:19 +02:00 |
|
Masy98
|
8c3cd18cdd
|
Added 1.8 food to the food list
|
2014-09-11 15:57:36 +02:00 |
|
archshift
|
19067b27de
|
In 1.8, carrots and potatoes yield one less hunger point.
|
2014-09-03 16:18:58 -07:00 |
|
madmaxoft
|
1cc65b6264
|
Fixed style and alpha-sorting.
|
2014-09-03 10:29:10 +02:00 |
|
archshift
|
34d6f0713e
|
Added mutton, which sheep now drop when killed
|
2014-09-02 23:21:08 -07:00 |
|
Howaner
|
84462ba8b2
|
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
|
2014-07-31 23:04:00 +02:00 |
|
madmaxoft
|
93d29555e5
|
Style: Normalized to no spaces before closing parenthesis.
|
2014-07-21 17:40:43 +02:00 |
|
Tiger Wang
|
3fc848c95a
|
Fixed #626
* Fixed consumption of carrots and potatoes
|
2014-02-03 21:16:26 +00:00 |
|
Alexander Harkness
|
675b4aa878
|
Moved source to src
|
2013-11-24 14:19:41 +00:00 |
|