Merge remote-tracking branch 'upstream/master'

Conflicts: bushes_blackberry.png bushes_blueberry.png bushes_gooseberry.png bushes_raspberry.png
2015-02-07 11:55:16 -08:00 · 2015-02-07 11:55:16 -08:00 · 6a21b54e20
parent 59dadb0d91 069b0e6bfa
commit 6a21b54e20
27 changed files with 3 additions and 22 deletions
--- a/animalmaterials_bone.png
+++ b/animalmaterials_bone.png
--- a/animalmaterials_cattle_coat.png
+++ b/animalmaterials_cattle_coat.png
--- a/animalmaterials_contract.png
+++ b/animalmaterials_contract.png
--- a/animalmaterials_deer_fur.png
+++ b/animalmaterials_deer_fur.png
--- a/animalmaterials_deer_horns.png
+++ b/animalmaterials_deer_horns.png
--- a/animalmaterials_egg.png
+++ b/animalmaterials_egg.png
--- a/animalmaterials_egg_big.png
+++ b/animalmaterials_egg_big.png
--- a/animalmaterials_egg_ent_mesh.png
+++ b/animalmaterials_egg_ent_mesh.png
--- a/animalmaterials_feather.png
+++ b/animalmaterials_feather.png
--- a/animalmaterials_fur.png
+++ b/animalmaterials_fur.png
--- a/animalmaterials_glass.png
+++ b/animalmaterials_glass.png
--- a/animalmaterials_ivory.png
+++ b/animalmaterials_ivory.png
--- a/animalmaterials_lasso.png
+++ b/animalmaterials_lasso.png
--- a/animalmaterials_meat_raw.png
+++ b/animalmaterials_meat_raw.png
--- a/animalmaterials_milk.png
+++ b/animalmaterials_milk.png
--- a/animalmaterials_net.png
+++ b/animalmaterials_net.png
--- a/animalmaterials_saddle.png
+++ b/animalmaterials_saddle.png
--- a/animalmaterials_scale_blue.png
+++ b/animalmaterials_scale_blue.png
--- a/animalmaterials_scale_golden.png
+++ b/animalmaterials_scale_golden.png
--- a/animalmaterials_scale_grey.png
+++ b/animalmaterials_scale_grey.png
--- a/animalmaterials_scale_white.png
+++ b/animalmaterials_scale_white.png
--- a/bushes_blackberry.png
+++ b/bushes_blackberry.png
--- a/bushes_blueberry.png
+++ b/bushes_blueberry.png
--- a/bushes_gooseberry.png
+++ b/bushes_gooseberry.png
--- a/bushes_raspberry.png
+++ b/bushes_raspberry.png
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,6 @@
+2015-02-06: Added partial support for Animals mod and some images for 
+bushes/bushes_classic, thanks to images contributed by C. Conrad Cady.
+
 2015-01-31: Add "metallic" tube connection overlay

 2015-01-23: ran all PNGs through pngcrush and optipng.
--- a/licenses.txt
+++ b/licenses.txt
@ -1,22 +0,0 @@
-bushes_blackberry.png
-	this is a derived work 
-	original file: https://upload.wikimedia.org/wikipedia/commons/0/04/Blackberry_close-up.JPG
-	creator: De-okin (https://commons.wikimedia.org/wiki/User:De-okin)
-	license: This file is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported license.
-
-bushes_blueberry.png
-	this is a derived work
-	original file: https://upload.wikimedia.org/wikipedia/commons/e/e4/Vaccinium_fruits.JPG
-	creator: Zirpe (https://commons.wikimedia.org/wiki/User:Zirpe)
-	license: This file is licensed under the Creative Commons Attribution-Share Alike 2.5 Generic, 2.0 Generic and 1.0 Generic license.
-
-bushes_gooseberry.png
-	this is a derived work
-	original file: https://upload.wikimedia.org/wikipedia/commons/b/b8/Gooseberries.jpg
-	creator: neurovelho (https://commons.wikimedia.org/wiki/User:Neurovelho)
-	license: CC BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0)], via Wikimedia Commons
-
-bushes_raspberry.png
-	this is a derived work
-	original file: http://pixabay.com/en/raspberry-red-berry-fruit-wild-446426/
-	license: CC0 Public Domain