Corrected stupid ubuntu corruptions

I am never using command line GitHub again

5 files changed, 19 insertions, 228 deletions

diff --git a/drinks/hot.lua b/drinks/hot.lua
index 1f600a0..ac3e580 100644
--- a/drinks/hot.lua
+++ b/drinks/hot.lua
@@ -11,49 +11,24 @@
 -- [craft] Hot Chocolate

 -- =====================================

 

-print ("RubenFood [Master] - Loading Hot")

+print ("Food [Modern] - Loading Hot")

 

------------------------------Coffee-----------------------------

 

-minetest.register_craftitem("food:coffeebean",{

-	description = "Raw Coffee Bean",

-	tiles = {"food_coffee.png"},

-	inventory_image = "food_coffee.png",

-})

-

-minetest.register_craftitem("food:coffeebean_cooked",{

-	description = "Cooked Coffee Bean",

-	tiles = {"food_coffee_cooked.png"},

-	inventory_image = "food_coffee_cooked.png",

-})

+-------------------------Hot Chocolate--------------------------

 

-minetest.register_craftitem("food:coffee", {

-	description = "Coffee",

-	inventory_image = "food_coffee_cup.png",

-	on_use = minetest.item_eat(10),

-	groups={food=1},

+minetest.register_craftitem("food_modern:hotchoco", {

+	description = "Hot Chocolate",

+	inventory_image = "food_hotchoco.png",

+	on_use = minetest.item_eat(4),

 })

 

 minetest.register_craft({

-	output = '"food:coffeebean" 1',

-	recipe = {

-		{'""','"default:dry_shrub"','""'},

-		{'""','"default:dry_shrub"','""'},

-		{'""','"default:dry_shrub"','""'},

-	}

+output = '"food_modern:hotchoco" 1 ',

+recipe = {

+{"food:chocolate_powder"},

+{"food:milk"},

+{"food:mug"},

+},

 })

 

-minetest.register_craft({

-	output = '"food:coffee" 1',

-	recipe = {

-		{'""','"food:coffeebean_cooked"','""'},

-		{'""','"food:coffeebean_cooked"','""'},

-		{'""','"food:cup"','""'},

-	}

-})

 

-minetest.register_craft({

-	type = "cooking",

-	output = "food:coffeebean_cooked",

-	recipe = "food:coffeebean",

-})

diff --git a/drinks/hot.lua~ b/drinks/hot.lua~
deleted file mode 100644
index f39e0a5..0000000
--- a/drinks/hot.lua~
+++ /dev/null
@@ -1,81 +0,0 @@
--- RUBENFOOD MOD

--- A mod written by rubenwardy that adds

--- food to the minetest game

--- =====================================

--- >> rubenfood/drinks/hot.lua

--- adds hot drinks

--- =====================================

--- [regis-food] Coffee

--- [craft] Coffe

--- [regis-food] Hot Chocolate

--- [craft] Hot Chocolate

--- =====================================

-

-print ("RubenFood [Master] - Loading Hot")

-

------------------------------Coffee-----------------------------

-

-minetest.register_craftitem("food:coffeebean",{

-	description = "Raw Coffee Bean",

-	tiles = {"food_coffee.png"},

-	inventory_image = "food_coffee.png",

-})

-

-minetest.register_craftitem("food:coffeebean_cooked",{

-	description = "Cooked Coffee Bean",

-	tiles = {"food_coffee_cooked.png"},

-	inventory_image = "food_coffee_cooked.png",

-})

-

-minetest.register_craftitem("food:coffee", {

-	description = "Coffee",

-	inventory_image = "food_coffee_cup.png",

-	on_use = minetest.item_eat(10),

-	groups={food=1},

-})

-

-minetest.register_craft({

-	output = '"food:coffeebean" 1',

-	recipe = {

-		{'""','"default:dry_shrub"','""'},

-		{'""','"default:dry_shrub"','""'},

-		{'""','"default:dry_shrub"','""'},

-	}

-})

-

-minetest.register_craft({

-	output = '"food:coffee" 1',

-	recipe = {

-		{'""','"food:coffeebean_cooked"','""'},

-		{'""','"food:coffeebean_cooked"','""'},

-		{'""','"food:cup"','""'},

-	}

-})

-

-minetest.register_craft({

-	type = "cooking",

-	output = "food:coffeebean_cooked",

-	recipe = "food:coffeebean",

-})

-

-

-

-

--------------------------Hot Chocolate--------------------------

-

-minetest.register_craftitem("food:hotchoco", {

-	description = "Hot Chocolate",

-	inventory_image = "food_hotchoco.png",

-	on_use = minetest.item_eat(4),

-})

-

-minetest.register_craft({

-output = '"food:hotchoco" 1 ',

-recipe = {

-{"food:chocolate_powder"},

-{"food:milk"},

-{"food:mug"},

-},

-})

-

-

diff --git a/drinks/juice.lua b/drinks/juice.lua
deleted file mode 100644
index b6d93ab..0000000
--- a/drinks/juice.lua
+++ /dev/null
@@ -1,50 +0,0 @@
--- RUBENFOOD MOD

--- A mod written by rubenwardy that adds

--- food to the minetest game

--- =====================================

--- >> rubenfood/drinks/juice.lua

--- adds juices

--- =====================================

--- [regis-food] Apple Juice

--- [craft] Cactus Juice

--- [regis-food] Cactus Juice

--- [craft] Cactus Juice

--- =====================================

-

-print ("RubenFood [Master] - Loading Juices")

-

---------------------------Apple Juice--------------------------

-minetest.register_craftitem("food:apple_juice", {

-	description = "Apple Juice",

-	inventory_image = "food_juice_apple.png",

-	on_use = minetest.item_eat(2)

-})

-

-minetest.register_craft({

-	output = '"food:apple_juice" 4',

-	recipe = {

-		{"","",""},

-		{"","default:apple",""},

-		{"","food:cup",""},

-	}

-})

-

-

-

-

-

-----------------------cactus juice----------------------------

-minetest.register_craftitem("food:cactus_juice", {

-	description = "Cactuz Juice",

-	inventory_image = "food_juice_cactus.png",

-	on_use = minetest.item_eat(2),

-})

-

-minetest.register_craft({

-	output = '"food:cactus_juice" 4',

-	recipe = {

-		{'""','""','""'},

-		{'""','"default:cactus"','""'},

-		{'""','"food:cup"','""'},

-	}

-})
\ No newline at end of file
diff --git a/drinks/milkshakes.lua b/drinks/milkshakes.lua
index e4c7846..34ffe82 100644
--- a/drinks/milkshakes.lua
+++ b/drinks/milkshakes.lua
@@ -8,44 +8,44 @@
 --

 -- =====================================

 

-print ("RubenFood [Master] - Loading Milk Shakes")

+print ("Food [Modern] - Loading Milk Shakes")

 

-minetest.register_craftitem("food:ms_chocolate", {

+minetest.register_craftitem("food_modern:ms_chocolate", {

 	description = "Chocolate Milkshake",

 	inventory_image = "food_ms_chocolate.png",

 	on_use = minetest.item_eat(4)

 })

 

 minetest.register_craft({

-	output = "food:ms_chocolate",

+	output = "food_modern:ms_chocolate",

 	recipe = {

 		{"food:chocolate_milk"},

 		{"food:cup"},	

 	},

 })

 

-minetest.register_craftitem("food:ms_strawberry", {

+minetest.register_craftitem("food_modern:ms_strawberry", {

 	description = "Strawberry Milkshake",

 	inventory_image = "food_ms_strawberry.png",

 	on_use = minetest.item_eat(4)

 })

 

 minetest.register_craft({

-	output = "food:ms_strawberry",

+	output = "food_modern:ms_strawberry",

 	recipe = {

 		{"food:strawberry"},

 		{"food:cup"},	

 	},

 })

 

-minetest.register_craftitem("food:ms_banana", {

+minetest.register_craftitem("food_modern:ms_banana", {

 	description = "Banana Milkshake",

 	inventory_image = "food_ms_banana.png",

 	on_use = minetest.item_eat(4)

 })

 

 minetest.register_craft({

-	output = "food:ms_banana",

+	output = "food_modern:ms_banana",

 	recipe = {

 		{"food:banana"},

 		{"food:cup"},	

diff --git a/drinks/milkshakes.lua~ b/drinks/milkshakes.lua~
deleted file mode 100644
index 487f81b..0000000
--- a/drinks/milkshakes.lua~
+++ /dev/null
@@ -1,53 +0,0 @@
--- RUBENFOOD MOD

--- A mod written by rubenwardy that adds

--- food to the minetest game

--- =====================================

--- >> rubenfood/drinks/milkshakes.lua

--- adds drinks

--- =====================================

---

--- =====================================

-

-print ("RubenFood [Master] - Loading Milk Shakes")

-

-minetest.register_craftitem("food:ms_chocolate", {

-	description = "Chocolate Milkshake",

-	inventory_image = "food_ms_chocolate.png",

-	on_use = minetest.item_eat(4)

-})

-

-minetest.register_craft({

-	output = "food:ms_chocolate",

-	recipe = {

-		{"food:chocolate_milk"},

-		{"food:cup"},	

-	},

-})

-

-minetest.register_craftitem("food:ms_strawberry", {

-	description = "Strawberry Milkshake",

-	inventory_image = "food_ms_strawberry.png",

-	on_use = minetest.item_eat(4)

-})

-

-minetest.register_craft({

-	output = "food:ms_strawberry",

-	recipe = {

-		{"food:strawberry"},

-		{"food:cup"},	

-	},

-})

-

-minetest.register_craftitem("food:ms_banana", {

-	description = "Banana Milkshake",

-	inventory_image = "food_ms_chocolate.png",

-	on_use = minetest.item_eat(4)

-})

-

-minetest.register_craft({

-	output = "food:ms_chocolate",

-	recipe = {

-		{"food:chocolate_milk"},

-		{"food:cup"},	

-	},

-})