Merge branch 'master' into 'version1.15'

Browse Source

# Conflicts:
#   src/main/java/de/bixilon/minosoft/Minosoft.java
#   src/main/java/de/bixilon/minosoft/util/ChunkUtil.java

...

This commit is contained in:

Bixilon 2020-07-28 13:49:57 +02:00

parent 60da329683 842bf9118b

commit 73c4dfe687

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available