themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
5328 commits 1 branch 1 tag 88 MiB
Commit graph

5328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lucas Nicodemus
58bc876eab Remove quake from funding file 
Apparently there's a hard limit on 4 people. So what we'll do is just
swap people in and out as they contribute I guess?
 2021-11-24 20:42:07 -08:00
Lucas Nicodemus
6e58173f8b Add DeathCradle to funding file 
Yo why are you not funding DeathCradle?
 2021-11-24 20:39:02 -08:00
Lucas Nicodemus
8cf7d164cb Version tick: 4.5.9 
This commit also bumps the submodule for TSAPI to support Terraria
1.4.3.2.
 2021-11-24 18:57:41 -08:00
Lucas Nicodemus
984a3ca460 Update changelog 2021-11-23 22:53:46 -08:00
Zoom L1
f98df0e4a3
Merge pull request #2447 from AgaSpace/patch-1 
Add the ability to change the player's pvp mode
 2021-11-23 22:52:47 -08:00
Lucas Nicodemus
01aa4b5732
Merge pull request from GHSA-6w5v-hxr3-m2wx 
Fix invalid place style exploit
 2021-11-23 20:52:50 -08:00
Lucas Nicodemus
e714f8ea58 Verison tick: 4.5.8 2021-11-23 18:31:55 -08:00
Lucas Nicodemus
50821e7e89 Fix changelog location for GHSA-6w5v-hxr3-m2wx 2021-11-23 18:29:57 -08:00
Arthri
a1eaf285cd Merge remote-tracking branch 'parent/general-devel' into fix-invalid-place-style 2021-11-24 09:21:40 +08:00
Lucas Nicodemus
462b03e306
Merge pull request #2508 from Arthri/fix-bad-xml 
Fix invalid xml
 2021-11-23 17:13:40 -08:00
Arthri
c5eeae8590 Add changelog entry 2021-11-23 17:23:44 +08:00
Arthri
350d76c315 Fix bad XML(unescaped ampersand) 2021-11-23 17:13:02 +08:00
Arthri
aa5cb13247 Fix bad XML(no opening <summary) 2021-11-23 17:12:49 +08:00
Lucas Nicodemus
e303071dce Fix firework command failing without color 
After updates to the firework command, a guard was lost, allowing the
switch statement that selected the color to execute on a parameter that
was empty. A guard was added to prevent falling into the switch
statement without enough arguments to match a color.

The default type of firework was manually set to a red firework.

Fixes #2507
 2021-11-22 22:16:56 -08:00
Lucas Nicodemus
a01b48ead5 Remove dead code: DBTools.cs 2021-11-22 19:27:40 -08:00
Lucas Nicodemus
320bbad051 Version tick: 4.5.7 2021-11-22 18:07:30 -08:00
Lucas Nicodemus
ce8623e84e Add support for 1.4.3.1 via submodule update 2021-11-22 18:02:40 -08:00
Lucas Nicodemus
6cd69324c7
Merge pull request #2504 from Pryaxis/h/hashing 
Remove DIY password hashing crypto
 2021-11-22 17:17:15 -08:00
Lucas Nicodemus
9416e8f1e2 Remove DIY password hashing crypto 
The old system for hashing passwords and permitting users to select
their algorithm has been deprecated and phased out since 2015. This
removes the remaining functions for hashing passwords to clear the way
for .NET5/6 and for OTAPI 3.

In 211b70ca37, I allowed blank passwords
to upgrade to bcrypt hashes. However, the minimum password length has
been 4 historically for a long time. So I don't actually assume a lot of
users have blank passwords, so I think there are very few, if any of the
old hashes laying around.

So therefore, I think this is pretty much safe to merge.
 2021-11-22 10:26:57 -08:00
Lucas Nicodemus
614211d7a1 Fix respawning players from the server console 2021-11-21 16:35:47 -08:00
Lucas Nicodemus
35db1cc372 Version tick: 4.5.6 2021-11-21 16:13:32 -08:00
Lucas Nicodemus
211b70ca37 Upgrade blank passwords to bcrypt hashes 
Previously, blank passwords were not upgraded to bcrypt hashes. This is
annoying and problematic because it makes it difficult to remove the old
password hashing system because those passwords might still be checked
against non-bcrypt hashes.
 2021-11-21 14:44:53 -08:00
Lucas Nicodemus
b17c4cfc13 Add support for disabling IP bans by default 
Some proxy users find it irritating when their proxy IP is banned by the
ban command. This helps those users find justice in the world.
 2021-11-21 14:30:59 -08:00
