Merge remote-tracking branch 'upstream/master'

SpringSkipper · Oct 12, 2023 · 2dcf39a · 2dcf39a
2 parents 7167440 + 7d47f4d
commit 2dcf39a
Show file tree

Hide file tree

Showing 590 changed files with 45,925 additions and 37,687 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -757,6 +757,8 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 * [lewcc](https://github.com/lewcc)
 * [S34N](https://github.com/S34NW)
 * [Sirryan2002](https://github.com/Sirryan2002)
+* [Contrabang](https://github.com/Contrabang)
+* [Burzah](https://github.com/Burzah)
 
 ---
 

diff --git a/_build_dependencies.sh b/_build_dependencies.sh
@@ -12,4 +12,4 @@ export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
 export BETA_BYOND_MINOR=1610
 # Python version for mapmerge and other tools
-export PYTHON_VERSION=3.7.9
+export PYTHON_VERSION=3.11.6