Commit Graph

151 Commits

Author SHA1 Message Date
Finn Künstner e4ecf6ce87
[ci skip] Fix various compile warnings (#6264) 2021-07-29 23:04:26 +00:00
Owen1212055 a67959e131
Add bee stinger API (#5962) 2021-07-29 00:36:53 +00:00
Gergely Sarkozi 7480b94720
fix empty array elements in command args (#5778) 2021-07-28 18:37:32 +00:00
Max Lee 2f1f1b7f0c
Add config option to specify timings url (#6256) 2021-07-25 07:10:30 +00:00
Jake Potrebic 170382fe35
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
e7b0f8d6 #642: Add Crafting methods to API
9e58831e SPIGOT-6641: Use varargs in sendMessage
e409fe49 SPIGOT-6545: Unable to set Guardian target via API while awareness is disabled
6997c726 SPIGOT-6661: Fix missing radius from GenericGameEvent
02d03f35 SPIGOT-6369: Add ItemStack to HangingPlaceEvent

CraftBukkit Changes:
0abf420c SPIGOT-6665: Shearing a Snowman does not drop a carved pumpkin
e8e3cbcc #893: Add Crafting methods to API
879acfee Fix missing varargs from previous commit
6572b9c3 SPIGOT-6641: Use varargs in sendMessage
9e06bb2a SPIGOT-6663: Chicken Jockeys chickens don't despawn
699f2d36 SPIGOT-6545: Unable to set Guardian target via API while awareness is disabled
8ffa54ba SPIGOT-6369: Add ItemStack to HangingPlaceEvent
c851639c SPIGOT-6645: Call EntityChangeBlockEvent before PlayerHarvestBlockEvent
8d244b0b SPIGOT-3725, SPIGOT-6638, MC-136917: Properly clear tile entities before replacing

Spigot Changes:
18c71bf4 Rebuild patches
2021-07-22 18:11:56 +00:00
Kyle Wood f25facb302
Update email & name (DenWav)
Also I think I prefer my few tiny patches to be GPL.
2021-07-19 21:07:53 -05:00
Nassim Jahnke c75a8378a2
Don't expose ASM in API (#6229)
ASM was not meant to exposed to API consumers in the first place, and for the duration of time it has been exposed, it has also been relocated.

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-07-19 22:58:48 +00:00
Jason bc127ea819
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6222)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron

CraftBukkit Changes:
b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron
d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket
4f34a67b #891: Fix scheduler task ID overflow and duplication issues

Spigot Changes:
d03d7f12 BUILDTOOLS-604: Rebuild patches
2021-07-18 09:41:53 +02:00
Shane Freeder b015abb952
Fix missing annotation 2021-07-13 19:15:18 +01:00
Shane Freeder 664eee6e13
Expand resource pack API 2021-07-12 20:42:17 +01:00
Jake Potrebic 70ea1b2e2b
Fix command signs (#6139) 2021-07-11 18:06:49 +00:00
Jake Potrebic d770f71f41
Add PlayerArmSwingEvent (#5353) 2021-07-09 13:56:30 +00:00
Nassim Jahnke 351a2c38b5
Drop no longer needed patch (#6115) 2021-07-07 19:18:05 +02:00
dfsek b5be382d00
Add methods to `ProtoWorld` for working with `BlockState`s (#5929) 2021-07-07 10:23:16 +00:00
Nassim Jahnke 56fd1a2f84
Update to Minecraft 1.17.1 (#6097) 2021-07-07 06:52:40 +00:00
chickeneer 6ea4da4a68
AbstractSkeleton should extend RangedEntity (#6087)
This includes Strays and matches the mojang RangedAttackMob
2021-07-06 03:48:08 +00:00
Jason 8827886501
Add back linking to Adventure Javadoc (#6088) 2021-07-05 20:25:23 -07:00
Jake Potrebic 8fe561162e
Fix Player#playerListName nullability annotation (#6089) 2021-07-06 03:22:11 +00:00
Shane Freeder 3aae7ef01a
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
214b9f14 SPIGOT-6605: Add method to access value of enforce-whitelist

CraftBukkit Changes:
b121d3b9 SPIGOT-6605: Add method to access value of enforce-whitelist
2021-06-29 01:31:35 +01:00
Kezz ba7ffd06e9
Implement Sound.Source.Provider (#5935) 2021-06-28 15:07:19 +02:00
Prof-Bloodstone d50cc01b08
Make gradle take build number from env vars and add git build info (#5890)
* Make gradle take build number from env vars

* Add git information to manifest and version command/log

* trim

* Fix tests by adding NotNull annotations

* rebase

* Apply suggestions from kashike

Co-authored-by: Riley Park <riley.park@meino.net>

* Not always show branch

* Why can't everything be NotNull by default?

* Rebase

Co-authored-by: Riley Park <riley.park@meino.net>
2021-06-23 17:19:44 +00:00
Owen1212055 aed4433aca
Add more fox API (#5743) 2021-06-22 07:44:02 +00:00
Riley Park 22280c5f55
Better checking for method return TYPE_USE annotations 2021-06-21 10:08:30 -07:00
Riley Park 15e4b30e9e
Allow use of TYPE_USE annotations 2021-06-21 09:57:15 -07:00
BillyGalbreath 1cc41d01ba
Permission message upgrades (#5932)
* Permission message upgrades

* Allow for blank lines after split

* the future is now :o
2021-06-21 07:07:21 -07:00
Pedro Arenas 1830de58bf
Fix `EntityEquipment::setDropChance` Javadoc (#5925) 2021-06-20 22:42:42 -07:00
Underscore11 321ddfea3c
fix: Blank ('') `no-permission` messages shouldn't send blank lines (#5892) 2021-06-21 01:50:36 +00:00
Nassim Jahnke 17f71ac87b
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5904)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
70d24eb8 SPIGOT-6587: Update documentation/error of drop chance API

CraftBukkit Changes:
470050ad SPIGOT-6587: Update documentation/error of drop chance API
1c39efa3 Fix Inventory#getViewers on the player inventory not returning the player first time their inventory is opened
d161627d Fix PrepareItemCraftEvent#isRepair
aa1fae73 SPIGOT-6586: EntityChangeBlockEvent for falling block does not cancel properly
8a04072e SPIGOT-6583: Throwing eggs doesn't make sounds

Spigot Changes:
f773da84 Remove redundant patch
cd367234 Rebuild patches
2021-06-20 21:25:59 +02:00
Jason 4bf6a631e7
Rename package from `io.papermc.paper.world.gen` to `io.papermc.paper.world.generation` (#5894) 2021-06-20 05:02:27 +00:00
dfsek c4c6e26c00
Worldgen Feature API (#5727) 2021-06-19 21:48:30 -07:00
Jake Potrebic 1882ec3c07
fix patch mis-order 2021-06-19 10:45:52 -07:00
Jason Penilla 3c5bfaddbe
Remove chat event APIs marked as deprecated for removal with 1.17 2021-06-18 15:47:40 -07:00
MiniDigger ad7644ce82 downgrade snakeyaml to fix issues with comments
this was done by upstream, but got missed. Thanks @mrfloris for pointing this out.
2021-06-18 16:34:30 +02:00
Jake Potrebic 86abcdafe1
remove remaining POMs 2021-06-17 10:11:00 -07:00
KennyTV c943a108a9
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
2dbec584 SPIGOT-6570: Missing InventoryType: COMPOSTER
e9ce88b9 SPIGOT-6562: Add more specific sculk sensor event

CraftBukkit Changes:
9122f5a6 #869: Fix BossBar setColor and setStyle updates
96a15d7a Incrase outdated build delay
ded19075 SPIGOT-6570: Missing InventoryType: COMPOSTER
d7ef1e91 SPIGOT-6558: Attempt to improve SkullMeta
e7a63287 SPIGOT-6562: Add more specific sculk sensor event

Spigot Changes:
101ebb63 SPIGOT-6573: Berry Bushes deal damage when not moving
2021-06-17 14:50:16 +02:00
Jason Penilla 8236add8cb
Update author on my patches 2021-06-17 02:37:24 -07:00
Kyle Wood 52287ea614
Simplify Multi-Release plugin jar patch
We don't have to worry about running on Java <9 anymore.
2021-06-16 23:18:55 -05:00
Jason Penilla a26d1aa427
Fix artifact ids 2021-06-16 17:27:10 -07:00
Jake Potrebic 7be3024c75
update to Adventure 4.8.1 2021-06-16 15:57:49 -07:00
Jake Potrebic 8e187cb187
remove optimise random tick patch for now 2021-06-16 13:12:05 -07:00
MiniDigger ba2b40c603 mojang mapped vanilla goals 2021-06-16 01:24:22 +02:00
Jason Penilla f267238e0e
reorder patches after merge 2021-06-14 22:49:09 -07:00
Omer Uddin b26ba5bc8a
port some patches (#5837) 2021-06-14 22:44:37 -07:00
Jason Penilla 5a86fba668
final patches from remapped and unmapped
keep in mind many patches in the removed folder still need to be updated
2021-06-14 21:56:30 -07:00
Jason Penilla f6636fca9e
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
ebb0e28d #631: Add Villager#shakeHead
751469c6 #629: Add LivingEntity#isClimbing

CraftBukkit Changes:
622cf611 SPIGOT-6555: Cannot access shield BlockStateMeta
8b2e78ec SPIGOT-6542: Fix counting players with fauxSleeping = true
f66c437a SPIGOT-6561: Add events for dripleaf tilting
6ed40004 SPIGOT-6560: Crash when falling stalactite hits player
72a2901b SPIGOT-6557: PlayerEditBookEvent#setNewBookMeta does not update meta
a07e783a #865: Implement Villager#shakeHead
3252ff18 #863: Add LivingEntity#isClimbing
77058c79 SPIGOT-6554: Worlds created with the bukkit ChunkGenerator cannot save
2021-06-14 21:02:21 -07:00
Jason Penilla 7271649af2
patches 2021-06-14 21:02:20 -07:00
Jake Potrebic d3424f4a8a
tons of patches (#5835) 2021-06-14 22:59:31 -04:00
Jason Penilla 0c732e2ef5
Put pom in correct location for Paperclip install to maven local feature 2021-06-14 18:56:02 -07:00
Jake Potrebic 09ead8b043 more patches 2021-06-14 23:42:23 +02:00
Jake Potrebic f777faa8c1 more patches & fixes to existing patches 2021-06-14 21:18:49 +02:00
Jake Potrebic 5dce4d9178 more patches 2021-06-14 21:18:49 +02:00
Jake Potrebic 8cf470d6b1 more patches 2021-06-14 19:02:40 +02:00
Aurora 21effd6c48
even moar workkkkk 2021-06-14 17:02:03 +02:00
Josh Roy 3721b1466f need to look at this later, fails rn 2021-06-14 06:47:04 -07:00
Josh Roy cfb17666ff even MOAR progress 2021-06-14 06:45:16 -07:00
Aurora 8ca5a642ef
more work work work 2021-06-14 14:04:35 +02:00
Aurora ba3ce754a9
more work uwu 2021-06-14 12:13:08 +02:00
Jake Potrebic 7fe98bd520
more patches (#5827)
* more patches

* even moar patches
2021-06-14 10:37:14 +02:00
Jason Penilla 3c02c90f3e
progress 2021-06-13 22:32:56 -07:00
Jason Penilla f67dc7a35b
patches 2021-06-13 19:42:02 -07:00
Jason Penilla 6c30949610
Use correct jetbrains annotations 2021-06-13 18:48:31 -07:00
Jake Potrebic 2a46c72164
EVEN MOOOOOAAAAAAARRRRRRR patches :) (#5820) 2021-06-13 18:06:38 -07:00
MiniDigger b75a22c4b1 not even checkstyle can help us now 2021-06-14 01:48:04 +02:00
Jake Potrebic f55b6e04b1 MOAR PATCHES 2021-06-14 00:06:46 +02:00
Jake Potrebic 27a8d6da9a more patches 2021-06-13 21:31:39 +02:00
MiniDigger 123a41d132 adjust material set tag sizes
MC added a buuuunch of stuff
2021-06-13 20:34:25 +02:00
KennyTV 5d9882a976
More more work 2021-06-13 14:43:56 +02:00
KennyTV 19da14ee00
More work 2021-06-13 14:14:18 +02:00
KennyTV d42140148f
Work 2021-06-13 13:05:43 +02:00
Jason Penilla 41a5f14f9e
patches and patches 2021-06-13 01:27:20 -07:00
Jason Penilla 79f1d1a078
patches
fix
2021-06-12 23:53:47 -07:00
Jason Penilla 0fa2a949ae
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
8503c3c9 #621: Add HumanEntity#getItemInUse and Material#getSlipperiness
248deb09 #622: Add methods to check if item is the breed item for an entity
2ce691d8 Clarify Player#breakBlock only works for blocks in the same world
5dcdd48e SPIGOT-6514: Small Dripleaf block data is missing half property
cc9610b7 #619: Add Player#breakBlock()
862bc475 Fix bad merge of SPIGOT-6502 fix
989bb0c1 Downgrade SnakeYAML due to issues with comments parsing
1dff62ae Fix inverted visual fire docs

CraftBukkit Changes:
40caacc8 SPIGOT-6526: World entities are not populated when plugin onEnable is called
c9a92ad0 SPIGOT-6536: Marker position not set on spawn
20d3e57c #855: Add HumanEntity#getItemInUse and Material#getSlipperiness
d9c69b44 SPIGOT-6529: Fix BundleMeta#setItems
8bd43be5 SPIGOT-6535: PlayerGameModeChangeEvent event incorrectly reports old gamemode
4ece3ff3 #856: Add methods to check if item is the breed item for an entity
dd4bec5f Add additional validation to Player#breakBlock
bc835ae6 SPIGOT-6532: Fix Entity#setGlowing
384e116e Restore 1.16.5 behaviour of InventoryDragEvent being called even when a single item is 'dragged' to its own slot
b42e708c Fix new map colors rendering as transparent
cfe7fecf SPIGOT-6524: Inventory desync when InventoryClickEvent is cancelled
eeae1b19 SPIGOT-6522: ItemStack on cursor is always AIR
7490724d Fix missing PlayerEditBookEvent
06875f76 SPIGOT-6513: Placing ItemStack in Inventory causes InventoryAction.NOTHING
27835bde SPIGOT-6519: Fix end gateway teleports
4ac634ad SPIGOT-6515: "Un-waterlogging" throws UnsupportedOperationException in some cases
da425fa2 SPIGOT-6518: Anvils falling onto dripstone can sometimes crash server
50530da9 SPIGOT-6514: Small Dripleaf block data is missing half property
6fdecf20 #853: Implement Player#breakBlock()
4db9c49f SPIGOT-6510: Bukkit#createMap throws NullPointerException
89e2b127 SPIGOT-6517: Spider jockey crash on dripstone
cbf2f678 SPIGOT-6508: Rename conflicted getServer
74575d48 SPIGOT-6506: Fix crash with custom inventories
a3df386f Fix NPE with Entity.getNearbyEntities
d747f8ed Fix NPE with World.getNearbyEntities
4d2c7800 Fix second usage of worldGenSettings just in case
5182f923 SPIGOT-6504: Fix generating fresh worlds

Spigot Changes:
66f9d3c1 Rebuild patches
191e4971 Rebuild patches
a09c0bb6 Restore Spigot experience merging
2021-06-12 22:13:07 -07:00
Jason Penilla 52f28953be
patches 2021-06-12 22:09:48 -07:00
Jason Penilla 5e9c53b5b7
Merge remote-tracking branch 'leaf/dev/1.17' into dev/1.17 2021-06-12 21:35:43 -07:00
Spottedleaf ca621e6280 even even even even more work 2021-06-12 21:03:02 -07:00
Spottedleaf cc19211cf9 wowe 2021-06-12 19:16:10 -07:00
Jason Penilla 672c5365f4
Write API version to pom.properties for Versioning to read
Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-12 18:28:41 -07:00
Jake Potrebic 2ba2c29b2e
more patches (#5811) 2021-06-13 00:45:00 +01:00
Jake Potrebic a968aefd32 more patches 2021-06-12 23:32:23 +02:00
Jake Potrebic 716a3139b7
more patches (#5808) 2021-06-12 20:30:37 +01:00
Jake Potrebic 2397b86efa
more patches (#5807) 2021-06-12 17:56:13 +01:00
Aurora 79da8f0eca
even more wooooooooooooooooooooooooork uwu 2021-06-12 17:06:20 +02:00
KennyTV 8125b3f1be
More more more work 2021-06-12 14:58:17 +02:00
KennyTV 3c1cd3bdf2
More more work 2021-06-12 13:54:46 +02:00
KennyTV 0ec8b900ba
More work 2021-06-12 12:26:21 +02:00
Spottedleaf d9210c3ee7 even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even
more work
2021-06-12 11:22:46 +02:00
Spottedleaf 1753b33104 even even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even

more work
2021-06-12 11:22:46 +02:00
Spottedleaf b1517fe9f2 even even even even even even even even even more changes 2021-06-12 09:26:16 +02:00
Spottedleaf 9da160169a even even even even even even even more work 2021-06-12 09:26:16 +02:00
Spottedleaf 42458fbca4 even even more progress 2021-06-12 09:26:16 +02:00
Spottedleaf 2920f9b9e5 some patches 2021-06-12 09:26:16 +02:00
Jake Potrebic 2dc0a31f5c
fix PlayerUseUnknownEntityEvent patch (#5800) 2021-06-12 04:37:02 +01:00
Jason Penilla c56800c6fb
Add ASM dep to API and fix issues from title packet changes with bungee api 2021-06-11 19:25:10 -07:00
Jake Potrebic 650edb93ca more patches 2021-06-12 03:19:04 +02:00
Jake Potrebic 3a3831d6aa more patches 2021-06-12 03:19:04 +02:00
Jake Potrebic a9f38a8789 fix adventure patch 2021-06-12 03:19:04 +02:00
Mariell Hoversholm 9c2a18af92
fix: remove #isStopping check
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:16:11 +02:00
Mariell Hoversholm 87ee3b4d67
fix: add pom changes to gradle
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:06:01 +02:00
Jake Potrebic 3f10bf1163
Update Timings patch (#5796) 2021-06-11 20:02:16 +02:00
Mariell Hoversholm 132382dca3
More remapped patches
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 17:52:05 +02:00