Browse Source

change formatting and texture naming for cleaner diff with Bucket_Game

master
poikilos 6 years ago
committed by Jacob Gustafson
parent
commit
43821c8ccb
  1. 12
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/LICENSE
  2. 43
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt
  3. 4
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderfood/cake/README.txt
  4. 34
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE
  5. 21
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua
  6. 29
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua
  7. 26
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/init.lua
  8. 0
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png
  9. 0
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png

12
patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/LICENSE

@ -1,10 +1,16 @@
# "nftools" license information
## Minerals
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>, Poikilos (modified by)
Copyright (C) 2019 OldCoder (Robert Kiraly) and Poikilos
Creative Commons Zero
Formerly WTFPL Version 2, December 2004, and what we want to do is re-
lease an improved version with a better license.
<https://creativecommons.org/share-your-work/public-domain/cc0/>
The original author is unknown, but WTFPL allows distribution without
attribution. We'll offer attribution if the original author can be
identified.
## Stool
Photo-326311 by Pixabay, made into texture by Poikilos
Creative Commons Zero
@ -40,7 +46,9 @@ Poikilos (relit, rendered, & retouched by)
## Code
MIT License
Copyright 2004 Sam Hocevar, 2019 OldCoder, 2019 Poikilos
Formerly WTFPL Version 2, December 2004, and what we want to do is re-
lease an improved version with a better license.
Copyright (C) 2019 OldCoder (Robert Kiraly) and Poikilos
Permission is hereby granted, free of charge, to any person obtaining

43
patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt

