Commit graph

5805 commits

Author SHA1 Message Date
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
hufang360
d5c7ad65e4
Merge branch 'general-devel' into general-devel 2022-10-29 00:31:28 +08:00
結柚
0c017ee7ac
Merge branch 'general-devel' into lang 2022-10-28 21:29:33 +08:00
Cardinal System
80736028df
New Crowdin updates (#2756)
* 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 (Spanish)
[skip actions]

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

* New translations template.pot (Pirate English)
[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 (Spanish)
[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]

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

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

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

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

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

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

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

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

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2022-10-27 14:57:42 -07:00
Cardinal System
e22de67bfd
Update translation template 2022-10-27 21:54:20 +00:00
Lucas Nicodemus
aa0e45de8f
Merge pull request #2760 from sgkoishi/patch-3
Update i18n
2022-10-27 15:52:59 -06:00
Lucas Nicodemus
eae8ae1fb5
Merge branch 'general-devel' into patch-3 2022-10-27 15:49:53 -06:00
Lucas Nicodemus
22f9153621
Merge pull request #2753 from KawaiiYuyu/npcbuff
Update Bouncer / OnNPCAddBuff
2022-10-27 15:45:54 -06:00
SGKoishi
4f6ba61611
Fix several bracket mismatch 2022-10-27 01:53:41 -07:00
yuyu
3ead63f9ac Handle vanilla -lang and -language CLI flags for I18n 2022-10-26 22:17:49 +08:00
yuyu
dfbf2b3b3c Update permissions reference 2022-10-26 22:17:25 +08:00
yuyu
4621a2f7f5 Update Bouncer / OnNPCAddBuff 2022-10-26 22:17:25 +08:00
SGKoishi
95d6baaf6c
Use full sentence rather than combining words 2022-10-25 08:50:29 -07:00
Stargazing Koishi
23c44793e9
Merge branch 'general-devel' into patch-3 2022-10-25 01:06:21 -07:00
Cardinal System
632df52ce7
Update translation template 2022-10-25 07:37:45 +00:00
Lucas Nicodemus
7626d7f2fd
Merge pull request #2761 from Pryaxis/renovate/otapi-things
Update OTAPI things
2022-10-25 01:36:20 -06:00
renovate[bot]
f9ef09f861
Update OTAPI things 2022-10-25 07:29:36 +00:00
Lucas Nicodemus
39c74035f7
Merge pull request #2759 from Pryaxis/renovate/gettext.net-1.x
Update dependency GetText.NET to v1.7.14
2022-10-25 01:29:06 -06:00
SGKoishi
f8c0f0ce15
i18n most texts 2022-10-24 21:16:28 -07:00
SGKoishi
d1a6c293f2
i18n commands 2022-10-24 13:49:26 -07:00
SGKoishi
b766e045b5
Use i18n for most string.Format if shown in log, console or client side 2022-10-24 13:38:33 -07:00
SGKoishi
ea9f6b73e0
Update some i18n source text 2022-10-24 12:51:08 -07:00
Stargazing Koishi
c7a39ec7e4
Update i18n dependency
https://github.com/perpetualKid/GetText.NET/issues/44
2022-10-24 12:30:54 -07:00
renovate[bot]
045115ca7a
Update dependency GetText.NET to v1.7.14 2022-10-24 11:10:52 +00:00
Cardinal System
a116b5f7be
Update translation template 2022-10-24 07:29:24 +00:00
Lucas Nicodemus
072d0aa0ed
Merge branch 'h/i18n-c-3' into general-devel 2022-10-24 01:27:58 -06:00
Lucas Nicodemus
0034e30fa5
Merge pull request #2757 from Pryaxis/renovate/nunit.analyzers-3.x
Update dependency NUnit.Analyzers to v3.5.0
2022-10-24 00:24:39 -07:00
Lucas Nicodemus
0c8a9c3e57
Add more i18n-compatible strings in commands 2022-10-24 01:23:23 -06:00
hufang360
ca93fa685e Fixed SSC not save ateArtisanBread, usedAegisCrystal, usedAegisFruit, usedArcaneCrystal, usedGalaxyPearl, usedGummyWorm, usedAmbrosia, unlockedSuperCart, enabledSuperCart flags, and Server will correct read them. 2022-10-24 13:27:50 +08:00
renovate[bot]
44d9a9e2be
Update dependency NUnit.Analyzers to v3.5.0 2022-10-23 21:19:31 +00:00
Cardinal System
4985c16863
Update translation template 2022-10-23 14:23:33 +00:00
Lucas Nicodemus
41bc22e292
Fix broken interpolation in CharacterManager 2022-10-23 07:22:13 -07:00
Cardinal System
8728bc1eb4
New Crowdin updates (#2752)
* 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]
2022-10-22 22:40:39 -07:00
Cardinal System
8af9322a6f
Update translation template 2022-10-23 05:28:18 +00:00
Lucas Nicodemus
ac8b2692a5
Merge pull request #2751 from BashGuy10/fix-sponges
Fix being kicked for using the new sponge types
2022-10-22 22:27:15 -07:00
BashGuy10
8818885a9e Fix being kicked for using the new sponge types 2022-10-22 20:52:33 -07:00
Cardinal System
1c6e69afd3
Update translation template 2022-10-23 01:31:18 +00:00
Lucas Nicodemus
1523b0d67c
Internationalizify more commands
This is most of commands through to projectile bans.
2022-10-22 18:23:40 -07:00
Lucas Nicodemus
5a58b4c1c0
Merge pull request #2749 from BashGuy10/fix-flamethrowers
Fix flamethrowers kicking players
2022-10-22 18:22:10 -07:00
BashGuy10
85532892dc Merge branch 'fix-flamethrowers' of https://github.com/BashGuy10/TShock into fix-flamethrowers 2022-10-22 17:30:51 -07:00
BashGuy10
309f4e5500
Fix flamethrowers kicking players 2022-10-22 17:28:16 -07:00
BashGuy10
8eb25fad8a Fix flamethrowers kicking players 2022-10-22 16:07:03 -07:00
Joseph Goh
7f15146217
Merge remote-tracking branch 'upstream/general-devel' into docker 2022-10-23 07:06:01 +08:00