Changed some support-scripts to generate changelog.md etc.

.travis.yml

@@ -24,14 +24,15 @@ script:
 - mvn -nsu -Dtravis.buildNumber=${TRAVIS_BUILD_NUMBER} -Pi18n,${MC},we613,wg62 clean install
 before_deploy:
 - mv uSkyBlock-Plugin/target/uSkyBlock.jar uSkyBlock-Plugin/target/uSkyBlock-bukkit${MC}.jar
+- ./changelog.sh > changelog.md
 deploy:
   provider: releases
   api-key: "${GITHUB_TOKEN}"
   file_glob: true
   file:
   - uSkyBlock-Plugin/target/uSkyBlock*.jar
   - uSkyBlock-Plugin/target/uSkyBlock-Plugin/gettext-report.txt
-  - changelog.txt
+  - changelog.md
   - uSkyBlock-API/target/uSkyBlock-API-*.jar
   skip_cleanup: true
   on:

changelog.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+newversion=$1
+lastversion=$2
+if [[ -z $lastversion ]];then
+  tag=$( git describe --tags --abbrev=0 )
+  lastversion="${tag%-*}"
+fi
+if [[ -z $newversion ]];then
+  newversion="HEAD"
+fi
+echo -e "## Change Log for ${lastversion}..${newversion}\n"
+git log --oneline ${lastversion}..HEAD | grep "#" | awk '{printf("  * %s\n",$0)}'
+echo -e "\n## Translations"
+echo '```'
+cat uSkyBlock-Core/target/classes/gettext-report.txt
+echo '```'

prerelease.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 tag=$( git describe --tags --abbrev=0 )
+lastversion="${tag%-*}"
 tstamp=$( date +%Y%m%d%H%M )
-tag="${tag%-*}"
-./createchangelog.sh $tag $tstamp
-tag="$tag-$tstamp"
-git commit -a -m "committing changes for $tag"
+newversion="$lastversion-$tstamp"
+./changelog.sh $newversion $lastversion > changelog.md
+git commit -a -m "Changelog for $tag"
 git push
-git tag $tag
+git tag $newversion
 git push --tags

release.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+if [[ -z $1 ]]; then
+  echo "Usage: $0 <newversion>"
+  exit -1
+fi
+newversion=$1
+tag=$( git describe --tags --abbrev=0 )
+tstamp=$( date +%Y%m%d%H%M )
+lastversion="${tag%-*}"
+./changelog.sh $newversion $lastversion > changelog.md
+git commit -a -m "Changelog for $tag"
+git push
+git tag $newversion
+git push --tags

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/menu/SkyBlockMenu.java

@@ -217,7 +217,7 @@ public Inventory displayPartyGUI(final Player player) {
         } else {
             addLore(lores, tr("\u00a7cThis island is full."));
         }
-        addLore(lores, tr("\u00a7eHover over a player's icon to\n\u00a7eview their permissions. The\n\u00a7eleader can change permissions\n\u00a7eby clicking a player''s icon."));
+        addLore(lores, tr("\u00a7eHover over a player''s icon to\n\u00a7eview their permissions. The\n\u00a7eleader can change permissions\n\u00a7eby clicking a player''s icon."));
         meta2.setLore(lores);
         sign.setItemMeta(meta2);
         menu.addItem(sign.clone());

uSkyBlock-Core/src/main/po/en_GB.po

@@ -1047,7 +1047,8 @@ msgstr "§7Invitation for §6{0} §7has timed out or been cancelled."
 
 #, java-format
 msgid "§eInvitation for {0}''s island has timedout or been cancelled."
-msgstr "§9* §7Invitation for §6{0}''s §7island has timed out or been cancelled."
+msgstr ""
+"§9* §7Invitation for §6{0}''s §7island has timed out or been cancelled."
 
 msgid "§eYou have accepted the invitation to join an island."
 msgstr "§9* §7You have §aaccepted §7the invitation to join an island."

uSkyBlock-Core/src/main/po/keys.pot

@@ -2191,7 +2191,7 @@ msgid "§cThis island is full."
 msgstr ""
 
 msgid ""
-"§eHover over a player's icon to\n"
+"§eHover over a player''s icon to\n"
 "§eview their permissions. The\n"
 "§eleader can change permissions\n"
 "§eby clicking a player''s icon."