VanessaE/hdx-256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
ccady 2015-02-08 15:41:38 -08:00
commit 0227c6fb24
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,3 +1,5 @@
2015-02-08: More animals modpack updates from ccady
2015-02-06: Added partial support for Animals mod and some images for
bushes/bushes_classic, thanks to images contributed by C. Conrad Cady.

32
image-credits.txt
View File

@ -1068,7 +1068,7 @@ http://commons.wikimedia.org/wiki/File:Pappel_Holz.JPG
birch
http://commons.wikimedia.org/wiki/File:Birkenrinde_Betula_3.JPG
chestnut
chestut
http://commons.wikimedia.org/wiki/File:Ch%C3%A2taignier_sweet_chestnut_tree_%281134519511%29.jpg
http://commons.wikimedia.org/wiki/File:Castanea_sativa_MHNT.BOT.2006.0.1272.JPG
http://commons.wikimedia.org/wiki/File:Castanea_dentata-foliage.jpg
@ -1157,33 +1157,3 @@ http://commons.wikimedia.org/wiki/Coins#mediaviewer/File:1821_George_IV_Crown_%2
http://en.wikipedia.org/wiki/File:PinkRhyolite.tif
http://upload.wikimedia.org/wikipedia/commons/0/0b/Comendite_rjw.jpg
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)
bushes_raspberry.png
this is a derived work
original file: http://pixabay.com/en/raspberry-red-berry-fruit-wild-446426/
license: CC0 Public Domain
animalmaterials_meat_raw.png
animalmaterials_meat_toxic_raw.png
animalmaterials_meat_undead_raw.png
these are derived works
original file: https://upload.wikimedia.org/wikipedia/commons/9/91/T-bone-raw-MCB.jpg
creator: MCB (https://en.wikipedia.org/wiki/User:MCB)
license: CC BY-SA 2.5 (http://creativecommons.org/licenses/by-sa/2.5)