From e1d8a9ebd81ec8529687717b95f5563b4bbf5cba Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 22 Jun 2024 22:35:41 -0700 Subject: [PATCH] missed a few spots --- .efrocachemap | 32 +++++++++++++------------- src/assets/sphinx/template/index.rst_t | 2 +- tools/batools/spinoff/_test.py | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 2a4c0cd3..890f384a 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4046,18 +4046,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "102e124c031cd2fbb0d8f07b011a6570", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "aa9c9d30698c6e4ffe6cf2ea6b8abccf", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e851caab7095c8fb4e86371a07fe1ef3", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5894d46820a3a6d90e145ab03f684966", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1e7d3dd4ee831e1b4fef02dac2cdf2c0", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c6f5942cd35a6f209d22a304475ecc94", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "46f23e51246a780aa6ad9d05d0bd9481", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "5dcc548316208f72622bd8bbdd2a766e", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "39d8555b9519033ff29619cd5753b1ae", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "ce1c0422ae252cf5573c21991ffb4651", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "83be5f800c1b705bb14df420547dd6ec", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ccc1fd541825bf5a0efadef750e915ee", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "025577c13d7c0e4a9a92112381a1cf7f", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "2e33f242beb0d9b586ca5af2e1e5f41c", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "37f2931b93009be12f2d0d4b4009324c", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "7b710cbf315e400fd3ad9ebb9c272413", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5b391d68bd2f543407570d8540db1b49", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "95adc840473943cc619cf8d2729bae14", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "6e210c9ee35e072be7115022b361016e", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "c8a99fc6e23280073703e707507a35d3", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5d48cdcb174073091faafbd8d24fd909", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "afe045e68caca489e2573b60580c42e3", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b769836453e5e027b1608e7da7d3dad7", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "c471e06d03862e91a2a949806803efbd", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "4f7b8eed54eb4c7d2b6400aaa4dfa37c", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "c471e06d03862e91a2a949806803efbd", @@ -4074,14 +4074,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "cd5c91eecddb1da4e8204e3496466a07", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "9adc2dc1c5c3cdc1ca6fc98fc76644c5", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "cd5c91eecddb1da4e8204e3496466a07", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "a2d7b8adb88d0bdbdb67e143dccffbcb", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "277582a63d58b37e6ee5bb1a425a6e7a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "606384dd100977c6e95c73808d47203b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "31ff5e1e195f288a8b28e4c12ba7f2be", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "f6359d1398d5fdf39c50a700fbb7904b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ee1e78325a2b620d1ebd819d6774ff7e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "d94367882e73c5da9f824b16a45914cf", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "02c33d337d252b3175cf129fc7b76bd1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "f129bbdc61d24d31cea6105b6cf45461", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "289d0bc2a5e77eef85b681967c0b8988", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "58f826bab8e8cde386a92426f68acd4a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d1f4ce60d3f02ea0e6ae4397ea7d08f6", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b05c5926eda50c9c31452824da8544cd", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "5cb7beea136bd1aa9873e8b3397f52e2", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "4071322052a81a5f4ed13bf51523829b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "e4db16386e09a1bbf3103919a2e653af", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/src/assets/sphinx/template/index.rst_t b/src/assets/sphinx/template/index.rst_t index 4f8366f2..2d19f198 100644 --- a/src/assets/sphinx/template/index.rst_t +++ b/src/assets/sphinx/template/index.rst_t @@ -22,4 +22,4 @@ Indices and tables * :ref:`genindex` * :ref:`modindex` -.. note:: For customization of this page see https://github.com/efroemling/ballistica/blob/master/src/assets/sphinx/template/index.rst_t +.. note:: For customization of this page see https://github.com/efroemling/ballistica/blob/main/src/assets/sphinx/template/index.rst_t diff --git a/tools/batools/spinoff/_test.py b/tools/batools/spinoff/_test.py index 313d22b5..308a4bd6 100644 --- a/tools/batools/spinoff/_test.py +++ b/tools/batools/spinoff/_test.py @@ -116,7 +116,7 @@ def spinoff_test(args: list[str]) -> None: flush=True, ) subprocess.run( - f'cd "{submpath}" && git checkout master && git pull', + f'cd "{submpath}" && git checkout main && git pull', shell=True, check=True, )