Commit f4db3e7

committed

Fix merge conflict

2 parents e00b7cd + 9477a19 commit f4db3e7Copy full SHA for f4db3e7

27 files changed

+189

-2015

lines changed

.rustfmt.toml
Cargo.lock
Cargo.toml
data
- build.rs
generator
- Cargo.toml
- biomes.sh
- block_format.md
- blocks.sh
- item_format.md
- items.sh
- src
  - biome.rs
  - block_data.rs
  - cli.yml
  - item_to_block
    - mod.rs
  - item
  - main.rs
  - rust.rs
  - util.rs
server
- lighting/src
  - lib.rs
- player/src
  - lib.rs
- src
  - lib.rs
  - shutdown.rs
- types/src
  - events.rs
- util/src
  - time.rs
- weather/src
  - lib.rs

27 files changed

+189

-2015

lines changed

`‎.rustfmt.toml‎`

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +# We use rustfmt, and formatting is checked in CI.
 +# Please run `cargo fmt` before committing
++
 +# Empty config: default settings!

Comments

(0)