fix appraisal vital colors for buff/debuff #4067
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mag-nus
approved these changes
Dec 2, 2023
WarlockHolmez
added a commit
to daralet-ac/ACE
that referenced
this pull request
Jan 17, 2024
* Prefer shared types in plugin loader (ACEmulator#4060) * Bump Microsoft.EntityFrameworkCore from 6.0.24 to 6.0.25 in /Source (ACEmulator#4066) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.55.4454.20231128161918-master-ea48116 * fix appraisal vital colors for buff/debuff (ACEmulator#4067) * add missing shield mastery to admin /buff command (ACEmulator#4068) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.55.4456.20231202215153-master-4868384 * [ci skip] Updating dbversion.txt 0.9.277 * Improve BiotaSQLWriter for ACLogView (ACEmulator#4071) This also fixes the missing order column for BiotaPropertiesPalette * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.55.4457.20231217201555-master-5eea515 * Bump MySqlConnector from 2.3.1 to 2.3.2 in /Source (ACEmulator#4072) * player corpse FFA after first open (ACEmulator#4070) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.55.4459.20231221190151-master-a366be7 * Switch to System.Text.Json (ACEmulator#4002) * Switch to System.Text.Json Removed Newtonsoft.Json and DouglasCrockford.JsMin * Update GameConfiguration.cs * Update MasterConfiguration.cs * Update ThreadConfiguration.cs * Update StarterSpell.cs * Update StarterGearFactory.cs * Update Program_Setup.cs * Update LifestonedConverter.cs * Update Program_Setup.cs * Update Program_Setup.cs * Update ACE.Adaptor Shift JSON weenie [de]serialization to System.Text.Json * Update LifestonedConverter.cs * Update StarterGearFactory.cs * Update ACE.Server.csproj * Update ACE.Server.Tests.csproj * Update Program.cs * Update MySqlConfiguration.cs * Update DDDConfiguration.cs * Update ModContainer.cs * Update ModManager.cs * Update ModMetadata.cs * Update ModMetadata.cs * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.55.4460.20231221191643-master-12e5696 * Update SphereTests.cs (ACEmulator#4073) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.55.4461.20231221193642-master-7eadaa5 * Update appveyor.yml * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.56.4462.20231221194446-master-fd13097 * improving network resiliency (ACEmulator#4074) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.56.4463.20231225032139-master-5639fac * refactoring some quest logic (ACEmulator#4077) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.56.4464.20231228135122-master-7785f44 * Fix issue with OOBE Setup (ACEmulator#4078) * Bump MySqlConnector from 2.3.2 to 2.3.3 in /Source (ACEmulator#4076) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.56.4466.20231229174746-master-7dd702a * Adjust Barbershop handling (ACEmulator#4079) * Adjust Barbershop handling * Delete Player_Barber.cs * Update Player_Character.cs * Update Player_Use.cs * Update Player_Character.cs * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.56.4467.20231231201925-master-e56390a * Update appveyor.yml * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.57.4468.20231231202603-master-4d73c70 * Bump Lib.Harmony in /Source (ACEmulator#4081) * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.57.4469.20240102154739-master-16ea384 * Add AllowTrailingCommas to JsonSerializerOptions (ACEmulator#4082) Additionally moved all serializers to single static instance in ACE.Common * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.57.4470.20240102155446-master-0d6f9dd * Switch from BCrypt.Net-Core to BCrypt.Net-Next (ACEmulator#4083) BCrypt.Net-Core was a 3rd party release to port BCrypt.Net to .NET Core in the early days of .NET Core. BCrypt.Net-Next is the current standard for BCrypt.Net https://github.com/BcryptNet/bcrypt.net * Use known UTC offset instead of TimeZoneConverter (3rd party) (ACEmulator#4084) * Use System.TimeZoneInfo instead of TimeZoneConverter (3rd party) * Don't rely on system lookup to find out EST is -5 UTC * Remove some unreferenced System packages (ACEmulator#4085) Not sure why these were ever added in the first place. They are not needed as nuget to build. * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.57.4473.20240108115117-master-7aa5402 * Remove a few more system packages from the ARM64 checkin (ACEmulator#4086) Just a few more packages that snuck in during the ARM64 docker support. * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.57.4474.20240109004701-master-a1debb6 * Remove MySql.Data package ref (ACEmulator#4087) This is the heaviest ref so it's nice to remove. We used MySql.Data to execute database update scripts since this pr: https://github.com/ACEmulator/ACE/pull/2736/files Now we use MysqlConnector * [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.57.4475.20240111005845-master-74b57b2 * Update Player_Inventory.cs * chore: remove log4net * Update NetworkSession.cs * Update Program_BinUpdates.cs * Update starterGear.json --------- Co-authored-by: aquafir <83029060+aquafir@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ty Conner <tyconner@itcproductions.com> Co-authored-by: gmriggs <gmriggs@gmail.com> Co-authored-by: Mag-nus <Mag-nus@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reported by @Nalindar