diff --git a/mod_sources.txt b/mod_sources.txt
index 1e1424c..233dfa8 100644
--- a/mod_sources.txt
+++ b/mod_sources.txt
@@ -72,7 +72,7 @@ origin	https://github.com/minetest-mods/dynamic_liquid (fetch)
 Mod: environment/dynamic_liquid
 
 origin	https://notabug.org/tenplus1/farming (fetch)
-* master 7a99786 [origin/master] remove mobs_animal check for certain recipes to be used with other mods
+* master 675b30d [origin/master] fix string translation
 Mod: flora/farming
 
 origin	https://repo.or.cz/minetest_hbarmor.git (fetch)
@@ -128,7 +128,7 @@ origin	git@github.com:minetest-mods/ts_workshop.git (fetch)
 Mod: lib_api/ts_workshop
 
 origin	https://github.com/Skandarella/Animal-World.git (fetch)
-* main f45ee6f [origin/main] Add files via upload
+* main dbc8794 [origin/main] Add files via upload
 Mod: mobs/mobs_mobs/Animal-World
 
 origin	https://github.com/FreeLikeGNU/goblins.git (fetch)
@@ -180,7 +180,7 @@ origin	https://github.com/minetest-mods/hbsprint/ (fetch)
 Mod: player/hbsprint
 
 origin	https://gitlab.com/4w/hunger_ng.git (fetch)
-* master bd5dcad [origin/master] make hunger effects player attributes
+* master e8de59e [origin/master] adapt i14y for mobs redo changes
 Mod: player/hunger_ng
 
 origin	https://github.com/minetest-mods/skinsdb.git (fetch)
