Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG
Browse files Browse the repository at this point in the history
…into upstream-mirror-511
  • Loading branch information
Iajret committed Feb 20, 2024
2 parents a3fcbc8 + 2bb2cfd commit 8d6277e
Show file tree
Hide file tree
Showing 2,329 changed files with 178,243 additions and 95,407 deletions.
1 change: 1 addition & 0 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
# Format is version: map
# Example:
# 500.1337: runtimestation
515.1621: runtimestation
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#Ignore everything in datafolder and subdirectories
/data/**/*
/tmp/**/*
/cache/**/*

#Ignore byond config folder.
/cfg/**/*
Expand Down
2 changes: 1 addition & 1 deletion .tgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: 1
# The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
# Must be interpreted as a string, keep quoted
byond: "515.1626"
byond: "515.1630"
# Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
static_files:
# Config directory should be static
Expand Down
Loading

0 comments on commit 8d6277e

Please sign in to comment.