Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three

This commit is contained in:
Florian Nücke 2014-04-28 00:24:23 +02:00
commit f36835511a

View File

@ -31,7 +31,7 @@ object GameTimeFormatter {
//'G' -> (t => ""),
'h' -> (t => format("%b", t)),
'H' -> (t => "%02d".format(t.hour)),
'I' -> (t => "%02d".format(t.hour % 12 + 1)),
'I' -> (t => "%02d".format((t.hour + 11) % 12 + 1)),
'j' -> (t => "%03d".format(t.yearDay)),
'm' -> (t => "%02d".format(t.month)),
'M' -> (t => "%02d".format(t.minute)),