Commit graph

5847 commits

Author SHA1 Message Date
Lucas Nicodemus
f52e909eea
Update changelog 2022-11-09 22:57:59 -08:00
Lucas Nicodemus
b322c4c1e0
Replace references to Main.max*whatever*count
All of the Main.maxwhatever fields have been replaced with
Terraria.ID.WhateverID.Count fields.
2022-11-09 22:53:29 -08:00
renovate[bot]
afb966dcff
Update OTAPI things 2022-11-10 01:32:45 +00:00
Cardinal System
f7553fde83
New Crowdin updates (#2788)
* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Polish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]
2022-11-06 23:20:39 -08:00
Lucas Nicodemus
842f8c0108
Merge remote-tracking branch 'drunderscore/fix/allow-surly-slime-to-be-fished' into general-devel 2022-11-06 23:03:48 -08:00
Lucas Nicodemus
a00d5ed2a9
Merge pull request #2801 from sgkoishi/issue2800
Fix #2800
2022-11-05 21:38:39 -07:00
SGKoishi
01e289e6ac
Fix #2800 2022-11-04 20:01:24 -07:00
James Puleo
a41272ce2e
Update CHANGELOG.md 2022-11-03 03:19:12 -04:00
James Puleo
1e432cd43b
Add TownSlimeRed to FishableNpcIDs list, allowing it to be fished up 2022-11-03 03:17:45 -04:00
Lucas Nicodemus
1ff308876e
Merge pull request #2794 from DGGua/general-devel
fix docker example code
2022-11-02 23:40:49 -07:00
DGGua
3af529dad2
fix docker example code 2022-11-03 14:28:36 +08:00
Lucas Nicodemus
98cca7a4c0
Merge pull request #2793 from DGGua/patch-1
fix docker docs for changes in Dockerfile
2022-11-02 23:13:30 -07:00
DGGua
78880836c3
fix docker docs for changes in Dockerfile 2022-11-03 13:54:49 +08:00
Lucas Nicodemus
d38046d74b
Merge pull request #2787 from Pryaxis/geoip_exclude
Geoip exclude
2022-11-01 22:44:41 -07:00
Luke
3e4ee001ea Update changelog.md 2022-11-02 15:35:21 +10:00
Luke
02694fcec0 Exclude GeoIP.dat from single file 2022-11-02 15:17:57 +10:00
Cardinal System
65340dd9dd
New Crowdin updates (#2785)
* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Portuguese)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]
2022-11-01 21:53:51 -07:00
Lucas Nicodemus
969e60775a
Merge pull request #2784 from punchready/patch-2
Fix item giving
2022-10-31 17:50:21 -07:00
punchready
bfd665bcb5
Update changelog 2022-11-01 01:32:28 +01:00
punchready
4f22d6a11e
Fix item giving
Previously this would potentially drop too many items on the ground if the inventory doesn't have enough free slots.
2022-11-01 01:29:46 +01:00
Lucas Nicodemus
1baad06484
Version tick: 5.0.0 2022-10-31 16:51:05 -07:00
Lucas Nicodemus
80c2ff6bd9
Update changelog with language credits 2022-10-31 16:44:52 -07:00
Cardinal System
efed0005dd
New Crowdin updates (#2774)
* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Italian)
[skip actions]
2022-10-31 16:37:33 -07:00
Lucas Nicodemus
917eb1ca5a
Fix malformed docs 2022-10-31 16:22:51 -07:00
Lucas Nicodemus
61e36d0abd
Move GiveItemsDirectly config item to tshock config
Due to an issue that stops the SSC config persister thing from working,
I moved the config item that's new back to the config file. I tried
applying the patches from
https://github.com/Pryaxis/TShock/pull/2354/commits but these didn't
actually resolve the issue. I'm keeping the commits here but I'm not
sure they help.

