diff --git a/CHANGELOG.md b/CHANGELOG.md index 8267a5406..4ebb80c3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,12 @@ CHANGELOG This changelog references the relevant changes (bug and security fixes) done in 6.x, 5.x, 4.x, 3.x, 2.x, 1.x and 0.x versions. -* 6.1.0 (20234-03-05) +* 6.2.0 (2024-03-22) + + * Added **Chinese** language + * Fixed multiline material description UI bug + +* 6.1.0 (2024-03-05) * Added **Portuguese** language (thanks to Henny Ferreira for joining the translators team) * Fixed _Clippy_ loading when OpenCutList installed under a non-ASCII path diff --git a/build/package.json b/build/package.json index 2d01d9e74..b51fc7c55 100644 --- a/build/package.json +++ b/build/package.json @@ -1,6 +1,6 @@ { "name": "lairdubois-opencutlist-sketchup-extension", - "version": "6.1.0", + "version": "6.2.0", "description": "OpenCutList by L'Air du Bois =======================================", "main": "index.js", "directories": { diff --git a/dist/ladb_opencutlist.rbz b/dist/ladb_opencutlist.rbz index 2897d9c12..b64ba0e07 100644 Binary files a/dist/ladb_opencutlist.rbz and b/dist/ladb_opencutlist.rbz differ diff --git a/dist/manifest.json b/dist/manifest.json index 320413890..b0c2acccf 100644 --- a/dist/manifest.json +++ b/dist/manifest.json @@ -1,6 +1,6 @@ { - "version": "6.1.0", - "build": "202403031324", + "version": "6.2.0", + "build": "202403210933", "url": "https://www.lairdubois.fr/opencutlist/download", "sponsor": { "objectiveName": "7.0", diff --git a/src/ladb_opencutlist.rb b/src/ladb_opencutlist.rb index 1275ffc3b..7b62e3595 100644 --- a/src/ladb_opencutlist.rb +++ b/src/ladb_opencutlist.rb @@ -20,7 +20,7 @@ module OpenCutList # Create extension ex = SketchupExtension.new('OpenCutList', File.join(PLUGIN_DIR, 'ruby', 'main')) - ex.version = "6.1.0" ## /!\ Auto-generated line, do not edit ## + ex.version = "6.2.0" ## /!\ Auto-generated line, do not edit ## ex.copyright = "2016-#{Date.today.year} - GNU GPLv3" ## /!\ Auto-generated line, do not edit ## ex.creator = 'L\'Air du Bois - www.lairdubois.fr' @@ -50,6 +50,8 @@ module OpenCutList ex.description = 'Плагин расчета карт раскроя для деревообработчиков и не только. Открытый исходный код, краундфандинг и простота использования ;)' when 'uk' ex.description = 'Плагін розрахунку карт розкрою листового та погонного матеріалів для деревообробників і не тільки. Відкритий вихідний код, фінансується користувачами і простий у використанні ;)' + when 'zh' + ex.description = '木工的切割清单和切割图生成器。 开源，众筹且易于使用 ;)' else ex.description = 'Cutlist and Cutting Diagram Generator for Woodworkers. Open Source, crowdfunded and easy to use ;)' ## DESCRIPTION_END ## diff --git a/src/ladb_opencutlist/js/constants.js b/src/ladb_opencutlist/js/constants.js index 8311bec75..d5ff3e49c 100644 --- a/src/ladb_opencutlist/js/constants.js +++ b/src/ladb_opencutlist/js/constants.js @@ -1,7 +1,7 @@ // CONSTANTS // ====================== -var EXTENSION_BUILD = '202403031324'; // /!\ Auto-generated line, do not edit // +var EXTENSION_BUILD = '202403210933'; // /!\ Auto-generated line, do not edit // // UI ///// diff --git a/src/ladb_opencutlist/ruby/constants.rb b/src/ladb_opencutlist/ruby/constants.rb index 9ba2ae92f..e687cb6d9 100644 --- a/src/ladb_opencutlist/ruby/constants.rb +++ b/src/ladb_opencutlist/ruby/constants.rb @@ -1,11 +1,11 @@ module Ladb::OpenCutList EXTENSION_NAME = 'OpenCutList'.freeze - EXTENSION_VERSION = '6.1.0'.freeze - EXTENSION_BUILD = '202403031324'.freeze + EXTENSION_VERSION = '6.2.0'.freeze + EXTENSION_BUILD = '202403210933'.freeze DEFAULT_LANGUAGE = 'en' - ENABLED_LANGUAGES = %w[ar cs de en es fr he it nl pt ru uk] + ENABLED_LANGUAGES = %w[ar cs de en es fr he it nl pt ru uk zh] FILE_FORMAT_SKP = 'skp'.freeze FILE_FORMAT_STL = 'stl'.freeze diff --git a/src/ladb_opencutlist/twig/tabs/cutlist/_material-origins.twig b/src/ladb_opencutlist/twig/tabs/cutlist/_material-origins.twig index b7a22e594..210eaaab9 100644 --- a/src/ladb_opencutlist/twig/tabs/cutlist/_material-origins.twig +++ b/src/ladb_opencutlist/twig/tabs/cutlist/_material-origins.twig @@ -1,18 +1,16 @@ {# set materialOrigin #} -{# set displayOwned (facultative) #} {# set flat (facultative) #} {# set noColor (facultative) #} {# set noPrint (facultative) #} {# set attr (facultative) #} -{% set displayOwned = displayOwned|default(false) %} {% set flat = flat|default(false) %} {% set noColor = noColor|default(false) %} {% set noPrint = noPrint|default(false) %} {% for materialOrigin in materialOrigins %} - {% if materialOrigin > 1 or displayOwned %} {# OWNED origin are ignored #} + {% if materialOrigin > 1 %} {# OWNED origin are ignored #} {% if flat %}
diff --git a/src/ladb_opencutlist/twig/tabs/cutlist/_modal-part.twig b/src/ladb_opencutlist/twig/tabs/cutlist/_modal-part.twig index 6920489a2..15352e8db 100644 --- a/src/ladb_opencutlist/twig/tabs/cutlist/_modal-part.twig +++ b/src/ladb_opencutlist/twig/tabs/cutlist/_modal-part.twig @@ -56,7 +56,7 @@
{% endif %}
-
{% include 'tabs/cutlist/_material-origins.twig' with { 'materialOrigins':part.material_origins, 'displayOwned':true, 'flat':false, 'noColor':true } %}
+
{% include 'tabs/cutlist/_material-origins.twig' with { 'materialOrigins':part.material_origins, 'flat':false, 'noColor':true } %}