Commit graph

4053 commits

Author SHA1 Message Date
Lucas Nicodemus
882ecef013
Merge remote-tracking branch 'drunderscore/fix/bottomless-honey-bucket-is-real' into general-devel 2022-10-14 23:27:07 -07:00
Lucas Nicodemus
da6a134609
Merge remote-tracking branch 'packmandude/general-devel' into general-devel 2022-10-14 23:19:40 -07:00
Lucas Nicodemus
2bc7541fb5
Merge remote-tracking branch 'origin/renovate/dotnet-monorepo' into general-devel 2022-10-14 23:17:02 -07:00
Lucas Nicodemus
2804f71eb0
Merge remote-tracking branch 'drunderscore/fix/you-cant-have-a-pie-without-cool-whip' into general-devel 2022-10-14 23:16:17 -07:00
Lucas Nicodemus
980ceeb4a1
Merge remote-tracking branch 'stealownz/fix/inferno-fork-onnpcaddbuff-kick' into general-devel 2022-10-14 23:10:45 -07:00
James Puleo
0f3f5d8652
Allow the Cool Whip to apply CoolWhipNPCDebuff buff for 240 ticks 2022-10-14 12:09:38 -04:00
renovate[bot]
44ae34f06e
Update dependency Microsoft.Data.Sqlite to v6.0.10 2022-10-13 05:53:52 +00:00
renovate[bot]
8bff6edfdc
Update dependency MySql.Data to v8.0.31 2022-10-13 05:44:50 +00:00
Luke
a7cd6b6c9c Update ITile with new NetTile data 2022-10-12 16:51:31 +10:00
Luke
818f5fcc59 Read/write new NetTile data 2022-10-12 16:38:15 +10:00
Stealownz
29d08dd606 Fix Inferno Fork's OnFire debuff causing Bouncer reject abnormal buff
Inferno Fork's OnFire debuff was buffed up to `60 * Main.rand.Next(8, 16)`
2022-10-11 22:15:30 +08:00
James Puleo
1df123d2be
Make Bouncer reject Shimmer placement without bucket or whilst banned 2022-10-10 19:00:43 -04:00
James Puleo
bf53c3313c
Make Bouncer allow Bottomless Honey Buckets 2022-10-10 18:59:54 -04:00
James Puleo
4189b4ab1f
Add LiquidType.Shimmer 2022-10-10 18:55:39 -04:00
Lucas Nicodemus
004ff63899
Merge remote-tracking branch 'drunderscore/fix/new-add-buffs-to-npc' into general-devel 2022-10-09 00:36:52 -07:00
Lucas Nicodemus
70d22111b2
Merge remote-tracking branch 'hufang360/general-devel' into general-devel 2022-10-08 12:50:11 -07:00
Lucas Nicodemus
20964a0e8c
Tick version to 5.0.0-beta.0.1 2022-10-08 11:18:00 -07:00
hufang360
678f18b827
Update GetDataHandlers.cs
Correct the mistakes caused by my carelessness.
2022-10-09 01:35:45 +08:00
James Puleo
c1edbea1a2
Allow Blood Butcherer and Shimmer buffs to be applied to NPCs by players 2022-10-08 11:07:49 -04:00
hufang360
66379a4a17 Fix player does't use the Shellphone (Ocean), Shellphone (Underworld) and Shellphone (Spawn). 2022-10-08 22:50:28 +08:00
Lucas Nicodemus
83427106a5
Merge remote-tracking branch 'punchready/general-devel' into general-devel 2022-10-07 20:41:46 -07:00
Lucas Nicodemus
ae578ce184
Merge remote-tracking branch 'tbc/fix/paint-rejects' into general-devel 2022-10-07 20:40:17 -07:00
Lucas Nicodemus
62eb0afb18
Merge remote-tracking branch 'drunderscore/feature/bounce-some-new-packets' into general-devel 2022-10-07 20:38:42 -07:00
Luke
d6caeb15cc Fix hard/mediumcore ban on death
Removed the force parameter since it is of no use.
2022-10-07 18:42:31 +10:00
James Puleo
40b07fdc7b
Don't allow players to sync loadout index whilst disabled 2022-10-06 12:24:09 -04:00
renovate[bot]
dd54f11c73
Update dependency Microsoft.Data.Sqlite to v6.0.9 2022-10-06 16:22:58 +00:00
Armano den Boef
b49810ae06
Merge branch 'general-devel' into fix/paint-rejects 2022-10-06 12:09:20 +02:00
Arthri
c313b0733e Remove obsolete resources 2022-10-06 13:23:46 +08:00
Rozen
d1505127dd
Revert accidental removal of OnPaintTile check 2022-10-05 21:59:49 +02:00
Rozen
62d35533a0
Init 2022-10-05 21:58:09 +02:00
James Puleo
aa17f013c1
Use a string interpolation and escape single quotes when escaping tables 2022-10-05 13:57:30 -04:00
Luke
02b8061531 Change nuget package name to tshock instead of tshockapi 2022-10-05 19:36:13 +10:00
Luke
9fb8320d60
Update TShockAPI/TShockAPI.csproj
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2022-10-04 16:07:22 +10:00
Luke
f87fa90e65 Nuget package information and workflow 2022-09-10 09:07:13 +10:00
Luke
5a98add6de Fix sqlite null parameters + unit test 2022-09-08 16:08:16 +10:00
Luke
67b06f5e4f Improve ReduceConsoleSpam module to filter world generation 2022-09-06 23:06:39 +10:00
Luke
aa0bd7deb2 Merge branch 'general-devel' into otapi3 2022-09-06 22:23:34 +10:00
Luke
99ddcb247b Dependency updates, OTAPI 3.1 & ModFw 1.1 2022-09-05 22:01:33 +10:00
Lucas Nicodemus
1d4d19f961 Version tick: 4.5.18
And also, add changelog entry for dependabot change
2022-08-16 20:57:26 -07:00
Lucas Nicodemus
bbc8ef2dab Merge branch 'h/punchready-fixes' into general-devel 2022-08-16 20:52:21 -07:00
Lucas Nicodemus
9a746a079b
Merge pull request #2632 from Pryaxis/dependabot/nuget/TShockAPI/Newtonsoft.Json-13.0.1
Bump Newtonsoft.Json from 10.0.3 to 13.0.1 in /TShockAPI
2022-08-16 20:49:50 -07:00
Lucas Nicodemus
39383c9fff Merge remote-tracking branch 'punchfix/h/a-new-branch' into h/punchready-fixes 2022-08-16 20:47:21 -07:00
PackmanDude
9092cea7ef Apply fix from @punchready 2022-08-15 00:25:26 +03:00
punchready
9358f11e51 Improve comments 2022-08-14 01:22:22 +02:00
Lucas Nicodemus
1c1ab95f4c
Merge branch 'general-devel' into dependabot/nuget/TShockAPI/Newtonsoft.Json-13.0.1 2022-07-27 21:32:11 -07:00
Luke
578df18901 Redo launcher csproj and action to use framework dependent builds
This also includes package updates across the entire solution, which shouldn't matter at this stage on this branch.
2022-07-27 21:53:09 +10:00
punchready
cf9240d56d Support grass mowing 2022-07-27 11:35:21 +02:00
punchready
8b4dc3a1a4 Fix flower boots check, clean up code 2022-07-27 06:23:34 +02:00
punchready
82a095f3cf fix a region bypass exploit using the ice rod 2022-07-26 08:58:56 +02:00
punchready
681c6de1f7 add strict STR size checking 2022-07-26 08:24:46 +02:00