Skip to content

Commit 18199bc

Browse files
committed
Merge
2 parents 8cfacdc + 615ded0 commit 18199bc

File tree

117 files changed

+21257
-6229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+21257
-6229
lines changed

.gitattributes

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
**/target
22
**/*.rs.bk
33
**/.idea
4-
feather.toml
5-
massif.out*
64
.cargo
7-
/data/minecraft
5+
/data/minecraft
6+
7+
world/
8+
feather.toml

.rustfmt.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# We use rustfmt, and formatting is checked in CI.
2+
# Please run `cargo fmt` before committing
3+
4+
# Empty config: default settings!

0 commit comments

Comments
 (0)