Merge remote-tracking branch 'upstream/master'

update penguin to use group:food_fish_raw for taming
use group:food_fish_raw instead of huge list of fish
2021-03-25 21:47:49 +01:00 · 2021-03-23 19:14:37 +00:00 · 2021-03-23 17:08:15 +00:00 · 2021-03-23 16:38:48 +00:00
2 changed files with 5 additions and 22 deletions
--- a/kitten.lua
+++ b/kitten.lua
@@ -53,17 +53,8 @@ stepheight = 1.1,
 		stoodup_end = 0,
 	},
 	follow = {
-		"mobs_animal:rat",
-		"ethereal:fish_raw",
-		"mobs_fish:clownfish",
-		"mobs_fish:tropical",
-		"fishing:clownfish_raw",
-		"fishing:bluewhite_raw",
-		"fishing:exoticfish_raw",
-		"fishing:carp_raw",
-		"fishing:perch_raw",
-		"fishing:catfish_raw",
-		"xocean:fish_edible",
+		"mobs:rat", "group:food_fish_raw", "mobs_fish:tropical", "xocean:fish_edible",
+		"group:fishraw" -- NALC: Group from fishing mod
 	},
 	view_range = 8,

--- a/penguin.lua
+++ b/penguin.lua
@@ -46,17 +46,9 @@ stepheight = 0.6,
 	fly_in = {"default:water_source", "default:water_flowing"},
 	floats = 0,
 	follow = {
-		"ethereal:fish_raw",
-		"mobs_fish:clownfish_set", "mobs_fish:clownfish",
-		"mobs_fish:tropical_set", "mobs_fish:tropical",
-		"fishing:fish_raw",
-		"fishing:clownfish_raw",
-		"fishing:bluewhite_raw",
-		"fishing:exoticfish_raw",
-		"fishing:carp_raw",
-		"fishing:perch_raw",
-		"fishing:catfish_raw",
-		"xocean:fish_edible",
+		"group:food_fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical",
+		"mobs_fish:clownfish_set", "mobs_fish:tropical_set", "xocean:fish_edible",
+		"group:fishraw" -- Edit from NALC: Group from fishing mod
 	},
 	view_range = 5,
Author	SHA1	Message	Date
sys4	0873ef4119	Merge remote-tracking branch 'upstream/master'	2021-03-25 21:47:49 +01:00
tenplus1	f2b1b752a7	update penguin to use group:food_fish_raw for taming	2021-03-23 19:14:37 +00:00
tenplus1	db59194f88	use group:food_fish_raw instead of huge list of fish	2021-03-23 17:08:15 +00:00
tenplus1	733ab61820	update fish kittens like	2021-03-23 16:38:48 +00:00