diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 89c7a06fa..6f9ca6df3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -28,7 +28,8 @@ body: attributes: label: DevilutionX version options: - - 1.5.0 (latest release) + - 1.5.1 + - 1.5.0 - 1.4.1 - 1.4.0 - 1.3.0 diff --git a/Source/dvlnet/zerotier_native.h b/Source/dvlnet/zerotier_native.h index 3febbe6ed..cf8e4c6a6 100644 --- a/Source/dvlnet/zerotier_native.h +++ b/Source/dvlnet/zerotier_native.h @@ -10,7 +10,7 @@ void zerotier_network_stop(); // NOTE: We have patched our libzt to have the corresponding multicast // MAC hardcoded, since libzt is still missing the proper handling. const unsigned char dvl_multicast_addr[16] = { - 0xff, 0x0e, 0xa8, 0xa9, 0xb6, 0x11, 0x60, 0xce, + 0xff, 0x0e, 0xa8, 0xa9, 0xb6, 0x11, 0x61, 0xce, 0x04, 0x12, 0xfd, 0x73, 0x37, 0x86, 0x6f, 0xb7 }; diff --git a/VERSION b/VERSION index 9fa7b61f4..c9c40b066 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.1-dev +1.5.1 diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index 2dba407ec..a78a3a596 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -15,7 +15,7 @@ android { } minSdkVersion 18 targetSdkVersion 33 - versionCode 26 + versionCode 28 versionName project.file('../../VERSION').text.trim() externalNativeBuild { cmake { diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1ae15e992..aea43e70f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## DevilutionX 1.5.1 ### Features