Merge 1.19.4 into 1.20

This commit is contained in:
embeddedt 2023-08-02 15:45:57 -04:00
commit a1a441d397
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 6 additions and 2 deletions

View File

@ -29,6 +29,8 @@ public class CanonizingStringMap<T> extends HashMap<String, T> {
@Override
public void putAll(Map<? extends String, ? extends T> m) {
if(m.isEmpty())
return;
HashMap<String, T> tmp = new HashMap<>();
m.forEach((k, v) -> tmp.put(intern(k), v));
super.putAll(tmp);

View File

@ -9,7 +9,9 @@ pluginManagement {
include("test_agent")
include("common")
include("fabric")
include("forge")
getProperty("enabled_platforms").tokenize(',').each { it ->
include(it.trim())
}
rootProject.name = 'modernfix'