From 23ec60fff05718b82320ddc8df856cc55ab9afba Mon Sep 17 00:00:00 2001 From: talamh Date: Mon, 10 Oct 2022 20:50:11 +0100 Subject: [PATCH] Change torch model, add soul fire flame particle texture --- .../mcl_particles_soul_fire_flame.png | Bin 0 -> 144 bytes .../textures/jeija_torches_off.png | Bin 141 -> 306 bytes .../textures/jeija_torches_on.png | Bin 141 -> 5768 bytes mods/ITEMS/mcl_blackstone/init.lua | 1 + .../textures/soul_torch_on_floor.png | Bin 1190 -> 180 bytes .../textures/soul_torch_on_floor_animated.png | Bin 1808 -> 239 bytes mods/ITEMS/mcl_torches/api.lua | 62 +++++++----- .../models/mcl_torches_torch_floor.obj | 81 ++++++++++++---- .../models/mcl_torches_torch_wall.obj | 89 +++++++++++++----- mods/ITEMS/mcl_torches/register.lua | 1 + .../textures/default_torch_on_floor.png | Bin 147 -> 184 bytes .../default_torch_on_floor_animated.png | Bin 197 -> 199 bytes 12 files changed, 167 insertions(+), 67 deletions(-) create mode 100644 mods/CORE/mcl_particles/textures/mcl_particles_soul_fire_flame.png diff --git a/mods/CORE/mcl_particles/textures/mcl_particles_soul_fire_flame.png b/mods/CORE/mcl_particles/textures/mcl_particles_soul_fire_flame.png new file mode 100644 index 0000000000000000000000000000000000000000..94022a6c33089206222b05d5787d6f5e629311d8 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxfL<4+6T!A$6v{~$pty(9~mwfzs z{_lSvU}ms91(aYc3GxeOaCmkj4am{-ba4#fkYzpC$auhjhe_eefB$zz49**SlpJTa mL@5Q&zf-IA{vGSADe_ZHIh3~9Ya9n^V(@hJb6Mw<&;$UZ%`OE1 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/REDSTONE/mesecons_torch/textures/jeija_torches_off.png b/mods/ITEMS/REDSTONE/mesecons_torch/textures/jeija_torches_off.png index cecdaf8fa96601b6584705613eb45cfa272a0c23..fff9a53a9f995e1851c9dc8e5ce220dd3b9b6ec0 100644 GIT binary patch delta 290 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 iJkg$kB|Qn9rYyU2)z4*}Q$iB}7rH1j diff --git a/mods/ITEMS/mcl_blackstone/init.lua b/mods/ITEMS/mcl_blackstone/init.lua index 995eb8f7e..99d168b15 100644 --- a/mods/ITEMS/mcl_blackstone/init.lua +++ b/mods/ITEMS/mcl_blackstone/init.lua @@ -342,6 +342,7 @@ mcl_torches.register_torch({ groups = {dig_immediate = 3, deco_block = 1}, sounds = mcl_sounds.node_sound_wood_defaults(), particles = true, + flame_type = 2, }) minetest.register_craft({ diff --git a/mods/ITEMS/mcl_blackstone/textures/soul_torch_on_floor.png b/mods/ITEMS/mcl_blackstone/textures/soul_torch_on_floor.png index 81bdddc07b5ff84fe791fa19b99b1c5fce3b9bc7..fc93c82d83a698e1856514317e8f9f1c3b4fc9d2 100644 GIT binary patch delta 163 zcmZ3+xrK3pWIZzj1A~Sxe=v|z5AX?b1=2FX!OF_YrlzJ2`}cc#dV1Ly20EC=dfKE1 zxfDjZS0s4te(@sq+p?!XrHmy(e!&b5&u*jvIo6&ojv*44xAuDSF(~jbZH)N-fB*H# zo~L8;oFf|QiyAsBSGl)`aqGIhn8}!WMomAeP->~nrPO48!)x9#cFGJZTbI9`2{ebn M)78&qol`;+03a?mZU6uP delta 1181 zcmV;O1Y-NN0j3F%8Gi-<001BJ|6u?C1H^h%SaechcOY2l6Y5P9qq;NMXH3*?k40hwMKd1Wx z59Q>YT1+8_;PGhI%mqU7*K^h6b$_21|02B8yZZ-*N>I!78h^%VU!b?w4pEQ3zSq0h zj-7N2(QSA?vPNF=X_t;6;Y&~F-R0A-=$q-B54U6X7=L`%h+uSsJz>W~NIbsN8b#KJ zr0lvtN@zr4kk_*`^m**uEj|SAmL6i~%hAjGP&gk>gYXceqbGaN%RLM~QhOQs-47+) zLwtzcoITAsu7BAT4Tw~5XHqXy*%BI7gi?05WiaAnkmD{HC1HvU#5!nJl;$WCBifUc zIu)8UcHOAKMdiT}HFE=lrArbybCZQYSE0#KvUDd2d>W_;)O`Cwd)&OoYm_i@C$waO zF+z_I#eJsyPPq-uxl)(Nr#n{gi&sv=jYV#KqZNSAJby8@9p7Eto4oOFzzPW34s*f; zi?5f7YV?|0vN;RdnOEnpr9rVD0|*huHaLSUR`LOfO@Vx5jzoxK0-plUS(GaXkQsM! z6Kq5R;9xaiZ1jn=+p_Vc#?}H5CP5<5WGR59YRI3c2{}|uOr4npiU>SbbM z8;D@R-w3i?U*bBQo~+$>JN|Fze?$KXLlX;ni&OpdI;F1{uGP<6q_uGwn!Zh32Y%v~ zdw-_G)OPvNn@qumQo^;|Rp1f!VKu@nIk$+5!V=d7^V!-x*@40pDjcdbwp0Zd2P0hA z$=JT_$X&aC=}5WeucQ&1<`P2*YGcQ&X!UMOxEKDk{wG7+FP{=lmMvLO3Ky)*Z+2$) zn-cpgL!Gb5`yx0ycJ3Gs+Iczk865XhT7O>{dXpySkgDvfT*R{OMz;PX`cS*Cet5RN z426769*$x4Zn5M{u^c+>+rfUeuI9FLOt?jC$+EY6(zQI3mF_3$jLY!$sI?;Qtl_>c zc;7TPaYxDSZ^AE{sl~s=#sB~S24YJ`L;xWGApjw81c5>T000SaNLh0L04^f{0Dmqc z0eGc9b^rhX2XskIMF-^q5)L5?8(s~B0001ENklD=TYORhgQaI_%%?2?U1@ zdD$2S96cK7U>b4!c&w*QdXP(DlzT;j*X|cD_Pu<0;MJ?cuV0^jq^krpg|Q^aFPOpM z*^M+HC)(4+F~s8Z(+S>u4GIFztCJ*I{#5^8y{k2Rmzv?i-DYonJ~fmXHB5c}a;?vc zKMvtx8C%(}Bu78#_Uq|0@+^8Bp?X93*6Y)c`wl7l#eS~X^x;JDb(?hxHiv!~%js)9 WXIVEfHnbmT4}+(xpUXO@geCxCOI=z3 delta 1804 zcmV+n2lM#v0gw)m8Gi-<000wx_m%(v1-yDxSaechcOYaYEw zjysOtf#?zVe0ZHZzsJ?9BYLj< z@`Bf6i7(i>Pk(h^*X}GAAXUP>sgJFk76x`e$!A)@Rq++H>$w^(#TEw`n_#o!8i5)m zpzV}tl9AIo&p`tz=Co49Go=9zcAs)hEe+ljEq}X4S>>9m)KY8J+NvpQR?(tWRhwE%jZwm+l~zO3)|wd>HH0?IHjFUqsdLX= zdg--mZ`}suGxCs8MjblZu$d-L*ngH;!_?WPEn1M$%1c&Rb?Iu$99nbs?Bd0%t2eg? zYjoT8g*AF(?$@l*&Dv%xpKPoQ}=%`7dCY_b6pMSeG@Qt)uKr@69>z7~a|8XDUqU%y_j7CrC|o114sp zw0}%vNk`>U?0QXKiAooQp%ZRt@Rhw`J15jyV*%M7J!7Xy+Xg9tPNA8Bog^s$;!3cw zL_19!Ei3d2E%e^koMW+1K~*19Mgx(3MU^?dtX0W@85Z+WOq-7+lU>z#rISQx6;l-z zE89R|twZ8$-cP0TJ*0@OYHdK3xz{TR#DDsf%}yr#lnqXsqP_vF&N?8X31rvSg~wL2 z@2$H+-s}Yv!P-tI#x=SO7o6rRjf_c!7mkN{w$szx(p=o5K~X|kNOHa!@EC64qw(Vt z(BmIVpSj=cLY!Vf51`o{H`(Eh?FzQdBqEtI6qN+R>BANN8tw%}0QPa?&9qbyKYwcP zNW6tLc&4sw323j89#oeJkWXfkn>}~&9hsXou(`5zn;vnlE?^6TJHXnB0|!SjSfCqW zoVfbvcJXO~W4vb2uVwfI{otpby>CS4g{XXo=nuJEsf2!H7CF~dHp6Wc9(|j@QDL%c z?p9Hr@+X09*Iwd066=M)_FNw*#)E0RN*-;I{?9dFm!lxw!+zYffX!{ zut;%l+Ti7Sy0p_)CsJMx6bRcmT$k`d_S&&x-}o7HYvcr6w3^{Z(uHyIS)bPnU&)20?;UoLl>(fL>96m_f@Ho#+Wc~MQk8KsqW!7lL!SBGC)>8jD+ zxq44HV!fRmzFPakNpJT4aQ6@1{{4(LcfW9U_+sssv*Q^1)z?QyUws|6vA0OV-&4@V zP~)XyO#lD@24YJ`L;xWGApjw81c5>T000SaNLh0L04^f{04^f|cz>lob^rhX2XskI zMF-^q5)L9DoX@8R0002hNkl 0 then - smoke_pdef.minrelpos = { x = 0.2, y = 0.04, z = -0.1 } - smoke_pdef.maxrelpos = { x = 0.38, y = 0.14, z = 0.1 } + smoke_pdef.minrelpos = { x = 0.2, y = 0.24, z = -0.1 } + smoke_pdef.maxrelpos = { x = 0.38, y = 0.34, z = 0.1 } elseif dir.z < 0 then - smoke_pdef.minrelpos = { x = -0.1, y = 0.04, z = -0.38 } - smoke_pdef.maxrelpos = { x = 0.1, y = 0.14, z = -0.2 } + smoke_pdef.minrelpos = { x = -0.1, y = 0.24, z = -0.38 } + smoke_pdef.maxrelpos = { x = 0.1, y = 0.34, z = -0.2 } elseif dir.z > 0 then - smoke_pdef.minrelpos = { x = -0.1, y = 0.04, z = 0.2 } - smoke_pdef.maxrelpos = { x = 0.1, y = 0.14, z = 0.38 } + smoke_pdef.minrelpos = { x = -0.1, y = 0.24, z = 0.2 } + smoke_pdef.maxrelpos = { x = 0.1, y = 0.34, z = 0.38 } else return end @@ -65,13 +68,25 @@ local function spawn_flames_wall(pos) maxexptime = 0.6, minsize = 0.7, maxsize = 2, - texture = "mcl_particles_flame.png", + texture = flame_texture[flame_type], glow = minetest.registered_nodes[node.name].light_source, }, "low") -- Smoke mcl_particles.spawn_smoke(pos, "torch", smoke_pdef) end +local function set_flames(pos, flame_type, attached_to) + if attached_to == "wall" then + return function(pos) + spawn_flames_wall(pos, flame_type) + end + end + + return function(pos) + spawn_flames_floor(pos, flame_type) + end +end + local function remove_flames(pos) mcl_particles.delete_node_particlespawners(pos) end @@ -124,6 +139,7 @@ function mcl_torches.register_torch(def) def.light = def.light or minetest.LIGHT_MAX def.mesh_floor = def.mesh_floor or "mcl_torches_torch_floor.obj" def.mesh_wall = def.mesh_wall or "mcl_torches_torch_wall.obj" + def.flame_type = def.flame_type or 1 local groups = def.groups or {} @@ -133,7 +149,8 @@ function mcl_torches.register_torch(def) groups.dig_by_water = 1 groups.destroy_by_lava_flow = 1 groups.dig_by_piston = 1 - + groups.flame_type = def.flame_type or 1 + local floordef = { description = def.description, _doc_items_longdesc = def.doc_items_longdesc, @@ -145,7 +162,6 @@ function mcl_torches.register_torch(def) inventory_image = def.icon, wield_image = def.icon, tiles = def.tiles, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -157,8 +173,7 @@ function mcl_torches.register_torch(def) drop = def.drop or itemstring, selection_box = { type = "wallmounted", - wall_top = {-1/16, -1/16, -1/16, 1/16, 0.5, 1/16}, - wall_bottom = {-1/16, -0.5, -1/16, 1/16, 1/16, 1/16}, + wall_bottom = {-2/16, -0.5, -2/16, 2/16, 1/16, 2/16}, }, sounds = def.sounds, node_placement_prediction = "", @@ -211,7 +226,7 @@ function mcl_torches.register_torch(def) return itemstack end, on_rotate = false, - on_construct = def.particles and spawn_flames_floor, + on_construct = def.particles and set_flames(pos, def.flame_type, "floor"), on_destruct = def.particles and remove_flames, } minetest.register_node(itemstring, floordef) @@ -223,7 +238,6 @@ function mcl_torches.register_torch(def) drawtype = "mesh", mesh = def.mesh_wall, tiles = def.tiles, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -234,13 +248,11 @@ function mcl_torches.register_torch(def) drop = def.drop or itemstring, selection_box = { type = "wallmounted", - wall_top = {-0.1, -0.1, -0.1, 0.1, 0.5, 0.1}, - wall_bottom = {-0.1, -0.5, -0.1, 0.1, 0.1, 0.1}, - wall_side = {-0.5, -0.5, -0.1, -0.2, 0.1, 0.1}, + wall_side = {-0.5, -0.3, -0.1, -0.2, 0.325, 0.1}, }, sounds = def.sounds, on_rotate = false, - on_construct = def.particles and spawn_flames_wall, + on_construct = def.particles and set_flames(pos, def.flame_type, "wall"), on_destruct = def.particles and remove_flames, } minetest.register_node(itemstring_wall, walldef) @@ -259,9 +271,9 @@ minetest.register_lbm({ action = function(pos, node) local torch_group = minetest.get_item_group(node.name, "torch") if torch_group == 1 then - spawn_flames_floor(pos) + spawn_flames_floor(pos, minetest.get_item_group(node.name, "flame_type")) elseif torch_group == 2 then - spawn_flames_wall(pos) + spawn_flames_wall(pos, minetest.get_item_group(node.name, "flame_type")) end end, }) diff --git a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj index ac4234d3e..b0683b59c 100644 --- a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj +++ b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj @@ -1,29 +1,72 @@ -# Blender v2.76 (sub 0) OBJ File: 'torch_on_floor_node.blend' +# Blender 3.3.1 # www.blender.org -o torch_Cube_Cube.001_Cube_Cube.001_Material.001 +mtllib mcl_torches_torch_floor.mtl +o cube.004 +v -0.062500 0.437500 -0.500000 +v -0.062500 -0.562500 -0.500000 +v -0.062500 0.437500 0.500000 +v -0.062500 -0.562500 0.500000 v 0.062500 0.062500 0.062500 v 0.062500 0.062500 -0.062500 +v 0.062500 -0.562500 0.062500 +v 0.062500 -0.562500 -0.062500 v -0.062500 0.062500 -0.062500 v -0.062500 0.062500 0.062500 -v -0.062500 -0.500000 0.062500 -v 0.062500 -0.500000 0.062500 -v 0.062500 -0.500000 -0.062500 -v -0.062500 -0.500000 -0.062500 +v -0.062500 -0.562500 -0.062500 +v -0.062500 -0.562500 0.062500 +v 0.500000 0.437500 0.062500 +v 0.500000 -0.562500 0.062500 +v -0.500000 0.437500 0.062500 +v -0.500000 -0.562500 0.062500 +v 0.500000 0.437500 -0.062500 +v 0.500000 -0.562500 -0.062500 +v -0.500000 0.437500 -0.062500 +v -0.500000 -0.562500 -0.062500 +v 0.062500 0.437500 -0.500000 +v 0.062500 -0.562500 -0.500000 +v 0.062500 0.437500 0.500000 +v 0.062500 -0.562500 0.500000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -0.0000 1.0000 +vn -1.0000 -0.0000 -0.0000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 vt 0.562500 0.500000 vt 0.562500 0.625000 +vt 0.562500 0.125000 +vt 0.562500 0.000063 vt 0.437500 0.625000 vt 0.437500 0.500000 -vt 0.437500 0.000000 -vt 0.562500 0.000000 -vt 0.562500 0.125000 +vt 0.437500 0.000063 vt 0.437500 0.125000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -vn 1.000000 0.000000 0.000000 -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/1 6/6/1 7/7/1 8/8/1 -f 1/2/2 6/6/2 5/5/2 4/3/2 -f 2/3/3 1/2/3 6/6/3 7/5/3 -f 3/2/2 2/3/2 7/5/2 8/6/2 -f 4/3/3 5/5/3 8/6/3 3/2/3 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +s 0 +usemtl m_0.002 +f 3/3/1 4/4/1 1/1/1 +f 4/4/1 2/2/1 1/1/1 +f 9/9/2 10/10/2 6/6/2 +f 10/10/2 5/5/2 6/6/2 +f 12/12/3 11/11/3 7/7/3 +f 11/11/3 8/8/3 7/7/3 +f 13/13/4 14/14/4 15/15/4 +f 14/14/4 16/16/4 15/15/4 +f 19/19/5 20/20/5 17/17/5 +f 20/20/5 18/18/5 17/17/5 +f 21/21/6 22/22/6 23/23/6 +f 22/22/6 24/24/6 23/23/6 diff --git a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj index 824223e6d..35c192c25 100644 --- a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj +++ b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj @@ -1,29 +1,72 @@ -# Blender v2.76 (sub 0) OBJ File: 'torch_on_wall_node.blend' +# Blender 3.3.1 # www.blender.org -o torch_wall_Cube_Cube.001_Cube_Cube.001_Material.001 -v 0.062469 -0.303502 0.086070 -v 0.062469 -0.195248 0.023570 -v -0.062531 -0.195248 0.023570 -v -0.062531 -0.303502 0.086070 -v -0.062531 -0.584752 -0.401070 -v 0.062469 -0.584752 -0.401070 -v 0.062469 -0.476498 -0.463570 -v -0.062531 -0.476498 -0.463570 +mtllib mcl_torches_torch_wall.mtl +o cube +v -0.062500 -0.198340 0.273825 +v -0.062500 -0.313825 0.321660 +v -0.062500 -0.437517 -0.303600 +v -0.062500 -0.553002 -0.255765 +v 0.062500 -0.313825 0.321660 +v 0.062500 -0.198340 0.273825 +v 0.062500 -0.553002 -0.255765 +v 0.062500 -0.437517 -0.303600 +v -0.500000 -0.054833 0.620280 +v -0.500000 -0.437517 -0.303600 +v 0.500000 -0.054834 0.620280 +v 0.500000 -0.437517 -0.303600 +v -0.500000 -0.170318 0.668115 +v -0.500000 -0.553002 -0.255765 +v 0.500000 -0.170318 0.668115 +v 0.500000 -0.553002 -0.255765 +v -0.062500 -0.574516 0.835539 +v -0.062500 -0.957199 -0.088340 +v -0.062500 0.349364 0.452856 +v -0.062500 -0.033320 -0.471024 +v 0.062500 -0.574516 0.835539 +v 0.062500 -0.957199 -0.088340 +v 0.062500 0.349364 0.452856 +v 0.062500 -0.033320 -0.471024 +vn -0.0000 0.3827 0.9239 +vn -0.0000 -0.3827 -0.9239 +vn -0.0000 -0.9239 0.3827 +vn -0.0000 0.9239 -0.3827 +vn 1.0000 -0.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 vt 0.562500 0.500000 vt 0.562500 0.625000 +vt 0.562500 0.125000 +vt 0.562500 0.000063 vt 0.437500 0.625000 vt 0.437500 0.500000 -vt 0.437500 0.000000 -vt 0.562500 0.000000 -vt 0.562500 0.125000 +vt 0.437500 0.000063 vt 0.437500 0.125000 -vn 0.000000 0.500000 0.866000 -vn 0.000000 0.866000 -0.500000 -vn 1.000000 -0.000000 0.000000 -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/1 6/6/1 7/7/1 8/8/1 -f 1/2/2 6/6/2 5/5/2 4/3/2 -f 2/3/3 1/2/3 6/6/3 7/5/3 -f 3/2/2 2/3/2 7/5/2 8/6/2 -f 4/3/3 5/5/3 8/6/3 3/2/3 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +s 0 +usemtl m_0.001 +f 5/5/1 6/6/1 2/2/1 +f 6/6/1 1/1/1 2/2/1 +f 8/8/2 7/7/2 3/3/2 +f 7/7/2 4/4/2 3/3/2 +f 9/9/3 10/10/3 11/11/3 +f 10/10/3 12/12/3 11/11/3 +f 15/15/4 16/16/4 13/13/4 +f 16/16/4 14/14/4 13/13/4 +f 17/17/5 18/18/5 19/19/5 +f 18/18/5 20/20/5 19/19/5 +f 23/23/6 24/24/6 21/21/6 +f 24/24/6 22/22/6 21/21/6 diff --git a/mods/ITEMS/mcl_torches/register.lua b/mods/ITEMS/mcl_torches/register.lua index f8c34e6b5..4eead4024 100644 --- a/mods/ITEMS/mcl_torches/register.lua +++ b/mods/ITEMS/mcl_torches/register.lua @@ -15,6 +15,7 @@ mcl_torches.register_torch({ groups = {dig_immediate = 3, deco_block = 1}, sounds = mcl_sounds.node_sound_wood_defaults(), particles = true, + flame_type = 1, }) minetest.register_craft({ diff --git a/mods/ITEMS/mcl_torches/textures/default_torch_on_floor.png b/mods/ITEMS/mcl_torches/textures/default_torch_on_floor.png index cb0ce15f12bd47281c4ec8a1d996a5f9179c2782..e0656dbb0f5d879bbd9e93832b2d5e86a4afd0e8 100644 GIT binary patch delta 168 zcmbQtxPx(mL_G&H0|SGGE`KnPQV;M6aRt&7<@qk=ssA}ssjRGQYHI4~>FH%-80cUc z>uHl73iOWs z|3A)OO}Bg}ZzAKrlZ)bhk(>OlO<2an~NjjH8)TPEF`FK6*pHkkKoV;Vd6R RQx(u422WQ%mvv4FO#ptNHoX7< delta 130 zcmdnNIGJ&RL^TUD0|Ud`yN`l^lw5#Mh%1o(bEfiQp87<2zVsj$FB`+cDEB}I(~1PI zSWg?dn~M^GDi}+G{DK)Ap4~_Ta+Ez?978G?lNF>5v>YUT*c6yrL=$+}G(Pg{ePY

ZrQUw=Pr<^cX-f?` zr5aX+ujJ%8|HojKyxZr)OV_>TJ*SevuxeiZVr!evx`#9BB+l|bf2BWtl2D<;)ypQT c?1dl^h6gu;WW}2fECo5o)78&qol`;+0OHa^djJ3c