Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve mergeconflicts

Browse source
This commit is contained in:
Milan Ihl 2020-08-17 22:07:15 +02:00
commit 029ab5aa0c
488 changed files with 9848 additions and 2154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
game.conf
View file

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