1
0
Commit Graph

8887 Commits

Author SHA1 Message Date
Alexander Harkness
b650508d4b Merge pull request #2253 from jammet/patch-7
Update crafting.txt
2015-06-16 17:37:32 +01:00
jammet
de448fde70 Update crafting.txt
Some more block types you can create by mixing others.
2015-06-16 18:35:34 +02:00
Alexander Harkness
49e94375c0 Merge pull request #2252 from jammet/patch-7
Update crafting.txt
2015-06-16 16:47:25 +01:00
jammet
144f47e234 Update crafting.txt
You can make Andesite by combining Diorite and Cobblestone in Vanilla. The recipe was missing.
2015-06-16 17:43:57 +02:00
Mattes D
8eb6bde881 Merge pull request #2249 from cuberite/old-chunk-serializer
Removed version 2.9 serilization
2015-06-16 11:58:26 +02:00
tycho
6687ed03a1 Removed version 29 serilization
This has been unused since support for <1.7 has been dropped.
2015-06-16 10:24:06 +01:00
Alexander Harkness
88d5891a82 Merge pull request #2248 from cuberite/clang3.6
Fixed override
2015-06-15 18:42:13 +01:00
tycho
b259ab53fb Fixed override
This was causing a compile error in clang 3.6
2015-06-15 18:03:54 +01:00
Tiger Wang
f8c7efdcd7 Merge pull request #2244 from martindev2/#2092-TNT-Fire
Fix block placement over fire
2015-06-14 22:01:09 +01:00
worktycho
0cd64ab90b Fixed tigers format string 2015-06-14 13:18:01 +01:00
Martin McArthur
d8865339f5 implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top 2015-06-14 12:53:09 +01:00
Tiger Wang
882f7c70c0 Fixed log files' timestamps
Also made Release mode log less technical information about the world
storage threads.
2015-06-14 11:23:14 +01:00
worktycho
d961693020 Merge pull request #2237 from lkolbly/master
Fixing how village doors are generated in 1.8.
2015-06-13 21:55:36 +01:00
NiLSPACE
8ecd545857 Merge pull request #2240 from cuberite/UpdatedPrefabs
Updated prefabs from the Gallery server.
2015-06-13 18:29:46 +02:00
Mattes D
ec4bd42dd8 Updated prefabs from the Gallery server. 2015-06-13 18:14:09 +02:00
Lane Kolbly
dafdded7d9 Fixed typo in BlockDoor.h 2015-06-13 08:00:20 -05:00
Alexander Harkness
ce93cfc34c Merge pull request #2193 from nounoursheureux/master
Added HOOK_KILLED
2015-06-13 11:59:07 +01:00
Nounours Heureux
ee28d71839 Added documentation for HOOK_KILLED 2015-06-13 11:16:44 +02:00
Nounours Heureux
d79f601d5a Added HOOK_KILLED 2015-06-13 10:00:31 +02:00
Mattes D
f0ee0b8ce8 NetherPortalScanner: Fixed type conversion warnings. 2015-06-13 08:46:05 +02:00
Alexander Harkness
ee3082a3c5 If defined, not just if. 2015-06-12 12:37:22 +01:00
Alexander Harkness
070801d561 Fixed build error on Linux 2015-06-12 11:57:34 +01:00
Alexander Harkness
001305247f Merge pull request #2231 from cuberite/SelfTestRegistering
SelfTests are registered and executed after logging framework init.
2015-06-12 11:00:47 +01:00
Mattes D
d390214929 SelfTests are registered and executed after logging framework init.
Fixes #2228.
2015-06-11 22:20:04 +02:00
Alexander Harkness
d3976917b1 Update gratipay 2015-06-11 19:32:13 +01:00
Alexander Harkness
47d78ab99c Merge pull request #2229 from cuberite/readme-namechange
Name change updates.
2015-06-11 19:31:02 +01:00
Alexander Harkness
d4eb98bcae Update GETTING-STARTED.md 2015-06-11 17:35:51 +01:00
Alexander Harkness
f3edfc0be4 Update CONTRIBUTORS 2015-06-11 17:34:10 +01:00
Alexander Harkness
372020b524 Update LICENSE 2015-06-11 17:33:37 +01:00
Alexander Harkness
79f51c6aff Name change updates. 2015-06-11 17:32:49 +01:00
Alexander Harkness
7a317a6a59 Update README.md 2015-06-11 17:03:53 +01:00
Alexander Harkness
cb0618326f More name change. 2015-06-11 16:59:34 +01:00
Alexander Harkness
86d18a4ac2 More name changes. 2015-06-11 16:56:34 +01:00
Mattes D
d436a71cbc Merge pull request #2162 from lkolbly/master
Nether Portal Jumping & Creation Code
2015-06-10 08:00:50 +02:00
Lane Kolbly
73b6a44d5f Implemented nether portal scanning code. 2015-06-09 18:23:57 -05:00
Alexander Harkness
f163cb1ebf Update build download links. 2015-06-09 16:24:36 +01:00
Alexander Harkness
1e77f27191 Merge pull request #2144 from mc-server/comparators
Redstone improvements [SEE DESC]
2015-06-09 09:15:08 +01:00
Julian Laubstein
87a8df7cde Merge pull request #2221 from mc-server/AreaCountBlocks
cBlockArea: Added CountSpecificBlocks() API function.
2015-06-08 23:05:49 +02:00
Mattes D
db863422b8 cBlockArea: Added CountSpecificBlocks() API function. 2015-06-08 21:52:13 +02:00
Alexander Harkness
2ea316b746 Merge pull request #2212 from mc-server/revert-2179-ChunkQueueCollapsing
Revert "Chunk queue collapsing"
2015-06-07 20:47:47 +01:00
worktycho
adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
Alexander Harkness
f1a3535d6e Merge pull request #2210 from nounoursheureux/bucket-craft
Cake crafting now give back the bucket
2015-06-07 14:43:16 +01:00
Alexander Harkness
e2c4a0a595 Merge pull request #2211 from jan64/master
Fix incorrent experience sending for 1.7 clients
2015-06-07 14:41:27 +01:00
Nounours Heureux
24210cbd6f Fixed style 2015-06-07 15:22:47 +02:00
jan64
be4a5a0803 Fix incorrent experience sending for 1.7 clients 2015-06-07 15:21:18 +02:00
Nounours Heureux
1a7e8f3e4f Cake crafting now give back the bucket 2015-06-07 15:03:47 +02:00
Tiger Wang
061866616d Added moar comments 2015-06-07 12:54:07 +01:00
Tiger Wang
f44d123ba8 Vector hasher is now a separate class 2015-06-07 12:53:59 +01:00
Alexander Harkness
4ece4a61f6 Merge pull request #2153 from mc-server/gcc5
Update SQLite
2015-06-06 13:52:58 +01:00
tycho
74e7f8fb53 Disable column metadata 2015-06-06 13:22:56 +01:00