diff --git a/android/app/build.gradle b/android/app/build.gradle index 5f94c61ef..18feaba8a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,8 +15,8 @@ android { } minSdkVersion 21 targetSdkVersion 26 - versionCode 225 - versionName "0.6.8pre1" + versionCode 226 + versionName "0.6.8pre2" externalNativeBuild { cmake { arguments "-DANDROID_APP_PLATFORM=android-21", "-DANDROID_STL=c++_static", "-DWARNINGS_ARE_ERRORS=ON", "-DWITH_LOCALE=ON", "-DUSE_MOMO=ON" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f3291c376..e9703aeca 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/papers/clipboard-format.md b/papers/clipboard-format.md index e076d7b2c..90f5a7a9b 100644 --- a/papers/clipboard-format.md +++ b/papers/clipboard-format.md @@ -6,7 +6,7 @@ when copying pattern data from Furnace, it's stored in the clipboard as plain te org.tildearrow.furnace - Pattern Data (144) ``` -this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6.8pre1 is `225`. +this top line of text is always the same except for the number in parentheses, which is the internal format version. for example, 0.6.8pre2 is `226`. the second line is a number between 0 and 18 (decimal) which indicates which column the clip starts from. - `0`: note. diff --git a/papers/format.md b/papers/format.md index 100877645..c59cfee69 100644 --- a/papers/format.md +++ b/papers/format.md @@ -32,6 +32,7 @@ these fields are 0 in format versions prior to 100 (0.6pre1). the format versions are: +- 226: Furnace 0.6.8pre2 - 225: Furnace 0.6.8pre1 - 219: Furnace 0.6.7 - 218: Furnace 0.6.6 diff --git a/res/Info.plist b/res/Info.plist index ec863a279..0624225cb 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 0.6.8pre1 + 0.6.8pre2 CFBundleName Furnace CFBundlePackageType APPL CFBundleShortVersionString - 0.6.8pre1 + 0.6.8pre2 CFBundleSignature ???? CFBundleVersion - 0.6.8pre1 + 0.6.8pre2 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/res/furnace.rc b/res/furnace.rc index 82c8b5ad0..756507c87 100644 --- a/res/furnace.rc +++ b/res/furnace.rc @@ -33,10 +33,10 @@ "Furnace" VALUE "ProductVersion", - "0.6.8pre1" + "0.6.8pre2" VALUE "FileVersion", - "0.6.8pre1" + "0.6.8pre2" VALUE "CompanyName", "tildearrow" diff --git a/src/engine/engine.h b/src/engine/engine.h index 4c7cce31a..b9fff61c0 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -54,8 +54,8 @@ class DivWorkPool; #define DIV_UNSTABLE -#define DIV_VERSION "0.6.8pre1" -#define DIV_ENGINE_VERSION 225 +#define DIV_VERSION "0.6.8pre2" +#define DIV_ENGINE_VERSION 226 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02