diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8edc74ede..be2046637 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ defaults: shell: bash env: - BUILD_TYPE: Debug + BUILD_TYPE: Release jobs: build: diff --git a/CMakeLists.txt b/CMakeLists.txt index 59f04d451..111c13f1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_PROJECT_VERSION_MAJOR 0) set(CMAKE_PROJECT_VERSION_MINOR 6) -set(CMAKE_PROJECT_VERSION_PATCH 5) +set(CMAKE_PROJECT_VERSION_PATCH 6) set(BUILD_GUI_DEFAULT ON) set(USE_SDL2_DEFAULT ON) diff --git a/android/app/build.gradle b/android/app/build.gradle index 57e276aa5..f61229a5d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,8 +15,8 @@ android { } minSdkVersion 21 targetSdkVersion 26 - versionCode 214 - versionName "0.6.5" + versionCode 218 + versionName "0.6.6" 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 0457c1bc5..170bdb6c6 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 bbc5070b2..a33c71394 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.5 is `215`. +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.6 is `218`. 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 98a98b07a..62f40c7fb 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: +- 218: Furnace 0.6.6 - 214: Furnace 0.6.5 - 212: Furnace 0.6.4 - 201: Furnace 0.6.3 diff --git a/po/de.po b/po/de.po index f7660c660..86a85d5e2 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: de\n" diff --git a/po/es.po b/po/es.po index 2511e1134..f4932f25a 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: es\n" diff --git a/po/fi.po b/po/fi.po index 2740cd674..3bc443208 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index 6c9413095..10f9d377c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: fr\n" diff --git a/po/furnace.pot b/po/furnace.pot index 29ec357fe..27d43adf7 100644 --- a/po/furnace.pot +++ b/po/furnace.pot @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/hy.po b/po/hy.po index 8b85de90b..01575d611 100644 --- a/po/hy.po +++ b/po/hy.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: hy\n" diff --git a/po/id.po b/po/id.po index 0fe3cdef8..e91345f0a 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: id\n" diff --git a/po/ja.po b/po/ja.po index 44ce1c7d2..0ef5ee2cc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: ja\n" diff --git a/po/ko.po b/po/ko.po index c7a4fde2d..0b9b532f4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: 희민Heemin\n" "Language-Team: none\n" "Language: ko\n" diff --git a/po/locale/de/LC_MESSAGES/furnace.mo b/po/locale/de/LC_MESSAGES/furnace.mo index ba5bbd8a3..531f60770 100644 Binary files a/po/locale/de/LC_MESSAGES/furnace.mo and b/po/locale/de/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/es/LC_MESSAGES/furnace.mo b/po/locale/es/LC_MESSAGES/furnace.mo index 37c55455f..b874698cf 100644 Binary files a/po/locale/es/LC_MESSAGES/furnace.mo and b/po/locale/es/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/fi/LC_MESSAGES/furnace.mo b/po/locale/fi/LC_MESSAGES/furnace.mo index 6081cdc18..282171e2e 100644 Binary files a/po/locale/fi/LC_MESSAGES/furnace.mo and b/po/locale/fi/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/fr/LC_MESSAGES/furnace.mo b/po/locale/fr/LC_MESSAGES/furnace.mo index 634948ad9..d4397233e 100644 Binary files a/po/locale/fr/LC_MESSAGES/furnace.mo and b/po/locale/fr/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/hy/LC_MESSAGES/furnace.mo b/po/locale/hy/LC_MESSAGES/furnace.mo index 201239515..89af149cd 100644 Binary files a/po/locale/hy/LC_MESSAGES/furnace.mo and b/po/locale/hy/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/id/LC_MESSAGES/furnace.mo b/po/locale/id/LC_MESSAGES/furnace.mo index e57697cb4..71d4f4077 100644 Binary files a/po/locale/id/LC_MESSAGES/furnace.mo and b/po/locale/id/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/ko/LC_MESSAGES/furnace.mo b/po/locale/ko/LC_MESSAGES/furnace.mo index 0186200bb..ddcb27cfb 100644 Binary files a/po/locale/ko/LC_MESSAGES/furnace.mo and b/po/locale/ko/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/nl/LC_MESSAGES/furnace.mo b/po/locale/nl/LC_MESSAGES/furnace.mo index ec6fa2b21..b555d7f07 100644 Binary files a/po/locale/nl/LC_MESSAGES/furnace.mo and b/po/locale/nl/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/pl/LC_MESSAGES/furnace.mo b/po/locale/pl/LC_MESSAGES/furnace.mo index 7172f8586..31c57da4c 100644 Binary files a/po/locale/pl/LC_MESSAGES/furnace.mo and b/po/locale/pl/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/pt_BR/LC_MESSAGES/furnace.mo b/po/locale/pt_BR/LC_MESSAGES/furnace.mo index 2db2920d8..75dec639a 100644 Binary files a/po/locale/pt_BR/LC_MESSAGES/furnace.mo and b/po/locale/pt_BR/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/ru/LC_MESSAGES/furnace.mo b/po/locale/ru/LC_MESSAGES/furnace.mo index b0089feab..a0d49aaf8 100644 Binary files a/po/locale/ru/LC_MESSAGES/furnace.mo and b/po/locale/ru/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/sk/LC_MESSAGES/furnace.mo b/po/locale/sk/LC_MESSAGES/furnace.mo index d09aacc64..4c0e2ab31 100644 Binary files a/po/locale/sk/LC_MESSAGES/furnace.mo and b/po/locale/sk/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/th/LC_MESSAGES/furnace.mo b/po/locale/th/LC_MESSAGES/furnace.mo index 3b7a5a2f2..d9439feef 100644 Binary files a/po/locale/th/LC_MESSAGES/furnace.mo and b/po/locale/th/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/tr/LC_MESSAGES/furnace.mo b/po/locale/tr/LC_MESSAGES/furnace.mo index ec52dea23..b913962dd 100644 Binary files a/po/locale/tr/LC_MESSAGES/furnace.mo and b/po/locale/tr/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/uk/LC_MESSAGES/furnace.mo b/po/locale/uk/LC_MESSAGES/furnace.mo index db85193a3..877f306f6 100644 Binary files a/po/locale/uk/LC_MESSAGES/furnace.mo and b/po/locale/uk/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/zh/LC_MESSAGES/furnace.mo b/po/locale/zh/LC_MESSAGES/furnace.mo index 43a33ebb0..de4e85411 100644 Binary files a/po/locale/zh/LC_MESSAGES/furnace.mo and b/po/locale/zh/LC_MESSAGES/furnace.mo differ diff --git a/po/locale/zh_HK/LC_MESSAGES/furnace.mo b/po/locale/zh_HK/LC_MESSAGES/furnace.mo index a4db16fe5..1526e90ac 100644 Binary files a/po/locale/zh_HK/LC_MESSAGES/furnace.mo and b/po/locale/zh_HK/LC_MESSAGES/furnace.mo differ diff --git a/po/nl.po b/po/nl.po index 9312b662b..94b118649 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: Lunathir\n" diff --git a/po/pl.po b/po/pl.po index 79b64152c..0386d3653 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: freq-mod, PoznańskiSzybkowiec\n" "Language: pl\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9600b937a..e4a89766d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: pt_BR\n" diff --git a/po/ru.po b/po/ru.po index fe82f34a7..b330cccad 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: LTVA\n" "Language-Team: none\n" "Language: ru\n" diff --git a/po/sk.po b/po/sk.po index 42a7431c2..0256cd7c2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: sk\n" diff --git a/po/th.po b/po/th.po index 3e39c2046..b0c3c6bce 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: th\n" diff --git a/po/tr.po b/po/tr.po index adf2e28b7..d8d67f9f4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: tr\n" diff --git a/po/uk.po b/po/uk.po index 7e8b4bd80..8cdf5acd0 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: uk\n" diff --git a/po/zh.po b/po/zh.po index b27a7abfc..60316bb72 100644 --- a/po/zh.po +++ b/po/zh.po @@ -27,7 +27,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: DJRen_GTR3QQ\n" "Language-Team: null\n" "Language: zh\n" diff --git a/po/zh_HK.po b/po/zh_HK.po index 0c1e0552e..a110a9bab 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -27,7 +27,7 @@ # msgid "" msgstr "" -"Project-Id-Version: furnace 0.6.5\n" +"Project-Id-Version: furnace 0.6.6\n" "Last-Translator: DJRen_GTR3QQ\n" "Language-Team: null\n" "Language: zh_HK\n" diff --git a/res/Info.plist b/res/Info.plist index c12d673f4..63aa3ebde 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 0.6.5 + 0.6.6 CFBundleName Furnace CFBundlePackageType APPL CFBundleShortVersionString - 0.6.5 + 0.6.6 CFBundleSignature ???? CFBundleVersion - 0.6.5 + 0.6.6 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/res/docpdf/make_paper.py b/res/docpdf/make_paper.py index 643e033d8..4106fcddf 100644 --- a/res/docpdf/make_paper.py +++ b/res/docpdf/make_paper.py @@ -325,7 +325,7 @@ if __name__ == "__main__":

