Commit graph

175 commits

Author SHA1 Message Date
Lucas Nicodemus
0516428f88
Merge branch 'general-devel' into feature/detect-installations-in-client-directory 2025-01-27 21:56:48 +09:00
Lucas Nicodemus
97d88b3b3c
Merge branch 'general-devel' into commandhooks 2025-01-27 10:06:01 +09:00
Lucas Nicodemus
fe3644ca80
Merge branch 'general-devel' into group-changes 2025-01-27 09:13:01 +09:00
Lucas Nicodemus
3115e1f032
Merge branch 'general-devel' into fix/player-data-is-sometimes-not-there 2025-01-27 08:57:36 +09:00
Lucas Nicodemus
4cab985d0f
Merge branch 'general-devel' into accountgroupcupdate-hook 2025-01-26 12:59:15 +09:00
Lucas Nicodemus
519f94116c
Merge branch 'general-devel' into general-devel 2025-01-26 09:38:37 +09:00
Lucas Nicodemus
18062c55e7
Merge branch 'general-devel' into netitem-changes 2025-01-26 09:02:51 +09:00
Lucas Nicodemus
fdee582dc7
Redirect ikebukuro to wiki
This redirects the hosted docs on github pages to the wiki, which is easier for normal people to edit.
2025-01-26 09:00:41 +09:00
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
SGKoishi
65559d5db8
Merge remote-tracking branch 'upstream/general-devel' into pr3005 2025-01-26 01:22:34 +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
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
e6b1fb139f
Merge branch 'general-devel' into netitem-changes 2025-01-25 22:42:52 +09:00
Lucas Nicodemus
b9d984863d
Merge branch 'general-devel' into pr3005 2025-01-25 22:40:03 +09:00
Lucas Nicodemus
1762f59a78
Merge branch 'general-devel' into general-devel 2025-01-25 22:37:52 +09:00
Lucas Nicodemus
cc2664e599
Merge branch 'general-devel' into test-pr 2025-01-25 22:35:17 +09: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
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
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
Cai
3a7786c71f Merge remote-tracking branch 'origin/general-devel' into general-devel 2024-07-31 19:17:14 +08:00
Cai
a8624a8163 update changelog 2024-07-31 19:16:52 +08:00
Cai
b90182f1e5 update changelog 2024-07-31 19:16:23 +08:00
Arthri
5c4db00f1e Fix Cursed Flare 2024-04-24 06:01:04 +00:00
Chris
14d292b591
Merge branch 'general-devel' into docker-ci 2024-04-13 15:55:02 +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
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
Tim Schumacher
93749be8bf Clear default Dockerfile assignments for *PLATFORM
These kept Docker buildx from automatically building for multiple
platforms.
2023-10-21 23:04:21 +02:00
Tim Schumacher
60599ef5b5 Rewrite the .dockerignore file into a denylist
This should help with not forgetting to add any new directories (such as
TShockInstaller and TShockPluginManager, which have been missing until
now).
2023-10-01 11:18:43 +02:00
Chris
3e64a9b82b
Merge branch 'general-devel' into patch-1 2023-08-15 19:17:35 +09:30
Zoom L1
c9f223e808
Merge branch 'general-devel' into accountgroupcupdate-hook 2023-06-17 19:03:44 +07:00
Zoom L1
228d5c7101
Merge branch 'general-devel' into netitem-changes 2023-06-17 19:00:12 +07:00
Zoom L1
e51b9f7874
Merge branch 'general-devel' into group-changes 2023-06-15 13:23:16 +07:00
Zoom L1
fb53bb96bc
Merge branch 'general-devel' into commandhooks 2023-06-15 13:22:32 +07:00
AkjaHAsLk1IALk0MasH
a656a1cc19 Added authorship 2023-06-15 12:17:11 +07:00
AkjaHAsLk1IALk0MasH
7a3b2e051f Update changelog.md 2023-06-15 12:11:44 +07:00
SGKoishi
5bcde689d4
Fix a typo in gbuff 2023-06-11 22:11:20 -07:00
James Puleo
72ecc47218
Update docs/changelog.md (#2953) 2023-06-09 02:52:19 -07:00
James Puleo
fbc1d9dc8d
Update docs/changelog.md 2023-06-09 03:05:43 -04:00
AkjaHAsLk1IALk0MasH
5498f84942 Update changelog.md 2023-06-08 18:12:25 +07:00
AkjaHAsLk1IALk0MasH
b3f3149850 Update changelog.md 2023-06-08 16:34:06 +07:00
AkjaHAsLk1IALk0MasH
a917beaca0 Update changelog.md 2023-06-07 23:44:04 +07:00
Chris
d15b25aa06
Merge branch 'general-devel' into patch-1 2023-06-06 20:45:57 +09:30
Chris
cfccc3a871
Merge branch 'general-devel' into patch-1 2023-06-06 20:42:37 +09:30
AkjaHAsLk1IALk0MasH
4e85c5ddac Update changelog.md 2023-05-14 12:19:05 +07:00