1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 18:20:34 +08:00
Commit Graph

409 Commits

Author SHA1 Message Date
Andrei Zavatski
a7a3372a98 Remove redundant empty switch section 2020-01-30 13:01:40 +03:00
Andrei Zavatski
29ba82ee44 Apply different font styles for different content parts 2020-01-30 12:29:35 +03:00
Andrei Zavatski
2f7076f91c Adjust icons size 2020-01-30 11:16:58 +03:00
Andrei Zavatski
b2c501a439 Adjust font size 2020-01-30 10:54:58 +03:00
Andrei Zavatski
1c4650c02c Merge master with conflicts resolved 2020-01-30 10:39:23 +03:00
smoogipoo
d7d7ab48d3 Cleanup 2020-01-30 12:36:38 +09:00
TheWildTree
f7c38da030 Match web border height 2020-01-29 22:25:56 +01:00
TheWildTree
87521f35ed Recolor buttons 2020-01-29 22:25:28 +01:00
Andrei Zavatski
786ed03868 Update profile recent activities in line with the web design 2020-01-29 21:01:40 +03:00
smoogipoo
7f946047f9 Adjust styling to closer match osu-web 2020-01-29 19:25:31 +09:00
smoogipoo
d908bc2693 Remove unnecessary extra spritetext 2020-01-29 18:44:30 +09:00
Andrei Zavatski
79cdfc6dc2 Use OverlayColourProvider 2020-01-27 12:55:19 +03:00
Andrei Zavatski
5f11084aed Refactor ProfileItemContainer to not use sounds 2020-01-19 22:57:39 +03:00
Andrei Zavatski
8906416294 ProfileItemBackground -> ProfileItemContainer 2020-01-19 22:48:11 +03:00
Andrei Zavatski
bab67eb399 CI fix 2020-01-18 04:12:17 +03:00
Andrei Zavatski
16cfb9310b Naming adjustments 2020-01-18 03:40:31 +03:00
Andrei Zavatski
d5a3d8dbaa Remove no longer used components 2020-01-18 03:35:47 +03:00
Andrei Zavatski
6e776d02f8 Refactor PaginatedScoreContainer to use new components 2020-01-18 03:33:02 +03:00
Andrei Zavatski
4964505c3e Implement ProfileWeightedScore component 2020-01-18 03:19:28 +03:00
Andrei Zavatski
4cdaebb42b Implement ProfileScore component 2020-01-18 02:58:10 +03:00
Andrei Zavatski
59cb93321f Implement ProfileItemBackground component 2020-01-18 01:36:14 +03:00
Andrei Zavatski
f6cde911e2 Use switch expressions 2019-12-17 13:41:28 +03:00
Andrei Zavatski
bc9177983a Fix possible null 2019-12-17 12:50:50 +03:00
Andrei Zavatski
023892738a Integration into overlay 2019-12-17 12:36:44 +03:00
Andrei Zavatski
8cd96acffc CounterPill implementation 2019-12-17 12:05:35 +03:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dean Herbert
f0d49d0cdf Decouple APILegacyScoreInfo from ScoreInfo 2019-12-03 15:31:11 +09:00
Dean Herbert
5dbc32f49b Fix MedalIcon usage 2019-11-29 16:19:57 +09:00
Dean Herbert
2663e5d756 Add some more missing LongRunningLoad flags 2019-11-29 13:52:23 +09:00
Andrei Zavatski
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00
Joehu
2a8fa2f593 Refactor modsContainer on profile scores 2019-09-12 14:01:12 -07:00
Dean Herbert
d21d68b36c Refactor to match web implementation 1:1 2019-09-02 17:04:38 +09:00
Dean Herbert
0985b1679f Move enum to response class 2019-09-02 15:57:55 +09:00
Dean Herbert
3d551b08a9 Rename legacy actions 2019-09-02 15:57:23 +09:00
Dean Herbert
da45070373 Group common prefixes together 2019-09-02 15:44:21 +09:00
Dean Herbert
c06908adf7 Fix spacing specifications 2019-09-02 15:37:38 +09:00
Andrei Zavatski
71c844facd Remove unwanted spacings 2019-08-30 10:22:49 +03:00
Andrei Zavatski
b03b520818 Move Absing from the APIKudosuHistory 2019-08-30 10:13:21 +03:00
Dean Herbert
bb22c2d6e4 Tidy up text construction 2019-08-28 17:29:18 +09:00
Dean Herbert
b1f523dae3 Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-08-28 17:13:57 +09:00
Dean Herbert
bef44b8e58 item -> model 2019-08-28 13:31:12 +09:00
Dean Herbert
3942c83c18 Simplify schedule layout 2019-08-28 13:28:57 +09:00
Dean Herbert
27633c8dbd T -> TModel 2019-08-28 13:28:21 +09:00
Dean Herbert
f18b5a3c02 Remove "AllowCreate" function by instead handling nulls 2019-08-28 13:27:44 +09:00
Andrei Zavatski
5fd43d42f4 CI fixes 2019-08-27 16:09:37 +03:00
Andrei Zavatski
9a383eee1a Add AllowCreate function 2019-08-27 15:58:57 +03:00
Andrei Zavatski
22ee7db805 Refactor PaginatedContainer to avoid code duplication 2019-08-27 15:47:37 +03:00
Andrei Zavatski
f49b58c102 Simplify text building 2019-08-27 15:30:41 +03:00
Andrei Zavatski
0cde0982e5 Use cansellation token 2019-08-23 14:52:26 +03:00
Andrei Zavatski
7e34afeab8 Conver to method group 2019-08-23 14:38:18 +03:00
Andrei Zavatski
45c0826314 Remove repetitive code 2019-08-23 14:14:39 +03:00
Andrei Zavatski
050130e159 Refactor PaginatedContainer to centralise repetitive logic 2019-08-23 14:11:21 +03:00
Andrei Zavatski
87379a42c8 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-23 13:05:19 +03:00
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Andrei Zavatski
f4d2bb036b Expand KudosuAction list 2019-08-22 16:50:54 +03:00
Andrei Zavatski
426c7a4898 Fix incorrect templates 2019-08-20 16:19:21 +03:00
Andrei Zavatski
5c7cb4dc21 Simplify text creation 2019-08-20 16:11:59 +03:00
Andrei Zavatski
c4344f3f7c CI fixes 2019-08-20 15:29:32 +03:00
Andrei Zavatski
f1d02d8169 Update design in line with web 2019-08-20 15:00:14 +03:00
Andrei Zavatski
6b8fbf0eb1 Change link format back
Due to unavaliability to handle round brackets
2019-08-19 17:59:55 +03:00
Andrei Zavatski
daeefc449c Use another link format to avoid representation issues 2019-08-19 17:49:53 +03:00
Andrei Zavatski
fd21e06389 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-19 17:16:50 +03:00
Dean Herbert
be51fde292 Centre beatmap panels in profile overlay 2019-08-19 13:22:32 +09:00
Andrei Zavatski
be97804180 Implement text formatting 2019-08-18 21:28:07 +03:00
Andrei Zavatski
cf2a9db8e0 Implement basic layout for kudosu history 2019-08-09 11:14:38 +03:00
Andrei Zavatski
0f36088ef8 Add loved section 2019-08-01 11:06:29 +03:00
Andrei Zavatski
ee6fed5b33 Use fixed height 2019-07-22 18:17:49 +03:00
Dean Herbert
2f111e6cf4 Fix incorrect corner radius 2019-07-22 23:57:26 +09:00
Dean Herbert
4dc9309a7e
Merge branch 'master' into underscored_link 2019-07-22 23:46:57 +09:00
smoogipoo
066bee3535 Simplify offset calculation 2019-07-19 16:02:33 +09:00
smoogipoo
f87e9b8017 Remove unnecessary tooltip text 2019-07-18 20:17:19 +09:00
smoogipoo
ca72409dc2 More closely match osu-web styling 2019-07-18 20:16:10 +09:00
Andrei Zavatski
9458bca58f Update usage of requests 2019-07-15 13:37:25 +03:00
Andrei Zavatski
d62e42ba14 Remove custom link container implementation 2019-07-15 13:09:21 +03:00
Andrei Zavatski
b93b26a036 Fix link formatting 2019-07-14 19:38:46 +03:00
Andrei Zavatski
c8192d6f3a Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link 2019-07-14 19:10:47 +03:00
Roman Kapustin
0c95dff3d6 Make FlowContainer insertion cleaner 2019-07-01 18:41:08 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
Dean Herbert
2531250f89 Fix paginated layouts only showing one column even if enough space is available for more 2019-06-07 14:58:04 +09:00
Dean Herbert
e8315085c0 Better handle OnClick 2019-06-04 10:26:21 +09:00
EVAST9919
d5a2ebf79f Fix endless loading state part 2 2019-06-04 04:04:33 +03:00
EVAST9919
2c71371282 Fix endless loading state 2019-06-04 02:06:15 +03:00
EVAST9919
fe6b4112c6 Adjust colors to match web design 2019-06-04 01:47:45 +03:00
Dean Herbert
633c3b74ec Don't handle clicks when in a loading state 2019-06-03 17:10:33 +09:00
Dean Herbert
c4f4f32db8 Shorten fade duration 2019-06-03 17:10:33 +09:00
EVAST9919
b32ffab580 Make the DrawableMostPlayedBeatmap inherit OsuHoverContainer 2019-05-31 02:19:09 +03:00
EVAST9919
e715cc8f6e Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link 2019-05-30 23:29:11 +03:00
EVAST9919
fe9e53e383 Add a testcase 2019-05-30 23:07:04 +03:00
EVAST9919
2933169614 Move the button into a separate class 2019-05-30 22:55:59 +03:00
EVAST9919
73fb28f9f7 Make the button inherit from OsuHoverContainer 2019-05-30 22:48:27 +03:00
EVAST9919
877fe97107 Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update 2019-05-30 22:17:22 +03:00
Dean Herbert
c950f37497 Ad missing link 2019-05-30 16:57:54 +09:00
Dean Herbert
e5999dd9b1 Update font sizes to match web 2019-05-30 16:49:18 +09:00
EVAST9919
9a13c52ffd Add missing lines 2019-05-29 21:19:03 +03:00
EVAST9919
97dbc95bc6 Kudosu section update 2019-05-29 21:02:20 +03:00
EVAST9919
1baf922f2c CI fixes 2019-05-29 20:36:14 +03:00
EVAST9919
6efa61b992 Split UnderscoredLinkContainer in different classes 2019-05-29 20:24:01 +03:00
EVAST9919
52fad723a2 Implement DrawableMostPlayedBeatmap 2019-05-29 19:51:59 +03:00
EVAST9919
8bcb4485ed implement UnderscoredLinkContainer 2019-05-29 19:00:20 +03:00
EVAST9919
5169e31d54 Fix CI issues 2019-05-28 19:53:00 +03:00
EVAST9919
19fbab6892 Applied suggested changes 2019-05-28 19:39:31 +03:00
EVAST9919
857eb9b83a Fix CI stuff 2019-05-28 17:21:34 +03:00
EVAST9919
6ca3bd086f ShowMore button update 2019-05-28 17:04:05 +03:00
Dean Herbert
bc962bf8f0 Move TooltipText to OsuClickableContainer 2019-05-21 13:51:38 +09:00
smoogipoo
77263bd56e Linkify more user links 2019-05-14 18:11:32 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
99e2e6cf1c Align text 2019-02-28 14:46:52 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
Dean Herbert
7e35afd178 Fix loading scores on profile pages potentially causing long blocking operations 2018-12-03 18:37:44 +09:00
Dean Herbert
059e9e180b Apply review 2018-11-30 18:07:15 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
5b409a5ae5 Fix missed renames 2018-11-28 17:27:22 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
Dean Herbert
f149a66a4d Use LargeTextureStore for all online texture retrieval
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.
2018-09-09 02:45:37 +09:00
Dean Herbert
923acfbeaf Fix some web requests being run after disposal of their owner 2018-09-05 10:26:54 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
smoogipoo
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
Dean Herbert
625b9ead4c Fix links from profile top scores to beatmaps not working correctly 2018-07-05 21:00:23 +09:00
Joehu
8518fce4a9 Fix osu!supporter naming 2018-06-27 17:57:55 -07:00
smoogipoo
ab2889da1f Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays 2018-06-21 13:24:02 +09:00
Dean Herbert
d7f65d62e0 Use vertical/horizontal pair instead 2018-06-20 10:45:35 +09:00
Michael Manis
a0f1143287 Add padding to 'show more' button 2018-06-18 19:14:44 -04:00
Dan Balasescu
126678c226
Merge branch 'master' into multiple_previews_different_overlays 2018-06-12 19:26:51 +09:00
Roman Kapustin
8702a70524 Resolve merge conflicts in DirectOverlay 2018-06-08 21:03:16 +03:00
Dean Herbert
955a78e76d Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
Dean Herbert
8cc31aca54 Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
TocoToucan
56c1c2beca Remove redundant multiple previews handling from PaginatedBeatmapContainer 2018-04-29 15:50:02 +03:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
Dean Herbert
fd54ae3c87 Simplify logic 2018-04-15 16:12:42 +09:00
Dean Herbert
069d48ac14 Remove unused variable 2018-04-15 15:29:00 +09:00
TocoToucan
671de4f6c2 Resolve merge conflicts 2018-04-14 15:11:28 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
TocoToucan
6a8f568f66 BeatmapContainer -> beatmapContainer 2018-04-11 16:32:58 +03:00
TocoToucan
6cdfaffcf7 PaginatedBeatmapContainer.BeganPlayingPreview 2018-04-11 16:19:21 +03:00
TocoToucan
640be621ac Handle multiple song previews playing in different beatmap categories on profile 2018-04-07 13:29:46 +03:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
3b56999118 Add drawable to display (and update) relative dates 2018-03-08 12:58:16 +09:00
naoey
983cefbe40
Add VisualTest. 2018-03-07 19:08:26 +05:30
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
naoey
9669c5aee3
Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
naoey
2e535afb84
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
naoey
62913163e0
Fix long recent activity text overlapping timestamp.
- Also remove unnecessary fallback from absolute URL helper
2018-02-27 21:21:53 +05:30
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
af86220dcc Merge remote-tracking branch 'origin/master' into update-branch 2018-01-05 12:08:50 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Dean Herbert
3c1654e5e4 Fix many instances of non-osu-prefixed text classes being used
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
7d8fb12332 DrawableScore -> DrawableProfileScore
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00
Dean Herbert
0c2158ccbd Improve display of beatmap thumbnails 2017-12-11 12:47:31 +09:00
Dean Herbert
98ce856de1 Use more sensible names for classes and methods
Adds xmldoc in places too.
2017-12-11 12:33:34 +09:00
smoogipoo
0ec10ba32d CI fixes 2017-11-30 00:11:00 +09:00
jorolf
7f068c0c68 correct string mistake 2017-11-27 21:13:01 +01:00
jorolf
70b6071898 add license header 2017-11-26 22:13:52 +01:00
jorolf
4c68090e59 separate GetUserBeatmapsRequest and GetUserMostPlayedBeatmapsRequest 2017-11-26 22:06:03 +01:00
jorolf
02fa1f9dd6 move shared stuff between MostPlayedBeatmapDrawable and DrawableScore to DrawableBeatmapRow 2017-11-26 21:52:35 +01:00
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section 2017-11-24 22:51:11 +01:00
Dean Herbert
38f5c55f80 Remove not-accessed field 2017-11-23 18:11:35 +09:00
Dean Herbert
30db2ce18a Rename KudosuValue to count and remove pointless local storage 2017-11-23 17:37:02 +09:00
Dean Herbert
6d9951d9af Use FillFlow rather than manually specifying positions 2017-11-23 17:32:41 +09:00
Dean Herbert
2ff21bbc6c Move descriptions to constructor 2017-11-23 17:29:20 +09:00
Dean Herbert
9d481eba96
Merge branch 'master' into kudosu-section 2017-11-23 17:19:42 +09:00
jorolf
22348a3d67 Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section 2017-11-22 21:14:11 +01:00
jorolf
66c51c7b44 cleanup 2017-11-19 14:33:50 +01:00
jorolf
4281d76bcf historical section now shows the most played beatmaps 2017-11-19 14:19:05 +01:00
jorolf
1f379cab8f move BeatmapMetadataContainer to a separate class 2017-11-19 14:17:14 +01:00
jorolf
9aaefb5e97 same for PaginatedScoreContainer 2017-11-18 20:09:31 +01:00