Fixes to the versioning and some minor improvements in line with suggestions raised on the PR.

This commit is contained in:
Ryan Wild 2018-05-26 13:21:11 +01:00
parent 75d20605e1
commit cb2ddee4e9
3 changed files with 4 additions and 23 deletions

23
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>me.totalfreedom</groupId>
<artifactId>totalfreedom</artifactId>
<version>5.1</version>
<version>5.0.1</version>
<packaging>jar</packaging>
<properties>
@ -180,7 +180,7 @@
<propertyfile file="src/main/resources/build.properties" comment="Build information. Edit this to your liking.">
<entry key="buildAuthor" default="unknown" />
<entry key="buildNumber" default="0" />
<entry key="buildCodeName" default="Electrum (MC 1.12) Pre-Release 1" />
<entry key="buildCodeName" default="${tfm.build.codename}" />
<entry key="buildVersion" default="${project.version}" />
</propertyfile>
</target>
@ -265,25 +265,6 @@
<format>properties</format>
<failOnNoGitDirectory>true</failOnNoGitDirectory>
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
<excludeProperties>
<excludeProperty>git.branch</excludeProperty>
<excludeProperty>git.build.host</excludeProperty>
<excludeProperty>git.build.user.email</excludeProperty>
<excludeProperty>git.build.user.name</excludeProperty>
<excludeProperty>git.closest.tag.commit.count</excludeProperty>
<excludeProperty>git.closest.tag.name</excludeProperty>
<excludeProperty>git.commit.id.describe</excludeProperty>
<excludeProperty>git.commit.id.describe-short</excludeProperty>
<excludeProperty>git.commit.message.full</excludeProperty>
<excludeProperty>git.commit.message.short</excludeProperty>
<excludeProperty>git.commit.time</excludeProperty>
<excludeProperty>git.commit.user.email</excludeProperty>
<excludeProperty>git.dirty</excludeProperty>
<excludeProperty>git.remote.origin.url</excludeProperty>
<excludeProperty>git.tags</excludeProperty>
<includeOnlyProperty>git.build.version</includeOnlyProperty>
<includeOnlyProperty>git.commit.user.name</includeOnlyProperty>
</excludeProperties>
<includeOnlyProperties>
<includeOnlyProperty>git.build.time</includeOnlyProperty>
<includeOnlyProperty>git.commit.id</includeOnlyProperty>

View file

@ -49,4 +49,4 @@ public class Command_cake extends FreedomCommand
return true;
}
}
}

View file

@ -52,7 +52,7 @@ public class Command_totalfreedommod extends FreedomCommand
msg("Running on " + ConfigEntry.SERVER_NAME.getString() + ".", ChatColor.GOLD);
msg("Created by Madgeek1450 and Prozza.", ChatColor.GOLD);
msg(String.format("Version "
+ ChatColor.BLUE + "%s - %s.%s " + ChatColor.GOLD + "("
+ ChatColor.BLUE + "%s - %s Build %s " + ChatColor.GOLD + "("
+ ChatColor.BLUE + "%s" + ChatColor.GOLD + ")",
build.codename,
build.version,