Fix

LICENSE

@@ -25,8 +25,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 
 .: MEDIA SOURCES :.
-Chocolate texture from <http://minecraft.novaskin.me/skin/1882463368/Chocolate-Bar> by unnamed user (slighty edited by me)
+Chocolate texture from Farming Redo by TenPlus1 (slighty edited by me)
-Cheese texture from Mobs Animal by Krupnov Pavel (also slighty edited by me)
+Cheese texture from Mobs Animal by Krupnov Pavel (slighty edited by me)
-Fried egg texture from <https://minecraft.novaskin.me/skin/4757072704962560/Fried-Egg> by unnamed user (heavily 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

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