diff --git a/mods/flora/farming/locale/zh_CN.txt b/mods/flora/farming/locale/zh_CN.txt
index 302338f..2ec4e55 100644
--- a/mods/flora/farming/locale/zh_CN.txt
+++ b/mods/flora/farming/locale/zh_CN.txt
@@ -1,119 +1,119 @@
-Seed=种子
-Banana=香蕉
-Banana Leaves=香蕉叶
-Orange=橙色
-Strawberry=草莓
-Sugar=糖
-Salt=盐
-Rose Water=玫瑰汁
-Turkish Delight=土耳其软糖
-Garlic Bread=蒜香面包
-Donut=甜甜圈
-Chocolate Donut=巧克力甜甜圈
-Apple Donut=苹果甜甜圈
-Porridge=粥
-Jaffa Cake=佳发饼
-Hoe=锄头
-Wooden Hoe=木锄
-Stone Hoe=石锄
-Steel Hoe=钢锄头
-Bronze Hoe=青铜锄头
-Mese Hoe=黄石锄头
-Diamond Hoe=钻石锄
-Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上）
-Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀（右击可收获并重新种植作物）
-Soil=土壤
-Wet Soil=湿土
-Wooden Bowl=木碗
-Saucepan=平底锅
-Cooking Pot=锅
-Baking Tray=烤盘
-Skillet=平底锅
-Mortar and Pestle=研钵
-Cutting Board=砧板
-Juicer=榨汁机
-Glass Mixing Bowl=搅拌杯
-Barley Seed=大麦种子
-Barley=大麦
-Green Beans=青豆
-Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土上）
-Beetroot=甜菜根
-Beetroot Soup=甜菜根汤
-Blueberries=蓝莓
-Blueberry Muffin=蓝莓松糕
-Blueberry Pie=蓝莓派
-Carrot=胡萝卜
-Carrot Juice=胡萝卜汁
-Golden Carrot=金萝卜
-Chili Pepper=辣椒
-Bowl of Chili=一碗辣椒
-Cocoa Beans=可可豆
-Cookie=曲奇
-Bar of Dark Chocolate=黑巧克力条
-Chocolate Block=巧克力块
-Coffee Beans=咖啡豆
-Cup of Coffee=一杯咖啡
-Corn=玉米
-Corn on the Cob=玉米棒
-Cornstarch=玉米淀粉
-Bottle of Ethanol=一瓶乙醇
-Cotton Seed=棉籽
-Cotton=棉花
-String=字符串
-Cucumber=黄瓜
-Garlic clove=蒜瓣
-Garlic=大蒜
-Garlic Braid=蒜辫
-Grapes=葡萄
-Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上）
-Hemp Seed=大麻籽
-Hemp Leaf=大麻叶
-Bottle of Hemp Oil=一瓶大麻油
-Hemp Fibre=大麻纤维
-Hemp Block=麻块
-Hemp Rope=麻绳
-Melon Slice=西瓜片
-Melon=甜瓜
-Onion=洋葱
-Pea Pod=豌豆荚
-Peas=豌豆
-Pea Soup=豌豆汤
-Peppercorn=胡椒粉
-Pepper=胡椒粉
-Ground Pepper=胡椒粉
-Pineapple Top=菠萝上衣
-Pineapple=菠萝
-Pineapple Ring=菠萝圈
-Pineapple Juice=菠萝汁
-Potato=土豆
-Baked Potato=焗马铃薯
-Cucumber and Potato Salad=黄瓜土豆沙拉
-Pumpkin Slice=南瓜片
-Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关）
-Scarecrow Bottom=稻草人屁股
-Pumpkin Bread=南瓜面包
-Pumpkin Dough=南瓜面团
-Pumpkin=南瓜
-Raspberries=覆盆子
-Raspberry Smoothie=覆盆子冰沙
-Rhubarb=大黄
-Rhubarb Pie=大黄派
-Rye=黑麦
-Rye seed=黑麦种子
-Oat=燕麦
-Oat seed=燕麦籽
-Rice=大米
-Rice grains=稻谷
-Rice Bread=米饭面包
-Rice Flour=米粉
-Multigrain Flour=多粒面粉
-Multigrain Bread=杂粮面包
-Tomato=番茄
-Wheat Seed=小麦种子
-Wheat=小麦
-Straw=稻草
-Flour=面粉
-Bread=面包
-Sliced Bread=切片面包
-Toast=烤面包片
-Toast Sandwich=三明治面包
+Seed=种子
+Banana=香蕉
+Banana Leaves=香蕉叶
+Orange=橙色
+Strawberry=草莓
+Sugar=糖
+Salt=盐
+Rose Water=玫瑰汁
+Turkish Delight=土耳其软糖
+Garlic Bread=蒜香面包
+Donut=甜甜圈
+Chocolate Donut=巧克力甜甜圈
+Apple Donut=苹果甜甜圈
+Porridge=粥
+Jaffa Cake=佳发饼
+Hoe=锄头
+Wooden Hoe=木锄
+Stone Hoe=石锄
+Steel Hoe=钢锄头
+Bronze Hoe=青铜锄头
+Mese Hoe=黄石锄头
+Diamond Hoe=钻石锄
+Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上）
+Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀（右击可收获并重新种植作物）
+Soil=土壤
+Wet Soil=湿土
+Wooden Bowl=木碗
+Saucepan=平底锅
+Cooking Pot=锅
+Baking Tray=烤盘
+Skillet=平底锅
+Mortar and Pestle=研钵
+Cutting Board=砧板
+Juicer=榨汁机
+Glass Mixing Bowl=搅拌杯
+Barley Seed=大麦种子
+Barley=大麦
+Green Beans=青豆
+Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土上）
+Beetroot=甜菜根
+Beetroot Soup=甜菜根汤
+Blueberries=蓝莓
+Blueberry Muffin=蓝莓松糕
+Blueberry Pie=蓝莓派
+Carrot=胡萝卜
+Carrot Juice=胡萝卜汁
+Golden Carrot=金萝卜
+Chili Pepper=辣椒
+Bowl of Chili=一碗辣椒
+Cocoa Beans=可可豆
+Cookie=曲奇
+Bar of Dark Chocolate=黑巧克力条
+Chocolate Block=巧克力块
+Coffee Beans=咖啡豆
+Cup of Coffee=一杯咖啡
+Corn=玉米
+Corn on the Cob=玉米棒
+Cornstarch=玉米淀粉
+Bottle of Ethanol=一瓶乙醇
+Cotton Seed=棉籽
+Cotton=棉花
+String=线
+Cucumber=黄瓜
+Garlic clove=蒜瓣
+Garlic=大蒜
+Garlic Braid=蒜辫
+Grapes=葡萄
+Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上）
+Hemp Seed=大麻籽
+Hemp Leaf=大麻叶
+Bottle of Hemp Oil=一瓶大麻油
+Hemp Fibre=大麻纤维
+Hemp Block=麻块
+Hemp Rope=麻绳
+Melon Slice=西瓜片
+Melon=甜瓜
+Onion=洋葱
+Pea Pod=豌豆荚
+Peas=豌豆
+Pea Soup=豌豆汤
+Peppercorn=胡椒粉
+Pepper=胡椒粉
+Ground Pepper=胡椒粉
+Pineapple Top=菠萝上衣
+Pineapple=菠萝
+Pineapple Ring=菠萝圈
+Pineapple Juice=菠萝汁
+Potato=土豆
+Baked Potato=焗马铃薯
+Cucumber and Potato Salad=黄瓜土豆沙拉
+Pumpkin Slice=南瓜片
+Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关）
+Scarecrow Bottom=稻草人屁股
+Pumpkin Bread=南瓜面包
+Pumpkin Dough=南瓜面团
+Pumpkin=南瓜
+Raspberries=覆盆子
+Raspberry Smoothie=覆盆子冰沙
+Rhubarb=大黄
+Rhubarb Pie=大黄派
+Rye=黑麦
+Rye seed=黑麦种子
+Oat=燕麦
+Oat seed=燕麦籽
+Rice=大米
+Rice grains=稻谷
+Rice Bread=米饭面包
+Rice Flour=米粉
+Multigrain Flour=多粒面粉
+Multigrain Bread=杂粮面包
+Tomato=番茄
+Wheat Seed=小麦种子
+Wheat=小麦
+Straw=稻草
+Flour=面粉
+Bread=面包
+Sliced Bread=切片面包
+Toast=烤面包片
+Toast Sandwich=三明治面包
diff --git a/mods/mobs/mobs_mobs/Animal-World/anteater.lua b/mods/mobs/mobs_mobs/Animal-World/anteater.lua
index 9a509d8..451dcd3 100644
--- a/mods/mobs/mobs_mobs/Animal-World/anteater.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/anteater.lua
@@ -24,7 +24,7 @@ mobs:register_mob("animalworld:anteater", {
 	walk_velocity = 0.7,
 	run_velocity = 2,
 	runaway = false,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor"},
 	jump = false,
 	jump_height = 3,
 	pushable = true,
@@ -68,7 +68,7 @@ if minetest.get_mapgen_setting("mg_name") ~= "v6" then
 end
 
 if minetest.get_modpath("ethereal") then
-	spawn_on = {"ethereal:grass_grove", "ethereal:green_dirt"}
+	spawn_on = {"ethereal:grass_grove", "ethereal:green_dirt", "default:dirt_with_rainforest_litter"}
 end
 
 if not mobs.custom_spawn_animal then
diff --git a/mods/mobs/mobs_mobs/Animal-World/bat.lua b/mods/mobs/mobs_mobs/Animal-World/bat.lua
index 442ebc6..f6caa03 100644
--- a/mods/mobs/mobs_mobs/Animal-World/bat.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/bat.lua
@@ -23,7 +23,7 @@ stepheight = 3,
 	walk_velocity = 5,
 	run_velocity = 6,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	fall_speed = 0,
 	jump = true,
         jump_height = 6,
@@ -65,10 +65,14 @@ view_range = 4,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dirt_with_grass", "default:dry_dirt_with_dry_grass", "default:dirt_with_rainforest_litter", "default:dirt_with_coniferous_litter", "ethereal:gray_dirt", "ethereal:mushroom_dirt", "ethereal:grove_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:bat",
-	nodes = {"default:dirt_with_grass"}, {"default:dry_dirt_with_dry_grass"}, {"default:dirt_with_rainforest_litter"}, {"default:dirt_with_coniferous_litter"},
+	nodes = {"default:dirt_with_grass", "default:dry_dirt_with_dry_grass", "default:dirt_with_rainforest_litter", "default:dirt_with_coniferous_litter"},
 	min_light = 0,
 	interval = 60,
 	chance = 8000, -- 15000
diff --git a/mods/mobs/mobs_mobs/Animal-World/bear.lua b/mods/mobs/mobs_mobs/Animal-World/bear.lua
index d4eb1f7..4ae51da 100644
--- a/mods/mobs/mobs_mobs/Animal-World/bear.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/bear.lua
@@ -59,10 +59,14 @@ stepheight = 1,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dirt_with_coniferous_litter", "default:permafrost_with_moss", "ethereal:bamboo_dirt", "ethereal:gray_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:bear",
-	nodes = {"default:dirt_with_coniferous_litter"}, {"default:permafrost_with_moss"}, {"ethereal:bamboo_dirt"},
+	nodes = {"default:dirt_with_coniferous_litter"}, {"default:permafrost_with_moss"},
 	min_light = 0,
 	interval = 60,
 	chance = 8000, -- 15000
diff --git a/mods/mobs/mobs_mobs/Animal-World/blackbird.lua b/mods/mobs/mobs_mobs/Animal-World/blackbird.lua
index 61e2486..19358e0 100644
--- a/mods/mobs/mobs_mobs/Animal-World/blackbird.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/blackbird.lua
@@ -23,7 +23,7 @@ stepheight = 3,
 	walk_velocity = 2,
 	run_velocity = 4,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = true,
         jump_height = 6,
 	stepheight = 3,
@@ -81,79 +81,3 @@ mobs:spawn({
 end
 
 mobs:register_egg("animalworld:blackbird", ("Blackbird"), "ablackbird.png")
-
--- egg
-minetest.register_node(":mobs:egg", {
-	description = ("Chicken Egg"),
-	tiles = {"mobs_chicken_egg.png"},
-	inventory_image  = "mobs_chicken_egg.png",
-	visual_scale = 0.7,
-	drawtype = "plantlike",
-	wield_image = "mobs_chicken_egg.png",
-	paramtype = "light",
-	walkable = false,
-	is_ground_content = true,
-	sunlight_propagates = true,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
-	},
-	groups = {food_egg = 1, snappy = 2, dig_immediate = 3},
-	after_place_node = function(pos, placer, itemstack)
-		if placer:is_player() then
-			minetest.set_node(pos, {name = "mobs:egg", param2 = 1})
-		end
-	end,
-	on_use = mobs_shoot_egg
-})
-
-
--- fried egg
-minetest.register_craftitem(":animalworld:chicken_egg_fried", {
-	description = ("Bird Egg"),
-	inventory_image = "animalworld_chicken_egg_fried.png",
-	on_use = minetest.item_eat(2),
-	groups = {food_egg_fried = 1, flammable = 2},
-})
-
-minetest.register_craft({
-	type  =  "cooking",
-	recipe  = "mobs:egg",
-	output = "animalworld:chicken_egg_fried",
-})
-
--- raw chicken
-minetest.register_craftitem(":animalworld:chicken_raw", {
-description = ("Raw Bird Meat"),
-	inventory_image = "animalworld_chicken_raw.png",
-	on_use = minetest.item_eat(2),
-	groups = {food_meat_raw = 1, food_chicken_raw = 1, flammable = 2},
-})
-
--- cooked chicken
-minetest.register_craftitem(":animalworld:chicken_cooked", {
-description = ("Cooked Bird Meat"),
-	inventory_image = "animalworld_chicken_cooked.png",
-	on_use = minetest.item_eat(6),
-	groups = {food_meat = 1, food_chicken = 1, flammable = 2},
-})
-
-minetest.register_craft({
-	type  =  "cooking",
-	recipe  = "animalworld:chicken_raw",
-	output = "animalworld:chicken_cooked",
-})
-
--- feather
-minetest.register_craftitem(":animalworld:chicken_feather", {
-	description = ("Bird Feather"),
-	inventory_image = "animalworld_chicken_feather.png",
-	groups = {flammable = 2},
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "animalworld:chicken_feather",
-	burntime = 1,
-})
-
diff --git a/mods/mobs/mobs_mobs/Animal-World/boar.lua b/mods/mobs/mobs_mobs/Animal-World/boar.lua
index 8a21bbe..0fa9ba4 100644
--- a/mods/mobs/mobs_mobs/Animal-World/boar.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/boar.lua
@@ -40,12 +40,13 @@ mobs:register_mob("animalworld:boar", {
 	light_damage = 0,
 	fear_height = 2,
 	animation = {
-		speed_normal = 100,
+		speed_normal = 80,
+		stand_speed = 50,
 		stand_start = 0,
 		stand_end = 100,
-		walk_start = 300,
-		walk_end = 450,
-		punch_start = 100,
+		walk_start = 100,
+		walk_end = 200,
+		punch_start = 200,
 		punch_end = 300,
 
 		die_start = 1, -- we dont have a specific death animation so we will
@@ -69,7 +70,7 @@ if minetest.get_mapgen_setting("mg_name") ~= "v6" then
 end
 
 if minetest.get_modpath("ethereal") then
-	spawn_on = {"ethereal:mushroom_dirt", "ethereal:bamboo_dirt", "ethereal:green_dirt", "ethereal:mushroom"}
+	spawn_on = {"ethereal:mushroom_dirt", "ethereal:bamboo_dirt", "ethereal:green_dirt", "ethereal:mushroom_dirt", "default:dirt_with_coniferous_litter", "default:dirt_gray"}
 end
 
 if not mobs.custom_spawn_animal then
diff --git a/mods/mobs/mobs_mobs/Animal-World/camel.lua b/mods/mobs/mobs_mobs/Animal-World/camel.lua
index 9456e2e..28e32fb 100644
--- a/mods/mobs/mobs_mobs/Animal-World/camel.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/camel.lua
@@ -25,7 +25,7 @@ mobs:register_mob("animalworld:camel", {
 	walk_velocity = 2,
 	run_velocity = 5,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor"},
 	jump = false,
 	jump_height = 3,
 	pushable = true,
diff --git a/mods/mobs/mobs_mobs/Animal-World/carp.lua b/mods/mobs/mobs_mobs/Animal-World/carp.lua
index ac27cd4..863c00d 100644
--- a/mods/mobs/mobs_mobs/Animal-World/carp.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/carp.lua
@@ -24,7 +24,7 @@ stepheight = 0.0,
 	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing",
 	fall_speed = 0,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:elephant", "animalworld:hippo", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	stepheight = 0.0,
 	drops = {
@@ -47,7 +47,7 @@ stepheight = 0.0,
 		punch_end = 200,
 		-- 50-70 is slide/water idle
 	},
-	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing"},
+	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing"},
 	floats = 0,
 	follow = {
 		"ethereal:worm", "seaweed", "fishing:bait_worm",
diff --git a/mods/mobs/mobs_mobs/Animal-World/crab.lua b/mods/mobs/mobs_mobs/Animal-World/crab.lua
index 792cfc6..c7df29e 100644
--- a/mods/mobs/mobs_mobs/Animal-World/crab.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/crab.lua
@@ -25,7 +25,7 @@ stepheight = 1,
 	walk_velocity = 0.7,
 	run_velocity = 1,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:elephant", "animalworld:hippo", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	jump_height = 6,
 	drops = {
diff --git a/mods/mobs/mobs_mobs/Animal-World/crocodile.lua b/mods/mobs/mobs_mobs/Animal-World/crocodile.lua
index ac1ff34..7764b79 100644
--- a/mods/mobs/mobs_mobs/Animal-World/crocodile.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/crocodile.lua
@@ -46,7 +46,7 @@ stepheight = 1,
 		punch_end = 200,
 		-- 50-70 is slide/water idle
 	},
-	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing"},
+	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing"},
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw", "animalworld:rawfish", "mobs_fish:tropical",
@@ -63,6 +63,10 @@ stepheight = 1,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"ethereal:grove_dirt", "default:dry_dirt_with_dry_grass", "default:dirt_with_rainforest_litter"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:crocodile",
diff --git a/mods/mobs/mobs_mobs/Animal-World/depends.txt b/mods/mobs/mobs_mobs/Animal-World/depends.txt
index 7fb8823..95b19ed 100644
--- a/mods/mobs/mobs_mobs/Animal-World/depends.txt
+++ b/mods/mobs/mobs_mobs/Animal-World/depends.txt
@@ -3,4 +3,5 @@ default
 ethereal?
 xocean?
 farming?
-fishing?
\ No newline at end of file
+fishing?
+hunger_ng?
\ No newline at end of file
diff --git a/mods/mobs/mobs_mobs/Animal-World/elephant.lua b/mods/mobs/mobs_mobs/Animal-World/elephant.lua
index 72fee58..f77fbc4 100644
--- a/mods/mobs/mobs_mobs/Animal-World/elephant.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/elephant.lua
@@ -63,6 +63,10 @@ stepheight = 2,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dry_dirt_with_dry_grass"}, {"default:dirt_with_rainforest_litter"}, {"ethereal:grove_dirt"}, {"ethereal:bamboo_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:elephant",
diff --git a/mods/mobs/mobs_mobs/Animal-World/frog.lua b/mods/mobs/mobs_mobs/Animal-World/frog.lua
index 18de897..b539a36 100644
--- a/mods/mobs/mobs_mobs/Animal-World/frog.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/frog.lua
@@ -22,7 +22,7 @@ sounds = {
 	walk_velocity = 2,
 	run_velocity = 3,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = true,
 	jump_height = 6,
 	drops = {
@@ -41,7 +41,7 @@ sounds = {
 		fly_start = 250, -- swim animation
 		fly_end = 350,
 	},
-	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing"},
+	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing"},
 	floats = 0,
 	follow = {"fishing:bait:worm", "ethereal:worm"},
 	view_range = 6,
diff --git a/mods/mobs/mobs_mobs/Animal-World/gnu.lua b/mods/mobs/mobs_mobs/Animal-World/gnu.lua
index 6066d5b..294593c 100644
--- a/mods/mobs/mobs_mobs/Animal-World/gnu.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/gnu.lua
@@ -23,9 +23,9 @@ mobs:register_mob("animalworld:gnu", {
 
 	},
 	walk_velocity = 1,
-	run_velocity = 5,
+	run_velocity = 4,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	jump_height = 3,
 	pushable = true,
@@ -44,6 +44,7 @@ mobs:register_mob("animalworld:gnu", {
 		stand_end = 100,
 		walk_start = 100,
 		walk_end = 200,
+		run_speed = 100,
 		run_start = 200,
 		run_end = 300,
 
@@ -68,7 +69,7 @@ if minetest.get_mapgen_setting("mg_name") ~= "v6" then
 end
 
 if minetest.get_modpath("ethereal") then
-	spawn_on = {"default:dry_dirt_with_dry_grass"}
+	spawn_on = {"default:dry_dirt_with_dry_grass", "ethereal:prairie_dirt"}
 end
 
 if not mobs.custom_spawn_animal then
diff --git a/mods/mobs/mobs_mobs/Animal-World/hare.lua b/mods/mobs/mobs_mobs/Animal-World/hare.lua
index 7cd84f5..6ffb2f7 100644
--- a/mods/mobs/mobs_mobs/Animal-World/hare.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/hare.lua
@@ -20,7 +20,7 @@ stepheight = 1,
 	walk_velocity = 3,
 	run_velocity = 6,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = true,
 	jump_height = 6,
 	drops = {
diff --git a/mods/mobs/mobs_mobs/Animal-World/hippo.lua b/mods/mobs/mobs_mobs/Animal-World/hippo.lua
index a76d072..4d6ce80 100644
--- a/mods/mobs/mobs_mobs/Animal-World/hippo.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/hippo.lua
@@ -47,7 +47,7 @@ stepheight = 1,
 		-- 50-70 is slide/water idle
 	},
 
-fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing"},
+fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing"},
 	floats = 0,
 	follow = {
 		"ethereal:banana_single", "farming:corn_cob", "farming:cabbage",
@@ -65,6 +65,10 @@ view_range = 6,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dry_dirt_with_dry_grass"}, {"default:dirt_with_rainforest_litter"}, {"ethereal:grove_dirt"}, {"ethereal:prairie_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:hippo",
diff --git a/mods/mobs/mobs_mobs/Animal-World/hunger.lua b/mods/mobs/mobs_mobs/Animal-World/hunger.lua
new file mode 100644
index 0000000..3c75f35
--- /dev/null
+++ b/mods/mobs/mobs_mobs/Animal-World/hunger.lua
@@ -0,0 +1,53 @@
+if minetest.get_modpath("hunger_ng") ~= nil then
+	hunger_ng.add_hunger_data('animalworld:chicken_egg_fried', {
+		satiates = 2.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:chicken_raw', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:chicken_cooked', {
+		satiates = 3.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:pork_raw', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:pork_cooked', {
+		satiates = 4.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:rawfish', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:cookedfish', {
+		satiates = 2.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:rabbit_raw', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:rabbit_cooked', {
+		satiates = 3.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:rat_cooked', {
+		satiates = 2.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:raw_athropod', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:cooked_athropod', {
+		satiates = 2.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:rawmollusk', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:cookedmollusk', {
+		satiates = 2.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:butter', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:bucket_milk', {
+		satiates = 1.0,
+	})
+	hunger_ng.add_hunger_data('animalworld:cheese', {
+		satiates = 2.0,
+	})
+end
\ No newline at end of file
diff --git a/mods/mobs/mobs_mobs/Animal-World/hyena.lua b/mods/mobs/mobs_mobs/Animal-World/hyena.lua
index c5514e9..be56131 100644
--- a/mods/mobs/mobs_mobs/Animal-World/hyena.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/hyena.lua
@@ -60,6 +60,10 @@ stepheight = 2,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dry_dirt_with_dry_grass"}, {"ethereal:dry_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:hyena",
diff --git a/mods/mobs/mobs_mobs/Animal-World/init.lua b/mods/mobs/mobs_mobs/Animal-World/init.lua
index 36abcd0..7572b8f 100644
--- a/mods/mobs/mobs_mobs/Animal-World/init.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/init.lua
@@ -58,6 +58,7 @@ dofile(path .. "lobster.lua") --
 dofile(path .. "squid.lua") --
 dofile(path .. "kobra.lua") --
 dofile(path .. "bat.lua") --
+dofile(path .. "hunger.lua") --
 
 
 
diff --git a/mods/mobs/mobs_mobs/Animal-World/kangaroo.lua b/mods/mobs/mobs_mobs/Animal-World/kangaroo.lua
index 0c79301..1dcbfae 100644
--- a/mods/mobs/mobs_mobs/Animal-World/kangaroo.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/kangaroo.lua
@@ -22,7 +22,7 @@ mobs:register_mob("animalworld:kangaroo", {
 	walk_velocity = 5,
 	run_velocity = 5,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = true,
 	jump_height = 8,
 	pushable = true,
@@ -72,7 +72,6 @@ if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:kangaroo",
 	nodes = {"default:desert_sand", "default:dry_dirt_with_dry_grass"},
-	neighbors = spawn_by,
 	min_light = 0,
 	interval = 60,
 	chance = 8000, -- 15000
diff --git a/mods/mobs/mobs_mobs/Animal-World/kobra.lua b/mods/mobs/mobs_mobs/Animal-World/kobra.lua
index 1dacd14..7b37fc9 100644
--- a/mods/mobs/mobs_mobs/Animal-World/kobra.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/kobra.lua
@@ -51,6 +51,8 @@ stepheight = 2,
 		walk_end = 350,
 		punch_start = 150,
 		punch_end = 200,
+		shoot_start = 150,
+		shoot_end = 200,
 		-- 50-70 is slide/water idle
 	},
 
@@ -58,6 +60,9 @@ stepheight = 2,
 	floats = 0,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:desert_sandstone", "default:desert_stone", "default:sandstone", "default:dirt_with_rainforest_litter", "ethereal:grove_dirt"}
+end
 
 if not mobs.custom_spawn_monster then
 mobs:spawn({
diff --git a/mods/mobs/mobs_mobs/Animal-World/lobster.lua b/mods/mobs/mobs_mobs/Animal-World/lobster.lua
index 54b3fd2..c81b30f 100644
--- a/mods/mobs/mobs_mobs/Animal-World/lobster.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/lobster.lua
@@ -23,7 +23,7 @@ mobs:register_mob("animalworld:lobster", {
 	walk_velocity = 0.5,
 	run_velocity = 1,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	jump_height = 3,
 	pushable = true,
@@ -33,7 +33,7 @@ mobs:register_mob("animalworld:lobster", {
 	drops = {
 		{name = "animalworld:raw_athropod", chance = 1, min = 0, max = 2},
 	},
-	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing"},
+	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing"},
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw", "animalworld:rawfish", "mobs_fish:tropical",
@@ -81,7 +81,6 @@ if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:lobster",
 	nodes = {"default:water_source"},
-	neighbors = spawn_by,
 	min_light = 0,
 	interval = 60,
 	chance = 8000, -- 15000
diff --git a/mods/mobs/mobs_mobs/Animal-World/manatee.lua b/mods/mobs/mobs_mobs/Animal-World/manatee.lua
index 5ce3ebb..d137eef 100644
--- a/mods/mobs/mobs_mobs/Animal-World/manatee.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/manatee.lua
@@ -21,10 +21,10 @@ stepheight = 0.0,
 	walk_velocity = 0.5,
 	run_velocity = 2,
         fly = true,
-	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing",
+	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing",
 	fall_speed = 0,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	stepheight = 0.0,
 	drops = {
diff --git a/mods/mobs/mobs_mobs/Animal-World/models/Boar.b3d b/mods/mobs/mobs_mobs/Animal-World/models/Boar.b3d
index 825a628..db231bd 100644
Binary files a/mods/mobs/mobs_mobs/Animal-World/models/Boar.b3d and b/mods/mobs/mobs_mobs/Animal-World/models/Boar.b3d differ
diff --git a/mods/mobs/mobs_mobs/Animal-World/monitor.lua b/mods/mobs/mobs_mobs/Animal-World/monitor.lua
index fd98947..6a53440 100644
--- a/mods/mobs/mobs_mobs/Animal-World/monitor.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/monitor.lua
@@ -46,7 +46,7 @@ stepheight = 1,
 		punch_end = 300,
 		-- 50-70 is slide/water idle
 	},
-	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing"},
+	fly_in = {"default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing"},
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw", "animalworld:rawfish", "mobs_fish:tropical",
@@ -63,6 +63,10 @@ stepheight = 1,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:desert_sand"}, {"default:desert_sandstone"}, {"default:sandstone"}, {"ethereal:dry_dirt"}, {"ethereal:fiery_dirt"}
+end
+
 if not mobs.custom_spawn_monster then
 mobs:spawn({
 	name = "animalworld:monitor",
diff --git a/mods/mobs/mobs_mobs/Animal-World/moose.lua b/mods/mobs/mobs_mobs/Animal-World/moose.lua
index c0792f7..3be22c8 100644
--- a/mods/mobs/mobs_mobs/Animal-World/moose.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/moose.lua
@@ -25,7 +25,7 @@ mobs:register_mob("animalworld:moose", {
 	walk_velocity = 1,
 	run_velocity = 3,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor"},
 	jump = false,
 	jump_height = 3,
 	pushable = true,
@@ -76,7 +76,6 @@ if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:moose",
 	nodes = {"default:dirt_with_grass", "default:dirt_with_coniferous_litter"},
-	neighbors = spawn_by,
 	min_light = 0,
 	interval = 60,
 	chance = 8000, -- 15000
diff --git a/mods/mobs/mobs_mobs/Animal-World/nandu.lua b/mods/mobs/mobs_mobs/Animal-World/nandu.lua
index 8a8ce6b..1e69717 100644
--- a/mods/mobs/mobs_mobs/Animal-World/nandu.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/nandu.lua
@@ -11,7 +11,7 @@ stepheight = 1,
 	hp_min = 20,
 	hp_max = 50,
 	armor = 100,
-	collisionbox = {-0.5, -0.01, -0.3, 0.5, 0.1, 0.5},
+	collisionbox = {-0.4, -0.01, -0.3, 0.4, 0.8, 0.4},
 	visual = "mesh",
 	mesh = "Nandu.b3d",
 	textures = {
@@ -26,10 +26,10 @@ stepheight = 1,
 	walk_velocity = 0.7,
 	run_velocity = 3,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:elephant", "animalworld:hippo", "animalworld:spider", "animalworld:spidermale", "animalworld:shark"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor"},
 	drops = {
-		{name = "wwildlife:chicken_raw", chance = 1, min = 1, max = 1},
-		{name = "wwildlife:chicken_feather", chance = 1, min = 0, max = 2},
+		{name = "animalworld:chicken_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:chicken_feather", chance = 1, min = 0, max = 2},
 	},
 	water_damage = 1,
 	lava_damage = 5,
diff --git a/mods/mobs/mobs_mobs/Animal-World/owl.lua b/mods/mobs/mobs_mobs/Animal-World/owl.lua
index 408393d..ca2e11a 100644
--- a/mods/mobs/mobs_mobs/Animal-World/owl.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/owl.lua
@@ -67,6 +67,10 @@ view_range = 6,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dirt_with_coniferous_litter"}, {"default:pine_needles"}, {"ethereal:mushroom_dirt"}
+end
+
 if not mobs.custom_spawn_monster then
 mobs:spawn({
 	name = "animalworld:owl",
diff --git a/mods/mobs/mobs_mobs/Animal-World/puffin.lua b/mods/mobs/mobs_mobs/Animal-World/puffin.lua
index bc5a545..abfb128 100644
--- a/mods/mobs/mobs_mobs/Animal-World/puffin.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/puffin.lua
@@ -22,7 +22,7 @@ stepheight = 3,
 	walk_velocity = 5,
 	run_velocity = 6,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	fall_speed = 0,
 	jump = true,
         jump_height = 6,
@@ -65,6 +65,10 @@ view_range = 4,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:snowblock"}, {"default:ice"}, {"ethereal:crystal_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:puffin",
diff --git a/mods/mobs/mobs_mobs/Animal-World/rat.lua b/mods/mobs/mobs_mobs/Animal-World/rat.lua
index 4f02e53..753215f 100644
--- a/mods/mobs/mobs_mobs/Animal-World/rat.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/rat.lua
@@ -57,6 +57,9 @@ mobs:register_mob("animalworld:rat", {
 
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:stone", "default:mossycobble", "ethereal:dry_dirt"}
+end
 
 if not mobs.custom_spawn_animal then
 mobs:spawn({
diff --git a/mods/mobs/mobs_mobs/Animal-World/reindeer.lua b/mods/mobs/mobs_mobs/Animal-World/reindeer.lua
index 4508f22..6055acb 100644
--- a/mods/mobs/mobs_mobs/Animal-World/reindeer.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/reindeer.lua
@@ -24,7 +24,7 @@ mobs:register_mob("animalworld:reindeer", {
 	walk_velocity = 1,
 	run_velocity = 3,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	jump_height = 3,
 	pushable = true,
@@ -67,7 +67,7 @@ if minetest.get_mapgen_setting("mg_name") ~= "v6" then
 end
 
 if minetest.get_modpath("ethereal") then
-	spawn_on = {"default:dirt_with_snow"}
+	spawn_on = {"default:dirt_with_snow", "default:permafrost_with_moss", "ethereal:crystal_dirt"}
 end
 
 if not mobs.custom_spawn_animal then
diff --git a/mods/mobs/mobs_mobs/Animal-World/seal.lua b/mods/mobs/mobs_mobs/Animal-World/seal.lua
index 276eb2c..16485c1 100644
--- a/mods/mobs/mobs_mobs/Animal-World/seal.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/seal.lua
@@ -22,7 +22,7 @@ stepheight = 0.6,
 	run_velocity = 1,
 	runaway = true,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor"},
 	jump = false,
 	stepheight = 1.1,
 	drops = {
@@ -42,7 +42,7 @@ stepheight = 0.6,
 		fly_end = 850,
 		-- 50-70 is slide/water idle
 	},
-	fly_in = {"default:water_source", "default:water_flowing"},
+	fly_in = {"default:water_source", "default:water_flowing", "default:river_water_flowing", "default:river_water"},
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw", "animalworld:rawfish", "mobs_fish:tropical",
@@ -59,6 +59,10 @@ stepheight = 0.6,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:snowblock", "default_ice"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:seal",
diff --git a/mods/mobs/mobs_mobs/Animal-World/shark.lua b/mods/mobs/mobs_mobs/Animal-World/shark.lua
index b5d2074..66dc87a 100644
--- a/mods/mobs/mobs_mobs/Animal-World/shark.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/shark.lua
@@ -24,7 +24,7 @@ stepheight = 0.0,
 	walk_velocity = 2,
 	run_velocity = 4,
         fly = true,
-	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing",
+	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing",
 	fall_speed = 0,
 	runaway = false,
 	jump = false,
diff --git a/mods/mobs/mobs_mobs/Animal-World/spider.lua b/mods/mobs/mobs_mobs/Animal-World/spider.lua
index 2e5e987..de32de2 100644
--- a/mods/mobs/mobs_mobs/Animal-World/spider.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/spider.lua
@@ -47,6 +47,8 @@ stepheight = 4,
 		walk_end = 200,
 		punch_start = 200,
 		punch_end = 300,
+		shoot_start = 200,
+		shoot_end = 300,
 		-- 50-70 is slide/water idle
 	},
 })
diff --git a/mods/mobs/mobs_mobs/Animal-World/squid.lua b/mods/mobs/mobs_mobs/Animal-World/squid.lua
index 7ed53c6..b00a664 100644
--- a/mods/mobs/mobs_mobs/Animal-World/squid.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/squid.lua
@@ -23,7 +23,7 @@ stepheight = 0.0,
 	walk_velocity = 2,
 	run_velocity = 4,
         fly = true,
-	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing",
+	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing",
 	fall_speed = 0,
 	runaway = false,
 	jump = false,
diff --git a/mods/mobs/mobs_mobs/Animal-World/tiger.lua b/mods/mobs/mobs_mobs/Animal-World/tiger.lua
index 12481d7..5ac6d3a 100644
--- a/mods/mobs/mobs_mobs/Animal-World/tiger.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/tiger.lua
@@ -60,6 +60,10 @@ stepheight = 2,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dirt_with_rainforest_litter", "ethereal:green_dirt", "ethereal:grass_grove"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:tiger",
diff --git a/mods/mobs/mobs_mobs/Animal-World/tortoise.lua b/mods/mobs/mobs_mobs/Animal-World/tortoise.lua
index c21c2dd..aabb8df 100644
--- a/mods/mobs/mobs_mobs/Animal-World/tortoise.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/tortoise.lua
@@ -1,13 +1,13 @@
 mobs:register_mob("animalworld:tortoise", {
 stepheight = 1,
-	type = "monster",
+	type = "animal",
 	passive = false,
 	reach = 1,
 	attack_npcs = true,
 	reach = 2,
 	damage = 0,
 	hp_min = 45,
-	hp_max = 100,
+	hp_max = 250,
 	armor = 100,
 	collisionbox = {-0.268, -0.01, -0.268,  0.268, 0.167, 0.268},
 	visual = "mesh",
@@ -22,7 +22,7 @@ stepheight = 1,
 	walk_velocity = 0.2,
 	run_velocity = 0.3,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	jump_height = 6,
 	drops = {
diff --git a/mods/mobs/mobs_mobs/Animal-World/toucan.lua b/mods/mobs/mobs_mobs/Animal-World/toucan.lua
index 0792cdd..3083801 100644
--- a/mods/mobs/mobs_mobs/Animal-World/toucan.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/toucan.lua
@@ -25,7 +25,7 @@ stepheight = 6,
 	fall_speed = -1,
 	fall_damage = 0,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor"},
 	jump = true,
         jump_height = 8,
 	stepheight = 6,
@@ -67,6 +67,11 @@ view_range = 4,
 	end,
 })
 
+
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dirt_with_rainforest_litter", "ethereal:grove_dirt"}
+end
+
 if not mobs.custom_spawn_animal then
 mobs:spawn({
 	name = "animalworld:toucan",
diff --git a/mods/mobs/mobs_mobs/Animal-World/trout.lua b/mods/mobs/mobs_mobs/Animal-World/trout.lua
index 6ea0417..8fb9ec6 100644
--- a/mods/mobs/mobs_mobs/Animal-World/trout.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/trout.lua
@@ -21,10 +21,10 @@ stepheight = 0.0,
 	walk_velocity = 3,
 	run_velocity = 4,
         fly = true,
-	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing",
+	fly_in = "default:water_source", "default:river_water_source", "default:water_flowing", "default:river_water_flowing",
 	fall_speed = 0,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:elephant", "animalworld:hippo", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	jump = false,
 	stepheight = 0.0,
 	drops = {
diff --git a/mods/mobs/mobs_mobs/Animal-World/volverine.lua b/mods/mobs/mobs_mobs/Animal-World/volverine.lua
index f0fbc7d..57f36fe 100644
--- a/mods/mobs/mobs_mobs/Animal-World/volverine.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/volverine.lua
@@ -61,6 +61,10 @@ stepheight = 3,
 	end,
 })
 
+if minetest.get_modpath("ethereal") then
+	spawn_on = {"default:dirt_with_snow"}, {"default:permafrost_with_moss"}, {"default:snowblock"}
+end
+
 if not mobs.custom_spawn_monster then
 mobs:spawn({
 	name = "animalworld:volverine",
diff --git a/mods/mobs/mobs_mobs/Animal-World/vulture.lua b/mods/mobs/mobs_mobs/Animal-World/vulture.lua
index 404fac0..18f85e2 100644
--- a/mods/mobs/mobs_mobs/Animal-World/vulture.lua
+++ b/mods/mobs/mobs_mobs/Animal-World/vulture.lua
@@ -23,7 +23,7 @@ stepheight = 3,
 	walk_velocity = 5,
 	run_velocity = 6,
 	runaway = true,
-        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "player"},
+        runaway_from = {"animalworld:bear", "animalworld:crocodile", "animalworld:tiger", "animalworld:spider", "animalworld:spidermale", "animalworld:shark", "animalworld:hyena", "animalworld:kobra", "animalworld:monitor", "animalworld:snowleopard", "animalworld:volverine", "livingfloatlands:deinotherium", "livingfloatlands:carnotaurus", "livingfloatlands:lycaenops", "livingfloatlands:smilodon", "livingfloatlands:tyrannosaurus", "livingfloatlands:velociraptor", "player"},
 	fall_speed = 0,
 	jump = true,
         jump_height = 6,
diff --git a/mods/player/hunger_ng/interoperability/mobs_animal.lua b/mods/player/hunger_ng/interoperability/mobs.lua
similarity index 88%
rename from mods/player/hunger_ng/interoperability/mobs_animal.lua
rename to mods/player/hunger_ng/interoperability/mobs.lua
index 4974180..7dc9d98 100644
--- a/mods/player/hunger_ng/interoperability/mobs_animal.lua
+++ b/mods/player/hunger_ng/interoperability/mobs.lua
@@ -4,13 +4,13 @@
 -- Forums  https://forum.minetest.net/viewtopic.php?t=9917
 -- VCS     https://notabug.org/TenPlus1/mobs_animal
 --
--- The `mobs_animal` mod registers it’s stuff with the `mobs` prefix.
+-- The mob mods register their stuff with the `mobs` prefix in the `mobs` mod.
 
 
 local add = hunger_ng.add_hunger_data
 
 add('mobs:cheese',              { satiates = 2.5 })
-add('mobs:chicked_egg_fried',   { satiates = 2 })
+add('mobs:chicken_egg_fried',   { satiates = 2 })
 add('mobs:chicken_cooked',      { satiates = 5 })
 add('mobs:chicken_egg_fried',   { satiates = 2 })
 add('mobs:chicken_raw',         { satiates = 2, heals = -2 })