diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/bom.lua b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/bom.lua similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/bom.lua rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/bom.lua diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_bom.b3d b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/models/codermobs_bom.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_bom.b3d rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/models/codermobs_bom.b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/BOM2b.blend b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/BOM2b.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/BOM2b.blend rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/BOM2b.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/codermobs_bom_mesh.xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/codermobs_bom_mesh.xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/165911__deganoth__explosion-1.wav b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/165911__deganoth__explosion-1.wav similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/165911__deganoth__explosion-1.wav rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/165911__deganoth__explosion-1.wav diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/372186__seidolon__fuse.wav b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/372186__seidolon__fuse.wav similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/372186__seidolon__fuse.wav rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/372186__seidolon__fuse.wav diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death.aup b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death.aup similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death.aup rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death.aup diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b.aup b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death1b.aup similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b.aup rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death1b.aup diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death_data/eff/d1f/eff1f2e0.au b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death_data/eff/d1f/eff1f2e0.au similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death_data/eff/d1f/eff1f2e0.au rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_bom_death_data/eff/d1f/eff1f2e0.au diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup rename to Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup diff --git a/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/textures/codermobs_bom_mesh.png b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/textures/codermobs_bom_mesh.png new file mode 100644 index 0000000..995d01a Binary files /dev/null and b/Bucket_Game-branches/bom--add/mods/codermobs/codermobs/textures/codermobs_bom_mesh.png differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.lua b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/baby_chick.lua similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.lua rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/baby_chick.lua diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.md b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/baby_chick.md similarity index 79% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.md rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/baby_chick.md index d2d215b..6da1ee0 100644 --- a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.md +++ b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/baby_chick.md @@ -7,6 +7,14 @@ by Poikilos Creative Commons Attribution-ShareAlike 4.0 https://creativecommons.org/licenses/by-sa/4.0/ Attribution: Poikilos + - or: +``` +---------------------------------------------------------------------- + +Media for "baby_chick": +(c) 2019 and CC-BY-NC-SA 4.0: Poikilos. + +``` ## 2019-04-18 I had watched a YouTube video of chicks but didn't measure the speed. @@ -14,6 +22,6 @@ I also halved the speed below. Today I did some research on chickens, and accounted for 10 Blender units being 1 Minetest unit. Adult chickens run around 9mph normally. That's 4.02 m/s (meters/sec). They are about .37 m tall. Ours our an exaggerated size, .63 but that's ok for illustration purposes. Some chickens are that tall or taller. Reverse the equation to get chick speed from size: -The chick, at size x10, is .53 m tall. Therefore, ratio of adult to immature is .63:.53. Maybe change it to two thirds: .63:.42 +The chick, at size x10, is .53 m tall. Therefore, ratio of adult to immature is .63:.53. Maybe change it to two thirds: .63:.42 Then change animation speed to match proportionally (to avoid foot sliding). See updated code for details: diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_baby_chick.b3d b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/models/codermobs_baby_chick.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_baby_chick.b3d rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/models/codermobs_baby_chick.b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_baby_chick.blend b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/codermobs_baby_chick.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_baby_chick.blend rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/codermobs_baby_chick.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_baby_chick.png b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/codermobs_baby_chick.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_baby_chick.png rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/codermobs_baby_chick.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick-OLD-blocky-highres.vsd b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick-OLD-blocky-highres.vsd similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick-OLD-blocky-highres.vsd rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick-OLD-blocky-highres.vsd diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick-tenthsize-actualmeters.b3d b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick-tenthsize-actualmeters.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick-tenthsize-actualmeters.b3d rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick-tenthsize-actualmeters.b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick-x100.b3d b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick-x100.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick-x100.b3d rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick-x100.b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick.blend b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_baby_chick.blend rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick/unused/codermobs_baby_chick.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_chick.png b/Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/textures/codermobs_chick.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_chick.png rename to Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/textures/codermobs_chick.png diff --git a/Bucket_Game-branches/deer--add/deer (same blurb as ostrich).txt b/Bucket_Game-branches/deer--add/deer (same blurb as ostrich).txt new file mode 100644 index 0000000..52a250e --- /dev/null +++ b/Bucket_Game-branches/deer--add/deer (same blurb as ostrich).txt @@ -0,0 +1,7 @@ +Media for "animal_materials", "deer", "elk", and "ostrich": + +See the 5 associated Lua source files. In general, the media is: +(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier and Poikilos + +The "ostrich" texture is as described above but also attribution: Old- +Coder. diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/deer.lua b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/deer.lua similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/deer.lua rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/deer.lua diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_deer.b3d b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/models/codermobs_deer.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_deer.b3d rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/models/codermobs_deer.b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_deer 2b.blend b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/codermobs_deer 2b.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_deer 2b.blend rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/codermobs_deer 2b.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_deer.xcf b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/codermobs_deer.xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_deer.xcf rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/codermobs_deer.xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer (WIP HD).xcf b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/unused/codermobs_deer (WIP HD).xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer (WIP HD).xcf rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/unused/codermobs_deer (WIP HD).xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer for unpatched Irrlicht (still glitters).xcf b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/unused/codermobs_deer for unpatched Irrlicht (still glitters).xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer for unpatched Irrlicht (still glitters).xcf rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/unused/codermobs_deer for unpatched Irrlicht (still glitters).xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer2a (still separate neck).blend b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/unused/codermobs_deer2a (still separate neck).blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer2a (still separate neck).blend rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer/unused/codermobs_deer2a (still separate neck).blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_deer_female_mesh.png b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/textures/codermobs_deer_female_mesh.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_deer_female_mesh.png rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/textures/codermobs_deer_female_mesh.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_deer_male_mesh.png b/Bucket_Game-branches/deer--add/mods/codermobs/codermobs/textures/codermobs_deer_male_mesh.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_deer_male_mesh.png rename to Bucket_Game-branches/deer--add/mods/codermobs/codermobs/textures/codermobs_deer_male_mesh.png diff --git a/Bucket_Game-branches/elk--add/elk (same blurb as ostrich).txt b/Bucket_Game-branches/elk--add/elk (same blurb as ostrich).txt new file mode 100644 index 0000000..52a250e --- /dev/null +++ b/Bucket_Game-branches/elk--add/elk (same blurb as ostrich).txt @@ -0,0 +1,7 @@ +Media for "animal_materials", "deer", "elk", and "ostrich": + +See the 5 associated Lua source files. In general, the media is: +(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier and Poikilos + +The "ostrich" texture is as described above but also attribution: Old- +Coder. diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/elk.lua similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/elk.lua diff --git a/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/elk.txt b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/elk.txt new file mode 100644 index 0000000..234ca18 --- /dev/null +++ b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/elk.txt @@ -0,0 +1,9 @@ +Unused Pixel Art in src (approximately 7 colors) Elk texture: + Copyright Sapier and Poikilos + (converted to UV-mapped texture by Poikilos) + Creative Commons Attribution Share-Alike 3.0 + +HD Elk texture and default (16-color realistic) texture: + Copyright Stephen Baker (BLM/Oregon) and Poikilos + (converted to UV-mapped texture by Poikilos) + Creative Commons Attribution 2.0 Generic diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/models/codermobs_elk.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/models/codermobs_elk.b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/Elk.webm.360p.vp9 (CC BY 2.0 Generic Stephen Baker of BLM Oregon [blm.gov slash yg5c]).jpg b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/Elk.webm.360p.vp9 (CC BY 2.0 Generic Stephen Baker of BLM Oregon [blm.gov slash yg5c]).jpg similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/Elk.webm.360p.vp9 (CC BY 2.0 Generic Stephen Baker of BLM Oregon [blm.gov slash yg5c]).jpg rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/Elk.webm.360p.vp9 (CC BY 2.0 Generic Stephen Baker of BLM Oregon [blm.gov slash yg5c]).jpg diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/codermobs_elk (HD).xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/codermobs_elk (HD).xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (detailed).b3d b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/codermobs_elk (detailed).b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (detailed).b3d rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/codermobs_elk (detailed).b3d diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/codermobs_elk.xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/codermobs_elk.xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk (detailed).blend b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/elk (detailed).blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk (detailed).blend rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/elk (detailed).blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk-with-doubles.blend b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/elk-with-doubles.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk-with-doubles.blend rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/elk-with-doubles.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/elk.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/elk.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer fell_texture.xcf b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/unused/codermobs_deer fell_texture.xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_deer fell_texture.xcf rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/unused/codermobs_deer fell_texture.xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_female_pixel_art.png b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/unused/codermobs_elk_female_pixel_art.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_female_pixel_art.png rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/unused/codermobs_elk_female_pixel_art.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_male_pixel_art.png b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/unused/codermobs_elk_male_pixel_art.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_male_pixel_art.png rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk/unused/codermobs_elk_male_pixel_art.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png b/Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png rename to Bucket_Game-branches/elk--add/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png diff --git a/Bucket_Game-branches/licenses-for-new-textures-and-sounds-190613/spider-sounds.txt b/Bucket_Game-branches/licenses-for-new-textures-and-sounds-190613/spider-sounds.txt new file mode 100644 index 0000000..ed70210 --- /dev/null +++ b/Bucket_Game-branches/licenses-for-new-textures-and-sounds-190613/spider-sounds.txt @@ -0,0 +1,4 @@ +Improved Spider/Bug Sounds: +codermobs_damage_giant_exoskeleton, codermobs_death_giant_bug, +codermobs_use_giant_exoskeleton +(c) 2019 and CC BY-SA 4.0: Poikilos diff --git a/Bucket_Game-branches/milk-bucket--add/mods/codermobs/codermobs/codermobs_bucket_milk.txt b/Bucket_Game-branches/milk-bucket--add/mods/codermobs/codermobs/codermobs_bucket_milk.txt new file mode 100644 index 0000000..6e20e7f --- /dev/null +++ b/Bucket_Game-branches/milk-bucket--add/mods/codermobs/codermobs/codermobs_bucket_milk.txt @@ -0,0 +1,3 @@ +Realistic Milk Bucket +----------------------------- +(c) 2015-2019 and CC BY-SA 3.0: ElementW, Poikilos (modified by). diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_bucket_milk.png b/Bucket_Game-branches/milk-bucket--add/mods/codermobs/codermobs/textures/codermobs_bucket_milk.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_bucket_milk.png rename to Bucket_Game-branches/milk-bucket--add/mods/codermobs/codermobs/textures/codermobs_bucket_milk.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/mob_ostrich_ostrich.b3d b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/models/mob_ostrich_ostrich.b3d similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/mob_ostrich_ostrich.b3d rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/models/mob_ostrich_ostrich.b3d diff --git a/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/ostrich.txt b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/ostrich.txt new file mode 100644 index 0000000..52a250e --- /dev/null +++ b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/ostrich.txt @@ -0,0 +1,7 @@ +Media for "animal_materials", "deer", "elk", and "ostrich": + +See the 5 associated Lua source files. In general, the media is: +(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier and Poikilos + +The "ostrich" texture is as described above but also attribution: Old- +Coder. diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/ostrich-License.txt b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich-License.txt similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/ostrich-License.txt rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich-License.txt diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_ostrich.blend b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich.blend similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_ostrich.blend rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich.blend diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_ostrich.xcf b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich.xcf similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_ostrich.xcf rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich.xcf diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_m_item.png b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_m_item.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_m_item.png rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_m_item.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_ostrich_f_item.png b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_ostrich_f_item.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_ostrich_f_item.png rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_ostrich_f_item.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_ostrich_mesh.png b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_ostrich_mesh.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_ostrich_mesh.png rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_ostrich_mesh.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_ostrich_saddle_mesh.png b/Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_ostrich_saddle_mesh.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_ostrich_saddle_mesh.png rename to Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/textures/codermobs_ostrich_saddle_mesh.png diff --git a/patches/Bucket_Game-patched/codermobs_fireball.txt b/patches/Bucket_Game-patched/codermobs_fireball.txt new file mode 100644 index 0000000..db6bcdb --- /dev/null +++ b/patches/Bucket_Game-patched/codermobs_fireball.txt @@ -0,0 +1,4 @@ +codermobs_fireball: +(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier, Poikilos + +---------------------------------------------------------------------- diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE index c0ba7f5..3f6e85a 100644 --- a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE +++ b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE @@ -28,25 +28,6 @@ licenses are copyright and licensed as follows: ---------------------------------------------------------------------- -Media for "baby_chick": -(c) 2019 and CC-BY-NC-SA 3.0: Poikilos. - ----------------------------------------------------------------------- - -Improved Spider/Bug Sounds: -codermobs_damage_giant_exoskeleton, codermobs_death_giant_bug, -codermobs_use_giant_exoskeleton -(c) 2019 and CC BY-SA 4.0: Poikilos - -Improved Particles: -codermobs_blood, codermobs_damage_stone, codermobs_lott_spider_blood -(c) 2019 and CC BY-SA 4.0: Poikilos - -codermobs_fireball: -(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier, Poikilos - ----------------------------------------------------------------------- - Media for "animal_materials", "deer", "elk", "ostrich", and "sacreep- er": @@ -60,16 +41,6 @@ Coder. Code for "animal_materials": Same as media. The other 4 mobs listed here use new code. -Unused Pixel Art in src (approximately 7 colors) Elk texture: - Copyright Sapier and Poikilos - (converted to UV-mapped texture by Poikilos) - Creative Commons Attribution Share-Alike 3.0 - -HD Elk texture and default (16-color realistic) texture: - Copyright Stephen Baker (BLM/Oregon) and Poikilos - (converted to UV-mapped texture by Poikilos) - Creative Commons Attribution 2.0 Generic - Additionally, "chicken.lua" uses Sapier's 3D egg. See that Lua source file as well. @@ -104,10 +75,6 @@ Butterfly ----------------------------- (c) 2012 to 2019 and CC BY-SA 3.0: AspireMint. -Realistic Milk Bucket ------------------------------ -(c) 2015-2019 and CC BY-SA 3.0: ElementW, Poikilos (modified by). - D00Med code ----------------------------- GNU Lesser General Public License 2.1 diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua deleted file mode 100644 index 78de380..0000000 --- a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua +++ /dev/null @@ -1,361 +0,0 @@ --- =================================================================== --- Code and media license. --- --- You may copy, use, modify or do nearly anything but remove this --- copyright notice. Of course, you're not allowed to pretend you've --- created or written the Sapier or Poikilos pieces. --- --- CC-BY-SA 3.0. Attribution: Sapier and Poikilos. - --- =================================================================== - --- Boilerplate to support localized strings if intllib mod is install- --- ed. - -local S -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function ( s ) return s end -end - -core.log("action","MOD: animal_materials loading ...") -local version = "0.1.3" - -animal_materialsdata = {} - --- =================================================================== --- Node definitions - --- =================================================================== --- Item definitions - --- =================================================================== --- deamondeath sword --- - -minetest.register_tool(":animal_materials:sword_deamondeath", { - description = S("Sword (Deamondeath)"), - inventory_image = "default_tool_steelsword.png", - tool_capabilities = { - full_punch_interval = 0.50, - max_drop_level=1, - groupcaps={ - fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=10, maxlevel=1}, - snappy={times={[2]=0.70, [3]=0.30}, uses=40, maxlevel=1}, - choppy={times={[3]=0.70}, uses=40, maxlevel=0}, - deamon={times={[1]=0.25, [2]=0.10, [3]=0.05}, uses=20, maxlevel=3}, - } - } - }) - --- =================================================================== --- scissors --- - -minetest.register_tool(":animal_materials:scissors", { - description = S("Scissors"), - inventory_image = "animal_materials_scissors.png", - tool_capabilities = { - max_drop_level=0, - groupcaps={ - wool = {uses=40,maxlevel=1} - } - }, -}) - --- =================================================================== --- lasso --- - -minetest.register_craftitem(":animal_materials:lasso", { - description = S("Lasso"), - image = "animal_materials_lasso.png", - stack_max=10, -}) - --- =================================================================== --- net --- - -minetest.register_craftitem(":animal_materials:net", { - description = S("Net"), - image = "animal_materials_net.png", - stack_max=10, -}) - --- =================================================================== --- saddle --- - -minetest.register_craftitem(":animal_materials:saddle", { - description = S("Saddle"), - image = "animal_materials_saddle.png", - stack_max=1 -}) - --- =================================================================== --- contract --- - -minetest.register_craftitem(":animal_materials:contract", { - description = S("Contract"), - image = "animal_materials_contract.png", - stack_max=10, -}) - --- =================================================================== --- meat --- - -minetest.register_craftitem(":animal_materials:meat_raw", { - description = S("Raw meat"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:meat_pork", { - description = S("Pork (raw)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:meat_beef", { - description = S("Beef (raw)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:meat_chicken", { - description = S("Chicken (raw)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:meat_lamb", { - description = S("Lamb (raw)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:meat_venison", { - description = S("Venison (raw)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:meat_undead", { - description = S("Meat (not quite dead)"), - image = "animal_materials_meat_undead_raw.png", - on_use = minetest.item_eat(-2), - groups = { meat=1, eatable=1 }, - stack_max=5 -}) - -minetest.register_craftitem(":animal_materials:meat_toxic", { - description = S("Toxic Meat"), - image = "animal_materials_meat_toxic_raw.png", - on_use = minetest.item_eat(-5), - groups = { meat=1, eatable=1 }, - stack_max=5 -}) - -minetest.register_craftitem(":animal_materials:meat_ostrich", { - description = S("Ostrich Meat"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(3), - groups = { meat=1, eatable=1 }, - stack_max=5 -}) - -minetest.register_craftitem(":animal_materials:pork_raw", { - description = S("Pork"), - image = "animal_materials_pork_raw.png", - on_use = minetest.item_eat(4), - groups = { meat=1, eatable=1 }, - stack_max=5 -}) - -minetest.register_craftitem(":animal_materials:fish_bluewhite", { - description = S("Fish (bluewhite)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:fish_clownfish", { - description = S("Fish (clownfish)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) - --- =================================================================== --- feather --- - -minetest.register_craftitem(":animal_materials:feather", { - description = S("Feather"), - image = "animal_materials_feather.png", - stack_max=25 -}) - --- =================================================================== --- milk --- - -minetest.register_craftitem(":animal_materials:milk", { - description = S("Milk"), - image = "animal_materials_milk.png", - on_use = minetest.item_eat(1), - groups = { eatable=1 }, - stack_max=10 -}) - --- =================================================================== --- egg --- - -minetest.register_craftitem(":animal_materials:egg", { - description = S("Egg"), - image = "animal_materials_egg.png", - stack_max=10 -}) - -minetest.register_craftitem(":animal_materials:egg_big", { - description = S("Egg (big)"), - image = "animal_materials_egg_big.png", - stack_max=5 -}) - -animal_materialsdata["animal_materials_egg"] = { - graphics_3d = { - visual = "mesh", - mesh = "animal_materials_egg_ent.b3d", - textures = { "animal_materials_egg_ent_mesh.png" }, - collisionbox = { -0.12,-0.125,-0.12,0.12,0.125,0.12 }, - visual_size = {x=1,y=1,z=1}, - } - } - -animal_materialsdata["animal_materials_egg_big"] = { - graphics_3d = { - visual = "mesh", - mesh = "animal_materials_egg_ent.b3d", - textures = { "animal_materials_egg_ent_mesh.png" }, - collisionbox = { -0.24,-0.25,-0.24,0.24,0.25,0.24 }, - visual_size = {x=2,y=2,z=2}, - } - } - --- =================================================================== --- bone --- - -minetest.register_craftitem(":animal_materials:bone", { - description = S("Bone"), - image = "animal_materials_bone.png", - stack_max=25 -}) - --- =================================================================== --- furs --- - --- =================================================================== - -minetest.register_craftitem(":animal_materials:fur", { - description = S("Fur"), - image = "animal_materials_fur.png", - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:fur_deer", { - description = S("Deer fur"), - image = "animal_materials_deer_fur.png", - stack_max=10 -}) - -minetest.register_craftitem(":animal_materials:coat_cattle", { - description = S("Cattle coat"), - image = "animal_materials_cattle_coat.png", - stack_max=10 -}) - --- =================================================================== --- horns --- - -minetest.register_craftitem(":animal_materials:antlers", { - description = S("Antlers"), - image = "animal_materials_antlers.png", - stack_max=20 -}) - -minetest.register_craftitem(":animal_materials:ivory", { - description = S("Ivory"), - image = "animal_materials_ivory.png", - stack_max=20 -}) - --- =================================================================== --- scale - -minetest.register_craftitem(":animal_materials:scale_golden", { - description = S("Scale (golden)"), - image = "animal_materials_scale_golden.png", - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:scale_white", { - description = S("Scale (white)"), - image = "animal_materials_scale_white.png", - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:scale_grey", { - description = S("Scale (grey)"), - image = "animal_materials_scale_grey.png", - stack_max=25 -}) - -minetest.register_craftitem(":animal_materials:scale_blue", { - description = S("Scale (blue)"), - image = "animal_materials_scale_blue.png", - stack_max=25 -}) - --- =================================================================== --- recipes - -minetest.register_craft({ - output = "wool:white", - recipe = { - {"animal_materials:feather","animal_materials:feather","animal_materials:feather"}, - {"animal_materials:feather", "animal_materials:feather","animal_materials:feather"}, - {"animal_materials:feather","animal_materials:feather","animal_materials:feather"}, - } -}) - -minetest.register_craft({ - output = "animal_materials:contract", - recipe = { - {"default:paper"}, - {"default:paper"}, - } -}) diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/animal_materials_antlers.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/animal_materials_antlers.png deleted file mode 100644 index 6f1d34a..0000000 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/animal_materials_antlers.png and /dev/null differ diff --git a/patches/deprecated/merged-upstream/minetest.org/mtcompile-program--implement-debug.patch b/patches/deprecated/merged-upstream/minetest.org/mtcompile-program--implement-debug-190621.patch similarity index 100% rename from patches/deprecated/merged-upstream/minetest.org/mtcompile-program--implement-debug.patch rename to patches/deprecated/merged-upstream/minetest.org/mtcompile-program--implement-debug-190621.patch