From 32f0c2f078caa02fea117d3936a9ca6d901e8929 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 16 Jul 2019 13:51:39 -0400 Subject: [PATCH] make old merged patches discreet --- .../mods/codermobs/codermobs/bom.lua | 0 .../codermobs/models/codermobs_bom.b3d | Bin .../codermobs/sounds/codermobs_bom_death.ogg | Bin .../sounds/codermobs_bom_explode.ogg | Bin .../codermobs/sounds/codermobs_bom_random.ogg | Bin .../sounds/codermobs_damage_hollow_metal.ogg | Bin .../codermobs/codermobs/src/bom}/BOM2b.blend | Bin .../codermobs/src/bom}/codermobs_bom_mesh.xcf | Bin .../sounds}/165911__deganoth__explosion-1.wav | Bin .../bom/sounds}/372186__seidolon__fuse.wav | Bin .../src/bom/sounds}/codermobs_bom_death.aup | 0 .../src/bom/sounds}/codermobs_bom_death1b.aup | 0 .../eff/d1f/eff1f2e0.au | Bin .../eff/d1f/eff1f2e0.au | Bin .../165911__deganoth__explosion-1.wav | Bin .../eff/d1f/eff1f7d4.au | Bin .../src/codermobs_damage_hollow_metal.aup | 0 .../codermobs/textures/codermobs_bom_mesh.png | Bin 0 -> 41727 bytes .../mods/codermobs/codermobs/baby_chick.lua | 0 .../mods/codermobs/codermobs/baby_chick.md | 10 +- .../codermobs/models/codermobs_baby_chick.b3d | Bin .../baby_chick}/codermobs_baby_chick.blend | Bin .../src/baby_chick}/codermobs_baby_chick.png | Bin ...odermobs_baby_chick-OLD-blocky-highres.vsd | Bin ...mobs_baby_chick-tenthsize-actualmeters.b3d | Bin .../unused/codermobs_baby_chick-x100.b3d | Bin .../unused/codermobs_baby_chick.blend | Bin .../codermobs/textures/codermobs_chick.png | Bin .../deer (same blurb as ostrich).txt | 7 + .../mods/codermobs/codermobs/deer.lua | 0 .../codermobs/models/codermobs_deer.b3d | Bin .../src/deer}/codermobs_deer 2b.blend | Bin .../codermobs/src/deer}/codermobs_deer.xcf | Bin .../deer}/unused/codermobs_deer (WIP HD).xcf | Bin ...or unpatched Irrlicht (still glitters).xcf | Bin ...dermobs_deer2a (still separate neck).blend | Bin .../textures/codermobs_deer_female_mesh.png | Bin .../textures/codermobs_deer_male_mesh.png | Bin .../elk--add/elk (same blurb as ostrich).txt | 7 + .../mods/codermobs/codermobs/elk.lua | 0 .../elk--add/mods/codermobs/codermobs/elk.txt | 9 + .../codermobs/models/codermobs_elk.b3d | Bin ...er of BLM Oregon [blm.gov slash yg5c]).jpg | Bin .../codermobs/src/elk}/codermobs_elk (HD).xcf | Bin .../src/elk}/codermobs_elk (detailed).b3d | Bin .../codermobs/src/elk}/codermobs_elk.xcf | Bin .../codermobs/src/elk}/elk (detailed).blend | Bin .../codermobs/src/elk}/elk-with-doubles.blend | Bin .../codermobs/codermobs/src/elk}/elk.blend | Bin .../unused/codermobs_deer fell_texture.xcf | Bin .../unused/codermobs_elk_female_pixel_art.png | Bin .../unused/codermobs_elk_male_pixel_art.png | Bin .../textures/codermobs_elk_female_hd.png | Bin .../textures/codermobs_elk_female_mesh.png | Bin .../textures/codermobs_elk_male_hd.png | Bin .../textures/codermobs_elk_male_mesh.png | Bin .../spider-sounds.txt | 4 + .../codermobs/codermobs_bucket_milk.txt | 3 + .../textures/codermobs_bucket_milk.png | Bin .../codermobs/models/mob_ostrich_ostrich.b3d | Bin .../mods/codermobs/codermobs/ostrich.txt | 7 + .../src/codermobs_ostrich-License.txt | 0 .../codermobs/src/codermobs_ostrich.blend | Bin .../codermobs/src/codermobs_ostrich.xcf | Bin .../codermobs/textures/codermobs_m_item.png | Bin .../textures/codermobs_ostrich_f_item.png | Bin .../textures/codermobs_ostrich_mesh.png | Bin .../codermobs_ostrich_saddle_mesh.png | Bin .../codermobs_fireball.txt | 4 + .../mods/codermobs/codermobs/LICENSE | 33 -- .../codermobs/codermobs/animal_materials.lua | 361 ------------------ .../textures/animal_materials_antlers.png | Bin 1927 -> 0 bytes ...ile-program--implement-debug-190621.patch} | 0 73 files changed, 50 insertions(+), 395 deletions(-) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/bom.lua (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/models/codermobs_bom.b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom}/BOM2b.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom}/codermobs_bom_mesh.xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/165911__deganoth__explosion-1.wav (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/372186__seidolon__fuse.wav (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/codermobs_bom_death.aup (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/codermobs_bom_death1b.aup (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/codermobs_bom_death_data/eff/d1f/eff1f2e0.au (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds => Bucket_Game-branches/bom--add/mods/codermobs/codermobs/src/bom/sounds}/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/bom--add}/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup (100%) create mode 100644 Bucket_Game-branches/bom--add/mods/codermobs/codermobs/textures/codermobs_bom_mesh.png rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/chicken-immature--add}/mods/codermobs/codermobs/baby_chick.lua (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/chicken-immature--add}/mods/codermobs/codermobs/baby_chick.md (79%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/chicken-immature--add}/mods/codermobs/codermobs/models/codermobs_baby_chick.b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick}/codermobs_baby_chick.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick}/codermobs_baby_chick.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick}/unused/codermobs_baby_chick-OLD-blocky-highres.vsd (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick}/unused/codermobs_baby_chick-tenthsize-actualmeters.b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick}/unused/codermobs_baby_chick-x100.b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/chicken-immature--add/mods/codermobs/codermobs/src/baby_chick}/unused/codermobs_baby_chick.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/chicken-immature--add}/mods/codermobs/codermobs/textures/codermobs_chick.png (100%) create mode 100644 Bucket_Game-branches/deer--add/deer (same blurb as ostrich).txt rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/deer--add}/mods/codermobs/codermobs/deer.lua (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/deer--add}/mods/codermobs/codermobs/models/codermobs_deer.b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer}/codermobs_deer 2b.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer}/codermobs_deer.xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer}/unused/codermobs_deer (WIP HD).xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer}/unused/codermobs_deer for unpatched Irrlicht (still glitters).xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/deer--add/mods/codermobs/codermobs/src/deer}/unused/codermobs_deer2a (still separate neck).blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/deer--add}/mods/codermobs/codermobs/textures/codermobs_deer_female_mesh.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/deer--add}/mods/codermobs/codermobs/textures/codermobs_deer_male_mesh.png (100%) create mode 100644 Bucket_Game-branches/elk--add/elk (same blurb as ostrich).txt rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/elk--add}/mods/codermobs/codermobs/elk.lua (100%) create mode 100644 Bucket_Game-branches/elk--add/mods/codermobs/codermobs/elk.txt rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/elk--add}/mods/codermobs/codermobs/models/codermobs_elk.b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => 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 (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/codermobs_elk (HD).xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/codermobs_elk (detailed).b3d (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/codermobs_elk.xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/elk (detailed).blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/elk-with-doubles.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/elk.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/unused/codermobs_deer fell_texture.xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/unused/codermobs_elk_female_pixel_art.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src => Bucket_Game-branches/elk--add/mods/codermobs/codermobs/src/elk}/unused/codermobs_elk_male_pixel_art.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/elk--add}/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/elk--add}/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/elk--add}/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/elk--add}/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png (100%) create mode 100644 Bucket_Game-branches/licenses-for-new-textures-and-sounds-190613/spider-sounds.txt create mode 100644 Bucket_Game-branches/milk-bucket--add/mods/codermobs/codermobs/codermobs_bucket_milk.txt rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/milk-bucket--add}/mods/codermobs/codermobs/textures/codermobs_bucket_milk.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/models/mob_ostrich_ostrich.b3d (100%) create mode 100644 Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/ostrich.txt rename patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/ostrich-License.txt => Bucket_Game-branches/ostrich--add/mods/codermobs/codermobs/src/codermobs_ostrich-License.txt (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/src/codermobs_ostrich.blend (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/src/codermobs_ostrich.xcf (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/textures/codermobs_m_item.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/textures/codermobs_ostrich_f_item.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/textures/codermobs_ostrich_mesh.png (100%) rename {patches/deprecated/merged-upstream/Bucket_Game => Bucket_Game-branches/ostrich--add}/mods/codermobs/codermobs/textures/codermobs_ostrich_saddle_mesh.png (100%) create mode 100644 patches/Bucket_Game-patched/codermobs_fireball.txt delete mode 100644 patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua delete mode 100644 patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/animal_materials_antlers.png rename patches/deprecated/merged-upstream/minetest.org/{mtcompile-program--implement-debug.patch => mtcompile-program--implement-debug-190621.patch} (100%) 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 0000000000000000000000000000000000000000..995d01a2c2d90ebd0dc58dc60ab023249477d9e7 GIT binary patch literal 41727 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

w{Udc*5-@A)2&{rq5Ze3r-?cL+fgkwj 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 literal 0 HcmV?d00001 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 6f1d34aec1e4a7ac3bd279f5ed53d6abf833e4f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1927 zcmV;22YC32P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00!?#L_t(o!^Kx?Y*fb?Ju`Ff zzPx^~z25Z$KZ$^VF<1#++kgo)QlO%Vu??goOdGT0F$q$!~o!DFP_`WTr9W=loFhte@bc$lr@r-+wY}c* zY*&Ny-g3OO63OtyLWmHYJKpMflEm+v&>Y^aE*iWNp$23|cK|%C0Nvnfk;6o;7k_Hr zUU`zK!R+8CA0G6_<(6PL{?j$NAWMR^&P})1y68Vu18_Q>(AC(5!D)W%Ot>57Z1c17ZKOVg-}BD)wn1f339RA zQ7I)j-cmwd@0k@Hz7l75?`&*2X?v5$L51-!MFna<~{qKhxU2nd4=%HEw=x8ow03b{3 z5||9#L<0aUt!qjTnC90O6&;E$-UEP+mh!yATNwN1fvTNf-Rb&t;!gbRwJH8)S{oMG z@pO5y{Z~0w?(pVYVmfoa%eBNA8QRZ-G5*Y_v--P}3;baE9`Ib`YUFV}sobz<7ycTQ z9)_;$p9(67XzZ##kUSIC@Il5Lun^=|6yi*_m7U(`mLM!naAg6y2@Fh&z<7ukrw^f$ zuuwvI5FC=tfp}cONWg@ui=(3<@iu_unuDk!pKg{Yu5T&^vB?CK67)}T=o|&(As$|i z?`-yXg=zYQG7m}!rXw5^Vf0Tf@P>5Uy>f+_>{fZ&dqV6G{{xvEqVwr_a-Qcz+{X>CZ?Axd6t*N=zE!I>z3zIH8lh3dllpd1_VHdQhk z0JI<2p3~v;4tG70C-&A*QJzPCbI;Si=-Oc&*zBfyWdSuAB}Gf-v!(IAuFGj%5hb?+ z_miy4=ibBxzD|VsRw5c6dgq3z)w)vCuDXzJ2QWA~&-s^j