Merge branch 'master-MC1.7.10' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10

This commit is contained in:
Florian Nücke 2015-07-17 19:13:18 +02:00
commit cdcbcc44b8

View File

@ -29,7 +29,7 @@ object PetRenderer {
"Sangar" ->(0.3, 0.9, 0.6),
"Jodarion" ->(1.0, 0.0, 0.0),
"DaKaTotal" ->(0.5, 0.7, 1.0),
"MichiyoRavencroft" ->(1.0, 0.0, 0.0),
"MichiRavencroft" ->(1.0, 0.0, 0.0),
"Vexatos" ->(0.18, 0.95, 0.922),
"StoneNomad" ->(0.8, 0.77, 0.75),
"LizzyTheSiren" ->(0.3, 0.3, 1.0),