Merge pull request #15 from FFXIV-CombatReborn/manifestFix

Fix for manifest issue, misc fixes, etc

Author: LTS-FFXIV

.github/workflows/pr-test.yaml

@@ -19,11 +19,11 @@ jobs:
 
       - name: Download Dalamud Latest
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip -DestinationPath "$env:AppData\XIVLauncher\addon\Hooks\dev"
 
       - name: Restore NuGet Packages
         run: dotnet restore ActionTimelineEx/ActionTimelineReborn.csproj
 
       - name: Build Plugin
-        run: dotnet build --no-restore -c Release ActionTimelineEx/ActionTimelineReborn.csproj
+        run: dotnet build --no-restore -c Release ActionTimelineReborn/ActionTimelineReborn.csproj

.github/workflows/publish.yaml

@@ -27,14 +27,14 @@ jobs:
 
       - name: Download Dalamud Latest
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
 
       - name: Restore Nuget Packages
         run: dotnet restore ActionTimelineEx/ActionTimelineReborn.csproj
 
       - name: Build Plugin
-        run: dotnet build --no-restore -c Release ActionTimelineEx/ActionTimelineReborn.csproj -p:AssemblyVersion=${{ env.tag }} -p:FileVersion=${{ env.tag }} -p:InformationalVersion=${{ env.tag }} --output .\build
+        run: dotnet build --no-restore -c Release ActionTimelineReborn/ActionTimelineReborn.csproj -p:AssemblyVersion=${{ env.tag }} -p:FileVersion=${{ env.tag }} -p:InformationalVersion=${{ env.tag }} --output .\build
 
       - name: Zip Plugin
         run: Compress-Archive -Path .\build\* -DestinationPath .\build\ActionTimelineReborn.zip

ActionTimelineReborn.sln

@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		manifest.json = manifest.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ActionTimelineReborn", "ActionTimelineEx\ActionTimelineReborn.csproj", "{875F9E4E-B981-46F7-93C2-68ABACCEA403}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ActionTimelineReborn", "ActionTimelineReborn\ActionTimelineReborn.csproj", "{875F9E4E-B981-46F7-93C2-68ABACCEA403}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

…onTimelineEx/ActionTimelineReborn.csproj …melineReborn/ActionTimelineReborn.csprojActionTimelineEx/ActionTimelineReborn.csproj renamed to ActionTimelineReborn/ActionTimelineReborn.csproj ActionTimelineEx/ActionTimelineReborn.csproj renamed to ActionTimelineReborn/ActionTimelineReborn.csproj

@@ -12,7 +12,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="ECommons" Version="3.2.0.9" />
+	  <PackageReference Include="ECommons" Version="3.2.0.16" />
 	</ItemGroup>
 
 	<ItemGroup>

…tionTimelineEx/ActionTimelineReborn.json …TimelineReborn/ActionTimelineReborn.jsonActionTimelineEx/ActionTimelineReborn.json renamed to ActionTimelineReborn/ActionTimelineReborn.json ActionTimelineEx/ActionTimelineReborn.json renamed to ActionTimelineReborn/ActionTimelineReborn.json

@@ -2,10 +2,9 @@
   "Author": "The Combat Reborn Team",
   "Name": "ActionTimeline Reborn",
   "InternalName": "ActionTimelineReborn",
-  "AssemblyVersion": "7.4.0.0",
+  "RepoUrl": "https://github.com/FFXIV-CombatReborn/ActionTimelineReborn",
   "Description": "Configurable timeline display of all the actions you use.",
   "ApplicableVersion": "any",
-  "RepoUrl": "https://github.com/FFXIV-CombatReborn/ActionTimelineReborn",
   "Tags": [
     "UI"
   ],
@@ -17,10 +16,11 @@
   "LoadSync": false,
   "CanUnloadAsync": false,
   "LoadPriority": 0,
-  "ImageUrls": [
-    "https://github.com/FFXIV-CombatReborn/ActionTimelineReborn/raw/main/Images/example.gif"
-  ],
-  "IconUrl": "https://github.com/FFXIV-CombatReborn/RebornAssets/blob/main/IconAssets/ATR_Icon.png",
+  "IsTestingExclusive": false,
+  "IconUrl": "https://raw.githubusercontent.com/FFXIV-CombatReborn/RebornAssets/main/IconAssets/ATR_Icon.png",
   "Punchline": "Show your actions in real-time.",
+  "ImageUrls":[
+     "https://raw.githubusercontent.com/ArchiDog1998/ActionTimelineReborn/main/Images/example.gif"
+  ],
   "AcceptsFeedback": true
-}
+}