Skip to content

Commit 680c772

Browse files
authored
Merge pull request #314 from Dn-Programming-Core-Management/version-incremement
Release Version 0.5.1.0
2 parents a9cbf00 + 4654268 commit 680c772

File tree

360 files changed

+4847
-4857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+4847
-4857
lines changed

.gitmodules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[submodule "Dn-help"]
22
path = Dn-help
33
url = https://github.com/Dn-Programming-Core-Management/Dn-help.git
4+
branch = release

Dn-FamiTracker.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ END
535535
//
536536

537537
VS_VERSION_INFO VERSIONINFO
538-
FILEVERSION 0,5,0,3
539-
PRODUCTVERSION 0,5,0,3
538+
FILEVERSION 0,5,1,0
539+
PRODUCTVERSION 0,5,1,0
540540
FILEFLAGSMASK 0x3fL
541541
#ifdef _DEBUG
542542
FILEFLAGS 0x1L
@@ -553,12 +553,12 @@ BEGIN
553553
BEGIN
554554
VALUE "CompanyName", "Dn Programming Core Management"
555555
VALUE "FileDescription", "Dn-FamiTracker, Extension of FamiTracker"
556-
VALUE "FileVersion", "0.5.0.3"
556+
VALUE "FileVersion", "0.5.1.0"
557557
VALUE "InternalName", "Dn-FamiTracker.exe"
558-
VALUE "LegalCopyright", "(c) jsr 2005-2020, HertzDevil 2014-2018, Dn Programming Core Management 2020-2024. All rights reserved."
558+
VALUE "LegalCopyright", "(c) jsr 2005-2020, HertzDevil 2014-2018, Dn Programming Core Management 2020-2025. All rights reserved."
559559
VALUE "OriginalFilename", "Dn-FamiTracker.exe"
560560
VALUE "ProductName", "Dn-FamiTracker"
561-
VALUE "ProductVersion", "0.5.0.3"
561+
VALUE "ProductVersion", "0.5.1.0"
562562
END
563563
END
564564
BLOCK "VarFileInfo"
@@ -1105,11 +1105,11 @@ BEGIN
11051105
ICON IDR_MAINFRAME,IDC_ICON_STATIC,11,58,20,20,SS_REALSIZEIMAGE
11061106
LTEXT "Dn-FamiTracker",IDC_ABOUT1,54,58,219,11,SS_NOPREFIX
11071107
LTEXT "Extension of 0CC-FamiTracker",IDC_ABOUT2,54,72,167,8,SS_NOPREFIX
1108-
LTEXT "Copyright (C) 2005 - 2020 jsr, 2014 - 2018 HertzDevil,\n2020 - 2024 Dn Programming Core Management.",IDC_ABOUT3,54,84,215,16
1108+
LTEXT "Copyright (C) 2005 - 2020 jsr, 2014 - 2018 HertzDevil,\n2020 - 2025 Dn Programming Core Management.",IDC_ABOUT3,54,84,215,16
11091109
LTEXT "Web:",IDC_STATIC,54,107,24,9
11101110
LTEXT "Dn-FamiTracker issue tracker",IDC_BUG,84,134,194,9,SS_NOTIFY
11111111
LTEXT "All comments and feedback are welcome\nGreets to everyone who has helped spread information about this mod or contributed with bug reports and suggestions!",IDC_STATIC,54,150,224,26
1112-
LTEXT "This software is licensed under the GNU General Public License.\n0CC / Dn sources are available on Github.\nVanilla source is available on the webpage.",IDC_STATIC,54,181,224,24
1112+
LTEXT "This software is licensed under the GNU General Public License v3.0.\n0CC / Dn sources are available on Github.\nVanilla source is available on the webpage.",IDC_STATIC,54,181,224,24
11131113
LTEXT "Contributions:",IDC_STATIC,54,210,224,9
11141114
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,54,221,215,1
11151115
LTEXT "Libraries:",IDC_STATIC,54,283,224,8
@@ -3000,12 +3000,16 @@ STRINGTABLE
30003000
BEGIN
30013001
ID_FILE_IMPORTTEXT "Imports module text files\nImport Text"
30023002
ID_FILE_EXPORTTEXT "Exports module as a text file\nExport Text"
3003-
ID_FILE_EXPORTJSON "Exports module in JavaScript Object Notation, for use in scripts\nExport JSON"
30043003
ID_CLEANUP_MERGEDUPLICATEDPATTERNS
30053004
"Combine copies of duplicated patterns\nMerge Duplicated Patterns"
30063005
ID_EDIT_VOLUMEMASK "Disable writing to the volume column while entering a note\nVolume Mark"
30073006
END
30083007

3008+
STRINGTABLE
3009+
BEGIN
3010+
ID_FILE_EXPORTJSON "Exports module in JavaScript Object Notation, for use in scripts\nExport JSON"
3011+
END
3012+
30093013
STRINGTABLE
30103014
BEGIN
30113015
IDS_KRAID "Do you want to carry out this operation? There is no undo for this command."

LICENSE.txt renamed to LICENSE-GPLv2.txt

Lines changed: 20 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,12 @@
1-
The majority of Dn-FamiTracker's codebase is available under the GNU General
2-
Public License, version 2 or later.
1+
GNU GENERAL PUBLIC LICENSE
2+
Version 2, June 1991
33

