Skip to content

Commit f5ed110

Browse files
cadoncadon
committed
Merge branch 'dev'
2 parents 4a1b7b8 + e9164ac commit f5ed110

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎ARKBreedingStats/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
// Revision
3131
//
3232
[assembly: AssemblyVersion("1.0.0.0")]
33-
[assembly: AssemblyFileVersion("0.52.1.0")]
33+
[assembly: AssemblyFileVersion("0.52.1.1")]
3434
[assembly: NeutralResourcesLanguage("en")]
3535

‎ARKBreedingStats/_manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ARK Smart Breeding": {
55
"Id": "ARK Smart Breeding",
66
"Category": "main",
7-
"version": "0.52.1.0"
7+
"version": "0.52.1.1"
88
},
99
"SpeciesColorImages": {
1010
"Id": "SpeciesColorImages",

‎ARKBreedingStats/json/values/_manifest.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"mod": { "id": "1083349027", "tag": "SpeedyFlyers", "title": "Najs Speedy Flyers" }
77
},
88
"1090809604-Pyria.json": {
9-
"version": "356.5.1671741134.1",
9+
"version": "357.12.1681020738",
1010
"mod": { "id": "1090809604", "tag": "Pyria", "title": "Pyria: Mythos Evolved" }
1111
},
1212
"1092784125-Gryphons.json": {
@@ -35,7 +35,7 @@
3535
"mod": { "id": "1139775728", "tag": "Confuciusornis", "title": "Confuciusornis" }
3636
},
3737
"1169020368-Trex.json": {
38-
"version": "357.4.1679236349",
38+
"version": "357.11.1680434574",
3939
"mod": { "id": "1169020368", "tag": "Trex", "title": "Ark Creature Rebalance (AG Reborn)" }
4040
},
4141
"1178308359-ShadDragon.json": {
@@ -149,7 +149,7 @@
149149
"mod": { "id": "1675895024", "tag": "NoUntameables", "title": "No Untameables" }
150150
},
151151
"1676159020-Aquaria.json": {
152-
"version": "355.16.1674259257",
152+
"version": "357.13.1681407858",
153153
"mod": { "id": "1676159020", "tag": "Aquaria", "title": "Additional Creatures: Aquaria" }
154154
},
155155
"1681125667-Primal_Fear_EX.json": {
@@ -170,11 +170,11 @@
170170
"mod": { "id": "1729512589", "tag": "Brachiosaurus", "title": "ARK Additions: Brachiosaurus!" }
171171
},
172172
"1734595558-Pyria2.json": {
173-
"version": "356.5.1669482607",
173+
"version": "357.5.1680228174",
174174
"mod": { "id": "1734595558", "tag": "Pyria2", "title": "Pyria: The Second Chapter" }
175175
},
176176
"1754846792-Zythara_Critters.json": {
177-
"version": "357.4.1678517540",
177+
"version": "357.14.1680668333",
178178
"mod": { "id": "1754846792", "tag": "Zythara_Critters", "title": "Zythara Critters" }
179179
},
180180
"1768499278-BalancedJPE.json": {
@@ -243,7 +243,7 @@
243243
"mod": { "id": "2000326197", "tag": "ExtraResources", "title": "Event Assets" }
244244
},
245245
"2003934830-Beasts.json": {
246-
"version": "357.4.1678923214",
246+
"version": "357.14.1681745937",
247247
"mod": { "id": "2003934830", "tag": "Beasts", "title": "Prehistoric Beasts" }
248248
},
249249
"2019846325-ApexMod.json": {
@@ -291,7 +291,7 @@
291291
"mod": { "id": "2362246280", "tag": "GigaFullTame", "title": "Giga Full Tame" }
292292
},
293293
"2447186973-ArkOmega.json": {
294-
"version": "357.4.1678350769",
294+
"version": "357.14.1681967408",
295295
"mod": { "id": "2447186973", "tag": "ArkOmega", "title": "Ark Omega" }
296296
},
297297
"2493949846-Endemics.json": {
@@ -303,15 +303,15 @@
303303
"mod": { "id": "2683373846", "tag": "ZazaCollection_2", "title": "Zaza's Collection" }
304304
},
305305
"2804332920-PaleoARKlegends.json": {
306-
"version": "356.12.1677311339",
306+
"version": "357.14.1681844066",
307307
"mod": { "id": "2804332920", "tag": "PaleoARKlegends", "title": "Paleo ARK: Legends Expansion!" }
308308
},
309309
"2869411055-SDinoVariants.json": {
310310
"version": "355.3.1671458793",
311311
"mod": { "id": "2869411055", "tag": "SDinoVariants", "title": "SDinoVariants" }
312312
},
313313
"710880648-DinoOverHaulMODX.json": {
314-
"version": "357.4.1678496346",
314+
"version": "357.14.1682108466",
315315
"mod": { "id": "710880648", "tag": "DinoOverHaulMODX", "title": "DinoOverhaul X -- Hardcore PvE Experience" }
316316
},
317317
"729352919-IndomRex.json": {
@@ -323,15 +323,15 @@
323323
"mod": { "id": "814833973", "tag": "Wyvern_Mating", "title": "Wyvern Mating" }
324324
},
325325
"839162288-Primal_Fear.json": {
326-
"version": "356.5.1651177976",
326+
"version": "357.12.1681258396",
327327
"mod": { "id": "839162288", "tag": "Primal_Fear", "title": "Primal Fear" }
328328
},
329329
"883957187-WyvernWorld.json": {
330330
"version": "342.13.1638248815",
331331
"mod": { "id": "883957187", "tag": "WyvernWorld", "title": "Wyvern World" }
332332
},
333333
"893735676-AE.json": {
334-
"version": "357.5.1679775865",
334+
"version": "357.14.1681700117",
335335
"mod": { "id": "893735676", "tag": "AE", "title": "Ark Eternal" }
336336
},
337337
"895711211-ClassicFlyers.json": {

‎ARKBreedingStats/values/Values.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public bool LoadModValues(IEnumerable<string> modFilesToLoad, bool throwExceptio
200200

201201
string filename = FileService.GetJsonPath(Path.Combine(FileService.ValuesFolder, modFileToLoad));
202202

203-
if (TryLoadValuesFile(filename, true, false, out ValuesFile modValues, out string modFileErrorMessage))
203+
if (TryLoadValuesFile(filename, true, false, out var modValues, out var modFileErrorMessage, true))
204204
{
205205
modifiedValues.Add(modValues);
206206
}

‎ARKBreedingStats/values/ValuesFile.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ protected static ValuesFile LoadValuesFile(string filePath)
9696
/// If the mod-values will be used, setModFileName should be true.
9797
/// If the file cannot be found or the format is wrong, the file is ignored and no exception is thrown if throwExceptionOnFail is false.
9898
/// </summary>
99-
protected static bool TryLoadValuesFile(string filePath, bool setModFileName, bool throwExceptionOnFail, out ValuesFile values, out string errorMessage)
99+
protected static bool TryLoadValuesFile(string filePath, bool setModFileName, bool throwExceptionOnFail, out ValuesFile values, out string errorMessage, bool checkIfModPropertyIsExisting = false)
100100
{
101101
values = null;
102102
errorMessage = null;
103103
try
104104
{
105105
values = LoadValuesFile(filePath);
106-
if (string.IsNullOrEmpty(values.mod?.id))
106+
if (checkIfModPropertyIsExisting && string.IsNullOrEmpty(values.mod?.id))
107107
{
108108
errorMessage =
109109
$"The mod file\n{filePath}\ndoesn't contains an object \"mod\" or that object doesn't contain a valid entry \"id\". The mod file cannot be loaded until this information is added";

0 commit comments

Comments
 (0)