make old merged patches discreet

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.md → 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:

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.

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.

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

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

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).

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.

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
+
+----------------------------------------------------------------------

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

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua

@@ -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"},
-    }
-})