From cde50e8f795825038194cec6ec2411203a5a9238 Mon Sep 17 00:00:00 2001 From: rudzik8 Date: Fri, 27 Aug 2021 10:09:13 +0700 Subject: [PATCH] Fix --- LICENSE | 6 +++--- README.md | 8 ++++++++ textures/mcl_morefood_chocolate_bar.png | Bin 261 -> 265 bytes textures/mcl_morefood_fried_egg.png | Bin 253 -> 243 bytes 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index f6850d2..4d9dbd2 100644 --- a/LICENSE +++ b/LICENSE @@ -25,8 +25,8 @@ OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to .: MEDIA SOURCES :. -Chocolate texture from by unnamed user (slighty edited by me) -Cheese texture from Mobs Animal by Krupnov Pavel (also slighty edited by me) -Fried egg texture from by unnamed user (heavily edited by me) +Chocolate texture from Farming Redo by TenPlus1 (slighty edited by me) +Cheese texture from Mobs Animal by Krupnov Pavel (slighty edited by me) +Fried egg texture from Mobs Animal by Krupnov pavel (slighty edited by me) Sandwich texture uses bread texture from REFI by MysticTempest (slighty edited by me) and cooked beef palette from PixelPerfection by XSSheep Sweet Berry Pie texture uses pumpkin pie texture from PixelPerfection by XSSsheep \ No newline at end of file diff --git a/README.md b/README.md index bad0eb2..472b133 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,16 @@ This mod adds five more food items to the Mineclone 2 (5) game! * ![texture](textures/mcl_morefood_sweet_berry_pie.png) Sweet Berry Pie ## Media sources +<<<<<<< Updated upstream Chocolate texture from http://minecraft.novaskin.me/skin/1882463368/Chocolate-Bar by unnamed user (slighty edited by me) Cheese texture from Mobs Animal by Krupnov Pavel (also slighty edited by me) Fried egg texture from https://minecraft.novaskin.me/skin/4757072704962560/Fried-Egg by unnamed user (heavily edited by me) Sandwich texture uses bread texture from REFI by MysticTempest (slighty edited by me) and cooked beef palette from PixelPerfection by XSSheep Sweet Berry Pie texture uses pumpkin pie texture from PixelPerfection by XSSsheep +======= +Chocolate texture from Farming Redo by TenPlus1 (slighty edited by me) +Cheese texture from Mobs Animal by Krupnov Pavel (slighty edited by me) +Fried egg texture from Mobs Animal by Krupnov pavel (slighty edited by me) +Sandwich texture uses bread texture from REFI by MysticTempest (slighty edited by me) and cooked beef palette from PixelPerfection by XSSheep +Sweet Berry Pie texture uses pumpkin pie texture from PixelPerfection by XSSsheep +>>>>>>> Stashed changes diff --git a/textures/mcl_morefood_chocolate_bar.png b/textures/mcl_morefood_chocolate_bar.png index 12fb4c88901108241e2eba99854fcccab42cde76..71e8dedac15893d164aafe369207ab5a1358a3a1 100644 GIT binary patch delta 243 zcmZo=>SR*v4DfU3<&xrJU|`_&^l%9R(&9iY$iWOG8P^`~pQxx%&mZ6u;%X+#lx)nJ zYQo&=$_kXb&M5QanMpkR@wi(`mJ zaA?0L(*Xqz=Ey()XG=Rd%tAxFcTYMk kBCq8)nLjq}*}~^Fg}0c++B>%=0lOE3aeWvY3H^?+^$xifVW@00q-L zT^vI+f@Av+3Nk2iFmo#XonFHkD1ZF;P1O#!|F1d&UYe9Ch&xy*an00_>SkDVg4?+4 z6PN4K_nHosZEA&|PX^D9t5Z#iwy-~=yHIe2?z9_qN51HqE%%F0;<;#}FB&8FvF_I0 azl=AtnIkT~_4@_1lEKr}&t;ucLK6VI(@N(6 diff --git a/textures/mcl_morefood_fried_egg.png b/textures/mcl_morefood_fried_egg.png index 25a9674291f602cd61d44363f9d11b9d72ea844b..88507aa44b662ec333404234775b9941daaf63ed 100644 GIT binary patch delta 186 zcmey%_?dBnW4&mAPl)UH@8AFZ`}cc0!`HKFpDyM;>1F@|Blc1rAjMu1c)m zncaXwoCO|{#S9F5he4R}c>anMpkRoni(`mJaOpWmz5@yzE`cmh|GB?2Xvod^)9n_w z#qrMzrltxH0m&5{@qL0T9RdTIZ_Q!zY%pdx6Ly9-i}8K$MuF%5GN+o?UFd$RuA(z_ fwOWnUfxnF0wallU9{U~*w1C0W)z4*}Q$iB}PZ~@} delta 196 zcmey&_?K~lW4%OxPl)U5*ROy6{Q3X?|DVek{;y^Dze)1{ZX*T;h7Ki5Ss=wx666;Q zlm!8Xd(C?zfnuBm9+AZi419+{nDKc2iWHz=l&6bhh(>T}Um)KB1s%3%xiN?A*#>E7;1DqHHyj|All%Nv6&M?FoteAGUw) rs;=<-$EtJjv@w5%Y5jp~j7Ir(Q7pkM3)4e@)-ZUw`njxgN@xNAERax5