From d3dbedd1991365f9c0f81539469fc5aa7e44edd3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 21 Jul 2017 19:47:20 +0200 Subject: [PATCH] Update stem images and automatically colorize them --- mods/ITEMS/mcl_farming/melon.lua | 11 ++++++++--- mods/ITEMS/mcl_farming/pumpkin.lua | 10 +++++++--- mods/ITEMS/mcl_farming/shared_functions.lua | 16 ++++++++++++++++ .../mcl_farming_melon_stem_connected.png | Bin 294 -> 232 bytes .../mcl_farming_melon_stem_disconnected.png | Bin 0 -> 234 bytes .../textures/mcl_farming_melontige_1.png | Bin 302 -> 0 bytes .../textures/mcl_farming_melontige_2.png | Bin 333 -> 0 bytes .../textures/mcl_farming_melontige_3.png | Bin 352 -> 0 bytes .../textures/mcl_farming_melontige_4.png | Bin 400 -> 0 bytes .../textures/mcl_farming_melontige_5.png | Bin 458 -> 0 bytes .../textures/mcl_farming_melontige_6.png | Bin 488 -> 0 bytes .../textures/mcl_farming_melontige_7.png | Bin 504 -> 0 bytes .../textures/mcl_farming_melontige_8.png | Bin 524 -> 0 bytes .../mcl_farming_pumpkin_stem_connected.png | Bin 294 -> 232 bytes .../mcl_farming_pumpkin_stem_disconnected.png | Bin 0 -> 179 bytes .../textures/mcl_farming_pumpkintige_1.png | Bin 302 -> 0 bytes .../textures/mcl_farming_pumpkintige_2.png | Bin 333 -> 0 bytes .../textures/mcl_farming_pumpkintige_3.png | Bin 352 -> 0 bytes .../textures/mcl_farming_pumpkintige_4.png | Bin 400 -> 0 bytes .../textures/mcl_farming_pumpkintige_5.png | Bin 458 -> 0 bytes .../textures/mcl_farming_pumpkintige_6.png | Bin 488 -> 0 bytes .../textures/mcl_farming_pumpkintige_7.png | Bin 504 -> 0 bytes .../textures/mcl_farming_pumpkintige_8.png | Bin 524 -> 0 bytes tools/Texture_Conversion_Table.csv | 4 ++++ 24 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_disconnected.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_1.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_2.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_3.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_4.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_5.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_6.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_7.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_8.png create mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_disconnected.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_1.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_2.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_3.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_4.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_5.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_6.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_7.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_8.png diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index 3a1c27643..fa8929c01 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -60,6 +60,10 @@ local stem_drop = { -- Growing unconnected stems +local startcolor = { r = 0x2E , g = 0x9D, b = 0x2E } +local endcolor = { r = 0xFF , g = 0xA8, b = 0x00 } + + for s=1,7 do local h = s / 8 local doc = s == 1 @@ -68,6 +72,7 @@ for s=1,7 do entry_name = "Premature Melon Stem" longdesc = "Melon stems grow on farmland in 8 stages. On hydrated farmland, the growth is a bit quicker. Mature melon stems are able to grow melons." end + local colorstring = mcl_farming:stem_color(startcolor, endcolor, s, 8) minetest.register_node("mcl_farming:melontige_"..s, { description = string.format("Premature Melon Stem (Stage %d)", s), _doc_items_create_entry = doc, @@ -78,7 +83,7 @@ for s=1,7 do drawtype = "plantlike", sunlight_propagates = true, drop = stem_drop, - tiles = {"mcl_farming_melontige_"..s..".png"}, + tiles = {"([combine:16x16:0,"..((8-s)*2).."=mcl_farming_melon_stem_disconnected.png)^[colorize:"..colorstring..":127"}, selection_box = { type = "fixed", fixed = { @@ -96,14 +101,14 @@ local stem_def = { description = "Mature Melon Stem", _doc_items_create_entry = true, _doc_items_longdesc = "A mature melon stem attempts to grow a melon at one of its four adjacent blocks. A melon can only grow on top of farmland, dirt, or a grass block. When a melon is next to a melon stem, the melon stem immediately bends and connects to the melon. While connected, a melon stem can't grow another melon. As soon all melons around the stem have been removed, it loses the connection and is ready to grow another melon.", - tiles = {"mcl_farming_melontige_8.png"}, + tiles = {"mcl_farming_melon_stem_disconnected.png^[colorize:#FFA800:127"}, } -- Register stem growth mcl_farming:add_plant("plant_melon_stem", "mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2", "mcl_farming:melontige_3", "mcl_farming:melontige_4", "mcl_farming:melontige_5", "mcl_farming:melontige_6", "mcl_farming:melontige_7"}, 30, 5) -- Register actual melon, connected stems and stem-to-melon growth -mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 25, 15, "mcl_farming_melon_stem_connected.png") +mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 25, 15, "mcl_farming_melon_stem_connected.png^[colorize:#FFA800:127") -- Items and crafting minetest.register_craftitem("mcl_farming:melon_item", { diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index 9d4c8c228..8a01caf71 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -34,6 +34,9 @@ local stem_drop = { -- Unconnected immature stem +local startcolor = { r = 0x2E , g = 0x9D, b = 0x2E } +local endcolor = { r = 0xFF , g = 0xA8, b = 0x00 } + for s=1,7 do local h = s / 8 local doc = s == 1 @@ -42,6 +45,7 @@ for s=1,7 do entry_name = "Premature Pumpkin Stem" longdesc = "Pumpkin stems grow on farmland in 8 stages. On hydrated farmland, the growth is a bit quicker. Mature pumpkin stems are able to grow pumpkins." end + local colorstring = mcl_farming:stem_color(startcolor, endcolor, s, 8) minetest.register_node("mcl_farming:pumpkin_"..s, { description = string.format("Premature Pumpkin Stem (Stage %d)", s), _doc_items_entry_name = entry_name, @@ -52,7 +56,7 @@ for s=1,7 do drawtype = "plantlike", sunlight_propagates = true, drop = stem_drop, - tiles = {"mcl_farming_pumpkintige_"..s..".png"}, + tiles = {"([combine:16x16:0,"..((8-s)*2).."=mcl_farming_pumpkin_stem_disconnected.png)^[colorize:"..colorstring..":127"}, selection_box = { type = "fixed", fixed = { @@ -69,7 +73,7 @@ end local stem_def = { description = "Mature Pumpkin Stem", _doc_items_longdesc = "A mature pumpkin stem attempts to grow a pumpkin at one of its four adjacent blocks. A pumpkin can only grow on top of farmland, dirt or a grass block. When a pumpkin is next to a pumpkin stem, the pumpkin stem immediately bends and connects to the pumpkin. A connected pumpkin stem can't grow another pumpkin. As soon all pumpkins around the stem have been removed, it loses the connection and is ready to grow another pumpkin.", - tiles = {"mcl_farming_pumpkintige_8.png"}, + tiles = {"mcl_farming_pumpkin_stem_disconnected.png^[colorize:#FFA800:127"}, } -- Template for pumpkin @@ -90,7 +94,7 @@ local pumpkin_base_def = { mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5) -- Register actual pumpkin, connected stems and stem-to-pumpkin growth -mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin_face", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png", +mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin_face", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127", function(pos) -- Attempt to spawn iron golem or snow golem mobs_mc.tools.check_iron_golem_summon(pos) diff --git a/mods/ITEMS/mcl_farming/shared_functions.lua b/mods/ITEMS/mcl_farming/shared_functions.lua index 31a4e0aec..5debb5ef8 100644 --- a/mods/ITEMS/mcl_farming/shared_functions.lua +++ b/mods/ITEMS/mcl_farming/shared_functions.lua @@ -363,3 +363,19 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s }) end +-- Used for growing gourd stems. Returns the intermediate color between startcolor and endcolor at a step +-- * startcolor: ColorSpec in table form for the stem in its lowest growing stage +-- * endcolor: ColorSpec in table form for the stem in its final growing stage +-- * step: The nth growth step. Counting starts at 1 +-- * step_count: The number of total growth steps +function mcl_farming:stem_color(startcolor, endcolor, step, step_count) + local color = {} + local function get_component(startt, endd, step, step_count) + return math.floor(math.max(0, math.min(255, (startt + (((step-1)/step_count) * endd))))) + end + color.r = get_component(startcolor.r, endcolor.r, step, step_count) + color.g = get_component(startcolor.g, endcolor.g, step, step_count) + color.b = get_component(startcolor.b, endcolor.b, step, step_count) + local colorstring = string.format("#%02X%02X%02X", color.r, color.g, color.b) + return colorstring +end diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_connected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_connected.png index e1ae622db0909eddaece7b9c0d8c9d85987cdd88..7c64ce5d108236dbeb65e4f9d55180b455d3901e 100644 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|7J0fjhFF|_ zJ82{D5d#j_`T49%rtnPC+~dr)(WayPgGgTRvU16jp==*QJubd1>0H0_*$ROUcKL?= zfA8Jdq$BGP%D7_dq@behjL$0G@9ww|cpXU?1nSPJD~zLMhTtge+p+E&pyBv zA}XkO>_$67I>&)s>v$N~B(MECt!2CC?laqRrv%;E&~i$0lJpK)78&qol`;+0G*;;xBvhE literal 294 zcmV+>0oneEP)BZP#xR6M!MJ_VAkTVKe0<(dSiHh%&l$b;^ zEebdT&I#whZ%OL$WKfgoOh#rj5Z(%Bi?hRNaF+a+J|!9NNa_=JvF3$NGK+P^b7O0O s6eyF{lwAX5=RIY|4P`?^*|^}r4U3%v>b=YK9RL6T07*qoM6N<$f_Woz-v9sr diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_disconnected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..82cf606d84caf2ed8418edbcbddabd4dfe660f33 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|mUy~2hFF~5 zI(Z`}i=u$*{?k_zG8Aw3wd$0agwBwfb&8)=nfrs%!v_HuAFBzu$vvK}|KWVmIn(Dc zv+wQ<6PRSdHo?U!ldIzFtYb5t8n2JHja9Dv8{>78y+t5lZ7#!v;(P2J9bJY^DqF6_ z2iH!EdfK4UV^}fIUDlgNagL`-XAqZ5ip9$f7gdi*Jlq?8+w#Th%TbT_z2C+wAb53h hM7HgJ?$t7T7}tpUo{RbDCJuBjgQu&X%Q~loCIDl2T4ewL literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_1.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_1.png deleted file mode 100644 index 50caebdd1ee05e59cbdbad9effd0faaae3d98b2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@mUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!4u#U;tHgLDj1?W82Fdh=keQEJKzH|x`I0~(Ax{^_ z5Q)pl2@%)A+6IPJ1_n0qPkB)^gTe~DWM4f(W*-r diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_2.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_2.png deleted file mode 100644 index 26a6db6a59320c55542d207371519fb83dc7b8c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAs65i;tHgLDj1?W7*b|1 zSo1vcVK4FY zb!C6Z%*QOCyZgm_NuZFtr;B5V#`)v~3D(0r28*~27IGU{FW}su2E^tLk_UO_QmvAUQh^kMk%6JPu7R_U+RNSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgp&sB9;tHgrDj1SG81iQ@ zI0Z1|OkoJjV91)p5Zl0z*~5@KjUlp%;s5{tD=(B>2P$PO3GxeOaCmkj4a7NUCwZt`|BqgyV)hf9t6-Y4{85o-D8W`&unuHh_ zTNzqdnHXyu7+M(^^uBo@g`y!hKP5A*5?zCtm5C`tL*t5AeV_&gPgg&ebxsLQ07qzD Awg3PC diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_4.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_4.png deleted file mode 100644 index afb7bbf30d8a7de7d61232b1097dd2e31f357100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10!al$!#1%-VRWKBEFx1Xq z@C;z6n!*sB!B8=YA+v#@yoaG?8beAIL&F?~mIVy0ix^__7)rYsswObBFJTBxV)+06 zKkK!xpMXX%mIV0)GdMiEkp|);jL(;{=wbth9E6ITU?=7XcF8>Tik z_RG&_VsvCvObk(Es8DA3s(bk2DxhJiC9V-ADTyViR>?)FK#IZ0z|dURz*yJNB*ehj z%Fx2f#6sJ^(8|D||Miv!C>nC}Q!>*k(KVP^nV3Q}G_Hu%2WnvOboFyt=akR{0KxBY AHvj+t diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_5.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_5.png deleted file mode 100644 index c4bcc5fb18baae458e8a8969714e7d5bac39541e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10A~wJ$#1%;ARWMX_Fm%jd z@DE^UnZl5i!O%R3p{RkOp@*Su8bfXsL-!np{sjyZ7cr#fG1PZ4v`k=_yo4bpiJ_#9 zp`eN(GKL``g&{eIVahUw$`*#{>ll*K7&40({{R1Pn{ZwTXaQqMkY6x^!?PP{AWo9E zyNg^Amx4Bs!(QU)>&pI+nU7gOclV3=l0czYPZ!4!i_^&o60FJ+20}pxTs#97h;CVtYW{UO$wFM3B6PV)ma79Q;{P^)vQ$Qd^K23n+A;u=wsl30>zm0Xkxq!^4049#^7 zjCBo7LJW+p3@xloO|=aStqcs5rd{2Kq9HdwB{QuOU4xmG2~!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10A}7En#1%+St<_xBZ*X9V zS)z~R?ggfeS;{-+nk;D3SwGEiM!nYI<>trNS)N*J)mf~%X0pMi8AfN;TUDnj&TG*r zjFPQQQ#`T8s;xlf;&$6*eR{X{JJh8s?OABnU!i_=mu*j}+QrSbvzxS!tg!h1|G)8+ zD?qm}FqQ=Q1v5B2yO9RsBze2LC~GC<^jwm<4oqznCux6w2{*aSX9I z{r19kz6JvU<_n8kgsSux{{QbjY34yW0qO0(PHyshvOoV^;(^oypE&~<85553v=q!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10qBOuK#1%+SE!JGsY;a(@ zS)!}t?kT2?iOM@Bnk=Z+S>I(iqg3ngEc4?FEKkk1>daJK(_yfw$LP#LtLhlVc~v@v zL9(@RiYMk-wWX_ETxq+kS?|^chq`#BJyXs4^VF}dvF*uGySUVLcDeSE*%mFyD!V3` z?NMQuIvw)`IrTCcfXh~ z2^1>!ba4!^IDPkmIbVZ=0P_LW!xM|oefY2M7^nF* zJT`i;QSe&z0*()o911(wTLhU3l``8L=B*Z}OATDLs!jOprk&DJD!by^1WQZ)UJz<1 zo|!i1^rlBKW!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10q9wp5#P$Cnuc_IZt7;7P z_n9R+Nbc$~ZHQ9d-fl9#SZ7_m;qGqJ8F^ZVCYT?eYI$n9RcE5=nmU6`%|>TtSXG58 z&MnfJo~u>hBU=-ucw(w$TfEA}xi*c_%1bNtZY{B|4OiOJW7e0ZeszIuPm0>bIX1Hk zw2w@(=ucB`iB;LzX_Dh96JjR%|NsA#ZqENe_b`?O`2{mLJiCzw;v{*yyJ)NIe8K_b zu$OrHy0SlH=3^Gn-Th*|Bv7cr)5S5w;`H7Nov>Wl-rOS zsk7|kiiTO8%UrK-?pyXYi?O0F@rmWKna?Zsu@u~|XP@uNu=yR|zT}5&Hqvo(!hvp3 zEpd$~Nl7e8wMs5Z1yT$~28QOk2FALECLspKR)&^VMkd+@hE@g!iO=@vqG-s?PsvQH cMAu+uWnv1^(6}O2AE<%B)78&qol`;+0Dtwg3IG5A diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_connected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_connected.png index e1ae622db0909eddaece7b9c0d8c9d85987cdd88..7c64ce5d108236dbeb65e4f9d55180b455d3901e 100644 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|7J0fjhFF|_ zJ82{D5d#j_`T49%rtnPC+~dr)(WayPgGgTRvU16jp==*QJubd1>0H0_*$ROUcKL?= zfA8Jdq$BGP%D7_dq@behjL$0G@9ww|cpXU?1nSPJD~zLMhTtge+p+E&pyBv zA}XkO>_$67I>&)s>v$N~B(MECt!2CC?laqRrv%;E&~i$0lJpK)78&qol`;+0G*;;xBvhE literal 294 zcmV+>0oneEP)BZP#xR6M!MJ_VAkTVKe0<(dSiHh%&l$b;^ zEebdT&I#whZ%OL$WKfgoOh#rj5Z(%Bi?hRNaF+a+J|!9NNa_=JvF3$NGK+P^b7O0O s6eyF{lwAX5=RIY|4P`?^*|^}r4U3%v>b=YK9RL6T07*qoM6N<$f_Woz-v9sr diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_disconnected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..7a3be1f56eb6a7c42d685c40a94ea5e183e04d75 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(i*ZiW~ z#>U3v=xk|4ie28U-i(tsR$PZ!4!iOa2h8+jQFd6*g> z+^>JK#Dh8LONre~;RDJk%%T^5{nl`}z^LPA=EipV;54hHmGfh@Rz6kw5NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!4u#U;tHgLDj1?W82Fdh=keQEJ#9BMxy$?`G$kW9! zMB;LCf&}Y|2Ek(qOo9xI77Q%0S9Z4nWmQXDBT7;dOH!?pi&B9UgOP!uxvqh+uAxbY wfw7g5ft9JHwt=CQfk8g=OnVd!x%nxXX_dG&$i*o(12r&sy85}Sb4q9e0At-rtN;K2 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_2.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_2.png deleted file mode 100644 index 48eca7011ff5b261d1deabf7ff0a7ea70ebad637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAs65i;tHgLDj1?W7*b|1 zSo1vcVK4FY zb!C6Z%*QOs`dRDnGN6#Wr;B5V#`)v~3D(0r28*~27IGU{FW}su2E^tLk_UO_QmvAUQh^kMk%6JPu7RNSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgp&sB9;tHgrDj1SG81iQ@ zI0Z1|OkoJjV91)p5Zl0z*~5@KjUlp%;s5{tD=(B>2P$PO3GxeOaCmkj4a7FMGaqH#VsL4viJ!(b7&!9s2W>jj(})PUH0 z0k@BXc?zRr!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10!al$!#1%-VRWKBEFx1Xq z@C;z6n!*sB!B8=YA+v#@yoaG?8beAIL&F?~mIVy0ix^__7)rYsswObBFJTBxV)+06 zKkK!xpMXX%mIV0)GdMiEkp|) z{qpmf7#-OZ6GIdkDwG+%>K?wh3TT*WiEBhjN@7W>RdP`(kYX@0Ff`XSFxE9R2{ACX tGBUI>G|@INv@$SAjhSnWq9HdwB{QuOw+0bL)pno;22WQ%mvv4FO#rsrZ0G<0 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_5.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_5.png deleted file mode 100644 index e24ec3ff8ca5a225592f2ed397e94a6cba9bc462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10A~wJ$#1%;ARWMX_Fm%jd z@DE^UnZl5i!O%R3p{RkOp@*Su8bfXsL-!np{sjyZ7cr#fG1PZ4v`k=_yo4bpiJ_#9 zp`eN(GKL``g&{eIVahUw$`*#{>ll*K7&40({{R1Pn{ZwTXaQqMkY6x^!?PP{AWo9E zyNg^Amx4Bs!(QU)>&pI+nU7ginEhYbcc4(Lr;B5V#p&b(307qZ1EHV;E*^}=+>ESi za#%z*6bl3$@H`+Jc7m2~2T&xFRGae*E~TDIky{AarcGgNw@){``Qh&hAfM z4@#A~cc@%o(X7#0k}9zyWg-hhU>#HPoX6ib11(Z5ag8WRNi0dVN-jzTQVd20hUU5k z#=3?kAqK`)Mut{~mf8k}Rt5$v-G6?gXvob^$xN%nt)cXqi#t#QgQu&X%Q~loCIFJ< Bgs1=j diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_6.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_6.png deleted file mode 100644 index 15852a1c3d9aa4eb89120f9e52367a48f074f15f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10A}7En#1%+St<_xBZ*X9V zS)z~R?ggfeS;{-+nk;D3SwGEiM!nYI<>trNS)N*J)mf~%X0pMi8AfN;TUDnj&TG*r zjFPQQQ#`T8s;xlf;&$6*eR{X{JJh8s?OABnU!i_=mu*j}+QrSbvzxS!tg!h1|G)8+ zD?qm}FqQ=Q1v5B2yO9RsBze2LC~GC<^jwm_@}ICU1HN6w2{*aSX9I z{r19kz6JvU<_n8kgsSux{{QbjY34yW0qO0(PHyshvOoV^;(^oypE&~<85553v=qo=I&2mdKI;Vst03T?mV*mgE diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_7.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_7.png deleted file mode 100644 index 12781147f4a95012c21cdef8c0acd4c527c37814..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10qBOuK#1%+SE!JGsY;a(@ zS)!}t?kT2?iOM@Bnk=Z+S>I(iqg3ngEc4?FEKkk1>daJK(_yfw$LP#LtLhlVc~v@v zL9(@RiYMk-wWX_ETxq+kS?|^chq`#BJyXs4^VF}dvF*uGySUVLcDeSE*%mFyD!V3` z?NMQuIvw)`ItrJD*d^< zfI`KdE{-71&@Rp<22uf z$3_n}3SO&T!0|znLtzJdiy%{>Qf8aOyww7Ase!9jwF#fyv{O1tWmjCAU}?$U3qlRW zGt=gr-t;KOEJ)$pKTC^q&ubaG|FK;5Eto0;v|hEuHKHUXu_Vl&Jb7#Ld_8Cn?|Xd4(>85mqP+ZT$WAvZrIGp!Q0hDF(IFM%2uJYD@<);T3K0RRVk Bt4RO= diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_8.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_8.png deleted file mode 100644 index 2db014d7738f3582a864d3cf4b2132695a937400..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10q9wp5#P$Cnuc_IZt7;7P z_n9R+Nbc$~ZHQ9d-fl9#SZ7_m;qGqJ8F^ZVCYT?eYI$n9RcE5=nmU6`%|>TtSXG58 z&MnfJo~u>hBU=-ucw(w$TfEA}xi*c_%1bNtZY{B|4OiOJW7e0ZeszIuPm0>bIX1Hk zw2w@(=ucB`iB;LzX_Dh96JjR%|NsA#ZqENe_b`?O`2{mLJiCzw;v{*yyJ)NIe8K_b zu$OrHy0SlH=3^FB3R5UM3lysGba4!^IKB6Rr%+RX0P}^88i$F20uw6>8h*=PkXGTI zc<))L*3|>o$^#ArJ;>lrkYSARZ=5Vu_)qo+Q;Z0QhJk~Gp@6!_dY+U>xl7^qy8gsn z>MZ-XqG49&GS};y`