Furnace
User Manual

- for version 0.6.5 + for version 0.6.6
@@ -348,7 +348,7 @@ if __name__ == "__main__":

this documentation is under the Creative Commons Attribution 3.0 Unported license.

you may reproduce, modify and/or distribute this documentation provided this copyright notice (including license and attribution) is present and any necessary disclaimers whether modifications have been made.

this documentation is provided as-is and without warranty of any kind.

-

this manual is written for version 0.6.5 of Furnace.
it may not necessarily apply to previous or future versions.

+

this manual is written for version 0.6.6 of Furnace.
it may not necessarily apply to previous or future versions.

%s diff --git a/res/furnace.rc b/res/furnace.rc index 2ac90391d..986364064 100644 --- a/res/furnace.rc +++ b/res/furnace.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 0,6,5,0 - PRODUCTVERSION 0,6,5,0 + FILEVERSION 0,6,6,0 + PRODUCTVERSION 0,6,6,0 { BLOCK "VarFileInfo" { @@ -33,10 +33,10 @@ "Furnace" VALUE "ProductVersion", - "0.6.5" + "0.6.6" VALUE "FileVersion", - "0.6.5" + "0.6.6" VALUE "CompanyName", "tildearrow" diff --git a/res/releaseReadme/stable-linux.txt b/res/releaseReadme/stable-linux.txt index f9b34aac7..151e82f09 100644 --- a/res/releaseReadme/stable-linux.txt +++ b/res/releaseReadme/stable-linux.txt @@ -16,7 +16,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below. - Furnace on GitHub (project page and issue tracker): https://github.com/tildearrow/furnace - issues: https://github.com/tildearrow/furnace/issues - discussion: https://github.com/tildearrow/furnace/discussions -- online manual: https://tildearrow.org/furnace/doc/v0.6.5/ +- online manual: https://tildearrow.org/furnace/doc/v0.6.6/ # notes diff --git a/res/releaseReadme/stable-mac.txt b/res/releaseReadme/stable-mac.txt index dfd2401be..8fd364fc4 100644 --- a/res/releaseReadme/stable-mac.txt +++ b/res/releaseReadme/stable-mac.txt @@ -26,7 +26,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below. - Furnace on GitHub (project page and issue tracker): https://github.com/tildearrow/furnace - issues: https://github.com/tildearrow/furnace/issues - discussion: https://github.com/tildearrow/furnace/discussions -- online manual: https://tildearrow.org/furnace/doc/v0.6.5/ +- online manual: https://tildearrow.org/furnace/doc/v0.6.6/ # notes diff --git a/res/releaseReadme/stable-win.txt b/res/releaseReadme/stable-win.txt index 98121b410..72e520a6d 100644 --- a/res/releaseReadme/stable-win.txt +++ b/res/releaseReadme/stable-win.txt @@ -16,8 +16,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below. - Furnace on GitHub (project page and issue tracker): https://github.com/tildearrow/furnace - issues: https://github.com/tildearrow/furnace/issues - discussion: https://github.com/tildearrow/furnace/discussions -- online manual: https://tildearrow.org/furnace/doc/v0.6.5/ - +- online manual: https://tildearrow.org/furnace/doc/v0.6.6/ # notes copyright (C) 2021-2024 tildearrow and contributors. diff --git a/scripts/update-po.sh b/scripts/update-po.sh index 506ed0ace..4425cb097 100755 --- a/scripts/update-po.sh +++ b/scripts/update-po.sh @@ -1,6 +1,6 @@ #!/bin/bash -FUR_VERSION="0.6.5" +FUR_VERSION="0.6.6" EXPORT_LANGS=("de" "es" "fr" "fi" "hy" "id" "ja" "ko" "nl" "pl" "pt_BR" "ru" "sk" "sv" "th" "tr" "uk" "zh" "zh_HK") diff --git a/src/engine/engine.h b/src/engine/engine.h index d2879d1a1..3e9358d8a 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -52,10 +52,10 @@ class DivWorkPool; #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 "dev217" -#define DIV_ENGINE_VERSION 217 +#define DIV_VERSION "0.6.6" +#define DIV_ENGINE_VERSION 218 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02