From b2df863adb1d7d787038ea19b135b0e8f4d20df7 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sat, 21 Dec 2024 08:47:46 -0800 Subject: [PATCH] more tidying --- .efrocachemap | 32 ++++++++++---------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/assets/ba_data/python/bauiv1lib/chest.py | 4 ++- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 638e7a80..f4cdbb08 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4103,22 +4103,22 @@ "build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1", "build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "56e112f2611f640ef7bfea763fc0ea16", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "5e0cffe1c4d0df70f18d49ba9681cc72", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "4b8e5afb0166ad3d3116d04d494f9ec1", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "0285611c819eca94e4c2940a7a16c2b8", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e33e669704eb9545a5297fca0f7e28f2", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8485f8eff6706edb86e59ae6a5384f04", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "478942a23a7c1aca322ec1a3f891f7c7", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "af131198a42bceb8267bfbcbf27dd6a7", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "322b35f9163d234b268514b5c0d5b1c9", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "fb16e35043f457789acffad702d44a6a", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "de8ce2028178cf500e5e566d585ab7f5", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "2a8cb6b7dae73d61f6099d632bf65ea3", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b1de7efc71e14c2dc90b7e174bb3c87a", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "2d41f6d86c37743f9816ca7cffe1d9d9", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "ae53c7ca3472750729b21e645a54b087", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "116735872e943dd1fa2c28784fdbdecc", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "682e088f6d572e970378cce906c77987", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "c8f4881e35900d74897c945edf963fae", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "02932e485e82101c0744da6a9e0b126b", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1eb1d9d67828ed64a59f9ded581da54a", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "9b36b6a493002e610153593bc7f480ab", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "02b5873c13723ad14b1038c6a01e2281", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9ae9c8f76f292483acc35a5b1193918c", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "da2e22cd02ce24a9bf628b367c9441d0", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "6da0d278341bff8ac3a9f875c9b851a0", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "718c1297084a64df19f2bd1b51cea7be", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "45a7153bb5bd89a0afe80d572d397b47", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "cc25b9fdbd3275407d46ea34a9db63d7", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "a04624edad5fa466045412b263873223", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f8c44d9c30890b873d76a4f671b97d64", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "2ff4ac5fa8adc5dd1384d15c5a0e0da2", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "9cb586ae131d2206cf08ab458fb313c3", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "c8c1f174ed35992eb71bf1ff22787f4e", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "67e1e5286f3fe64c9935e0e22d3fe443", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "c8c1f174ed35992eb71bf1ff22787f4e", diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e06064c..9305c1f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22140, api 9, 2024-12-21) +### 1.7.37 (build 22141, api 9, 2024-12-21) - Bumping api version to 9. As you'll see below, there's some UI changes that will require a bit of work for any UI mods to adapt to. If your mods don't touch UI stuff at all you can simply bump your api version and call it a day. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index f3b6fcab..f8324380 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22140 +TARGET_BALLISTICA_BUILD = 22141 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/assets/ba_data/python/bauiv1lib/chest.py b/src/assets/ba_data/python/bauiv1lib/chest.py index d8b7cf96..1657b36c 100644 --- a/src/assets/ba_data/python/bauiv1lib/chest.py +++ b/src/assets/ba_data/python/bauiv1lib/chest.py @@ -272,7 +272,9 @@ class ChestWindow(bui.MainWindow): # Allow only one in-flight action at once. if self._action_in_flight: - bui.screenmessage('ERR', color=(1, 0, 0)) + bui.screenmessage( + bui.Lstr(resource='pleaseWaitText'), color=(1, 0, 0) + ) bui.getsound('error').play() return diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 55d541d5..28cc5737 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 22140; +const int kEngineBuildNumber = 22141; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;