From fc7cafa6f86bb63b8d5e61eb506d1df8384e0654 Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Tue, 30 May 2017 01:32:32 -0400
Subject: [PATCH] Fix changelog and display name

---
 build.gradle      | 16 ++++++++++++----
 gradle.properties |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index dd64819..a87b5ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,11 @@ plugins {
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false');
+<<<<<<< Updated upstream
 ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom';
+=======
+ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom'
+>>>>>>> Stashed changes
 
 group = 'com.tterrag.blur'
 archivesBaseName = "Blur"
@@ -99,7 +103,7 @@ task createResourcePacks {
 // tasks.build.dependsOn createResourcePacks
 
 tasks.curseforge.enabled = !dev && project.hasProperty('curseforge_key')
-    
+
 curseforge {
     if (project.hasProperty('curseforge_key')) {
         apiKey = project.curseforge_key
@@ -107,13 +111,17 @@ curseforge {
 
     project {
         id = project.project_id
-        changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelog() : System.getenv('CHANGELOG')
-        changelogType = 'text'
+        changelogType = 'html'
+        changelog = System.getenv('CHANGELOG')
+        if (changelog == null || 'none'.equals(changelog)) {
+        	changelog = getChangelog()
+        	changelogType = 'text'
+        }
         releaseType = project.release_type
 		addGameVersion '1.9.4'
 		addGameVersion '1.11.2'
         mainArtifact(jar) {
-            displayName = "Blur ${version}"
+            displayName = "Blur ${mod_version}"
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 86c7569..5798dd1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 minecraft_version=1.10.2
 forge_version=12.18.3.2297
-mod_version=1.0.0
+mod_version=1.0.1
 
 project_id=268324
 release_type=release
\ No newline at end of file