Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-09-22 10:03:10 -04:00
3 changed files with 28 additions and 7 deletions

View File

@@ -73,8 +73,7 @@ public class MenuFragment extends Fragment{
}));
}
String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : (Version.type.equals("official") ? Version.modifier : Version.type) + " build " + Version.build + (Version.revision == 0 ? "" : "." + Version.revision));
String versionText = ((Version.build == -1) ? "[#fc8140aa]" : "[#ffffffba]") + Version.combined();
parent.fill((x, y, w, h) -> {
TextureRegion logo = Core.atlas.find("logo");
float logoscl = Scl.scl(1);