Compare commits

...

7 Commits

Author SHA1 Message Date
dependabot[bot]
af8c48adce Bump ASF-WebConfigGenerator from adb2111 to 249bf61 (#1077)
Bumps [ASF-WebConfigGenerator](https://github.com/JustArchiNET/ASF-WebConfigGenerator) from `adb2111` to `249bf61`.
- [Release notes](https://github.com/JustArchiNET/ASF-WebConfigGenerator/releases)
- [Commits](adb2111205...249bf61ca7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-05 03:24:18 +01:00
dependabot[bot]
624a0d9fca Bump ASF-ui from 9aa6d5c to ced8221
Bumps [ASF-ui](https://github.com/JustArchiNET/ASF-ui) from `9aa6d5c` to `ced8221`.
- [Release notes](https://github.com/JustArchiNET/ASF-ui/releases)
- [Commits](9aa6d5cd28...ced8221b21)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-05 01:41:42 +00:00
dependabot[bot]
68e09e786b Bump wiki from 22e3db6 to 12ba9ed
Bumps [wiki](https://github.com/JustArchiNET/ArchiSteamFarm.wiki) from `22e3db6` to `12ba9ed`.
- [Release notes](https://github.com/JustArchiNET/ArchiSteamFarm.wiki/releases)
- [Commits](22e3db69e6...12ba9edb75)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-05 01:34:17 +00:00
JustArchi
922f572383 Add handling for consumable EType 2019-02-04 22:29:00 +01:00
JustArchi
f19d821388 Add ProfileModifier EType 2019-02-04 22:08:50 +01:00
JustArchi
a3f600efd9 Correct returned version for update function 2019-02-04 22:06:26 +01:00
JustArchi
5cf07ca691 Bump 2019-02-04 03:21:38 +01:00
6 changed files with 21 additions and 16 deletions

2
ASF-ui

Submodule ASF-ui updated: 9aa6d5cd28...ced8221b21

View File

@@ -178,15 +178,13 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericInfo(string.Format(Strings.UpdateVersionInfo, SharedInfo.Version, newVersion)); ArchiLogger.LogGenericInfo(string.Format(Strings.UpdateVersionInfo, SharedInfo.Version, newVersion));
if (SharedInfo.Version == newVersion) { if (SharedInfo.Version >= newVersion) {
return SharedInfo.Version; if (SharedInfo.Version > newVersion) {
} ArchiLogger.LogGenericWarning(Strings.WarningPreReleaseVersion);
await Task.Delay(15 * 1000).ConfigureAwait(false);
}
if (SharedInfo.Version > newVersion) { return newVersion;
ArchiLogger.LogGenericWarning(Strings.WarningPreReleaseVersion);
await Task.Delay(15 * 1000).ConfigureAwait(false);
return SharedInfo.Version;
} }
if (!updateOverride && (GlobalConfig.UpdatePeriod == 0)) { if (!updateOverride && (GlobalConfig.UpdatePeriod == 0)) {

View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>ASF.ico</ApplicationIcon> <ApplicationIcon>ASF.ico</ApplicationIcon>
<AssemblyVersion>4.0.0.3</AssemblyVersion> <AssemblyVersion>4.0.0.4</AssemblyVersion>
<Authors>JustArchi</Authors> <Authors>JustArchi</Authors>
<Company>JustArchi</Company> <Company>JustArchi</Company>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection> <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
@@ -11,7 +11,7 @@
<DefaultItemExcludes>$(DefaultItemExcludes);config/**;debug/**;out/**;overlay/**</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);config/**;debug/**;out/**;overlay/**</DefaultItemExcludes>
<Description>ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.</Description> <Description>ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.</Description>
<ErrorReport>none</ErrorReport> <ErrorReport>none</ErrorReport>
<FileVersion>4.0.0.3</FileVersion> <FileVersion>4.0.0.4</FileVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<NoWarn>1591</NoWarn> <NoWarn>1591</NoWarn>

View File

@@ -198,9 +198,8 @@ namespace ArchiSteamFarm.Json {
TradingCard, TradingCard,
SteamGems, SteamGems,
SaleItem, SaleItem,
Consumable,
// ReSharper disable once UnusedMember.Global - TODO: This type exists, but we don't know what item class it has, maybe we can fill it when consumables return in one of the future sales ProfileModifier
Consumable
} }
} }
@@ -578,10 +577,18 @@ namespace ArchiSteamFarm.Json {
case "item_class_5": case "item_class_5":
type = Asset.EType.BoosterPack; type = Asset.EType.BoosterPack;
break;
case "item_class_6":
type = Asset.EType.Consumable;
break; break;
case "item_class_7": case "item_class_7":
type = Asset.EType.SteamGems; type = Asset.EType.SteamGems;
break;
case "item_class_8":
type = Asset.EType.ProfileModifier;
break; break;
case "item_class_10": case "item_class_10":
type = Asset.EType.SaleItem; type = Asset.EType.SaleItem;

2
wiki

Submodule wiki updated: 22e3db69e6...12ba9edb75