nalc
/
technology
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/jimy-byerley/minetest-technology 

Conflicts:
	README.md

	modified:   README.md
This commit is contained in:
jimy-byerley 2014-06-23 23:20:36 +02:00
parent e49d3dcafa 23adb05612
commit 70966d8c6b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -6,9 +6,17 @@ A minetest mod which provide some hi-tech stuff : flat screen, bronze structures
Install
=======
<<<<<<< HEAD
As other minetest mod : extract the zip file as "technology" in the `games/minetest_game/mods` directory.
=======
As other minetest mod : extract the zip file as "technology" in the games/minetest_game/mods directory.
>>>>>>> 23adb05612beee25e86052d11f6d5084ec06d3aa
Other
=====
See documentation.txt to learn more (about crafting for exemple).
<<<<<<< HEAD
See documentation.txt to learn more (about crafting for exemple).
=======
See documentation.txt to learn more (about crafting for exemple).
>>>>>>> 23adb05612beee25e86052d11f6d5084ec06d3aa