Lucas Nicodemus
70d4bb9503 Update submodule for PacketTypes updates 2021-11-20 23:50:15 -08:00
Lucas Nicodemus
1aa9956e45 Report correct god mode status to target player 
The previous version of the code always told the player having their god
mode toggled the state of the player that issued the command, rather
than their own god mode state. This fixes that issue, and now returns
the correct player's state to the correct player.
 2021-11-20 20:02:23 -08:00
Lucas Nicodemus
f523d38300 Check RegionProtectGemLocks before enforcing perms 
Fixes #2485. Bouncer now checks to ensure that RegionProtectGemLocks is
enabled before attempting to reject changes from gem locks from players
that don't have build permissions.
 2021-11-20 18:19:47 -08:00
Lucas Nicodemus
6bcd9753c7 Add even more formatting to changelog 2021-11-20 12:11:28 -08:00
Lucas Nicodemus
16a31e6677 Update changelog to fix formatting 2021-11-20 12:10:54 -08:00
Lucas Nicodemus
96b260532f Fix GHSA-6w5v-hxr3-m2wx via changelog update 2021-11-20 12:08:16 -08:00
Lucas Nicodemus
abb12629ad Add Deerclops to spawnboss command 
Fixes #2500
 2021-11-20 12:04:55 -08:00
Lucas Nicodemus
b44d72056c Update TSAPI submodule for OTAPI 2.0.0.45 (Terraria 1.4.3.0) 2021-11-19 22:48:41 -08:00
Lucas Nicodemus
42ca83e6b5 Update version codename and changelog for 1.4.3 2021-11-19 22:39:45 -08:00
Lucas Nicodemus
6e1af33d5c
Merge pull request #2419 from moisterrific/general-devel 
Add colour differentiation and examples for more commands
 2021-11-19 22:30:37 -08:00
Lucas Nicodemus
4fff15580b
Merge branch 'general-devel' into general-devel 2021-11-19 22:24:47 -08:00
Lucas Nicodemus
3dbadae1f5
Merge pull request #2450 from Pryaxis/moisterrific-patch-1-config-respawntime 
Change default RespawnSeconds & RespawnBossSeconds from 10 to 0
 2021-11-19 22:23:09 -08:00
Lucas Nicodemus
b48b1a1eda
Merge branch 'general-devel' into moisterrific-patch-1-config-respawntime 2021-11-19 22:19:52 -08:00
Lucas Nicodemus
af6271e79f
Merge pull request #2488 from NezbednikSK/general-devel 
Fix Linux guide
 2021-11-16 22:53:44 -08:00
Nezbednik
5bf36fd799
Update CHANGELOG.md 2021-11-13 08:46:14 +01:00
Nezbednik
f7effe9c82
Update README.md 2021-11-13 08:37:15 +01:00
stacey
8ce61c1e01
Add RespawnSeconds change to changelog 2021-09-13 10:04:06 -04:00
stacey
d8aa7b0f69
Change RespawnSeconds & RespawnBossSeconds to use default 
a value of 0 will use the default time based on selected difficulty
 2021-09-13 10:02:03 -04:00
stacey
2b50cbc7b9
Merge branch 'general-devel' into general-devel 2021-09-13 09:52:46 -04:00
Chris
03c20a9804
Merge pull request #2443 from sgkoishi/patch-1 
Update `/help` for `/setup` change
 2021-09-01 18:16:15 +09:30
Stargazing Koishi
bc5c337b5e
Update /help for /setup change 
The auth command was renamed in 8451ef9fb7 but the `/help` command was not updated.
 2021-08-31 19:54:40 -07:00
Arthri
d1459bb1ba Fix spaghetti one liner 2021-08-28 10:42:19 +08:00
Chris
367883417d
Merge pull request #2437 from Rozen4334/patch-1 
Fix return for sundial
 2021-08-27 14:46:56 +09:30
Armano den Boef
bc1a548edf
Following up on changelog entry suggestion; 
Co-authored-by: Chris <2648373+QuiCM@users.noreply.github.com>
 2021-08-25 13:10:54 +02:00
Armano den Boef
b60d62fb74
Properly clarifying issue + fix; 2021-08-25 12:41:28 +02:00
Armano den Boef
1329813f59
Merge branch 'Pryaxis:general-devel' into patch-1 2021-08-25 12:39:04 +02:00
Chris
fa46ac65fb
Merge pull request #2397 from Pryaxis/fix-invalid-groups 
Fix invalid group problems & error reporting on startup
 2021-08-25 19:22:40 +09:30