diff --git a/CHANGES b/CHANGES index 34c16bb75..1be8469f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,12 @@ Changes for SVN top of tree: +Re-add misc/machine.arc and machine.base.x11.png under the GFDL after obtaining +permission from the original author to relicense the image under the GFDL or +the GPL as appropriate. Though neither does address images, the GFDL has been +applied to images by other organizations and is somewhat clearer in how it may +be applied to graphic art. +Kevin Bulgrien 2007-01-12 + Remove misc/machine.arc and machine.base.x11.png and newly added LICENCE (as it was added specifically to address Creative Commons licensing) due to concerns about Creative Commons ShareAlike licensing requirements, and most especially diff --git a/misc/machine.arc b/misc/machine.arc new file mode 100644 index 000000000..669215521 --- /dev/null +++ b/misc/machine.arc @@ -0,0 +1,121 @@ +# Permission is granted to copy, distribute and/or modify machine.base.x11.png +# under the terms of the GNU Free Documentation License, Version 1.2 or any +# later version published by the Free Software Foundation; with no Invariant +# Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the +# license may be found at http://www.gnu.org/licenses/fdl.html. +# +# The machine.base.x111.png artwork was created by Kevin R. Bulgrien (kbulgrien +# at att daht net) on 2008/01/10, and is a derivation of an image published at: +# +# http://www.marcdatabase.com/ +# ~lemur/lemur.com/gallery-of-antiquarian-technology/ +# steam-engines/hf-steam-models/hf-table-engine-2-1200x1600.jpg +# +# The original work was licensed under the GFDL and is Copyright © 2001, 2004 +# by David M. MacMillan and Rollande Krandall. David M. MacMillan (dmm at lemur +# daht com), the original author, granted permission on 2008/01/12 to relicense +# this derivative under the GPL for the purpose of its inclusion into the arch +# collection of the Crossfire project. Permission was granted by e-mail: +# +# Message-Id: <200801120526.m0C5Qeig012934@quartz1.mhtc.net> +# Subject: Re: hf-table-engine-2-1200x1600.jpg +# Date: Fri, 11 Jan 2008 23:00:54 -0600 +# +Object Machine.1 +name Machine +title of the Empire +face machine.x11 +move_block none +blocksview 0 +identified 1 +no_pick 1 +x 0 +y 0 +end +More +Object Machine.2 +face machine.x11 +move_block all +x 1 +y 0 +end +More +Object Machine.3 +face machine.x11 +move_block none +blocksview 0 +x 2 +y 0 +end +More +Object Machine.4 +face machine.x11 +move_block all +blocksview 0 +x 0 +y 1 +end +More +Object Machine.5 +face machine.x11 +move_block all +blocksview 1 +x 1 +y 1 +end +More +Object Machine.6 +face machine.x11 +move_block all +blocksview 1 +x 2 +y 1 +end +More +Object Machine.7 +face machine.x11 +move_block all +blocksview 1 +x 0 +y 2 +end +More +Object Machine.8 +face machine.x11 +move_block all +blocksview 0 +x 1 +y 2 +end +More +Object Machine.9 +face machine.x11 +move_block all +blocksview 1 +x 2 +y 2 +end +More +Object Machine.A +face machine.x11 +move_block none +blocksview 0 +x 0 +y 3 +end +More +Object Machine.B +face machine.x11 +move_block all +blocksview 0 +x 1 +y 3 +end +More +Object Machine.C +face machine.x11 +move_block none +blocksview 0 +x 2 +y 3 +end diff --git a/misc/machine.base.x11.png b/misc/machine.base.x11.png new file mode 100644 index 000000000..329448708 Binary files /dev/null and b/misc/machine.base.x11.png differ