Merge branch 'master' of https://github.com/Venuska1117/Paradise

Venuska1117 · Jul 12, 2023 · e94d0af · e94d0af
2 parents 20829e2 + c85e015
commit e94d0af
Show file tree

Hide file tree

Showing 106 changed files with 2,896 additions and 2,018 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           tools/ci/check_json.sh
           tools/ci/build_tgui.sh
-          tools/ci/check_grep.sh
+          python3 tools/ci/check_grep2.py
           python3 tools/ci/check_line_endings.py
           python3 tools/ci/check_file_names.py
           python3 tools/ci/unticked_files.py ${GITHUB_WORKSPACE}

diff --git a/_build_dependencies.sh b/_build_dependencies.sh
@@ -10,6 +10,6 @@ export STABLE_BYOND_MINOR=1589
 # Beta Byond Major
 export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
-export BETA_BYOND_MINOR=1594
+export BETA_BYOND_MINOR=1608
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.7.9