From 4a3e9b2a0c7f5e27ab3953dd10712a5384117387 Mon Sep 17 00:00:00 2001
From: CsatiZoltan <csati_zoltan@freemail.hu>
Date: Thu, 4 Mar 2021 21:24:33 +0100
Subject: [PATCH] Bump version 1.1.0

---
 CHANGELOG.md        | 12 ++++++++++--
 docs/source/conf.py |  2 +-
 grains/__init__.py  |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df5f383..2573c17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,15 +6,22 @@ All notable changes to this project will be documented in this file. The format
 
 ## [Unreleased]
 
+
+
+
+
+
+## [1.1.0] - 2021-03-04
+
 ### Added
 
 - Grains embedded into other grains are now identified in the splinegon creation algorithm. [4cef7ec](https://github.com/CsatiZoltan/CristalX/commit/4cef7ecbbe4c3fc5cddb9947b29b3d0b454eecb8), [6c4ad0a](https://github.com/CsatiZoltan/CristalX/commit/6c4ad0aff2c4dae49fb648656a94b14436925bed)
 - Computation of the infinitesimal and Green-Lagrange strain tensors for DIC displacement field. [7eaa0b5](https://github.com/CsatiZoltan/CristalX/commit/7eaa0b523c0bc7e7a585f955aa8c31206cff751a), [9e5466e](https://github.com/CsatiZoltan/CristalX/commit/9e5466ebe1f4ab19defb9e91ff2ed8a961b7044b)
 - Computation of the equivalent von Mises strain. [2b9b0be](https://github.com/CsatiZoltan/CristalX/commit/2b9b0be36cf38f5d1683821573646a65ca541160)
+- Characterization of the strain localization (intergranular/intragranular) in the microstructure. [a74f954](https://github.com/CsatiZoltan/CristalX/commit/a74f95424e08d4915ff833e335a2863103da5ca4), [13576f7](https://github.com/CsatiZoltan/CristalX/commit/13576f7ed85f23b9680eecad030229fc4636e50d)
 - The README file shows how to cite our paper. [#30](https://github.com/CsatiZoltan/CristalX/issues/30)
 - Added a new segmented microstructure ([6b539ba](https://github.com/CsatiZoltan/CristalX/commit/6b539ba356bb2e27f6dca4fbc299ca90635d3ab2)) and the corresponding DIC measurements ([3c845e7](https://github.com/CsatiZoltan/CristalX/commit/3c845e7e180a75acb2ea27404d75c308d35ca786)).
 
-
 ### Deprecated
 
 - The content of `dic.DIC.plot_strain` will be replaced with that of `dic.plot_strain` in version 1.3.0. The latter function will be removed. [b8633c2](https://github.com/CsatiZoltan/CristalX/commit/b8633c202cff0b8bc7b698cc771473b8d40055a9)
@@ -42,6 +49,7 @@ This is the initial release of *CristalX*.
 
 
 
-[unreleased]: https://github.com/CsatiZoltan/CristalX/compare/v1.0.1...HEAD
+[unreleased]: https://github.com/CsatiZoltan/CristalX/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/CsatiZoltan/CristalX/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/CsatiZoltan/CristalX/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/CsatiZoltan/CristalX/compare/981dbcd...v1.0.0
\ No newline at end of file
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 8a200ce..081ad66 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -28,7 +28,7 @@
 author = 'Zoltan Csati'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0.1'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/grains/__init__.py b/grains/__init__.py
index e222e7c..d25cce1 100644
--- a/grains/__init__.py
+++ b/grains/__init__.py
@@ -3,7 +3,7 @@
 warnings.simplefilter('module', ImportWarning)  # print import warnings once in a module
 # warnings.simplefilter('always', RuntimeWarning)
 
-__version__ = '1.0.1'
+__version__ = '1.1.0'
 
 try:
     import OCC