Lucas Nicodemus
b984ff8b65
Apply patch from https://github.com/Pryaxis/TShock/pull/3018
...
This applies https://github.com/Pryaxis/TShock/pull/3018 as a patch per @punchready because they deleted the head repository so that we can't merge it and none of the git objects have valid refs anymore on the command line and we can't merge it on the gui.
2025-01-26 08:45:11 +09:00
Lucas Nicodemus
2952762032
Merge pull request #3005 from sgkoishi/pr3005
...
Whitelist the Striking Moment (`ParryDamageBuff`) buff
2025-01-26 01:26:45 +09:00
SGKoishi
65559d5db8
Merge remote-tracking branch 'upstream/general-devel' into pr3005
2025-01-26 01:22:34 +09:00
Lucas Nicodemus
c9678fac26
Merge pull request #2925 from sgkoishi/patch-1
...
Remove Connection: Close for REST api
2025-01-26 01:08:50 +09:00
SGKoishi
6ee22758c1
Merge remote-tracking branch 'upstream/general-devel' into patch-1
2025-01-25 08:05:35 -08:00
SGKoishi
61a81bb4ff
Fix merge conflict
2025-01-26 01:00:17 +09:00
Lucas Nicodemus
251353c566
Merge pull request #2939 from sgkoishi/consistency-playeractive-patch
...
Use same TSPlayer.Active check
2025-01-25 23:15:31 +09:00
Lucas Nicodemus
8f5a81014f
Merge branch 'general-devel' into patch-1
2025-01-25 23:08:28 +09:00
Lucas Nicodemus
a42046e79c
Merge branch 'general-devel' into consistency-playeractive-patch
2025-01-25 23:03:30 +09:00
Lucas Nicodemus
7e9b97be29
Disable renovate
...
This is really irritating
2025-01-25 22:51:42 +09:00
Lucas Nicodemus
8246b95739
Disable stupid semantic commits
2025-01-25 22:50:15 +09:00
Lucas Nicodemus
6cdc7599ad
Merge pull request #3048 from timschumi/test-pr
...
docker: Publish Docker images to GHCR
2025-01-25 22:47:35 +09:00
Lucas Nicodemus
696110ae4d
Merge branch 'general-devel' into test-pr
2025-01-25 22:44:01 +09:00
Lucas Nicodemus
e64389db81
Merge pull request #2900 from Pryaxis/renovate/mysql.data-8.x
...
Update dependency MySql.Data to 8.4.0
2025-01-25 22:43:39 +09:00
Lucas Nicodemus
b9d984863d
Merge branch 'general-devel' into pr3005
2025-01-25 22:40:03 +09:00
Lucas Nicodemus
cc2664e599
Merge branch 'general-devel' into test-pr
2025-01-25 22:35:17 +09:00
renovate[bot]
9aba57dab6
Update dependency MySql.Data to 8.4.0
2025-01-25 13:31:02 +00:00
Lucas Nicodemus
b4968adb7d
Fix typo in config file
...
Closes https://github.com/Pryaxis/TShock/pull/3052
2025-01-25 22:29:56 +09:00
Lucas Nicodemus
2755450277
Merge pull request #2943 from sgkoishi/dump-commands
...
Fix dump-reference-data mutate command name
2025-01-25 21:34:44 +09:00
Lucas Nicodemus
748b516f3f
Merge branch 'general-devel' into dump-commands
2025-01-25 21:30:12 +09:00
Lucas Nicodemus
78dd32a837
Fix changelog versioning
2025-01-25 21:28:24 +09:00
Lucas Nicodemus
0912f690cc
Merge pull request #2949 from Pryaxis/renovate/sharpziplib-1.x
...
Update dependency SharpZipLib to 1.4.2
2025-01-05 20:49:39 +09:00
renovate[bot]
e21322b86b
Update dependency SharpZipLib to 1.4.2
2025-01-05 10:58:00 +00:00
Lucas Nicodemus
0b5c9580f7
Merge pull request #3041 from Pryaxis/renovate/nuget-nuget.protocol-vulnerability
...
Update dependency NuGet.Protocol to 6.3.3 [SECURITY]
2025-01-05 19:57:31 +09:00
renovate[bot]
d53517104c
Update dependency NuGet.Protocol to 6.3.3 [SECURITY]
2025-01-05 10:45:58 +00:00
Lucas Nicodemus
9e643d0239
Merge pull request #3040 from Pryaxis/renovate/nuget-nuget.packaging-vulnerability
...
Update dependency NuGet.Packaging to 6.3.4 [SECURITY]
2025-01-05 19:45:25 +09:00
Tim Schumacher
02ce8fdf0d
docker: Don't push to the registry for Pull Requests
...
This requires more thought on how to handle secrets, and whether to just
omit it permanently.
2025-01-05 01:39:51 +01:00
Tim Schumacher
d54711651b
docker: Update documentation for officially provided Docker images
2025-01-04 14:36:58 +01:00
Tim Schumacher
cbdae5b15e
Add a changelog entry for publishing to GHCR
2025-01-04 14:29:40 +01:00
Tim Schumacher
660ec5bc60
docker: Restrict tagging 'latest' to version tags
2025-01-04 14:14:38 +01:00
Tim Schumacher
ca3dfcdf17
docker: Push semver tags if a version tag is pushed
2025-01-04 14:04:57 +01:00
Tim Schumacher
cc3d2af15f
docker: Generate build provenance attestations
...
Co-authored-by: BrailleBennett <BrailleBennett@users.noreply.github.com>
Co-authored-by: TheSuperGamer20578 <TheSuperGamer20578@users.noreply.github.com>
2025-01-04 13:49:38 +01:00
Tim Schumacher
a82881b7d3
docker: Tag and push images to GHCR automatically
...
Co-authored-by: BrailleBennett <BrailleBennett@users.noreply.github.com>
Co-authored-by: TheSuperGamer20578 <TheSuperGamer20578@users.noreply.github.com>
2025-01-04 13:41:08 +01:00
Tim Schumacher
68bb381ece
docker: Bump docker/build-push-action to v6
2025-01-04 13:25:04 +01:00
renovate[bot]
af969898b1
Update dependency NuGet.Packaging to 6.3.4 [SECURITY]
2025-01-03 21:17:29 +00:00
Lucas Nicodemus
1b31665a88
Update logo in readme
2025-01-04 05:31:27 +09:00
Lucas Nicodemus
99701f9a84
Update logo url in readme
2025-01-04 05:31:04 +09:00
Lucas Nicodemus
3da4bf4b45
Remove inactive people from sponsors
2025-01-03 00:05:25 +09:00
quicm
5075997264
Add bandaid fix to RemoteClient.Reset for SecAd GHSA-hvm9-wc8j-mgrc
2024-12-17 01:15:56 +10:30
Chris
0b6bf9ef40
Merge pull request #3029 from Arthri/increase-cursed-inferno-time
...
Increase Cursed Inferno Maximum Debuff Time
2024-04-24 21:38:23 +09:30
Arthri
5c4db00f1e
Fix Cursed Flare
2024-04-24 06:01:04 +00:00
Chris
edd7d7e997
Merge pull request #2974 from timschumi/docker-ci
...
Add CI for Docker images
2024-04-14 14:41:37 +09:30
Chris
14d292b591
Merge branch 'general-devel' into docker-ci
2024-04-13 15:55:02 +09:30
Chris
787fe923c2
Merge pull request #3023 from ZakFahey/logwriter
...
Lazy initialize TextLog._logWriter
2024-04-13 15:47:08 +09:30
ZakFahey
a19ac72e0d
Lazy initialize TextLog._logWriter
...
There is an instance of this in SqlLog that's used as a backup, but since the StreamWriter is created in the constructor, the file is created too. This means that you'll get an empty text log created, every time a server starts up, even if you have text logs disabled. This is especially problematic when you have a multi-server setup with file write conflicts.
2024-02-18 11:36:26 -08:00
SGKoishi
dbca317639
Update CursedInferno time limit
2023-12-27 13:01:55 -08:00
SGKoishi
cf726368c5
Use seconds as the time unit
2023-12-22 13:19:58 -08:00
SGKoishi
3c2a3f3e53
Add unstaged changes
2023-12-21 20:43:41 -08:00
SGKoishi
b6041a738e
Whitelist the Striking Moment (ParryDamageBuff) buff
2023-12-21 20:40:01 -08:00
Tim Schumacher
3ffe8e1274
Add CI for Docker images
2023-10-21 23:04:21 +02:00
