From 68c6374110a00c1d541667065393feef8dfad761 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Tue, 22 Jul 2025 16:55:02 -0300 Subject: [PATCH 1/4] pragma balls; --- src/common/Common.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From 28f86b96024d0ac0e5124207e6ae696462fea2ad Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Tue, 22 Jul 2025 17:16:56 -0300 Subject: [PATCH 2/4] update workflow windows image; --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 5ff3981f62bcf1dfab082c10efd7d0b5b330f456 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Tue, 22 Jul 2025 17:21:49 -0300 Subject: [PATCH 3/4] update findcmake; --- cmake/FindMySQL.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index d15f7abd..10f4ae5d 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" From 7f8700a6fa9ca5d4b846c8b49444c6c3c0e919de Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Tue, 22 Jul 2025 17:47:55 -0300 Subject: [PATCH 4/4] reckoning will come for findcmake; --- cmake/FindMySQL.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 10f4ae5d..e0a22be5 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -145,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" @@ -202,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"