diff --git a/CHANGELOG-2.1.1.0.md b/CHANGELOG-2.1.1.0.md new file mode 100644 index 0000000..d3f4201 --- /dev/null +++ b/CHANGELOG-2.1.1.0.md @@ -0,0 +1,80 @@ + +# ForbiddenMagic + +Changelog of ForbiddenMagic. + + +### GitHub # +**Merge branch 'master' of https://github.com/GTNewHorizons/ForbiddenMagic** +* # Conflicts: +* # .gitignore + +[5703b178630af24](https://github.com/GTNewHorizons/ForbiddenMagic/commit/5703b178630af24) +by DreamMasterXXL *2021-04-27 17:48:19* +### [#1 Fixes](https://github.com/GTNewHorizons/ForbiddenMagic/pull/1) +**Merge pull request #1 from jss2a98aj/master** +* Fixes + +[40d7828b616f4ac](https://github.com/GTNewHorizons/ForbiddenMagic/commit/40d7828b616f4ac) +by Martin Robertz *2021-04-27 16:51:29* +### [#2 fixed gradle after forge change](https://github.com/GTNewHorizons/ForbiddenMagic/pull/2) +**Merge pull request #2 from repo-alt/feature/gradle_fix** +* fixed gradle after forge change + +[72bb9bfdd26b25c](https://github.com/GTNewHorizons/ForbiddenMagic/commit/72bb9bfdd26b25c) +by Martin Robertz *2021-04-27 17:42:05* +### [#3 Update ru_RU.lang](https://github.com/GTNewHorizons/ForbiddenMagic/pull/3) +**Merge pull request #3 from Reystlin/patch-1** +* Update ru_RU.lang + +[05afc78fba1a107](https://github.com/GTNewHorizons/ForbiddenMagic/commit/05afc78fba1a107) +by Martin Robertz *2021-06-03 18:06:50* +### Jira patch-1 +**Merge pull request #3 from Reystlin/patch-1** +* Update ru_RU.lang + +[05afc78fba1a107](https://github.com/GTNewHorizons/ForbiddenMagic/commit/05afc78fba1a107) +by Martin Robertz *2021-06-03 18:06:50* +### No issue +**bump version** + +[a1c0e894d46727c](https://github.com/GTNewHorizons/ForbiddenMagic/commit/a1c0e894d46727c) +by DreamMasterXXL *2021-06-15 19:41:13* + +**Update ru_RU.lang** + +[0c861947cb606ac](https://github.com/GTNewHorizons/ForbiddenMagic/commit/0c861947cb606ac) +by Reystlin *2021-06-03 17:36:56* + +**Update ru_RU.lang** +* thanks for the suggestions repo-alt + +[45e3667a8c6c86f](https://github.com/GTNewHorizons/ForbiddenMagic/commit/45e3667a8c6c86f) +by Reystlin *2021-06-03 17:20:36* + +**Update ru_RU.lang** +* Сorrecting grammatical errors, adding new translated text + +[7b70b10082f8b41](https://github.com/GTNewHorizons/ForbiddenMagic/commit/7b70b10082f8b41) +by Reystlin *2021-05-25 17:01:55* + +**add libs** + +[46fd73c43f81730](https://github.com/GTNewHorizons/ForbiddenMagic/commit/46fd73c43f81730) +by DreamMasterXXL *2021-04-27 17:46:58* + +**update git ignore** + +[6bbc13ec81f62ec](https://github.com/GTNewHorizons/ForbiddenMagic/commit/6bbc13ec81f62ec) +by DreamMasterXXL *2021-04-27 17:46:30* + +**fixed gradle after forge change** + +[2fbb295c674455b](https://github.com/GTNewHorizons/ForbiddenMagic/commit/2fbb295c674455b) +by repo_alt *2021-04-27 17:18:06* + +**add gradle** + +[fe60db4037751ce](https://github.com/GTNewHorizons/ForbiddenMagic/commit/fe60db4037751ce) +by DreamMasterXXL *2021-04-27 16:53:49* +