The core problem is this: if you add a new config file item to the ssc
config, the ssc config is overwritten with the default config items
instead of being merged automatically with the new items. This is a
critical issue as it means that SSC is disabled on all servers that had
it enabled and results in "data misplacement" which is alarming enough
to cause users to think they had data loss, which is not ideal.

Until the issue with the SSC config is resolved, I'm not willing or
confident to change it.
2022-10-31 16:18:39 -07:00
Chris
05fe6c905f
Add a little more info to config method descriptions 2022-10-31 16:04:27 -07:00
Chris
53213345b0
Add upgrade to SSC config so we don't overwrite ssc configs anymore 2022-10-31 16:04:20 -07:00
Lucas Nicodemus
f7a95c7a9f
Update docs (again) 2022-10-31 15:58:53 -07:00
Lucas Nicodemus
f186a7abb0
Update sidebar with proper convention for titles 2022-10-31 15:56:45 -07:00
Lucas Nicodemus
5d32f35047
Minor docs updates 2022-10-31 15:55:04 -07:00
Lucas Nicodemus
2ec33a16c1
Update language documentation with -lang flag 2022-10-31 15:53:49 -07:00
Cardinal System
657be6169d
Update translation template 2022-10-31 22:50:22 +00:00
Lucas Nicodemus
46001c5be1
Merge remote-tracking branch 'sgk/general-devel' into general-devel 2022-10-31 15:33:36 -07:00
Lucas Nicodemus
61b5dd1743
Merge pull request #2782 from sgkoishi/bufftime
Show buff time in the log
2022-10-31 15:30:36 -07:00
SGKoishi
65e93b7c17
Show buff time in the log 2022-10-31 14:33:05 -07:00
Stargazing Koishi
e72896490d
Hide command args when not DoLog
resolves #2779
2022-10-31 14:18:26 -07:00
Cardinal System
45ea3cc771
New Crowdin updates (#2770)
* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]
2022-10-29 11:06:48 -07:00
Lucas Nicodemus
90da93ae33
Merge pull request #2769 from sgkoishi/general-devel
Fix i18n not calling actual method
2022-10-28 23:08:55 -07:00
SGKoishi
03f3b4005a
Fix i18n not calling actual method 2022-10-28 22:47:21 -07:00
Lucas Nicodemus
8a764bb6e1
Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel 2022-10-28 17:47:32 -07:00
Lucas Nicodemus
ac17cfefdd
Update submodule for TSAPI 5.0.0-beta.1.0 2022-10-28 17:47:07 -07:00
Cardinal System
c54bffe0ec
New Crowdin updates (#2762)
* New translations template.pot (French)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2022-10-28 17:35:24 -07:00
Lucas Nicodemus
9503c4b6c7
Merge remote-tracking branch 'hufang360/general-devel' into general-devel 2022-10-28 17:34:56 -07:00
Lucas Nicodemus
9f7a8aa05b
Merge remote-tracking branch 'kawaiiyuyu/lang' into general-devel 2022-10-28 17:34:38 -07:00
Lucas Nicodemus
1b3a3d6cc4
Merge remote-tracking branch 'pontaoski/work/janb/give-direct' into general-devel 2022-10-28 17:34:19 -07:00
Lucas Nicodemus
e76b393689
Merge remote-tracking branch 'potatocider/docker' into general-devel 2022-10-28 17:34:06 -07:00
Cardinal System
e900a326e6
Update translation template 2022-10-28 23:11:09 +00:00
Lucas Nicodemus
ddf0844214
Merge pull request #2765 from sgkoishi/general-devel
Minor i18n fix with interpolation
2022-10-28 16:10:04 -07:00
SGKoishi
6c3415d86b
Minor i18n fix with interpolation
The extractor handle the concatenate incorrectly
2022-10-28 14:01:20 -07:00
Janet Blackquill
7198a47e82 Add ability for items given to players to be inserted directly into their inventory instead of spawned as an item drop 2022-10-28 15:04:53 -04:00