From eb997601a427dfe42449bc6d3221a002f4366216 Mon Sep 17 00:00:00 2001
From: Kotolegokot <gkotolegokot@gmail.com>
Date: Wed, 19 Dec 2012 23:12:49 +0600
Subject: [PATCH] Fixed coals

---
 mods/minerals/init.lua                   |  14 ++++----------
 mods/minerals/textures/minerals_coal.png | Bin 415 -> 0 bytes
 mods/ores/init.lua                       |  11 +++++------
 mods/ores/textures/ores_coal.png         | Bin 998 -> 0 bytes
 4 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 mods/minerals/textures/minerals_coal.png
 delete mode 100644 mods/ores/textures/ores_coal.png

diff --git a/mods/minerals/init.lua b/mods/minerals/init.lua
index fbcdee3..63cb90f 100644
--- a/mods/minerals/init.lua
+++ b/mods/minerals/init.lua
@@ -2,7 +2,6 @@ MINERALS_LIST={
 	'lapis',
 	'anthracite',
 	'lignite',
-	'coal',
 	'bituminous_coal',
 	'magnetite',
 	'hematite',
@@ -45,7 +44,6 @@ MINERALS_DESC_LIST={
 	'Lapis',
 	'Anthracite',
 	'Lignite',
-	'Coal',
 	'Bituminous coal',
 	'Magnetite',
 	'Hematite',
@@ -111,14 +109,14 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "minerals:brown_coal",
+	recipe = "minerals:lignite",
 	burntime = 25,
 })
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "minerals:coal",
-	burntime = 40,
+	recipe = "minerals:bituminous_coal",
+	burntime = 35,
 })
 
 minetest.register_craft({
@@ -127,8 +125,4 @@ minetest.register_craft({
 	burntime = 50,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "minerals:bituminous_coal",
-	burntime = 25,
-})
+minetest.register_alias("minerals:brown_coal", "minerals:lignite")
diff --git a/mods/minerals/textures/minerals_coal.png b/mods/minerals/textures/minerals_coal.png
deleted file mode 100644
index 82dc3ead5c7ba6c492b75bf5f61593c1240a3882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<CSDdD-Kf+gKcFe{o-U3d7N^fn
zKHbG+DB$Y9>e3N5@mpOifBxGSYd$*UZlyLivgg|mkHZIYmX&GhnX8AIe>iR={P$CI
z?%K$Zsb|xgI}+BWZofUTc-^a~dl#-+b3J?7Y1P|rr%e&MR~@p|OU+d0xy&&MCk`Dk
z?gmfcm3wWU_ZZr5S$(x@S>`IWPkrzA9<TP-Y?V+pbSpX+vp$?**ShK%3<>u?279##
z2nhBaSFXMPc+TSY)oqCqz3)Vx9X=4{&GFE%bWSmYiLbL}>$cp?+tUs|bU62OGJ`_P
zhoXIV^X^;kKmWASPM*!sEy&B_xf@r*>8FPbcp|dh4@Vhvt-4ey%kcbj<sM&`fKV^Z
zIeyCxBPM&!Ih)3C=6UhA-+#LwSWcZ>|FAMN*zlkHSJqOds(0<r_&@>A;OXk;vd$@?
F2>|6+swe;e

diff --git a/mods/ores/init.lua b/mods/ores/init.lua
index 0b49830..5f815c4 100644
--- a/mods/ores/init.lua
+++ b/mods/ores/init.lua
@@ -322,10 +322,9 @@ end
 minetest.register_on_generated(function(minp, maxp, seed)
 	local pr = PseudoRandom(seed)
 	local gen_ores = {
-		{"ores:lignite", -3000, -1000},
-		{"ores:coal", -6000, -3000},
-		{"ores:anthracite", -31000, -6000},
-		{"ores:bituminous_coal"},
+		{"ores:lignite", -3000, -500},
+		{"ores:bituminous_coal", -6000, -3000},
+		{"ores:anthracite", -8000, -6000},
 		{"ores:bismuthinite"},
 		{"ores:magnetite"},
 		{"ores:hematite"},
@@ -345,7 +344,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		{'ores:cryolite'},
 		{'ores:galena'},
 		{'ores:garnierite'},
-		{'ores:graphite'},
+		{'ores:graphite', -31000, -8000},
 		{'ores:gypsum'},
 		{'ores:jet'},
 		{'ores:kaolinite'},
@@ -434,5 +433,5 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ores:peat",
-	burntime = 25,
+	burntime = 15,
 })
diff --git a/mods/ores/textures/ores_coal.png b/mods/ores/textures/ores_coal.png
deleted file mode 100644
index 0555fb644c32649fee94029257f84c9ddca6e20f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 998
zcmV<C0~!2@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk(
z3IZRy6z{7500U-8L_t(I%T3SAQd?yJ!14cg^5q8PPACPMfDj2p3KUC+q1F*~bkuR7
zwYx5S0d?h!?_kH38{fe$6pBhEP`nhJN(+`opq+x;n#;+RoSfV~7mkiE@SFLGk3RX3
zYQ0Rr(+1K?L)B=pySV+`ib|)mbcQ21Ee1u?<n1?R#Hm@Km@TmRU<+HT7g=l6vDsSK
zd2*r>i3HVZlg~c=Se&G95*vzOwM#<bi12z`2&rgqYvVLmWN0MD?!#?lCRt=C+C{nI
z5>A_6cQ_2+=QqAoD2<Dg<3eZxUDv5KYn1g8x?Ut6|4o^d8dFmjgl3v$R@XL3pEL<S
z*WugU*(aOJGd3RM_w@~Ke!ZX?3cM~KLOEDmTve%58fb#FARq5ORdvnF<b)xnr>+P<
zB@(*;Y;W(Ya#^vl{*Y8M$=cm5l}_sb6pBSQHujWulFSh4^N9XPA4^Mj=<4hg(dYp2
z_|MpEcKlvDp->k_xyI#}CdKvZ?+E~ll+=w3^8CoKI6wS6#cY+0t!D&}kLl<<OK&(t
zK3||>R*~Cw>{7!Y?BTRhVjvO{yF2?TmC=ziGnbjW^`nZ742!Yh9y|dTlb1%tt+}|m
zv$BcH)q1b3&BK$O1j%d#vz$i&LBCJD_SQRS-+nW%{DBVA$pa#TVQkXEpO2mbkV_wN
zTFgx(a|(-9(mym!y(w_J{fv$dbNAN`rKQq3`BE8wz{ia*z9Li5+1~yKXg_lfo6}1!
zd7vy-H}`*;#V8huMtg7vTFGbjkg5rKT4yzzQKJ*nqEf1}x3^C|TN0&QMoFn*bF>gX
z*NdJ!#^ZJ)tyY$9uPMVY5m&Fh$^G>|l)WwR-%mp^K5;=bRaGs=SLyCLLp0Ve1_uWy
z7$))gMJ1&rdw7)cX^lo5i&ftH|8Hz^S{xo8;PrUL%dcF*>9k`J7Jm4Ck(GsIC8Y(~
z67;pWf@m|ZPh)r3U;OtsaWNtutZ$M$(Ww|E3fYqA4xJ?yi}J$Q5PH6WYzdNjmg4HQ
zX`#){E)(<zsG0^Ix10Id6>4T4x2Kh!zCn6Io#gbK*xXFetkrN>o9sW{VQ8>j7-bXL
z-5KQgq`=gbSB2jTf9)O7tT%xMwVH`)g3<z1j1o>~JH7oOQ7#pE|ATi~nEQ#p0XsyT
U9tHUzfB*mh07*qoM6N<$f}qvSRsaA1