From 513609dcfdb42e28a30bcf5a3fd37fecf845ab5f Mon Sep 17 00:00:00 2001
From: Paramat <paramat@users.noreply.github.com>
Date: Sun, 8 Jul 2018 22:22:07 +0100
Subject: [PATCH] Fence rails: Add fence rail textures
Minor clean up of README.txt, including deletion of credits for removed
torch textures.
---
mods/default/README.txt | 20 ++++++++++++------
mods/default/nodes.lua | 10 ++++-----
.../default_fence_rail_acacia_wood.png | Bin 0 -> 444 bytes
.../default_fence_rail_aspen_wood.png | Bin 0 -> 235 bytes
.../default_fence_rail_junglewood.png | Bin 0 -> 230 bytes
.../textures/default_fence_rail_pine_wood.png | Bin 0 -> 235 bytes
.../textures/default_fence_rail_wood.png | Bin 0 -> 230 bytes
7 files changed, 19 insertions(+), 11 deletions(-)
create mode 100644 mods/default/textures/default_fence_rail_acacia_wood.png
create mode 100644 mods/default/textures/default_fence_rail_aspen_wood.png
create mode 100644 mods/default/textures/default_fence_rail_junglewood.png
create mode 100644 mods/default/textures/default_fence_rail_pine_wood.png
create mode 100644 mods/default/textures/default_fence_rail_wood.png
diff --git a/mods/default/README.txt b/mods/default/README.txt
index bb7523ef..6a01cbf4 100644
--- 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 2ef3b93b..b1d965d0 100644
--- 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
index 0000000000000000000000000000000000000000..64dc90f121118a8207219451ae5d1e6e1f18023a
GIT binary patch
literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0004lNkl<ZD9?pb
zJx{_=6g_QU3lV671h7yO4dEk^u;{|5zrclsK?Z-6|G>ZD=t3O~ixMR!qy`LBORdre
zt-~edGx1Efz31I`&Ush3xi|p;z;~TOHYNK4fX-lOSiDuqb1`_EOnodNTon&wNx(X4
zDl;rjHFfzspig$1lmR^2v$Nd(+97LHKTHAe92<ZVSE&${xC(&SzU$};^IZo3v586?
zDwyZkWi9>m{z1R`-b~z!18AG$Mp+|E_}4={m%KME(!J@SRmo!uTnqq&EiMKm0RZa^
zh9oic2cVkGP`KfUki!5RCnBWPRoGpBRESGq3>)wqn;8~2EORyThtGK>jkY<)E-c<5
zyirD=C!+8HpjpiAH~^rmrB~zQSOn7h{?QXrYH=~>O{Sh>vuZZ;Jo()iQ;J0!Weq@Y
zGVKn(&h?ZWkvzw)W;4QdMccl&S<Kyb7sgg!0|2Y3Y*C3~xUGcCql_GpUIwF?zuZ?w
mk(0`BlS{EEfY<SOd&(boK%J!<Xg16M0000<MNUMnLSTaAroQ_C
literal 0
HcmV?d00001
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
index 0000000000000000000000000000000000000000..ab16a60c8484c69a4b14e8c4838ad641041cc690
GIT binary patch
literal 235
zcmV<H02Kd;P)<h;3K|Lk000e1NJLTq000mG000mK0{{R3?cL&10000aP)t-s!?cma
zwv@!Tl*qc8(#E9I$EDNAtJBG^)XJ{g(YM^wy57~kZS<}Q0001jNkl<Z2-g+Mu?oU4
z7zE(U<ls^qog@UQ<TZW?m<JGD9bF?Q^f7#fQfO8|=)IijZO45FzUp^7k#ODzxDK!*
zxhcs|c)PL%7bEwQR?{C=)5;Px8WJrBOGMV^*=zx@i@pWMca7^SOSP{m_>sf>m^0cO
ledn4vSDi*PXyFj<(jTLFFTeQ?XRZJM002ovPDHLkV1kV&XEXo+
literal 0
HcmV?d00001
diff --git a/mods/default/textures/default_fence_rail_junglewood.png b/mods/default/textures/default_fence_rail_junglewood.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebc1ef06a14f45ed06d6be169de15cd44713f7c9
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYl@?%-6Jk^qXE9Y~H&f-b
z)Znwy;<wh~cQ+F8G!^wR6AQH|y8~3*;OXKR!f{>nv>_Lhp$N+b&&1@Z0x71~e=NK4
zmUXKM-=S}DN6y`HHCP+*Wd5c3FWV}a<6f8lReR{vQ6M*gcc)flK!weProa<(SCtw6
z$Xl~ziN519pTJF$wR6sjF(|Tfw``yFD?4PZb1tiW(Z85^!a05it&M-Ly6wtx>s_(U
b%72XiQq<z!7(J8$x`n~h)z4*}Q$iB}?7vWz
literal 0
HcmV?d00001
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
index 0000000000000000000000000000000000000000..fd8d99d6aeacc2dd0c47e8061a3f31043499dc62
GIT binary patch
literal 235
zcmV<H02Kd;P)<h;3K|Lk000e1NJLTq000mG000mK0{{R3?cL&10000aP)t-s&!S+_
zqhiseV$`W@;kb9=xq02Xgx$P|-@b|E#g*pCn&`=%MAL6U0001jNkl<Z2-g+Mu?oU4
z7zE(U<ls^qog@UQ<TZW?m<JGD9bF?Q^f7#fQfO8|=)IijZO45FzUp^7k#ODzxDK!*
zxhcs|c)PL%7bEwQR?{C=)5;Px8WJrBOGMV^*=zx@i@pWMca7^SOSP{m_>sf>m^0cO
ledn4vSDi*PXyFj<(jTLFFTeQ?XRZJM002ovPDHLkV1n%TWYPct
literal 0
HcmV?d00001
diff --git a/mods/default/textures/default_fence_rail_wood.png b/mods/default/textures/default_fence_rail_wood.png
new file mode 100644
index 0000000000000000000000000000000000000000..f84b755b90e33be5a9cf0e8810963d6a328aedd5
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY4YF4bcUDdI)~ZV|XiPS4
z&9rIHw(ZQeom=U;u+C#yqt|Bj4kMuA22U5q5RU7jrwzH73`JNjcqS%K6-Y6?{$tsV
zx2#)D_zr!GJ96%ptHIicC-X1Of7w>a9QV5Xui8VWjsm#}ygRib11fATGzFfRyQ<9i
zN8Xw(OY|L=`2=o~tetaKj6so=yJh>VU)dpRopV|3i~hyT6VCBFXl?v^)ooXnTknc(
bR{mrBm!cN;#^|98&@Bv}u6{1-oD!M<@|Rc!
literal 0
HcmV?d00001
--
GitLab