From f039c8d1b6643e362d7832a7fe6717400eba8632 Mon Sep 17 00:00:00 2001
From: Ginger88895 <soft_ginger@live.cn>
Date: Tue, 28 Jan 2014 09:02:46 -0500
Subject: [PATCH] Added some details about conflicts about the original TNT mod

---
 README.txt         |  2 ++
 README.txt~        | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 bettertnt/init.lua |  6 +++---
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 README.txt~

diff --git a/README.txt b/README.txt
index 3ef625d..4376921 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,8 @@
 === TNT-MOD for MINETEST-C55 ===
 by minermoder27
 derived from PilzAdam's TNT mod and HybridDog's TNT mod.
+WARNING: Purge PilzAdam's TNT mod before using this mod. Otherwise it
+would cause conflict and eventually crash the game.
 
 Introduction:
 This mod adds 10 types TNT to Minetest. TNT is a tool to help the player
diff --git a/README.txt~ b/README.txt~
new file mode 100644
index 0000000..3ef625d
--- /dev/null
+++ b/README.txt~
@@ -0,0 +1,51 @@
+=== TNT-MOD for MINETEST-C55 ===
+by minermoder27
+derived from PilzAdam's TNT mod and HybridDog's TNT mod.
+
+Introduction:
+This mod adds 10 types TNT to Minetest. TNT is a tool to help the player
+in mining.
+
+How to install:
+Unzip the archive an place it in minetest-base-directory/mods/minetest/
+if you have a windows client or a linux run-in-place client. If you have
+a linux system-wide instalation place it in ~/.minetest/mods/minetest/.
+If you want to install this mod only in one world create the folder
+worldmods/ in your worlddirectory.
+For further information or help see:
+http://wiki.minetest.com/wiki/Installing_Mods
+
+How to use the mod:
+Craft gunpowder by placing coal and gravel in the crafting area. The
+gunpowder can be used to craft TNT or as fuze for TNT.
+
+To craft TNT1 place gunpowder in a + shape.
+To craft TNT2 surround TNT1 with 4 gunpowder in a + shape.
+To craft TNT3 surround TNT2 with 4 gunpowder in a + shape.
+To craft TNT4 surround TNT3 with 4 gunpowder in a + shape.
+Right up to TNT10.
+
+There are different ways to blow up TNT:
+1. Hit it with a torch.
+2. Hit a gunpowder fuze that leads to a TNT block with a torch.
+3. Activate it with mesecons (fastest way)
+
+License:
+WTFPL (see below)
+
+See also:
+http://minetest.net/
+
+         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/bettertnt/init.lua b/bettertnt/init.lua
index 54865fb..b2b8415 100644
--- a/bettertnt/init.lua
+++ b/bettertnt/init.lua
@@ -7,8 +7,7 @@ local tnt_tables = {["bettertnt:tnt1"] = {r=1},
 					["bettertnt:tnt7"] = {r=12},
 					["bettertnt:tnt8"] = {r=14},
 					["bettertnt:tnt9"] = {r=16},
-					["bettertnt:tnt10"] = {r=18},
-					["tnt:tnt"] = {r=2}}
+					["bettertnt:tnt10"] = {r=18}}
 
 tnt = {}
 tnt.force = {
@@ -188,6 +187,7 @@ end
 function boom_id(pos, time, player, id)
 	minetest.after(time, function(pos)
 		
+		print(id);
 		local tnt_range = tnt_tables[id].r * 6
 	
 		local t1 = os.clock()
@@ -440,7 +440,7 @@ minetest.register_abm({
 minetest.register_craft({
         output = "bettertnt:gunpowder",
         type = "shapeless",
-        recipe = {"default:coal_lump", "default:gravel", "default:coal_lump"}
+        recipe = {"default:coal_lump", "default:gravel"}
 })