diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4082e463..0f2afac7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: matrix: buildType: [RelWithDebInfo, Debug] - runs-on: windows-2019 + runs-on: windows-2025 steps: - uses: actions/checkout@v3.3.0 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index d15f7abd..e0a22be5 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -100,6 +100,7 @@ find_path(MYSQL_INCLUDE_DIR "${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql" "${PROGRAM_FILES_64}/MariaDB 10.8/include/mysql" "${PROGRAM_FILES_64}/MariaDB 10.9/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 11.8/include/mysql" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" "${PROGRAM_FILES_64}/MySQL/include" "C:/MySQL/include" @@ -144,6 +145,7 @@ if( WIN32 ) "${PROGRAM_FILES_64}/MariaDB 10.7/lib" "${PROGRAM_FILES_64}/MariaDB 10.8/lib" "${PROGRAM_FILES_64}/MariaDB 10.9/lib" + "${PROGRAM_FILES_64}/MariaDB 11.8/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" "${PROGRAM_FILES_64}/MySQL/lib" @@ -201,6 +203,7 @@ if( WIN32 ) "${PROGRAM_FILES_64}/MariaDB 10.5/bin" "${PROGRAM_FILES_64}/MariaDB 10.6/bin" "${PROGRAM_FILES_64}/MariaDB 10.7/bin" + "${PROGRAM_FILES_64}/MariaDB 11.8/bin" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" "${PROGRAM_FILES_64}/MySQL/bin" diff --git a/src/common/Common.h b/src/common/Common.h index dad9e8eb..5d697954 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -1182,7 +1182,7 @@ namespace Sapphire::Common // Legacy subtypes - skipping - #pragma region Synth 1 -50 Recipes + // Synth 1 -50 Recipes SynthWoodworkingLv01to10Recipes = 23, SynthWoodworkingLv11to20Recipes = 24, SynthWoodworkingLv21to30Recipes = 25, @@ -1223,7 +1223,6 @@ namespace Sapphire::Common SynthCookingLv21to30Recipes = 60, SynthCookingLv31to40Recipes = 61, SynthCookingLv41to50Recipes = 62, - #pragma endregion // TODO: Map gathering subtypes 63 to 128