Merge remote-tracking branch 'upstream/master'

Conflicts:
	bushes_blackberry.png
	bushes_blueberry.png
	bushes_gooseberry.png
	bushes_raspberry.png
master
ccady 2015-02-07 11:55:16 -08:00
commit 6a21b54e20
27 changed files with 3 additions and 22 deletions

BIN
animalmaterials_bone.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
animalmaterials_egg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
animalmaterials_egg_big.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
animalmaterials_feather.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
animalmaterials_fur.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
animalmaterials_glass.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
animalmaterials_ivory.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
animalmaterials_lasso.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
animalmaterials_milk.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
animalmaterials_net.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
animalmaterials_saddle.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

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

View File

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