Skip to content

Commit ec11e5a

Browse files
committed
Fix license + some additional options.
1 parent ba6d34f commit ec11e5a

File tree

6 files changed

+82
-53
lines changed

6 files changed

+82
-53
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
text eol=lf
1+
text eol=lf
2+
LICENSE.txt eof=crlf

.idea/encodings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE.md

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
Copyright © 2022 Qboi123 <[qboiwastaken@gmail.com](mailto:qboiwastaken@gmail.com)>
2-
3-
# Ultreon API License version 1.1
4-
5-
## §1 - Meaning:
6-
1. "Executable Form":
7-
The "executable form" is the file/folder being referred as executable.
8-
9-
2. "Executables":
10-
Archives containing bytecode and/or executable files still count as executables.
11-
12-
## §2 - Information:
13-
1. Distribution and Modification:
14-
Copying anything from this project is hereby prohibited.
15-
Redistributing isn't allowed, and any modification made to the code or resources is prohibited.
16-
Project members are allowed to make changes from within the organization boundaries.
17-
18-
2. Usage:
19-
This project is meant to be used for personal use only. Any commercial or public use outside the organization is hereby prohibited.
20-
Using this project and/or the contents of it in a way that leads it to believe you're the owner while not being the real owner is prohibited.
21-
Automatic downloading is allowed as long it's not going to be publicly stored.
22-
For executables and binary applications, educational use is allowed for the executable form only, the source code and any artwork isn't allowed to be used.
23-
24-
3. Moving Content:
25-
Any content can be moved from public to private projects and from public to public, as long both projects are from the same organization.
26-
Moving content from private to public needs permission of the project owner.
27-
28-
4. Mixins:
29-
Mixins are allowed to be used to make changes on runtime level. As long the file itself will be left unchanged.
30-
AND it's not allowed to export the mixins.
31-
32-
## §3 - Notes:
33-
* If you notice that the project with originally this license is redistributed in a modified or non-modified form without explicit permission of the original project owner, we advise you to contact that project owner.
34-
* Any usage of the project and/or it's contents that violates the license will lead to termination of any of the online accounts / services that violates it.
1+
Copyright © 2022 Qboi123 <[qboiwastaken@gmail.com](mailto:qboiwastaken@gmail.com)>
2+
3+
# Ultreon API License version 1.1
4+
5+
## §1 - Meaning:
6+
1. "Executable Form":
7+
The "executable form" is the file/folder being referred as executable.
8+
9+
2. "Executables":
10+
Archives containing bytecode and/or executable files still count as executables.
11+
12+
## §2 - Information:
13+
1. Distribution and Modification:
14+
Copying anything from this project is hereby prohibited.
15+
Redistributing isn't allowed, and any modification made to the code or resources is prohibited.
16+
Project members are allowed to make changes from within the organization boundaries.
17+
18+
2. Usage:
19+
This project is meant to be used for personal use only. Any commercial or public use outside the organization is hereby prohibited.
20+
Using this project and/or the contents of it in a way that leads it to believe you're the owner while not being the real owner is prohibited.
21+
Automatic downloading is allowed as long it's not going to be publicly stored.
22+
For executables and binary applications, educational use is allowed for the executable form only, the source code and any artwork isn't allowed to be used.
23+
24+
3. Moving Content:
25+
Any content can be moved from public to private projects and from public to public, as long both projects are from the same organization.
26+
Moving content from private to public needs permission of the project owner.
27+
28+
4. Mixins:
29+
Mixins are allowed to be used to make changes on runtime level. As long the file itself will be left unchanged.
30+
AND it's not allowed to export the mixins.
31+
32+
## §3 - Notes:
33+
* If you notice that the project with originally this license is redistributed in a modified or non-modified form without explicit permission of the original project owner, we advise you to contact that project owner.
34+
* Any usage of the project and/or it's contents that violates the license will lead to termination of any of the online accounts / services that violates it.

LICENSE.rtf

Lines changed: 0 additions & 16 deletions
This file was deleted.

build.gradle.kts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ tasks.jpackage {
101101
destination = "$buildDir/dist"
102102

103103
appName = "Notepad Improved 2"
104-
appVersion = packageVersion
104+
appVersion = project.version.toString()
105105
vendor = "Ultreon Team"
106106
copyright = "Copyright (c) 2022 Ultreon Team"
107107
runtimeImage = System.getProperty("java.home")
@@ -111,7 +111,8 @@ tasks.jpackage {
111111

112112
destination = "$buildDir/dist"
113113

114-
licenseFile = "$projectDir/LICENSE.rtf"
114+
licenseFile = "$projectDir/package/LICENSE.txt"
115+
aboutUrl = "https://github.com/Ultreon/notepad-improved-2"
115116

116117
javaOptions = listOf("-Dfile.encoding=UTF-8")
117118

@@ -125,6 +126,11 @@ tasks.jpackage {
125126
linux {
126127
icon = "icons/icons.png"
127128
linuxPackageName = "notepad-improved"
129+
linuxDebMaintainer = "Ultreon Team"
130+
linuxRpmLicenseType = "Ultreon API License v1.1"
131+
linuxAppRelease = "2"
132+
linuxShortcut = true
133+
appVersion = project.version.toString()
128134
}
129135

130136
windows {
@@ -135,5 +141,8 @@ tasks.jpackage {
135141
winPerUserInstall = true
136142
winShortcutPrompt = true
137143
winShortcut = false
144+
winUpgradeUuid = "0dd76e9b-dd95-495d-876e-9da69c86329c"
145+
winMenuGroup = "Ultreon Team"
146+
appVersion = (version as String).replace("+local", ".0").replace("+", ".")
138147
}
139148
}

package/LICENSE.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright © 2022 Qboi123 <qboiwastaken@gmail.com>
2+
3+
Ultreon API License version 1.1
4+
5+
6+
§1 - Meaning:
7+
8+
1. "Executable Form": The "executable form" is the file/folder being referred as executable.
9+
10+
2. "Executables": Archives containing bytecode and/or executable files still count as executables.
11+
12+
13+
§2 - Information:
14+
15+
1. Distribution and Modification: Copying anything from this project is hereby prohibited. Redistributing isn't allowed, and any modification made to the code or resources is prohibited. Project members are allowed to make changes from within the organization boundaries.
16+
17+
2. Usage: This project is meant to be used for personal use only. Any commercial or public use outside the organization is hereby prohibited. Using this project and/or the contents of it in a way that leads it to believe you're the owner while not being the real owner is prohibited. Automatic downloading is allowed as long it's not going to be publicly stored. For executables and binary applications, educational use is allowed for the executable form only, the source code and any artwork isn't allowed to be used.
18+
19+
3. Moving Content: Any content can be moved from public to private projects and from public to public, as long both projects are from the same organization. Moving content from private to public needs permission of the project owner.
20+
21+
4. Mixins: Mixins are allowed to be used to make changes on runtime level. As long the file itself will be left unchanged. AND it's not allowed to export the mixins.
22+
23+
24+
§3 - Notes:
25+
26+
If you notice that the project with originally this license is redistributed in a modified or non-modified form without explicit permission of the original project owner, we advise you to contact that project owner.
27+
28+
Any usage of the project and/or it's contents that violates the license will lead to termination of any of the online accounts / services that violates it.

0 commit comments

Comments
 (0)