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 12fb4c8..71e8ded 100644 Binary files a/textures/mcl_morefood_chocolate_bar.png and b/textures/mcl_morefood_chocolate_bar.png differ diff --git a/textures/mcl_morefood_fried_egg.png b/textures/mcl_morefood_fried_egg.png index 25a9674..88507aa 100644 Binary files a/textures/mcl_morefood_fried_egg.png and b/textures/mcl_morefood_fried_egg.png differ