From 97129d911fb58dc3ad62ac61eda5ae90b25ff7b6 Mon Sep 17 00:00:00 2001
From: Scrounger <scrounger@gmx.net>
Date: Tue, 26 Nov 2019 18:21:59 +0100
Subject: [PATCH] ### 1.1.0

---
 README.md         |  5 +++++
 io-package.json   | 14 +++++++++++++-
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0003fb5..46f21af 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,11 @@ This adapter is inspired from [virtual devices script by Pman](https://forum.iob
 
 ## Changelog
 
+### 1.1.0
+* (Scrounger) option to merge linkedObject on adapter restart added
+* (Scrounger) string to number conversion added
+* (algar42) russian translation corrected
+
 ### 1.0.1
 * (Scrounger) adapter configuration: repair function added
 * (Scrounger) receive system messages added
diff --git a/io-package.json b/io-package.json
index e3bbaaa..4e29b6a 100644
--- a/io-package.json
+++ b/io-package.json
@@ -1,8 +1,20 @@
 {
 	"common": {
 		"name": "linkeddevices",
-		"version": "1.0.1",
+		"version": "1.1.0",
 		"news": {
+			"1.1.0": {
+				"en": "string to number converter added. option to merge linkedObject on adapter restart added. russian translation corrected by algar42.",
+				"de": "Zeichenkette in Zahl konvertieren hinzugefügt. Option zum Zusammenführen von linkedObject beim Neustart des Adapters. Russische übersetzung korrigiert von algar42.",
+				"ru": "Добавлен конвертер строк в числа. добавлена возможность слияния связанного объекта при перезагрузке адаптера. русский перевод исправлен algar42.",
+				"pt": "conversor de string para número adicionado. opção para mesclar linkedObject na reinicialização do adaptador adicionada. tradução russa corrigida por algar42.",
+				"nl": "tekenreeks naar nummerconvertor toegevoegd. optie om gelinkteObject op adapter opnieuw samen te voegen toegevoegd. Russische vertaling gecorrigeerd door algar42.",
+				"fr": "convertisseur de chaîne en nombre ajouté. option de fusion de linkedObject au redémarrage de l'adaptateur ajoutée. traduction en russe corrigée par algar42.",
+				"it": "convertitore stringa a numero aggiunto. aggiunta opzione per unire linkedObject al riavvio dell'adattatore. traduzione russa corretta da algar42.",
+				"es": "convertidor de cadena a número agregado. Se agregó la opción para fusionar el objeto vinculado al reiniciar el adaptador. traducción rusa corregida por algar42.",
+				"pl": "dodano konwerter ciągów na liczby. dodano opcję scalania obiektu LinkedObject przy ponownym uruchomieniu adaptera. tłumaczenie rosyjskie poprawione przez algar42.",
+				"zh-cn": "字符串到数字转换器已添加。添加了在适配器重新启动时合并linkedObject的选项。俄语翻译已由algar42纠正。"
+			},
 			"1.0.1": {
 				"en": "• adapter configuration: repair function added\n• receive system messages added",
 				"de": "• Adapterkonfiguration: Reparaturfunktion hinzugefügt\n• Systemmeldungen empfangen hinzugefügt",
diff --git a/package-lock.json b/package-lock.json
index 0b59901..960f302 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.linkeddevices",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f9f1c2b..eaf678d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.linkeddevices",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Create linked objects (datapoints) of your devices with a self-defined structure. This makes it possible to create a structure in ioBroker, where all objects are centralized, e.g. to be used in the vis or scripts.",
   "author": {
     "name": "Scrounger",