Merge remote-tracking branch 'origin/main' into 1.18

This commit is contained in:
embeddedt 2023-05-04 19:56:13 -04:00
commit 74007827f9
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -50,7 +50,7 @@ public class ModelBakeryHelpers {
/**
* The time in seconds after which a model becomes eligible for eviction if not used.
*/
public static final int MAX_MODEL_LIFETIME_SECS = 90;
public static final int MAX_MODEL_LIFETIME_SECS = 300;
private static void gatherAdditionalViaManualScan(List<PackResources> untrustedPacks, Set<ResourceLocation> knownLocations,
Collection<ResourceLocation> uncertainLocations, String filePrefix) {