From ac5ef9959485b22af74043e07be79e67199aaf7d Mon Sep 17 00:00:00 2001 From: theo3 Date: Sat, 15 Aug 2020 20:38:48 -0700 Subject: [PATCH 1/4] font.png --- data/data_081320FC.s | 53 ++++------------------------------------- graphics/font.pal | 19 +++++++++++++++ graphics/font.png | Bin 0 -> 10493 bytes graphics/gameover.pal | 19 --------------- graphics/gameover.png | Bin 904 -> 0 bytes graphics_file_rules.mk | 6 +++++ 6 files changed, 29 insertions(+), 68 deletions(-) create mode 100644 graphics/font.pal create mode 100644 graphics/font.png delete mode 100644 graphics/gameover.pal delete mode 100644 graphics/gameover.png diff --git a/data/data_081320FC.s b/data/data_081320FC.s index 7e1a2fc3..5781a11e 100755 --- a/data/data_081320FC.s +++ b/data/data_081320FC.s @@ -11726,58 +11726,13 @@ gUnk_08692E80:: @ 08692E80 .incbin "baserom.gba", 0x692E80, 0x00000E0 gUnk_08692F60:: @ 08692F60 - .incbin "baserom.gba", 0x692F60, 0x0000BE9 + .incbin "baserom.gba", 0x692F60, 0x0000040 -gUnk_08693B49:: @ 08693B49 - .incbin "baserom.gba", 0x693B49, 0x00001F1 - -gUnk_08693D3A:: @ 08693D3A - .incbin "baserom.gba", 0x693D3A, 0x000014C - -gUnk_08693E86:: @ 08693E86 - .incbin "baserom.gba", 0x693E86, 0x00000C3 - -gUnk_08693F49:: @ 08693F49 - .incbin "baserom.gba", 0x693F49, 0x0001800 - -gUnk_08695749:: @ 08695749 - .incbin "baserom.gba", 0x695749, 0x0000347 - -gUnk_08695A90:: @ 08695A90 - .incbin "baserom.gba", 0x695A90, 0x0000383 - -gUnk_08695E13:: @ 08695E13 - .incbin "baserom.gba", 0x695E13, 0x0000327 - -gUnk_0869613A:: @ 0869613A - .incbin "baserom.gba", 0x69613A, 0x000007C - -gUnk_086961B6:: @ 086961B6 - .incbin "baserom.gba", 0x6961B6, 0x0000DAA - -gUnk_08696F60:: @ 08696F60 - .incbin "baserom.gba", 0x696F60, 0x0000980 - -gUnk_086978E0:: @ 086978E0 - .incbin "baserom.gba", 0x6978E0, 0x0000668 - -gUnk_08697F48:: @ 08697F48 - .incbin "baserom.gba", 0x697F48, 0x0001998 - -gUnk_086998E0:: @ 086998E0 - .incbin "baserom.gba", 0x6998E0, 0x0006720 - -gUnk_086A0000:: @ 086A0000 - .incbin "baserom.gba", 0x6A0000, 0x000141A - -gUnk_086A141A:: @ 086A141A - .incbin "baserom.gba", 0x6A141A, 0x00004C6 - -gUnk_086A18E0:: @ 086A18E0 - .incbin "baserom.gba", 0x6A18E0, 0x0001180 +gUnk_08692FA0:: + .incbin "graphics/font.4bpp" gUnk_086A2A60:: @ 086A2A60 - .incbin "baserom.gba", 0x6A2A60, 0x0000480 + .incbin "baserom.gba", 0x6A2A40, 0x00004A0 gUnk_086A2EE0:: @ 086A2EE0 .incbin "baserom.gba", 0x6A2EE0, 0x0001423 diff --git a/graphics/font.pal b/graphics/font.pal new file mode 100644 index 00000000..199e6c39 --- /dev/null +++ b/graphics/font.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 189 148 +49 131 24 +65 205 24 +74 255 24 +24 90 164 +41 156 255 +74 230 255 +123 41 24 +189 49 32 +255 82 49 +255 246 0 +115 98 98 +172 156 156 +213 197 197 +255 255 255 +0 0 0 diff --git a/graphics/font.png b/graphics/font.png new file mode 100644 index 0000000000000000000000000000000000000000..73f072571833427b7326c87e131ec8fa28bfb4da GIT binary patch literal 10493 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 literal 0 HcmV?d00001 diff --git a/graphics/gameover.pal b/graphics/gameover.pal deleted file mode 100644 index 32050439..00000000 --- a/graphics/gameover.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 230 0 -255 172 16 -246 115 0 -238 65 0 -230 0 0 -180 65 90 -0 0 90 diff --git a/graphics/gameover.png b/graphics/gameover.png deleted file mode 100644 index f82d6e33ec3775c9f105f6247b43f44d92a2f65d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmV;319$w1P)S^xlA>6n150009M zNklMI$ITOk8DdLL+x$1D$xly za%w=mYa5*(^ zt~TcY6!hfWP)4AnYQVWV0bW{4ci`ZJ1Fs0cpVA9pvf~^rHPph=V3_(Uh*tpc&W`NH zgu9G-R62_axus+ia$Eg`wY-R0#0xajRRXxat&?})i1Rf83c9StJL;<>k|Z2LBuQLv ztZ4)ZJ9j5Zz*!eIl7Q20azO%4t22ru;ACG%5^(a0B;Z5{mLZavbM0J=WCTzHIW{4Z z)xeSA`Vb$ZTrxhqpz3GD$9SuF7ZolS^{BiaIsk3sZYUW+(*Yj1C7KdM9`+J|2au`~ z=++tM{&=n%*lY0K9A?OLLz^A#yTb&W2!wlE;;a$aQbwKW;Lr(xuMrPTK{HU=Y>(Ur z;3nX*M&MQj{hER9fbw$9>3IguSB{8$HkAQRj|e~rUZJu%v1SQxtJQtpecP4R#`&%x zEAjgaYOG_L;%WQZ3czP23BW9YJ?E+5Ks~ACv5LDz48oOfANuL_oB$-c$s@p51Dya> zQs^1@*hD+HqUh|^BtT;N13>HKE_aHJ>9r`r-*+uw`w|UYEc0?yx=)HvXRTO&e z>X#s)d*;4>q^+py_1o`U3?wD~#5OrypwJH~a8twIcPu#WPFdP9%^y|-uAe_dqg&qg zUXMG)?lt|!3vsU=#C|}~e365F7Tc@d)y{2CTDYN+J)28^cYx5(aV|8r`rO9}#C;wy zOB#ES1*PsyoMIFcW^@v{|3qCOhZtrpte8*~jtC8DWGxb3dy;6@M3M|fOd>fwNqa~- z1p?%n0?TkvKc%;*$CJ10H@=!y!cRHAB5WN+9qYWP9{_AxKYC1#`WVyH`8lu@d5ec+ z2Tu>j7juz7dJ6BrvkaKhmU06Fc`_*TDMvXM1E_K%wy;rsA-`YP(pr4KK#( Date: Sat, 15 Aug 2020 20:39:46 -0700 Subject: [PATCH 2/4] fix --- graphics_file_rules.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3cd48c6a..c2f9c320 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -4,7 +4,4 @@ $(GFXDIR)/intro/nintendo_capcom.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 123 $(GFXDIR)/font.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 2005 - -$(GFXDIR)/kinstones.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 692 \ No newline at end of file + $(GFX) $< $@ -num_tiles 2005 \ No newline at end of file From 037dd0a55acd2e968abdd4ce603650fc09b0ba09 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sat, 15 Aug 2020 23:48:09 -0700 Subject: [PATCH 3/4] pot_portal.png --- data/data_081320FC.s | 20 ++++---------------- graphics/pot_portal.png | Bin 0 -> 2431 bytes graphics_file_rules.mk | 5 ++++- 3 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 graphics/pot_portal.png diff --git a/data/data_081320FC.s b/data/data_081320FC.s index 5781a11e..38660493 100755 --- a/data/data_081320FC.s +++ b/data/data_081320FC.s @@ -6739,23 +6739,11 @@ gUnk_082D3629:: @ 082D3629 gUnk_082D4138:: @ 082D4138 .incbin "baserom.gba", 0x2D4138, 0x000075C -gUnk_082D4894:: @ 082D4894 - .incbin "baserom.gba", 0x2D4894, 0x00004CD +gUnk_082D4894:: + .incbin "graphics/pot_portal.4bpp" -gUnk_082D4D61:: @ 082D4D61 - .incbin "baserom.gba", 0x2D4D61, 0x0000208 - -gUnk_082D4F69:: @ 082D4F69 - .incbin "baserom.gba", 0x2D4F69, 0x00004D7 - -gUnk_082D5440:: @ 082D5440 - .incbin "baserom.gba", 0x2D5440, 0x000012D - -gUnk_082D556D:: @ 082D556D - .incbin "baserom.gba", 0x2D556D, 0x00004ED - -gUnk_082D5A5A:: @ 082D5A5A - .incbin "baserom.gba", 0x2D5A5A, 0x00000FB +gUnk_082D5A94:: + .incbin "baserom.gba", 0x2D5A94, 0x00000C1 gUnk_082D5B55:: @ 082D5B55 .incbin "baserom.gba", 0x2D5B55, 0x0007F92 diff --git a/graphics/pot_portal.png b/graphics/pot_portal.png new file mode 100644 index 0000000000000000000000000000000000000000..3de640a78bba053c5cb9674859331ea6746761ee GIT binary patch literal 2431 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 literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index c2f9c320..6a4db246 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -4,4 +4,7 @@ $(GFXDIR)/intro/nintendo_capcom.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 123 $(GFXDIR)/font.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 2005 \ No newline at end of file + $(GFX) $< $@ -num_tiles 2005 + +$(GFXDIR)/pot_portal.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 144 \ No newline at end of file From 293d080fca7119f2d2708b5bfd3762ef9574ea49 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sun, 16 Aug 2020 00:16:19 -0700 Subject: [PATCH 4/4] remove problematic file --- tools/minishmaker-license.txt | 674 ---------------------------------- 1 file changed, 674 deletions(-) delete mode 100644 tools/minishmaker-license.txt diff --git a/tools/minishmaker-license.txt b/tools/minishmaker-license.txt deleted file mode 100644 index e72bfdda..00000000 --- a/tools/minishmaker-license.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file