Merge branch 'release/1.2.3'

KillenCraft · Feb 9, 2015 · 1b64a47 · 1b64a47
2 parents 70e6207 + 2dbee89
commit 1b64a47
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ## Kore Sample
-**LATEST OFFICIAL VERSION**: [Kore Sample 1.2.2 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all releases][releases])
+**LATEST OFFICIAL VERSION**: [Kore Sample 1.2.3 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all releases][releases])
 [latest]: https://github.com/MinecraftModArchive/KoreSample/releases/latest
 [releases]: https://github.com/MinecraftModArchive/KoreSample/releases
 [changelog.md]: https://github.com/MinecraftModArchive/KoreSample/blob/develop/src/main/resources/CHANGELOG.md

diff --git a/src/main/java/com/scottkillen/mod/koresample/config/ConfigEventHandler.java b/src/main/java/com/scottkillen/mod/koresample/config/ConfigEventHandler.java
@@ -33,7 +33,7 @@ public ConfigEventHandler(String modID, File configFile, ConfigSyncable sync, St
 
         final Configuration localConfiguration = new Configuration(configFile, configVersion);
         final Optional<Configuration> oldConfig;
-        if (isConfigVersionMismatch(localConfiguration, configVersion))
+        if (isConfigVersionMismatch(localConfiguration))
         {
             backup(configFile);
             oldConfig = Optional.of(localConfiguration);
@@ -56,9 +56,9 @@ private static String getModName(String modID)
         return mod == null ? "Unknown" : mod.getName();
     }
 
-    private static boolean isConfigVersionMismatch(Configuration configuration, String configVersion)
+    private static boolean isConfigVersionMismatch(Configuration configuration)
     {
-        return !configVersion.equals(configuration.getDefinedConfigVersion());
+        return !configuration.getLoadedConfigVersion().equals(configuration.getDefinedConfigVersion());
     }
 
     public void activate()

diff --git a/src/main/resources/CHANGELOG.md b/src/main/resources/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.3
+- Fixed failure to detect config version mismatch.
+- Update build environment to Minecraft Forge 10.13.2.1291
+
 ## 1.2.2
 - Refactored Version Checker integration to be reused by client mods.
 

diff --git a/version/gradle.properties b/version/gradle.properties
@@ -1,6 +1,6 @@
-#Sun, 18 Jan 2015 00:19:26 -0500
+#Mon, 09 Feb 2015 00:41:05 -0500
 mcversion=1.7.10
-forgeversion=10.13.2.1235
+forgeversion=10.13.2.1291
 version_major=1
 version_series=2
-version_revision=2
+version_revision=3