diff --git a/android/app/build.gradle b/android/app/build.gradle index e19c78a58..5384d6d9e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,8 +15,8 @@ android { } minSdkVersion 21 targetSdkVersion 26 - versionCode 162 - versionName "0.6pre7" + versionCode 166 + versionName "0.6pre8" externalNativeBuild { cmake { arguments "-DANDROID_APP_PLATFORM=android-21", "-DANDROID_STL=c++_static", "-DWARNINGS_ARE_ERRORS=ON" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7f6a769d4..a72f1b837 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 d12af1cc2..1b274543b 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.6pre7 is `162`. +this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6pre8 is `166`. 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 4a5e6e900..38696622a 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: +- 166: Furnace 0.6pre8 - 162: Furnace 0.6pre7 - 161: Furnace 0.6pre6 - 158: Furnace 0.6pre5 diff --git a/res/Info.plist b/res/Info.plist index 2bb0c814e..bb3bab0e8 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 0.6pre7 + 0.6pre8 CFBundleName Furnace CFBundlePackageType APPL CFBundleShortVersionString - 0.6pre7 + 0.6pre8 CFBundleSignature ???? CFBundleVersion - 0.6pre7 + 0.6pre8 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/src/engine/engine.h b/src/engine/engine.h index d935d79ac..54a33c23e 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -54,10 +54,10 @@ #define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock(); #define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false; -#define DIV_UNSTABLE +//#define DIV_UNSTABLE -#define DIV_VERSION "dev165" -#define DIV_ENGINE_VERSION 165 +#define DIV_VERSION "0.6pre8" +#define DIV_ENGINE_VERSION 166 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02