Skip to content

Commit

Permalink
Merge branch 'main' into asset-log
Browse files Browse the repository at this point in the history
  • Loading branch information
GoldenGnu committed Oct 18, 2024
2 parents d491f2a + 863b745 commit 8e6213b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion credits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Contributors:
Boran Lordsworth
Ed Thelleres
Tsuro Tsero
Salartarium

Retired Testers:
Varo Jan
Expand Down Expand Up @@ -68,7 +69,7 @@ _EVE-ONLINE_____________________________________________________________________
jEveAssets use EVE-Online API and SDE

Link:
Main site: http://www.eveonline.com
Main site: https://www.eveonline.com
SDE: https://developers.eveonline.com/resource/resources
API: https://esi.evetech.net/ui

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>9.0.0-SNAPSHOT</version>
<name>jeveassets</name>
<description>jEveAssets is an out-of-game asset manager for Eve-Online, written in Java</description>
<url>http://eve.nikr.net/jeveasset</url>
<url>https://eve.nikr.net/jeveasset</url>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/GoldenGnu/jeveassets/issues</url>
Expand All @@ -18,7 +18,7 @@
<id>niklas</id>
<name>Niklas Kyster Rasmussen</name>
<email>[email protected]</email>
<url>http://nikr.net/</url>
<url>https://nikr.net/</url>
<timezone>+1</timezone>
</developer>
<developer>
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ________________________________________________________________________________
_CONTACT________________________________________________________________________

www:
http://eve.nikr.net/jeveasset
https://eve.nikr.net/jeveasset

email:
[email protected]
Expand Down
4 changes: 2 additions & 2 deletions src/main/izpack/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<appname>jEveAssets</appname>
<appversion>@{project.version}</appversion>
<appsubpath>jEveAssets</appsubpath>
<url>http://eve.nikr.net/jeveasset</url>
<url>https://eve.nikr.net/jeveasset</url>
<javaversion>1.6</javaversion>
<requiresjdk>no</requiresjdk>
<run-privileged/>
Expand Down Expand Up @@ -65,4 +65,4 @@
</updatecheck>
</pack>
</packs>
</izpack:installation>
</izpack:installation>
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public AboutDialog(final Program program) {
+ "&nbsp;Boran Lordsworth<br>"
+ "&nbsp;Ed Thelleres<br>"
+ "&nbsp;Tsuro Tsero<br>"
+ "&nbsp;Salartarium<br>"
+ "<br>"
+ "<b>Retired Testers</b><br>"
+ "&nbsp;Varo Jan<br>"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ private void showPopupMenu() {
return;
}
///XXX Workaround for BugID: 281
//http://eve.nikr.net/jeveassets/bugs/#bugid281
//http://eve.nikr.net/jeveassets/bugs/#bugid420
//https://eve.nikr.net/jeveassets/bugs/#bugid281
//https://eve.nikr.net/jeveassets/bugs/#bugid420
if (!this.isShowing()) {
return;
}
Expand Down

0 comments on commit 8e6213b

Please sign in to comment.