4-
It incorporates code from nsfplay, licensed under an informal permissive
5-
license, as well as code from Mesen, which is licensed under the GPL v3 only.
6-
As a result, Dn-FamiTracker as a whole is only available under the GPL v3.
7-
8-
On the FamiTracker website, the NSF driver code is distributed seperately from
9-
the rest of the source code. This is because jsr wanted to license the driver
10-
under a more permissive license than GPL 2, but didn't seem to get around doing
11-
so.
12-
13-
HertzDevil erroneously licensed his modified NSF driver code under GPL v2,
14-
which restricts anyone sharing compiled NSFs and binaries without sharing the
15-
assembly source!
16-
17-
Therefore, Dn-FT NSF driver changes are distributed under a seperate MIT-0
18-
license, while 0CC FT NSF driver changes are distributed under GPL v2. The
19-
remaining original driver code is not under any license.
20-
21-
The texts for the MIT-0 and GPL v2 licenses are listed below:
22-
23-
MIT No Attribution
24-
25-
Copyright 2024 D.P.C.M.
26-
27-
Permission is hereby granted, free of charge, to any person obtaining a copy of
28-
this software and associated documentation files (the "Software"), to deal in
29-
the Software without restriction, including without limitation the rights to
30-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
31-
of the Software, and to permit persons to whom the Software is furnished to do
32-
so.
33-
34-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
35-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
36-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
37-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
38-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
39-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
40-
SOFTWARE.
41-
42-
GNU GENERAL PUBLIC LICENSE
43-
Version 2, June 1991
44-
45-
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
46-
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4+
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
5+
<https://fsf.org/>
476
Everyone is permitted to copy and distribute verbatim copies
487
of this license document, but changing it is not allowed.
498

50-
Preamble
9+
Preamble
5110

5211
The licenses for most software are designed to take away your
5312
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +15,7 @@ software--to make sure the software is free for all its users. This
5615
General Public License applies to most of the Free Software
5716
Foundation's software and to any other program whose authors commit to
5817
using it. (Some other Free Software Foundation software is covered by
59-
the GNU Library General Public License instead.) You can apply it to
18+
the GNU Lesser General Public License instead.) You can apply it to
6019
your programs, too.
6120

6221
When we speak of free software, we are referring to freedom, not
@@ -96,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
9655

9756
The precise terms and conditions for copying, distribution and
9857
modification follow.
99-
100-
GNU GENERAL PUBLIC LICENSE
58+
59+
GNU GENERAL PUBLIC LICENSE
10160
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
10261

10362
0. This License applies to any program or other work which contains
@@ -151,7 +110,7 @@ above, provided that you also meet all of these conditions:
151110
License. (Exception: if the Program itself is interactive but
152111
does not normally print such an announcement, your work based on
153112
the Program is not required to print an announcement.)
154-
113+
155114
These requirements apply to the modified work as a whole. If
156115
identifiable sections of that work are not derived from the Program,
157116
and can be reasonably considered independent and separate works in
@@ -209,7 +168,7 @@ access to copy from a designated place, then offering equivalent
209168
access to copy the source code from the same place counts as
210169
distribution of the source code, even though third parties are not
211170
compelled to copy the source along with the object code.
212-
171+
213172
4. You may not copy, modify, sublicense, or distribute the Program
214173
except as expressly provided under this License. Any attempt
215174
otherwise to copy, modify, sublicense or distribute the Program is
@@ -266,7 +225,7 @@ impose that choice.
266225

267226
This section is intended to make thoroughly clear what is believed to
268227
be a consequence of the rest of this License.
269-
228+
270229
8. If the distribution and/or use of the Program is restricted in
271230
certain countries either by patents or by copyrighted interfaces, the
272231
original copyright holder who places the Program under this License
@@ -296,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
296255
of preserving the free status of all derivatives of our free software and
297256
of promoting the sharing and reuse of software generally.
298257

299-
NO WARRANTY
258+
NO WARRANTY
300259

301260
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
302261
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -318,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
318277
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
319278
POSSIBILITY OF SUCH DAMAGES.
320279

321-
END OF TERMS AND CONDITIONS
322-
323-
How to Apply These Terms to Your New Programs
280+
END OF TERMS AND CONDITIONS
281+
282+
How to Apply These Terms to Your New Programs
324283

325284
If you develop a new program, and you want it to be of the greatest
326285
possible use to the public, the best way to achieve this is to make it
@@ -344,10 +303,8 @@ the "copyright" line and a pointer to where the full notice is found.
344303
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
345304
GNU General Public License for more details.
346305

347-
You should have received a copy of the GNU General Public License
348-
along with this program; if not, write to the Free Software
349-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
350-
306+
You should have received a copy of the GNU General Public License along
307+
with this program; if not, see <https://www.gnu.org/licenses/>.
351308

352309
Also add information on how to contact you by electronic and paper mail.
353310

@@ -371,11 +328,11 @@ necessary. Here is a sample; alter the names:
371328
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
372329
`Gnomovision' (which makes passes at compilers) written by James Hacker.
373330

374-
<signature of Ty Coon>, 1 April 1989
375-
Ty Coon, President of Vice
331+
<signature of Moe Ghoul>, 1 April 1989
332+
Moe Ghoul, President of Vice
376333

377334
This General Public License does not permit incorporating your program into
378335
proprietary programs. If your program is a subroutine library, you may
379336
consider it more useful to permit linking proprietary applications with the
380-
library. If this is what you want to do, use the GNU Library General
337+
library. If this is what you want to do, use the GNU Lesser General
381338
Public License instead of this License.

0 commit comments

Comments
 (0)