Mattes D
4976190516
Merge pull request #2836 from cuberite/FixDefaultWorldGenParams
...
Fixed default Nether generator params.
2015-12-30 13:37:50 +01:00
Mattes D
6c9be8df4b
Fixed default Nether generator params.
...
The prefab file is "NetherFort"
2015-12-30 13:37:28 +01:00
Mattes D
1210eb1316
Merge pull request #2831 from cuberite/BlockingSslClientSocketFix
...
Changed m_IsConnected to an atomic bool, added logging.
2015-12-30 13:36:17 +01:00
Mattes D
0054104017
Fixed problems in cBlockingSslClientSocket.
2015-12-30 13:00:02 +01:00
Julian Laubstein
2440b9bea1
Merge pull request #2837 from cuberite/FixMonsterBurn
...
Fixed the monster burn code.
2015-12-30 02:40:23 +01:00
Mattes D
902f428342
Fixed the monster burn code.
...
The old code failed when the monster was out of Y range.
2015-12-30 01:15:13 +01:00
Mattes D
7a778e2911
Debuggers plugin: Added "uuid" console command.
2015-12-28 11:08:46 +01:00
Mattes D
78eb4c8ed8
Removed excessive logging in redstone simulator.
2015-12-28 11:06:41 +01:00
Julian Laubstein
df9825ac09
Merge pull request #2829 from LogicParrot/fences2
...
Deleted cPath::BlockTypeIsFence
2015-12-27 15:53:05 +01:00
LogicParrot
fc8a117a0c
Deleted cPath::BlockTypeIsFence
2015-12-27 16:13:44 +02:00
Alexander Harkness
831270f74c
Merge pull request #2825 from Gargaj/snowlayers
...
fix crafting recipe for snow layers
2015-12-27 14:02:38 +00:00
LogicParrot
7ed8c47d2b
Merge pull request #2828 from LogicParrot/contrib
...
Update CONTRIBUTORS
2015-12-27 13:47:36 +02:00
LogicParrot
eb70550d4f
Update CONTRIBUTORS
2015-12-27 13:47:04 +02:00
Safwat Halaby
bfafc39576
Merge pull request #2814 from SafwatHalaby/chunk2
...
Freeze player until chunk is loaded
2015-12-26 21:08:12 +02:00
worktycho
b99b60720a
Merge pull request #2820 from cuberite/UrlParser
...
Added the cUrlParser class, exported to Lua API.
2015-12-26 19:01:37 +00:00
Gargaj
fb69688fe9
fix crafting recipe for snow layers
2015-12-26 16:49:40 +01:00
Mattes D
5c8a8f322f
Merge pull request #2789 from cuberite/apidump-analytics
...
Added analytics to APIDump
2015-12-26 16:47:43 +01:00
Alexander Harkness
23e2bc5042
Added analytics to APIDump
2015-12-26 14:10:53 +00:00
Julian Laubstein
c0732cc666
Added ProtoProxy and MCADefrag binaries to .gitignore
2015-12-26 00:19:25 +01:00
Safwat Halaby
79e7451316
Merge pull request #2822 from SafwatHalaby/fence
...
Update fences and gates list
2015-12-25 20:45:16 +02:00
Mattes D
958df6ad91
Added the cUrlParser class, exported to Lua API.
2015-12-25 18:50:25 +01:00
Safwat Halaby
687d1816c4
Update fences and gates list
...
Update fences and gates list
2015-12-25 19:19:22 +02:00
Safwat Halaby
400f875918
Freeze player until chunk is loaded
2015-12-25 17:47:06 +02:00
Safwat Halaby
6a22605fae
Merge pull request #2795 from SafwatHalaby/doors
...
"Special blocks" handling
2015-12-25 15:03:39 +02:00
Safwat Halaby
c4c839bee1
Merge pull request #2815 from SafwatHalaby/world
...
Nether and End in settings.ini by default, and created at startup
2015-12-25 14:05:50 +02:00
Safwat Halaby
b4649248d1
Nether and End in settings.ini by default, and created at startup
2015-12-25 13:49:13 +02:00
Safwat Halaby
87b2d60a0e
Merge pull request #2816 from SafwatHalaby/redstone
...
Silenced the Redstone Simulator console spam
2015-12-24 18:57:34 +02:00
Safwat Halaby
75fea3cd1e
Silenced the Redstone Simulator console spam
2015-12-24 17:58:34 +02:00
Mattes D
a8dd39acd1
Merge pull request #2801 from cuberite/ExposeJson
...
Added a Json parser and serializer to Lua API.
2015-12-24 14:02:05 +01:00
Mattes D
122d824a8a
Added a Json parser and serializer to Lua API.
2015-12-24 14:00:31 +01:00
Safwat Halaby
dfeced18b2
PF - "Special blocks" handling
2015-12-24 06:20:16 +02:00
Safwat Halaby
7b65ee4096
Merge pull request #2811 from cuberite/isblockfence
...
Added IsBlockFence method to defines.h
2015-12-24 06:19:07 +02:00
Julian Laubstein
d319c9dd58
Added IsBlockFence method to defines
2015-12-24 00:05:49 +01:00
worktycho
1221f80d98
Merge pull request #2808 from cuberite/freebsd32fix
...
Fixed builds on FreeBSD 32bit
2015-12-23 16:34:23 +00:00
Julian Laubstein
2713577dbf
Fixed builds on FreeBSD 32bit
2015-12-23 17:13:47 +01:00
worktycho
10c2d84198
Merge pull request #2807 from cuberite/UpdateLibEvent
...
Updated LibEvent.
2015-12-23 16:05:17 +00:00
Mattes D
4950cd6a19
Updated LibEvent.
...
Includes a fix to Unicode error messages for Windows builds.
2015-12-23 16:27:27 +01:00
Safwat Halaby
7285a43cf6
Merge pull request #2806 from SafwatHalaby/gargraj-chicken
...
[Gargaj] - Baby chickens don't lay eggs
2015-12-23 16:31:35 +02:00
Safwat Halaby
1ccf7d9c8a
Chicken egg code early bailout
2015-12-23 15:57:26 +02:00
Gargaj
fd2edf3ecf
Baby chickens don't lay eggs
2015-12-23 15:54:07 +02:00
Mattes D
8422ada77f
Fixed return value description in doxycomment.
2015-12-23 14:17:04 +01:00
Mattes D
44d2f37e7b
Merge pull request #2802 from mathias-github/master
...
Added 1.7 item names
2015-12-23 11:17:16 +01:00
Mathias
a72318bbc3
Added 1.7 item names
2015-12-22 23:19:35 +02:00
Julian Laubstein
3389b234ae
Merge pull request #2800 from cuberite/rconbuild-fix
...
Removed offending tr1 references.
2015-12-22 21:19:13 +01:00
Alexander Harkness
16d0bc10a4
Removed offending tr1 references.
2015-12-22 19:55:00 +00:00
Safwat Halaby
7a8b50f8d1
Merge pull request #2790 from Gargaj/waterbottle
...
Add handling of water bottle
2015-12-22 21:43:55 +02:00
Gargaj
8968a7174e
add handling of water bottle
2015-12-22 20:25:59 +01:00
Alexander Harkness
2b27bf9f22
Merge pull request #2796 from cuberite/MojangCert
...
Added GeoTrust Root Certificate
2015-12-22 16:39:09 +00:00
worktycho
76cd723867
Added GeoTrust Root Certificate
2015-12-22 16:08:02 +00:00
worktycho
ecb94e0dc6
Ignore == if followed by \
...
Ignore the space before == rule if immediately followed by a \. If it is imediatly followed by a \, then this is likely the base64 padding at the end of a certificate, which is followed by \n.
2015-12-22 16:08:02 +00:00
