Skip to content

Commit a75df95

Browse files
Merge pull request #170 from logicallysynced/chromatics-3.x
Chromatics 3.x
2 parents cbf18b3 + 525046e commit a75df95

7 files changed

Lines changed: 446 additions & 500 deletions

File tree

Chromatics/Chromatics.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFramework>net8.0-windows7.0</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77
<StartupObject>Chromatics.Program</StartupObject>
8-
<Version>3.1.5.0</Version>
8+
<Version>3.1.6.0</Version>
99
<Authors>Danielle Thompson</Authors>
1010
<ApplicationManifest>app.manifest</ApplicationManifest>
1111
<Copyright>Danielle Thompson 2024</Copyright>
@@ -35,7 +35,7 @@
3535
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
3636
<PackageReference Include="CsvHelper" Version="33.0.1" />
3737
<PackageReference Include="Cyotek.Windows.Forms.ColorPicker" Version="2.0.0-beta.7" />
38-
<PackageReference Include="FFXIVWeather" Version="1.0.16" />
38+
<PackageReference Include="FFXIVWeather" Version="1.0.17" />
3939
<PackageReference Include="HidSharp" Version="2.1.0" />
4040
<PackageReference Include="HueApi" Version="1.6.3" />
4141
<PackageReference Include="HueApi.ColorConverters" Version="1.5.1" />
@@ -44,20 +44,20 @@
4444
<PackageReference Include="NAudio" Version="2.2.1" />
4545
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
4646
<PackageReference Include="NLog" Version="5.3.3" />
47-
<PackageReference Include="RGB.NET.Core" Version="3.0.0-prerelease.2" />
48-
<PackageReference Include="RGB.NET.Devices.Asus" Version="3.0.0-prerelease.2" />
49-
<PackageReference Include="RGB.NET.Devices.CoolerMaster" Version="3.0.0-prerelease.2" />
50-
<PackageReference Include="RGB.NET.Devices.Corsair" Version="3.0.0-prerelease.2" />
51-
<PackageReference Include="RGB.NET.Devices.Logitech" Version="3.0.0-prerelease.2" />
52-
<PackageReference Include="RGB.NET.Devices.Msi" Version="3.0.0-prerelease.2" />
53-
<PackageReference Include="RGB.NET.Devices.Novation" Version="3.0.0-prerelease.2" />
54-
<PackageReference Include="RGB.NET.Devices.OpenRGB" Version="3.0.0-prerelease.2" />
55-
<PackageReference Include="RGB.NET.Devices.Razer" Version="3.0.0-prerelease.2" />
56-
<PackageReference Include="RGB.NET.Devices.SteelSeries" Version="3.0.0-prerelease.2" />
57-
<PackageReference Include="RGB.NET.Devices.Wooting" Version="3.0.0-prerelease.2" />
58-
<PackageReference Include="RGB.NET.HID" Version="3.0.0-prerelease.2" />
59-
<PackageReference Include="RGB.NET.Layout" Version="3.0.0-prerelease.2" />
60-
<PackageReference Include="RGB.NET.Presets" Version="3.0.0-prerelease.2" />
47+
<PackageReference Include="RGB.NET.Core" Version="3.0.0-prerelease.3" />
48+
<PackageReference Include="RGB.NET.Devices.Asus" Version="3.0.0-prerelease.3" />
49+
<PackageReference Include="RGB.NET.Devices.CoolerMaster" Version="3.0.0-prerelease.3" />
50+
<PackageReference Include="RGB.NET.Devices.Corsair" Version="3.0.0-prerelease.3" />
51+
<PackageReference Include="RGB.NET.Devices.Logitech" Version="3.0.0-prerelease.3" />
52+
<PackageReference Include="RGB.NET.Devices.Msi" Version="3.0.0-prerelease.3" />
53+
<PackageReference Include="RGB.NET.Devices.Novation" Version="3.0.0-prerelease.3" />
54+
<PackageReference Include="RGB.NET.Devices.OpenRGB" Version="3.0.0-prerelease.3" />
55+
<PackageReference Include="RGB.NET.Devices.Razer" Version="3.0.0-prerelease.3" />
56+
<PackageReference Include="RGB.NET.Devices.SteelSeries" Version="3.0.0-prerelease.3" />
57+
<PackageReference Include="RGB.NET.Devices.Wooting" Version="3.0.0-prerelease.3" />
58+
<PackageReference Include="RGB.NET.HID" Version="3.0.0-prerelease.3" />
59+
<PackageReference Include="RGB.NET.Layout" Version="3.0.0-prerelease.3" />
60+
<PackageReference Include="RGB.NET.Presets" Version="3.0.0-prerelease.3" />
6161
<PackageReference Include="Sanford.Multimedia.Midi" Version="6.6.2" />
6262
<PackageReference Include="Sharlayan" Version="8.0.1" />
6363
</ItemGroup>

Chromatics/Extensions/Sharlayan/DutyFinderBellExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static void RefreshData(MemoryHandler memoryHandler)
7777
if (_memoryHandler.Scanner.Locations.ContainsKey(memoryName))
7878
{
7979
var address = _memoryHandler.Scanner.Locations[memoryName];
80-
var contentFinderState = _memoryHandler.GetByte(address.GetAddress(), 0x145);
80+
var contentFinderState = _memoryHandler.GetByte(address.GetAddress(), 0x14D);
8181

8282
_isPopped = contentFinderState == 3; //ContentFinderState of 3 means DF pop but not entered yet
8383
_inInstance = contentFinderState > 3;

0 commit comments

Comments
 (0)