Skip to content

Commit c6357bc

Browse files
committed
Merge branch 'dev' into 2.0
2 parents eea401e + d9774eb commit c6357bc

Some content is hidden

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

73 files changed

+5672
-4797
lines changed

.gitignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
**/target
22
.idea
3-
/src/crates/ferrumc_net/NBT_CODEC.nbt
4-
/src/crates/ferrumc_net/NBT_CODEC.zlib
3+
/src/net/NBT_CODEC.nbt
4+
/src/net/NBT_CODEC.zlib
55
**/rustc-ice*
6+
.zed
7+
/data
8+
chunk.json
9+
dummyregion.mca

0 commit comments

Comments
 (0)