Merge remote-tracking branch 'upstream/master' into forkhausen

This commit is contained in:
Alexander Minges 2020-05-14 17:58:13 +02:00
commit c6b85fdf93
18 changed files with 73 additions and 51 deletions

View file

@ -8,7 +8,7 @@ End portal: Build an upright frame of red nether brick blocks, 4 blocks wide and
Created by maikerumine and Wuzzy.
Code license: MIT License (see `LICENSE`).
Texture license: See main MineClone 2 directory.
Texture license: See README.md in main MineClone 2 directory.
License of sound: [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
Authors: [FreqMan](https://freesound.org/people/FreqMan/) and Wuzzy