aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-24 17:16:27 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-24 17:16:27 +1000
commitce8ae634223ac0e33998e2736073af3cd3c55db2 (patch)
tree8e88d66258e7a3d2764d19d8b12803e090e1bbdf
parent37271be246f94eb81c909be45403ee377d7228c3 (diff)
downloadGT5-Unofficial-ce8ae634223ac0e33998e2736073af3cd3c55db2.tar.gz
GT5-Unofficial-ce8ae634223ac0e33998e2736073af3cd3c55db2.tar.bz2
GT5-Unofficial-ce8ae634223ac0e33998e2736073af3cd3c55db2.zip
^ Version bump to 1.7.0-pre20.
% Updated Changelog generator template, it now produces lovely Changelogs for Github, easily formatted for anything else by removing the copious ` used for code blocks.
-rw-r--r--build.gradle6
-rw-r--r--changelog.mustache15
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/resources/mcmod.info2
4 files changed, 11 insertions, 14 deletions
diff --git a/build.gradle b/build.gradle
index 64e7327267..15c3391e25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ targetCompatibility = JavaVersion.VERSION_1_8
//Jar Info
archivesBaseName = "GT-PlusPlus"
-version = "1.7.0-prerelease-19-early-test2"
+version = "1.7.0-prerelease-20"
minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
minecraft {
@@ -77,9 +77,9 @@ repositories {
}
task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
- file = new File("CHANGELOG.md");
+ file = new File("CHANGELOG ${project.version}.md");
untaggedName = "Current release ${project.version}"
- fromCommit = "1e6bf5e889344acabacec633f7be1aabcfbf4e0e"
+ fromCommit = "a580c9245097b5bddcfbab0d49d7667aec836b93"
toRef = "HEAD"
templateContent = file('changelog.mustache').getText('UTF-8')
}
diff --git a/changelog.mustache b/changelog.mustache
index 64fc20a48b..8094f6ac9c 100644
--- a/changelog.mustache
+++ b/changelog.mustache
@@ -1,6 +1,4 @@
-# Git Changelog Gradle plugin
-
-Changelog of Git Changelog Gradle plugin.
+# Generated via Git Changelog Gradle plugin
{{#tags}}
## {{name}}
@@ -18,14 +16,13 @@ Changelog of Git Changelog Gradle plugin.
{{/hasIssue}}
{{#commits}}
-**{{{messageTitle}}}**
-
+[{{hash}}] | {{authorName}} | {{commitTime}}
+```
+{{{messageTitle}}}
{{#messageBodyItems}}
- * {{.}}
+{{.}}
{{/messageBodyItems}}
-
-[{{hash}}](https://github.com/tomasbjerre/git-changelog-gradle-plugin/commit/{{hash}}) {{authorName}} *{{commitTime}}*
-
+```
{{/commits}}
{{/issues}}
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index adf86ba77f..2c57d71785 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -48,7 +48,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
- public static final String VERSION = "1.7.0-prerelease-17-early";
+ public static final String VERSION = "1.7.0-prerelease-20";
public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
public static boolean isModUpToDate = Utils.isModUpToDate();
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 0866355ddd..50f5b726b4 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.",
"credits": "",
"logoFile": "",
- "version": "1.7.0-prerelease-17-early",
+ "version": "1.7.0-prerelease-20",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",