merge upstream

This commit is contained in:
Milan 2019-02-07 13:17:18 +01:00
commit 2e451bd11e
236 changed files with 7780 additions and 2577 deletions

View file

@ -1 +1,3 @@
name = Illuna
name = TechEth Game
author = minetest, illuna
description = Game of the Illuna TechEth flagship-server, based on the official minetest_game