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 concerning a possible perception that this project or a distribution might be construed to be a "collection" as defined by Creative Commons. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@8171 282e977c-c81d-0410-88c4-b93c2d0d6712master
							parent
							
								
									adb9522ce2
								
							
						
					
					
						commit
						7fde0e8928
					
				
							
								
								
									
										7
									
								
								CHANGES
								
								
								
								
							
							
						
						
									
										7
									
								
								CHANGES
								
								
								
								
							| 
						 | 
				
			
			@ -1,5 +1,12 @@
 | 
			
		|||
Changes for SVN top of tree:
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
concerning a possible perception that this project or a distribution might be
 | 
			
		||||
construed to be a "collection" as defined by Creative Commons.
 | 
			
		||||
Kevin Bulgrien 2007-01-11
 | 
			
		||||
 | 
			
		||||
Correct the license text to show that this derivation is released under
 | 
			
		||||
version 3.0 Creative Commons licensing to improve compatibility with
 | 
			
		||||
Debian.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										35
									
								
								LICENSE
								
								
								
								
							
							
						
						
									
										35
									
								
								LICENSE
								
								
								
								
							| 
						 | 
				
			
			@ -1,35 +0,0 @@
 | 
			
		|||
===============================================================================
 | 
			
		||||
LICENSE
 | 
			
		||||
===============================================================================
 | 
			
		||||
 | 
			
		||||
All of the graphics in the arch collection are not necessarily controlled under
 | 
			
		||||
identical licenses.  Use this file to identify the types of licenses used for
 | 
			
		||||
these works.  Note however, that this file does not necessarily list all
 | 
			
		||||
licenses in use.
 | 
			
		||||
 | 
			
		||||
It is suggested that the license terms for a graphic file be placed in comment
 | 
			
		||||
sections of .arc files that reference them.  See misc/machine.arc for an
 | 
			
		||||
example.
 | 
			
		||||
 | 
			
		||||
CREATIVE COMMONS
 | 
			
		||||
----------------
 | 
			
		||||
 | 
			
		||||
Creative Commons "Some Rights Reserved"
 | 
			
		||||
 | 
			
		||||
Various Creative Commons Licenses exist.  The following are known to be
 | 
			
		||||
used for certain works in the arch collection:
 | 
			
		||||
 | 
			
		||||
* Attribution-ShareAlike
 | 
			
		||||
 | 
			
		||||
  Some of the graphics and/or .arc files in this collection are licensed under
 | 
			
		||||
  the terms of an Attribution-ShareAlike.  Such works are redistributions, or
 | 
			
		||||
  derivatives, of similarly licensed material.
 | 
			
		||||
 | 
			
		||||
  Original works are usually copyrighted.  Credit, or attribution, must be
 | 
			
		||||
  given to the copyright holder and/or author according to terms he/she
 | 
			
		||||
  provides.  The original work is licensed under an Attribution-ShareAlike
 | 
			
		||||
  Creative Commons License, and derivative works must be licensed under the
 | 
			
		||||
  same terms as the original work. The terms of this license are described
 | 
			
		||||
  at http://creativecommons.org/licenses/by-sa/3.0/, and includes important
 | 
			
		||||
  disclaimers of warranty and liability.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										117
									
								
								misc/machine.arc
								
								
								
								
							
							
						
						
									
										117
									
								
								misc/machine.arc
								
								
								
								
							| 
						 | 
				
			
			@ -1,117 +0,0 @@
 | 
			
		|||
# The machine.base.x111.png artwork is a derivative work 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
 | 
			
		||||
#
 | 
			
		||||
# Creative Commons "Some Rights Reserved"
 | 
			
		||||
#
 | 
			
		||||
# The original image is Copyright © 2001, 2004 by David M. MacMillan and
 | 
			
		||||
# Rollande Krandall. The original work, and this derivative, are both licensed
 | 
			
		||||
# under a Creative Commons Attribution-ShareAlike License which is described
 | 
			
		||||
# at http://creativecommons.org/licenses/by-sa/2.0/.  The license includes
 | 
			
		||||
# important disclaimers of warranty and liability.
 | 
			
		||||
#
 | 
			
		||||
# The derivative work is distributed under the Attribution-ShareAlike
 | 
			
		||||
# license described at at http://creativecommons.org/licenses/by-sa/3.0/.
 | 
			
		||||
# Attribution requirements are met through retention of this header text.
 | 
			
		||||
#
 | 
			
		||||
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
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 7.2 KiB  | 
		Loading…
	
		Reference in New Issue