mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Fix rebase
This commit is contained in:
parent
e1fcb3744e
commit
c2a2361c22
@ -42,8 +42,6 @@ make_case_elim!(
|
||||
Wood = 0x40,
|
||||
Leaves = 0x41,
|
||||
// 0x42 <= x < 0x50 is reserved for future tree parts
|
||||
Snow = 0x50,
|
||||
|
||||
// Covers all other cases (we sometimes have bizarrely coloured misc blocks, and also we
|
||||
// often want to experiment with new kinds of block without allocating them a
|
||||
// dedicated block kind.
|
||||
|
Loading…
Reference in New Issue
Block a user