Stargazing Koishi
7a49d61761
Merge branch 'Pryaxis:general-devel' into patch-buffnpc-i18nconsistency
2022-11-10 02:23:30 -08:00
Lucas Nicodemus
3ad573855b
Version tick 5.1.1
2022-11-10 00:46:05 -08:00
Lucas Nicodemus
15c8bf8436
Fix bug from i18nification
...
Wrong paren match
2022-11-10 00:25:45 -08:00
Stargazing Koishi
1db4e5e20b
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency
2022-11-10 00:13:35 -08:00
SGKoishi
2f1420faef
Update 1.4.4.8
2022-11-10 00:10:38 -08:00
SGKoishi
fb96d8b0c8
Merge upstream
2022-11-10 00:09:40 -08:00
Lucas Nicodemus
ea96b3dc70
Version tick: 5.1.0
2022-11-10 00:09:39 -08:00
Lucas Nicodemus
09b1e86c0c
Fix build due to outdated PR merge lol
2022-11-09 23:24:39 -08:00
Lucas Nicodemus
01917d48ed
Merge remote-tracking branch 'sgk/pr2811' into general-devel
2022-11-09 23:20:19 -08:00
James Puleo
ad9c9cccce
Properly remove all buffs in PlayerData.RestoreCharacter
...
This was previously using the constant `22` directly, instead of
`Player.maxBuffs`, which is now `44`. This theoretically allowed players
to smuggle buffs on to servers with SSC enabled, by using buff indexes
past `22`.
2022-11-09 23:18:03 -08:00
James Puleo
5a72121200
Only restrict CC'd players during login whilst SSC is enabled
...
The player being CC'd does not cause any issues for us if SSC isn't
enabled, so we can relax it's restriction.
This also allows the `RequireLogin` config option to function usefully
again, as it would disable the player, causing them to be CC'd until
they logged in, creating a vicious cycle.
2022-11-09 23:18:03 -08:00
Lucas Nicodemus
a9aa988547
Merge remote-tracking branch 'sgk/patch-morei18n' into general-devel
2022-11-09 23:08:34 -08:00
Lucas Nicodemus
ea6a128759
Merge remote-tracking branch 'sgk/pr2808' into general-devel
2022-11-09 23:05:50 -08:00
renovate[bot]
4a7971519d
Update dependency Microsoft.Data.Sqlite to v6.0.11
2022-11-10 07:02:44 +00: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
SGKoishi
34886864ec
Update HandleSpawnBoss
...
Apply permission restriction to Mechdusa, Deerclops, and slime pet
2022-11-07 11:42:26 -08:00
Stargazing Koishi
51a8ee8672
Merge branch 'general-devel' into pr2811
2022-11-07 11:38:21 -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
SGKoishi
bd70495774
Allow Torch God's Facor to place biome torch and campfire
2022-11-06 11:45:02 -08:00
SGKoishi
863d51ad27
Add missing string
2022-11-04 20:46:53 -07:00
SGKoishi
770b177426
Rewording update
2022-11-04 20:40:07 -07:00
SGKoishi
01e289e6ac
Fix #2800
2022-11-04 20:01:24 -07:00
James Puleo
1e432cd43b
Add TownSlimeRed to FishableNpcIDs list, allowing it to be fished up
2022-11-03 03:17:45 -04:00
SGKoishi
4eba2b1765
Fix a startup crash
2022-11-02 15:12:54 -07:00
SGKoishi
f57d03ab61
Use actual name instead of Reflecrtion
2022-11-02 14:57:21 -07:00
SGKoishi
1ee8058776
Use same logic for all GetByNameOrId
...
NPC, Item, Prefix, Buff
2022-11-02 14:40:59 -07:00
SGKoishi
fde43a7730
More i18n
...
Strings for player kick/ban, anti-cheating and server logs
2022-11-02 13:42:52 -07: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
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
46001c5be1
Merge remote-tracking branch 'sgk/general-devel' into general-devel
2022-10-31 15:33: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
SGKoishi
03f3b4005a
Fix i18n not calling actual method
2022-10-28 22:47:21 -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
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
Lucas Nicodemus
eae8ae1fb5
Merge branch 'general-devel' into patch-3
2022-10-27 15:49:53 -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
SGKoishi
f8c0f0ce15
i18n most texts
2022-10-24 21:16:28 -07:00