@ -1,27 +1,37 @@
Name: nftools
Source: Fork of upstream mod - Do not replace
License: Open the LICENSE file using your favorite text editor.
License: See "LICENSE"
----------------------------------------------------------------------
Nftools adds additional minerals and tools to minetest.
New tools:
1. "nftools" is a fork of a deceased mod, name and author unknown,
that was licensed originally under WTFPL.
As the original mod was licensed under WTFPL, attribution isn't re-
quired, though we'll offer it if the mod can be identified.
----------------------------------------------------------------------
2. "nftools" adds new minerals and tools.
New tools include:
* Battle Axe (low level weapon, does knockback occasionally)
* Mace (high level weapon)
* Scythe
* "Quartz Crystals" decorative node
The Original version by Sam Hocevar adds the following minerals:
Amber (block and "chip")
Poikilos has made changes designed to make "nftools" complement
"birthstones". His changes include:
Poikilos' fork is designed to compliment birthstones by making the
following changes:
* Changed alexandrite (overlap with birthstones):
to bismuth (it already looked somewhat like bismuth)
* Changed amethyst (modified texture until looked like black opal):
to black opal
to black opal.
* Changed aquamarine:
to turquoise
* Use standard texture naming conventions
(change nftools_*ore.png to nftools_mineral_*.png,
nftools:*_ore to nftools:stone_with_*,
@ -32,15 +42,16 @@ following changes:
`nftools:aquamarine, nftools:turquoise`
(using aliases)
Unrelated changes:
Other changes:
* Battle Axe, Mace, and Scythe textures
* Tint of amber nodes is now amber (with yellow highlights) instead of
yellow. Blending is improved, and texture is 16% transparent.
* Bismuth texture is more angular to look even more like bismuth
* Improve ore textures (nftools_mineral_*.png)
* fixed issue where aquamarine ore drops ore
* removed all smelting (smelting gemstones? really? not anymore)
except Bismuth (formerly nftools:alexandrite)
* Register each craftitem before referencding it as a drop.
* Make missing recipe for quartz crystals node (displayable quartz)
* Removed unused textures
* Fixed issue where aquamarine ore drops ore
* Removed all smelting except for Bismuth
* Register each craftitem before referencing it as a drop
* Add missing recipe for quartz crystals node (displayable quartz)

4
patches/deprecated/merged-upstream/Bucket_Game/mods/coderfood/cake/README.txt

@ -25,7 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Authors and licenses of textures (not based on textures from TenPlus1's version):
Authors and licenses of textures:
---------------------------------
Creative Commons Zero
https://creativecommons.org/share-your-work/public-domain/cc0/
@ -38,6 +38,6 @@ lux_pp, Poikilos (texture and 3d version):
cake_sugar.png
cake_top.png
(also files in src directory)
unknown CC0 (multiple users on purepng.com):
cake_sugar.png
(also sugar xcf project in src directory)

34
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE

@ -22,14 +22,44 @@ HD Elk texture and default (16-color realistic) texture:
(converted to UV-mapped texture by Poikilos)
Creative Commons Attribution 2.0 Generic
Other code and media for Sapier's "animal_materials", "elk":
----------------------------------------------------------------------
Ostrich model:
CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
http://creativecommons.org/licenses/by-sa/3.0/de/legalcode
2019-04-06: Poikilos reexported the model and worked on the textures.
----------------------------------------------------------------------
Other code and media for Sapier's "animal_materials", "elk"
(formerly "deer"), and "ostrich":
See the associated Lua source files.
----------------------------------------------------------------------
Code and media for Sapier's "animal_materials", "ostrich", and
"sacreeper": See the associated Lua source files.
Additionally, "chicken.lua" uses Sapier's 3D egg. See that Lua source
file as well.
----------------------------------------------------------------------
Car model:
CC-BY-NC-SA 3.0. Attribution: Melkor.
http://creativecommons.org/licenses/by-nc-sa/3.0/
----------------------------------------------------------------------
mdoege code and/or media
-----------------------------
WTFPL
PilzAdam code and/or media
--------------------------
-----------------------------
WTFPL
Bat

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

@ -1,20 +1,17 @@
-- ===================================================================
-- Mob Framework Mod by Sapier
-- License for this mod.
--
-- You may copy, use, modify or do nearly anything but remove this
-- copyright notice. Of course, you are NOT allow to pretend you have
-- copyright notice. Of course, you're not allowed to pretend you've
-- created or written the Sapier-specific pieces.
--
-- CC-BY-SA 3.0. Attribution: sapier.
--
--! @file init.lua
--! @brief animal_materials
--! @copyright Sapier
--! @author Sapier
--! @date 2013-01-27
--
-- Boilerplate to support localized strings if intllib mod is installed.
-- ===================================================================
-- 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")
@ -26,7 +23,6 @@ end
core.log("action","MOD: animal_materials loading ...")
local version = "0.1.3"
animal_materialsdata = {}
-- ===================================================================
@ -295,7 +291,6 @@ minetest.register_craftitem(":animal_materials:fur_deer", {
stack_max=10
})
minetest.register_craftitem(":animal_materials:coat_cattle", {
description = S("Cattle coat"),
image = "animal_materials_cattle_coat.png",
@ -308,7 +303,7 @@ minetest.register_craftitem(":animal_materials:coat_cattle", {
minetest.register_craftitem(":animal_materials:antlers", {
description = S("Antlers"),
image = "animal_materials_deer_horns.png",
image = "animal_materials_antlers.png",
stack_max=20
})
minetest.register_alias("animal_materials:deer_horns", "animal_materials:antlers")

29
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua

@ -1,18 +1,13 @@
-- Deer. Descended from Sapier version.
-- Elk. Descended from Sapier version.
-- ===================================================================
-- Mob Framework Mod by Sapier
-- License for "elk" media.
--
-- You may copy, use, modify or do nearly anything except removing this
-- copyright notice. Of course, you are NOT allow to pretend you have
-- written it.
-- CC-BY-SA 3.0. Attribution: sapier.
-- 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-specific pieces.
--
--! @file init.lua
--! @brief deer implementation
--! @copyright Sapier
--! @author Sapier
--! @date 2013-01-27
-- CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
-- ===================================================================
@ -47,7 +42,7 @@ mobs_param = {
} ,
spawn_by = {
"group:grass" ,
"default:pine_tree" ,
"flowers:mushroom_brown" ,
} ,
@ -92,11 +87,12 @@ mobs_param.core_param = {
collisionbox = { -0.70, -1.10, -0.70, 0.70, 0.80, 0.70 } ,
mesh = msname .. ".b3d" ,
visual = "mesh" ,
textures = {
{ msname .. "_male.png" },
{ msname .. "_female.png"}
{ msname .. "_male_mesh.png" } ,
{ msname .. "_female_mesh.png" } ,
},
visual = "mesh" ,
sounds = {
},
@ -113,7 +109,7 @@ mobs_param.core_param = {
chance = 1, min = 1, max = 1 ,
} ,
{
name = "animal_materials:fur_elk" ,
name = "animal_materials:fur_deer" ,
chance = 4, min = 1, max = 1 ,
} ,
{
@ -143,7 +139,6 @@ mobs_param.core_param = {
-- ===================================================================
codermobs.setup_mob()
codermobs.log_done()
-- ===================================================================

26
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/init.lua

@ -10,10 +10,14 @@ local enable_moontest =
minetest.setting_getbool ("enable_moontest" )
-- ===================================================================
-- These must come first.
dofile (mp .. "/globals.lua" )
dofile (mp .. "/util.lua" )
dofile (mp .. "/animal_materials.lua" )
dofile (mp .. "/vombie_flame.lua" )
-- ===================================================================
dofile (mp .. "/badger.lua" )
dofile (mp .. "/bat.lua" )
@ -27,52 +31,52 @@ dofile (mp .. "/bunny.lua" )
dofile (mp .. "/butterfly.lua" )
dofile (mp .. "/cacodemon.lua" )
dofile (mp .. "/car.lua" )
dofile (mp .. "/chicken.lua" )
dofile (mp .. "/cow.lua" )
dofile (mp .. "/sacreeper.lua" )
dofile (mp .. "/cyberdemon.lua" )
-- dofile (mp .. "/deer.lua" )
dofile (mp .. "/elk.lua" )
mobs:alias_mob("codermobs:deer", "codermobs:elk")
dofile (mp .. "/dirt_monster.lua" )
dofile (mp .. "/dog.lua" )
dofile (mp .. "/elephant.lua" )
dofile (mp .. "/elk.lua" )
dofile (mp .. "/farhorse.lua" )
dofile (mp .. "/flying_pig.lua" )
dofile (mp .. "/ghost.lua" )
dofile (mp .. "/goat.lua" )
dofile (mp .. "/hedgehog.lua" )
dofile (mp .. "/jeraf.lua" )
dofile (mp .. "/kitten.lua" )
dofile (mp .. "/lava_flan.lua" )
dofile (mp .. "/lostsoul.lua" )
dofile (mp .. "/lott_spider.lua" )
dofile (mp .. "/mammoth.lua" )
dofile (mp .. "/mdskeleton.lua" )
dofile (mp .. "/oerkki.lua" )
dofile (mp .. "/ostrich.lua" )
dofile (mp .. "/owl.lua" )
dofile (mp .. "/panda.lua" )
dofile (mp .. "/penguin.lua" )
dofile (mp .. "/polar_bear.lua" )
dofile (mp .. "/rat.lua" )
dofile (mp .. "/rat_better.lua" )
dofile (mp .. "/santa.lua" )
dofile (mp .. "/sheep.lua" )
dofile (mp .. "/silverfish.lua" )
dofile (mp .. "/snake_garter.lua" )
dofile (mp .. "/snake_ice.lua" )
dofile (mp .. "/snowman.lua" )
dofile (mp .. "/tree_monster.lua" )
dofile (mp .. "/vombie.lua" )
dofile (mp .. "/warthog.lua" )
dofile (mp .. "/wolf.lua" )
dofile (mp .. "/zebra.lua" )
-- Moon Cow must be defined after regular cow.

0
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png → patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png → patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Loading…
Cancel
Save