Fence rails: Add fence rail textures

Minor clean up of README.txt, including deletion of credits for removed
torch textures.

diff --git a/mods/default/README.txt b/mods/default/README.txt
index bb7523efeb813ebf6f32eae84d5b485f8ca63d16..6a01cbf432648728cc28eba7ed17a972733414d2 100644 (file)
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -12,6 +12,9 @@ Authors of media (textures, models and sounds)
 Everything not listed in here:
 celeron55, Perttu Ahola <celeron55@gmail.com> (CC BY-SA 3.0)
 
+
+Textures
+--------
 Cisoun's texture pack (CC BY-SA 3.0):
   default_jungletree.png
   default_lava.png
@@ -23,11 +26,6 @@ Cisoun's texture pack (CC BY-SA 3.0):
   default_tree_top.png
   default_water.png
 
-Originating from G4JC's Almost MC Texture Pack (CC BY-SA 3.0):
-  default_torch.png
-  default_torch_on_ceiling.png
-  default_torch_on_floor.png
-
 VanessaE's animated torches (CC BY-SA 3.0):
   default_torch_animated.png
   default_torch_on_ceiling_animated.png
@@ -118,6 +116,11 @@ paramat (CC BY-SA 3.0):
   default_stones.png -- Derived from a texture by sofar (CC0 1.0)
   default_moss.png
   default_moss_side.png
+  default_fence_rail_acacia_wood
+  default_fence_rail_aspen_wood -- Derived from a texture by sofar (CC BY-SA 3.0)
+  default_fence_rail_junglewood
+  default_fence_rail_pine_wood
+  default_fence_rail_wood -- Derived from a texture by BlockMen (CC BY-SA 3.0)
 
 TumeniNodes (CC BY-SA 3.0):
   default_desert_cobble.png -- Derived from a texture by brunob.santos (CC BY-SA 3.0)
@@ -195,7 +198,6 @@ Pithydon (CC BY-SA 3.0)
 
 Ferk (CC0 1.0):
   default_item_smoke.png
-  default_item_smoke.ogg, based on sound by http://opengameart.org/users/bart
 
 npx (CC BY-SA 3.0):
   default_rainforest_litter.png
@@ -225,6 +227,9 @@ CloudyProton (CC BY-SA 3.0):
 Mossmanikin (CC BY-SA 3.0):
   default_fern_*.png
 
+
+Sounds
+------
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/
@@ -303,3 +308,6 @@ Chests sounds added by sofar, derived of several files mixed together:
 Ryding (CC0 1.0):
 http://freesound.org/people/Ryding/sounds/94337/
   default_snow_footstep.*.ogg
+
+Ferk (CC0 1.0):
+  default_item_smoke.ogg, based on a sound by http://opengameart.org/users/bart

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 2ef3b93bc7f5326a1a385ec4136812e3921626dc..b1d965d047e27b8cf1f47e0461560d2baa30fdb7 100644 (file)
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -2649,7 +2649,7 @@ default.register_fence("default:fence_aspen_wood", {
 
 default.register_fence_rail("default:fence_rail_wood", {
        description = "Apple Wood Fence Rail",
-       texture = "default_wood.png",
+       texture = "default_fence_rail_wood.png",
        inventory_image = "default_fence_rail_overlay.png^default_wood.png^" ..
                                "default_fence_rail_overlay.png^[makealpha:255,126,126",
        wield_image = "default_fence_rail_overlay.png^default_wood.png^" ..
@@ -2661,7 +2661,7 @@ default.register_fence_rail("default:fence_rail_wood", {
 
 default.register_fence_rail("default:fence_rail_acacia_wood", {
        description = "Acacia Wood Fence Rail",
-       texture = "default_acacia_wood.png",
+       texture = "default_fence_rail_acacia_wood.png",
        inventory_image = "default_fence_rail_overlay.png^default_acacia_wood.png^" ..
                                "default_fence_rail_overlay.png^[makealpha:255,126,126",
        wield_image = "default_fence_rail_overlay.png^default_acacia_wood.png^" ..
@@ -2673,7 +2673,7 @@ default.register_fence_rail("default:fence_rail_acacia_wood", {
 
 default.register_fence_rail("default:fence_rail_junglewood", {
        description = "Jungle Wood Fence Rail",
-       texture = "default_junglewood.png",
+       texture = "default_fence_rail_junglewood.png",
        inventory_image = "default_fence_rail_overlay.png^default_junglewood.png^" ..
                                "default_fence_rail_overlay.png^[makealpha:255,126,126",
        wield_image = "default_fence_rail_overlay.png^default_junglewood.png^" ..
@@ -2685,7 +2685,7 @@ default.register_fence_rail("default:fence_rail_junglewood", {
 
 default.register_fence_rail("default:fence_rail_pine_wood", {
        description = "Pine Wood Fence Rail",
-       texture = "default_pine_wood.png",
+       texture = "default_fence_rail_pine_wood.png",
        inventory_image = "default_fence_rail_overlay.png^default_pine_wood.png^" ..
                                "default_fence_rail_overlay.png^[makealpha:255,126,126",
        wield_image = "default_fence_rail_overlay.png^default_pine_wood.png^" ..
@@ -2697,7 +2697,7 @@ default.register_fence_rail("default:fence_rail_pine_wood", {
 
 default.register_fence_rail("default:fence_rail_aspen_wood", {
        description = "Aspen Wood Fence Rail",
-       texture = "default_aspen_wood.png",
+       texture = "default_fence_rail_aspen_wood.png",
        inventory_image = "default_fence_rail_overlay.png^default_aspen_wood.png^" ..
                                "default_fence_rail_overlay.png^[makealpha:255,126,126",
        wield_image = "default_fence_rail_overlay.png^default_aspen_wood.png^" ..

diff --git a/mods/default/textures/default_fence_rail_acacia_wood.png b/mods/default/textures/default_fence_rail_acacia_wood.png
new file mode 100644 (file)
index 0000000..64dc90f
Binary files /dev/null and b/mods/default/textures/default_fence_rail_acacia_wood.png differ

diff --git a/mods/default/textures/default_fence_rail_aspen_wood.png b/mods/default/textures/default_fence_rail_aspen_wood.png
new file mode 100644 (file)
index 0000000..ab16a60
Binary files /dev/null and b/mods/default/textures/default_fence_rail_aspen_wood.png differ

diff --git a/mods/default/textures/default_fence_rail_junglewood.png b/mods/default/textures/default_fence_rail_junglewood.png
new file mode 100644 (file)
index 0000000..ebc1ef0
Binary files /dev/null and b/mods/default/textures/default_fence_rail_junglewood.png differ

diff --git a/mods/default/textures/default_fence_rail_pine_wood.png b/mods/default/textures/default_fence_rail_pine_wood.png
new file mode 100644 (file)
index 0000000..fd8d99d
Binary files /dev/null and b/mods/default/textures/default_fence_rail_pine_wood.png differ

diff --git a/mods/default/textures/default_fence_rail_wood.png b/mods/default/textures/default_fence_rail_wood.png
new file mode 100644 (file)
index 0000000..f84b755
Binary files /dev/null and b/mods/default/textures/default_fence_rail_wood.png differ