From 8791b134aaee8e7671811b47e8e01e425078f960 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sat, 21 Dec 2024 14:04:31 -0800 Subject: [PATCH] tidying --- .efrocachemap | 48 ++++++++++---------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/assets/ba_data/python/bauiv1lib/chest.py | 6 +-- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index f4cdbb08..4a0ad862 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": "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/full/linux_arm64_gui/debug/ballisticakit": "7b3d63941d9fa6824cd495a76a2b22e8", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "f156725c4d4225f98862ef005401c0ee", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "a3347cdc1a4f0bfad79645d1a4684f50", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "9ba8100133ce9fe51cf04b8f43c458b6", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "bc9e2a7fa797d8e1defc4baa4b7cbc4f", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8d1654b2e246359a24d2675d108213ce", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e4a5ff44ae13ab883b338e8d67ef4a4e", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e0271f9b10935bda462768bdd741171f", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "05a02ca028c8d7d8a8591a333ad27f35", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "0a8dc7ec29d7b2d8adad0584bea36a77", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "34ddde7177538daca7ca4ee9015dcd9b", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c44a8a9a4d39b7071bbb3699388e72d1", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "eb455b5630633349f445543cdfa5cd9a", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "83ec8f327b1a921346d28399f5cc0615", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "976821defc488982092c4dddf09ba595", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ed572175e0b27c1d7d14cd369aaf8f1d", "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", @@ -4131,14 +4131,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "1c2d42d75e8f975514b2e30f5602516d", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "b39713b9f3a9102fefff1f6d62a9fd82", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "1c2d42d75e8f975514b2e30f5602516d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "7d1035b51bf53dc9021d4d4123433b53", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "a299482d1e4b0991326809fee71f0705", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "cf2b630383875f27554c0260578f09c6", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a19bfc04eff7a19f1719488c441c9408", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "58ee8e1778866d7024ebe47de325ccb9", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9d5b9c3c508803b95f9a8e747bfc5921", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "8a0d29889da01c8aa1613d481dbfa151", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "568ff8fd799e4b2f51b939716d75e23c", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "16d68f7f33f7a917ae16889ea6b38ade", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "f2198c3422ee6aca76b847e4cc00bd66", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "5900536bbd1b7d3759e63763e537f679", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "96f98cccea24abf47c4467375969c3d5", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "c32b0b157acd5970e9dd4e252a735689", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "42f8083d2248def6a79f18a40f412066", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b3287f1cccb32d07b158052fd6a3d053", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3d448bbf222d66671ff41e234e7060be", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91", diff --git a/CHANGELOG.md b/CHANGELOG.md index 9305c1f6..baf783e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22141, api 9, 2024-12-21) +### 1.7.37 (build 22142, 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 f8324380..9d77d9c2 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 = 22141 +TARGET_BALLISTICA_BUILD = 22142 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 1657b36c..0a60fe6d 100644 --- a/src/assets/ba_data/python/bauiv1lib/chest.py +++ b/src/assets/ba_data/python/bauiv1lib/chest.py @@ -16,8 +16,8 @@ if TYPE_CHECKING: class ChestWindow(bui.MainWindow): """Allows operations on a chest.""" - def __del__(self) -> None: - print('~ChestWindow()') + # def __del__(self) -> None: + # print('~ChestWindow()') def __init__( self, @@ -25,7 +25,7 @@ class ChestWindow(bui.MainWindow): transition: str | None = 'in_right', origin_widget: bui.Widget | None = None, ): - print('ChestWindow()') + # print('ChestWindow()') self._index = index diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 28cc5737..93b153b4 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 = 22141; +const int kEngineBuildNumber = 22142; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;