Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CCTV-1
2020-03-08 16:11:00 +08:00
76 changed files with 4333 additions and 411 deletions

View File

@@ -1162,7 +1162,7 @@ public class FSkin {
}
final Localizer localizer = Localizer.getInstance();
FView.SINGLETON_INSTANCE.setSplashProgessBarMessage(localizer.getMessage("splash.loading.processingimagesprites") + ": ", 8);
FView.SINGLETON_INSTANCE.setSplashProgessBarMessage(localizer.getMessage("splash.loading.processingimagesprites") + ": ", 12);
// Grab and test various sprite files.
final String defaultDir = ForgeConstants.DEFAULT_SKINS_DIR;