Howaner
6c8baf66c8
Updated HOOK_PLAYER_MOVING documentation.
2014-08-16 18:49:24 +02:00
madmaxoft
3020e8cc05
Merge remote-tracking branch 'origin/master' into Ranks
2014-08-12 11:10:32 +02:00
Christophe Piveteau
f7726317c9
Add entry for bat in monsters.ini
2014-08-11 18:57:41 +02:00
madmaxoft
af202c2363
Debuggers: Disabled UUID and RankMgr tests.
2014-08-09 22:55:38 +02:00
madmaxoft
4b1505f39d
Merge remote-tracking branch 'origin/master' into Ranks
2014-08-09 14:25:49 +02:00
madmaxoft
251f0d5b97
Debuggers: Simple cRankManager test case.
2014-08-08 23:13:43 +02:00
Howaner
43de9af878
Added api documentation for Clamp()
2014-08-05 13:54:04 +02:00
Tiger Wang
01e9d6311a
Updated submodules
2014-08-04 14:24:46 +01:00
madmaxoft
f5aaf52210
Debuggers: Added a Name-from-UUID cMojangAPI test.
2014-08-03 22:04:51 +02:00
madmaxoft
21f52676f3
cMojangAPI: Added UUID-to-Name lookup.
...
Also fixed the bindings, now all functions are static-like.
2014-08-03 22:04:51 +02:00
madmaxoft
003f18bd0f
Added cMojangAPI:GetUUIDFromPlayerName().
...
This is a simpler way to ask for a single name -> uuid conversion.
2014-08-03 22:04:50 +02:00
Tiger Wang
c865fc8ca5
Improved endermen code a little
2014-08-01 22:15:32 +01:00
Mattes D
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
madmaxoft
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
Howaner
c138d19c31
Updated documentation again.
2014-07-31 18:16:52 +02:00
Howaner
c49d4fd215
Updated documentation.
2014-07-31 12:15:18 +02:00
madmaxoft
8b519bf6e2
MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().
2014-07-31 10:02:50 +02:00
Howaner
66d34b83d2
Added beacon documentation.
2014-07-30 22:31:43 +02:00
madmaxoft
a71c2da3f8
APIDump: Added notes about cache to cMojangAPI.
2014-07-30 17:07:57 +02:00
madmaxoft
1793644fef
APIDump: Fixed UUID-related documentation.
2014-07-30 14:02:36 +02:00
madmaxoft
afef7a79d7
Debuggers: Updated for the new cMojangAPI changes.
2014-07-30 13:56:30 +02:00
madmaxoft
6476bd0e2e
Exported cMojangAPI to Lua.
2014-07-30 13:56:29 +02:00
madmaxoft
b6677efecd
Debuggers: Added an example for cClientHandle:GetUUIDsFromPlayerNames().
2014-07-28 17:14:23 +02:00
madmaxoft
1acd03f96f
Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.
2014-07-28 17:09:39 +02:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft
0346ab15ad
Debuggers: Optimized and commented the /rmitem handler.
2014-07-18 23:51:15 +02:00
madmaxoft
abe8a6bd45
APIDump: Documented RemoveItem().
2014-07-18 23:48:06 +02:00
Howaner
51b91befbd
Added RemoveItem() function to the player inventory.
2014-07-18 23:11:59 +02:00
Tiger Wang
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
Howaner
fc6a5878df
Removed special character in APIDump
2014-07-18 01:45:45 +02:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
archshift
554e1c0dd3
OnEntityAddEffect.lua: Removed Originator param
2014-07-13 16:10:01 -07:00
Howaner
f1491ad1d1
Fixed diamond mover plugin
2014-07-13 01:18:41 +02:00
archshift
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
madmaxoft
d790a45c50
APIDump: Documented cWorld:SetChunkAlwaysTicked.
...
Ref.: #1160
2014-07-10 18:28:20 +02:00
madmaxoft
3b7e0969b9
Debuggers: Added forced chunk ticking test.
...
Ref.: #1160
2014-07-10 18:19:05 +02:00
archshift
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
madmaxoft
8f65d13d1b
Merge remote-tracking branch 'origin/HandleCommand'
2014-07-04 15:41:48 +02:00
STRWarrior
546aab7b4a
Removed useless sentence in cPluginManager:ExecuteCommand description.
2014-07-04 15:36:29 +02:00
STRWarrior
aa81a3ff3e
Fixed ExecuteCommand description.
2014-07-04 14:29:19 +02:00
madmaxoft
20afd5d70e
APIDump: Updated OnWeatherChanging docs after latest code changes.
2014-07-03 17:53:57 +02:00
Mattes D
9204c8a124
Merge pull request #1139 from Howaner/Hooks
...
Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE
2014-07-02 16:33:24 +02:00
Howaner
835d00428c
Update documentation
2014-07-02 14:49:08 +02:00
Howaner
5a888f0a51
Change documentation
2014-07-01 20:30:13 +02:00
Howaner
5a152435b3
Add documentation.
2014-06-30 15:22:48 +02:00
Tiger Wang
bd5df3d3b9
Merge branch 'master' of https://github.com/mc-server/MCServer into portals
2014-06-24 21:15:48 +01:00
madmaxoft
e96a774f59
Added the Lua Proxy DLL.
...
This builds the lua5.1.dll file on Windows, making it 64-bit if so required.
2014-06-24 14:48:18 +02:00
madmaxoft
4306092753
Debuggers: Fixed the Blaze rod query tool.
2014-06-24 07:05:49 +02:00
madmaxoft
08fed2a213
Added cClientHandle::IsUUIDOnline function.
...
Ref.: #771
2014-06-21 22:13:35 +02:00
STRWarrior
e0a9f37d90
(Force)ExecuteCommand returns the CommandResult enums
...
Exported and documented the CommandResult enums
2014-06-18 12:13:01 +02:00
madmaxoft
a37d5410b4
APIDump: Added OnEntityAddEffect hook documentation.
2014-06-17 11:39:22 -07:00
archshift
5b2b6e0615
Pawn: renamed HandleEntityEffects to HandleEntityEffect
...
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift
b2fbcaf1bf
Implemented PR suggestions
...
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
2014-06-15 20:27:27 -07:00
Tiger Wang
7188a1f670
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/World.h
2014-06-14 09:57:07 +01:00
STRWarrior
b0f1707d50
Fixed ChunkWorx stop button giving an error
2014-06-13 23:16:52 +02:00
madmaxoft
72043f5b0c
APIDump: Added the Info.lua article.
...
Fixes #504 .
2014-06-13 00:10:01 +02:00
Alexander Harkness
db4d786a84
Merge pull request #1082 from mc-server/cauldronfixes
...
Add biome-aware downfall functions.
2014-06-12 16:50:08 +01:00
Tiger Wang
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
Qais Patankar
3e7384d921
Fix typo in handy_functions.lua
2014-06-12 15:01:24 +01:00
Alexander Harkness
c335b8d773
Update APIDesc.lua
2014-06-11 13:34:49 +01:00
madmaxoft
97bfccfdc0
APIDump: Documented cBlockArea:GetCoordRange().
2014-06-11 14:34:47 +02:00
Tiger Wang
bd25069c25
Update APIDesc.lua
2014-06-11 13:21:57 +01:00
Alexander Harkness
c5d1ca7dac
Small change for easier understanding.
2014-06-08 20:54:41 +01:00
Alexander Harkness
e5da3097de
Corrected the furnace fuels. Solves #1071
2014-06-07 18:25:18 +01:00
STRWarrior
8cf4e806ba
APIDump: Fixed crash
2014-06-02 13:49:05 +02:00
STRWarrior
4c757de9ff
Added OnProjectileHitBlock example in Debuggers
2014-06-02 11:54:45 +02:00
STRWarrior
fa78379f5a
Updated OnProjectileHitBlock documentation.
2014-06-02 11:45:32 +02:00
Alexander Harkness
e06f786f11
Stuff.
2014-05-27 20:24:04 +01:00
Alexander Harkness
2194238ef0
Update main.css
2014-05-26 17:17:54 +01:00
Tiger Wang
27a9fa3110
Updated Core
2014-05-24 23:28:48 +01:00
Mattes D
28815252e6
Merge branch 'master' into SslWebAdmin
2014-05-10 21:27:57 +02:00
madmaxoft
45ca5bb857
Fixed cert filename in Linux script.
2014-05-07 15:09:25 +02:00
Howaner
f5fe368220
Merge branch 'master' into Slabs
2014-05-07 12:54:58 +02:00
Mattes D
e3d850b24a
Made the cert generation script executable on Linux
2014-05-02 21:35:30 +00:00
madmaxoft
13452d3ab9
APIDump: Updated the OnDisconnect hook docs.
...
Ref.: #655 .
2014-05-02 12:35:35 +02:00
madmaxoft
0cfa0c4561
APIDump: Improved error handling in API file loader.
2014-05-02 12:35:35 +02:00
madmaxoft
dc2d2ce53c
Added a mention to run as admin.
2014-05-01 12:27:07 +02:00
madmaxoft
cf821bc9a4
Added scripts for generating HTTPS cert and key.
2014-05-01 11:48:45 +02:00
madmaxoft
272c232efb
Implemented SSL connection for WebAdmin.
...
Fixes FS-319.
2014-05-01 11:48:03 +02:00
archshift
06819595b0
Fixed references to renamed files.
2014-04-23 15:25:10 -07:00
madmaxoft
695baed226
Updated docs for StringToEnchantmentID.
...
Ref.: mc-server/Core#67
2014-04-23 23:06:29 +02:00
archshift
fe08a903fc
Declaration that a mob is not fireproof is implicit.
...
Removed explicitly declaring mobs as not fireproof.
2014-04-22 15:45:52 -10:00
archshift
e1476ebb26
Added IsFireproof hook for monsters.ini
2014-04-22 13:17:42 -10:00
archshift
1cf396c814
Fixed capitalization issues
...
Wasn't parsing correctly before, as some items were not capitalized correctly.
2014-04-22 02:18:41 -10:00
madmaxoft
62991d46fe
APIDump: Added a ChunkStay article.
...
Fixes #772 .
2014-04-19 16:15:57 +02:00
madmaxoft
8c7d0f5304
InfoReg uses cCompositeChat for subcommand lists.
...
Also fixed an issue with console commands.
2014-04-10 19:09:37 +02:00
madmaxoft
176deb4b5b
Added the generated ZBS API file to ignore list.
2014-04-06 22:30:34 +02:00
Howaner
7da308a7e1
Merge branch 'master' into Slabs
2014-04-06 21:43:23 +02:00
Tiger Wang
c7f8c7eb21
Updated cWorld::CreateProjectile() documentation
2014-04-06 17:47:27 +01:00
madmaxoft
43e3a55a70
Added more API documentation to cCompositeChat.
2014-04-05 12:09:30 +02:00
Howaner
32d054e8fd
Merge branch 'master' into Slabs
...
Conflicts:
src/Blocks/BlockDirt.h
2014-04-03 22:03:18 +02:00
madmaxoft
e2fb507be2
APIDump: Added angular specifics.
2014-04-03 21:52:50 +02:00
madmaxoft
e304bd08a2
Documented the units and range for entity rotations.
2014-04-03 21:44:03 +02:00
madmaxoft
67d7ad8689
Debuggers: Added a Base64 API roundtrip test.
2014-04-02 11:58:19 +02:00
madmaxoft
e7e65b5005
Merged branch 'msDifference'.
2014-04-01 21:21:11 +02:00
STRWarrior
21e0607e49
APIDump: Gave msDifference it's own table.
2014-04-01 21:12:48 +02:00
madmaxoft
1229795ff0
cBlockArea: Added the msMask merge strategy.
2014-04-01 20:50:10 +02:00
madmaxoft
7aa6a3b866
LOG() API reads the LogLevel from the cCompositeChat's MessageType.
2014-04-01 09:32:14 +02:00
madmaxoft
58f2550321
APIDump: Documented the cCompositeChat support in logging functions.
2014-03-31 23:05:31 +02:00
madmaxoft
8126d9e66e
Console logging supports cCompositeChat as its parameters.
2014-03-31 22:51:14 +02:00
STRWarrior
b19022fc7e
Added extra table which should make it more clear what msDifference does.
2014-03-31 20:13:08 +02:00
STRWarrior
a8bc27f872
Fixed typo
2014-03-31 20:05:48 +02:00
STRWarrior
f7df8e133b
Documented msDifference
2014-03-31 19:58:19 +02:00
madmaxoft
55d0db1606
APIDump: Added code completion support file to ZBS tutorial.
2014-03-31 18:34:27 +02:00
madmaxoft
f38a009b3c
APIDump: Renamed the ZBS API dump file to mcserver_api.lua.
...
This is to avoid confusion with ZBS, where two "mcserver.lua" files were present.
2014-03-31 18:25:00 +02:00
madmaxoft
1bda9b0424
Merge branch 'NetherFortGen'.
2014-03-30 19:17:33 +02:00
madmaxoft
b64a1daf6c
APIDump: Added article: Setting up ZeroBrane Studio.
...
Fixes #824 .
2014-03-30 18:48:11 +02:00
madmaxoft
47a427d3dc
Merge branch 'master' into NetherFortGen
2014-03-29 23:05:17 +01:00
STRWarrior
379d403443
Documented both hooks.
2014-03-29 16:08:39 +01:00
madmaxoft
8557549cfa
Implemented the msSpongePrint merge strategy.
...
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
2014-03-28 18:03:37 +01:00
madmaxoft
173fd0dd92
Merge branch 'howaner/GlobalFixes'.
2014-03-28 16:39:32 +01:00
madmaxoft
7cc44d4d8b
Debuggers: Deactivated the chunk generator callback.
2014-03-28 13:34:32 +01:00
Howaner
327b70e769
Change documentation text
2014-03-27 23:20:28 +01:00
Howaner
9ac3e3405a
Change SpreadSource documentation
2014-03-27 23:20:28 +01:00
Howaner
54d55b31ef
Add documentation for new Block spread
2014-03-27 23:20:28 +01:00
madmaxoft
1b00b62a4b
Ignoring the default GalExports folder.
2014-03-25 23:49:58 +01:00
madmaxoft
f67ad36965
InfoReg updated for multi-verb console commands.
2014-03-25 21:59:40 +01:00
madmaxoft
b370cacf0c
Plugins can set flying speed.
2014-03-20 16:14:40 +01:00
madmaxoft
9fae50f447
APIDump: Fixed wrong escaped strings.
2014-03-20 16:05:22 +01:00
madmaxoft
64d9390069
Rewritten player speeds to be relative unit-less.
...
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00
madmaxoft
d6a72da382
APIDump: Updated comments to reflect current code.
2014-03-19 22:51:02 +01:00
madmaxoft
96e0b26912
APIDump: Added ZeroBraneStudio API export.
...
Fixes #821 .
2014-03-19 22:42:56 +01:00
madmaxoft
7c717fe6df
APIDump: Reformatted the plugin to avoid all ZBS Analyzer issues.
2014-03-19 13:57:37 +01:00
madmaxoft
38aad32a8b
Debuggers: Using binary file mode for .schematics.
2014-03-18 13:54:32 +01:00
Mattes D
728bfd155e
Merge pull request #811 from mc-server/DumpInfo
...
Created a small plugin for InfoDump
2014-03-16 21:53:11 +01:00
STRWarrior
5a9f17060d
Only check for "Info.lua" with capital I
2014-03-16 21:52:28 +01:00
madmaxoft
4227066f6d
Fixed InfoReg.lua's handling of multi-level commands.
2014-03-16 21:37:33 +01:00
madmaxoft
5ac863f7fa
Removed the @EnableMobDebug.lua file.
...
It is not needed anymore, ZeroBrane Studio now has direct support for invoking the debugger in MCS plugins.
2014-03-16 21:37:33 +01:00
STRWarrior
db73e37e2d
Created a small plugin for InfoDump
...
It allows you to dump the info of a plugin by pressing a button in the webadmin.
2014-03-15 20:33:34 +01:00
madmaxoft
4a5bea159f
Debuggers: Added a test for WE selection API.
...
This tests mc-server/WorldEdit#34 .
2014-03-15 08:38:15 +01:00
madmaxoft
d364c7befc
APIDump: Documented a forgotten cCuboid constructor.
2014-03-15 08:38:14 +01:00
madmaxoft
62ed305f07
APIDump: Fixed missing return statement.
2014-03-15 07:51:33 +01:00
madmaxoft
0442c41c87
Added cCuboid:Assign(OtherCuboid) API function.
2014-03-15 07:50:39 +01:00
madmaxoft
dc1049da3c
Ignoring all config and SQLite files in the output folder.
2014-03-14 16:18:31 +01:00
madmaxoft
a982b9b5ac
APIDump: Trigger the dump manually.
...
Fixes #715 . The dump can be triggerred by issuing an "api" console command, or in the webadmin.
2014-03-14 16:18:31 +01:00
madmaxoft
bba090ebdd
cPluginManager:Bind[Console]Command returns true on success.
...
Fixes #801 .
2014-03-14 11:18:14 +01:00
madmaxoft
04dcd850d6
APIDump: Removed old documentation, documented some new functions.
2014-03-11 08:31:27 +01:00
madmaxoft
15c70a1f68
APIDump: Updated WEOffset-related docs.
2014-03-12 07:53:25 +01:00
madmaxoft
3e9f265a36
Merge branch 'master' into cBlockArea_Offset
2014-03-12 07:39:39 +01:00
STRWarrior
7d1e32a28b
Fixed APIDump
2014-03-11 19:45:16 +01:00
STRWarrior
fa4ff28bc0
Documented the functions.
2014-03-11 19:38:56 +01:00
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
d5180ef230
Added extra dye rules to crafting.txt
2014-03-09 12:48:56 +00:00
Tiger Wang
d872f2e41d
Updated Core
2014-03-09 01:49:32 +00:00
Howaner
60091bcba3
Change tnt documentation to ticks
2014-03-08 12:31:20 +01:00
Howaner
527f358510
Merge branch 'master' into BlockEntitys
2014-03-08 12:29:45 +01:00
Howaner
baeff21a5b
Add new tnt documentation
2014-03-08 10:29:57 +01:00
madmaxoft
ffdf5f2022
Fixed cBlockArea schematic string saving signature.
2014-03-07 21:28:52 +01:00
Mattes D
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01:00
Howaner
eff054027f
Link cItem in the documentation
2014-03-07 17:51:43 +01:00
Howaner
8fdffbb48c
Add missing documentation files
2014-03-07 16:14:11 +01:00
madmaxoft
f6aaeb74a9
Debuggers: Added a test of the cBlockArea string-serialization.
2014-03-07 09:18:10 +01:00
madmaxoft
166ab59582
APIDump: Documented cBlockArea string-serialization functions.
2014-03-07 09:17:42 +01:00
Mattes D
2def1b40e1
Merge pull request #747 from mc-server/InfoDump_Github
...
Info dump github
2014-03-06 10:38:45 +01:00
STRWarrior
dc0cbd594c
The APIDump generates a list of all the permissions again.
2014-03-05 19:17:59 +01:00
madmaxoft
036608c645
APIDump: Documented the cCompositeChat class.
2014-03-05 18:56:32 +01:00
madmaxoft
86615428cd
APIDump: Ignoring classes by exact match.
...
"cCompositeChat" was ignored because it matched "os".
2014-03-05 18:28:42 +01:00
madmaxoft
ab30d94b2f
Debuggers: Added simple test for cCompositeChat.
2014-03-04 22:17:47 +01:00
STRWarrior
20e377ea7b
Fixed typo
...
Discription => Description
2014-03-02 16:55:04 +01:00
STRWarrior
0c8d08cb09
Simplified and more clearer infodump for Github.
2014-03-02 16:48:55 +01:00
Mattes D
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
andrew
0c87341631
GetById => Get
2014-03-02 16:24:09 +02:00
andrew
f40f2ad928
APIDump: ID -> Type
2014-03-02 12:59:09 +02:00
andrew
3ca56b39bc
Exported cBlockInfo
2014-03-02 10:50:24 +02:00
madmaxoft
29cc1ed051
Ignoring all plugin subfolders.
...
Plugins developed directly with MCS have been added explicitly; other plugins are ignored.
2014-03-01 20:59:40 +01:00
Mattes D
80b0496bff
Merge pull request #735 from xdot/master
...
Exported and documented cScoreboard
2014-03-01 15:20:30 +01:00
STRWarrior
854cf9df99
Using comma instead of string concatenation.
2014-03-01 14:45:38 +01:00
STRWarrior
6129b6edf1
If there is a SourceLocation available the InfoDump will note it in the forum version.
2014-03-01 14:29:40 +01:00
andrew
add9955255
APIDump: Fixed cScoreboard enums
2014-03-01 15:03:27 +02:00
andrew
39c8e68ef0
Exported cScoreboard::ForEachTeam
2014-03-01 14:27:55 +02:00
andrew
a28e5eca18
Exported cScoreboard::ForEachObjective
2014-03-01 14:03:16 +02:00
andrew
5c44945287
Exported and documented cScoreboard
2014-03-01 12:08:40 +02:00
STRWarrior
ce07a22fe6
APIDump: Documented cRoot:CreateAndInitializeWorld.
2014-03-01 10:44:34 +01:00
madmaxoft
d97363a1b3
Documented the changes in cJukeboxEntity.
2014-02-28 15:41:46 +01:00
madmaxoft
e4c3d3eb6d
Added a MobDebug enabler script.
...
This file is to be copied to a plugin's folder in order to debug that plugin with MobDebug.
2014-02-28 10:37:09 +01:00
madmaxoft
6a191cce0a
Fixed compatibility with ZeroBraneStudio and LuaRocks.
...
Lua now compiles into lua51.dll and there's a lua5.1.dll that acts as a export-forwarding proxy to lua51.dll.
2014-02-28 08:27:02 +01:00
Tiger Wang
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
madmaxoft
da75907942
APIDump: Added Geometry file to project.
2014-02-26 20:49:01 +01:00
madmaxoft
b7b027c0f6
APIDump: Documented new cCuboid functions.
2014-02-26 20:44:52 +01:00
madmaxoft
50b664fd0c
APIDump: Separated out Geometry-related classes to their own file.
2014-02-26 20:38:51 +01:00
madmaxoft
0d8ab184e0
InfoReg: Subcommand aliases are handled properly.
2014-02-25 18:15:09 +01:00
madmaxoft
9ab766189d
Added useful parameter overloads to cBlockArea Lua API.
2014-02-24 23:17:12 +01:00
Tiger Wang
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
madmaxoft
6da013c538
Documented cBlockArea:GetOrigin(), :GetSize() and :GetVolume().
2014-02-23 14:28:03 +01:00
andrew
f471873945
Maps: Improvements
2014-02-23 15:05:03 +02:00
andrew
30b22e9f59
Manually exported DoWithMap
2014-02-23 13:25:02 +02:00
andrew
9fa4fa1cc7
Documented and exported cMapManager
2014-02-23 12:55:55 +02:00
andrew
866fde81ca
Documented and exported cMap
2014-02-22 13:59:49 +02:00
madmaxoft
1b9840b328
APIDump: Documented cClientHandle:HasPluginChannel.
2014-02-20 23:32:08 +01:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
madmaxoft
7b8ff7c986
APIDump: Fixed cBlockArea:GetRelBlockType() return types.
2014-02-20 11:06:15 +01:00
Mattes D
98332c5b76
Merge pull request #696 from mc-server/paintings
...
Implemented paintings, fixes #689
2014-02-18 23:08:12 +01:00
madmaxoft
600861988e
APIDump: Documented missing cWorld functions.
2014-02-18 13:49:24 +01:00
madmaxoft
71b6fd3da9
Debuggers: Added a test for the cWorld:SetAreaBiome() function.
2014-02-18 13:49:23 +01:00
Tiger Wang
8ad4ab5bc1
Updated Core
2014-02-18 12:48:25 +00:00
Tiger Wang
6788dbe7f2
Properly exported and documented paintings
2014-02-18 11:37:45 +00:00
Mattes D
d05964cbd2
Merge pull request #695 from narroo/Issue673
...
ChunkWorx uses QueueUnloadUnusedChunks
2014-02-18 07:07:45 +01:00
narroo
66cfd29ddc
Fixed Chunkworx, Issue 673.
2014-02-17 19:12:31 -05:00
narroo
fb963b6393
Issue #673 Fix, Chunkworx now uses QueueUnloadUnusedChunks instead of UnloadUnusedChunks.
2014-02-17 19:05:11 -05:00
madmaxoft
e924d102e1
Added the InfoReg plugin library file.
...
This file should be used by all plugins that use Info.lua to register their commands. It defines the functions that register the commands and provide handling for the subcommands.
2014-02-17 23:41:48 +01:00
madmaxoft
89ef81b5e8
Documented the cPluginManager:GetPluginsPath() API function.
2014-02-17 23:39:53 +01:00
MuhammadWang
e0868c5c06
Added files for eclipse and debug, fix a mistake
...
src/Bindings/BindingsDependecies.txt is a mistake made in 45bc1ff033
2014-02-17 01:25:17 +08:00
madmaxoft
3582c4bc60
Debuggers: Added code to test cCompositeChat functionality.
...
Ref.: #678
2014-02-15 23:17:50 +01:00
Tiger Wang
a5b8d35845
Updated Plugin article
...
+ Adds reference to new SendMessage() functions
2014-02-15 15:37:10 +00:00
madmaxoft
147b9ed694
Debuggers: Added a WebAdmin StressTest page.
...
This page reloads content from the WebAdmin as fast as possible.
2014-02-15 16:30:28 +01:00
Alexander Harkness
a57c8bd7da
Merge pull request #677 from mc-server/BroadcastParticleEffect
...
Broadcast particle effect
2014-02-15 10:52:31 +00:00
STRWarrior
34207a606a
Documented BroadcastParticleEffect
2014-02-15 11:45:20 +01:00
andrew
c7fb000858
EmptyMap item handler
2014-02-14 17:38:22 +02:00
madmaxoft
6103589e8c
Updated Core.
2014-02-13 17:05:31 +01:00
madmaxoft
9bb48a8fa4
Merged branch 'narroo/master'.
...
This merges pull request #661 .
2014-02-13 17:04:25 +01:00
narroo
972919589b
Fixed formatting issue in APIDesc.lua
2014-02-13 07:51:17 -06:00
tonibm19
fecf40d95b
Decreased mobs attack range
...
Mobs attack from too far and throught walls, this will reduce the bug.
2014-02-12 19:34:45 +01:00
madmaxoft
b0018da615
Updated Core.
2014-02-12 10:36:13 +01:00
narroo
2f11e145e5
Fixed location of QueueUnloadUnusedChunks entry in APIDesc dump. Now is lexographically listed in cWorld, not cRoot.
2014-02-11 19:58:40 -05:00
narroo
03dbfce10e
Alpha-Sorted List.
2014-02-11 14:11:20 -05:00
narroo
619c3438ef
Changed console.lua in core plugin.
2014-02-11 10:35:25 -05:00
narroo
803314b940
Updated APIDesc.lua to replace 'UnloadUnusedChunks' with 'QueueUnloadUnusedChunks'.
2014-02-11 10:19:18 -05:00
Mattes D
c969794511
Fixed *nix attribs.
2014-02-11 11:33:48 +01:00
madmaxoft
90d68c57e4
Debuggers: Updated messaging functions
2014-02-11 08:54:29 +01:00
madmaxoft
8a8997cc38
Merge branch 'master' into ChunkStay
2014-02-11 08:50:30 +01:00
madmaxoft
a25fcd25d6
APIDump: Documented cWorld:ChunkStay().
2014-02-11 07:51:32 +01:00
madmaxoft
2b1506de9c
Debuggers: Updated to reflect the new API.
2014-02-10 22:47:32 +01:00
Tiger Wang
0cf1c1d91d
Updated MagicCarpet and Core
2014-02-10 20:13:22 +00:00
narroo
8028a8bbc6
Typo Fix in console.lua
2014-02-10 11:22:15 -05:00
madmaxoft
1447d6d0dc
Debuggers: Added a cLuaChunkStay test code.
2014-02-09 20:40:20 +01:00
madmaxoft
4ef6c56f32
Debuggers: Disabled testing plugin calls.
2014-02-09 18:56:43 +01:00
madmaxoft
9795bfcbe3
Added air, farmland and tilleddirt to items.ini.
...
Air hasn't been present at all, the others are usual synonyms.
2014-02-09 16:19:38 +01:00
madmaxoft
1d51521f80
Merge branch 'master' into playerimprovements
2014-02-09 09:32:40 +01:00
Tiger Wang
373e450518
Updated Core
2014-02-09 01:04:16 +00:00
Tiger Wang
9d1c9097e3
Merge remote-tracking branch 'origin/master' into playerimprovements
...
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615
Merge branch 'master' into playerimprovements
...
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
Tiger Wang
0a5c14bf68
Removed some unexported documentation.
2014-02-07 19:56:22 +00:00
Tiger Wang
88a64ec40d
Improved chat messaging functions
...
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00
madmaxoft
aec7ffd3f6
InfoDump: Added github output.
2014-02-05 21:50:56 +01:00
Tiger Wang
7d151d5494
Updated Core & PolarSSL
2014-02-04 23:53:10 +00:00
madmaxoft
e5dce265ae
Added cPluginManager:LogStackTrace() to the Lua API.
...
Fixes #637 .
2014-02-05 00:16:33 +01:00
madmaxoft
b63c206a5c
InfoDump: Git-Ignoring all generated files.
2014-02-05 00:09:35 +01:00
madmaxoft
dd1d85c8ad
Fixed indent from previous commits.
2014-02-04 18:27:05 +01:00
Mattes D
0ceb0ef607
Merge pull request #635 from tonibm19/master
...
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-04 09:23:03 -08:00
tonibm19
f3f4c5b110
Fixed indentation
2014-02-04 17:31:17 +01:00
tonibm19
a845b9abbb
Blank lines and indentation.
...
Also removed GetClosestPlayer documentation
2014-02-04 17:29:36 +01:00
madmaxoft
1bd939c4d4
InfoDump: Fixed export for undeclared command param combinations.
2014-02-04 00:16:26 +01:00
Tiger Wang
b5e898a608
Server now handles join messages also
...
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
tonibm19
0beae3a427
Added documentation
2014-02-03 21:02:32 +01:00
Tycho
0b0aa5554f
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Mattes D
33759197e9
Merge pull request #585 from daniel0916/hooks
...
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
daniel0916
b34ba6be7b
Added PlayerDestroyedHook Documentation
2014-02-01 13:58:35 +01:00
Tycho
fec17409d2
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/World.h
2014-01-31 15:31:05 -08:00
Alexander Harkness
79ef653cb7
Fixed some more.
2014-01-31 07:41:21 +00:00
Alexander Harkness
d3b8796c48
Fixed at least a little of the plugin guide.
2014-01-30 21:19:45 +00:00
Alexander Harkness
e0cb06dfae
Update Core
2014-01-30 17:54:10 +00:00
STRWarrior
4d53eb2711
Documented cFloater.
2014-01-29 15:36:53 +01:00
Mattes D
cdcad2237a
Merge pull request #587 from mc-server/mobimprovements
...
Mob improvements & rudimentary artificial intelligence
2014-01-25 13:36:32 -08:00
madmaxoft
9d1ebaaf0d
Ignoring the Comm Logs.
2014-01-25 15:06:30 +01:00
Tiger Wang
4eb52b25db
Updated Core
2014-01-24 19:58:37 +00:00
Tiger Wang
3e675f8c38
Implemented creeper abilities
...
* Creepers now explode with a sound effect
* Creepers drop a music disc on the unlikely event of being killed by a
skeleton's arrow
Inspired by @maniak89's PR #132 .
2014-01-24 19:52:52 +00:00
madmaxoft
ebc3f6aa28
APIDump: Fixed indent after merge.
2014-01-24 08:59:21 +01:00
madmaxoft
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
Mike Hunsinger
9926ea58e8
Fixed indentation and doxygen comments... For real this time.
2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b
Fixed spacing and doxycomments.
2014-01-23 19:54:00 -07:00
Mike Hunsinger
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
madmaxoft
a6661e899a
InfoDump: Can dump a single plugin without LFS.
2014-01-22 12:41:19 +01:00
madmaxoft
f58d11fc1a
InfoDump: Dump all referenced permissions.
2014-01-22 10:18:58 +01:00
madmaxoft
2a018cfa49
Implemented cPluginManager:CallPlugin() API.
...
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
2014-01-21 23:00:35 +01:00
madmaxoft
2407a67906
APIDump: Added notes about objects across cWorld's task execution.
2014-01-19 23:56:49 +01:00
madmaxoft
e9e9593e6d
APIDump: Updated cWorld:ScheduleTask()'s description.
2014-01-19 23:50:49 +01:00
madmaxoft
41618bf242
Changed the cWorld::ScheduleTask() signature.
...
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
madmaxoft
1c05831974
Updated Core.
2014-01-19 16:20:38 +01:00
Tiger Wang
2a4fa72d10
Updated core
2014-01-19 13:43:42 +00:00
madmaxoft
cef2967637
APIDump: Updated cPluginManager:GetAllPlugins().
2014-01-17 15:54:33 +01:00
Alexander Harkness
714c8ed1a9
Updated core to the latest version and edited the submodules file to allow greater compatibility on restricted networks.
2014-01-17 10:38:36 +00:00
madmaxoft
343136a2ae
Finished exporting cWorld:ScheduleTask() to Lua API.
2014-01-16 19:56:08 +01:00
Alexander Harkness
bf0d58428d
Merge pull request #548 from worktycho/documention
...
Added Documention for a few features I've added
2014-01-16 09:55:37 -08:00
Tycho
daf94e5f48
Documented the SchedualeTask function
2014-01-16 09:53:46 -08:00
madmaxoft
7e2675a998
APIDump: Explicitly listed static cPlayer functions.
2014-01-15 19:26:01 +01:00
Tiger Wang
c4da025d5a
Updated Core! ±±±___±±±
2014-01-15 14:08:41 +00:00
Mattes D
457e93f1ed
Merge pull request #538 from mc-server/minecarts
...
Minecarts
2014-01-15 02:42:24 -08:00
madmaxoft
e3117d797e
Moved profiling scripts into the MCServer folder.
...
Also they default to the 2010 version of the tools, which is Win7-compatible, and should be 64-bit-compatible, too.
2014-01-14 11:05:27 +01:00
madmaxoft
f7c691caaa
APIDump: Wrapped example code so that it displays well on small screens.
...
The listing was pushing the resulting webpage too wide on my 19" screen, causing various distortions.
2014-01-13 21:39:21 +01:00
madmaxoft
74ddd03a9f
APIDump: Added OnPluginMessage.lua file to Decoda project.
2014-01-13 19:48:07 +01:00
madmaxoft
448ac3ef14
APIDump: Added missing bits of documentation.
...
The recent changes didn't document some of the new API functions.
2014-01-13 19:45:15 +01:00
madmaxoft
55e92f056d
APIDump: Documented the plugin messaging hook and function.
2014-01-13 19:21:57 +01:00
Tiger Wang
e932c69b82
Fixed VS2013 compile and updated Core
2014-01-12 13:59:39 +00:00
Mattes D
1ec9eb564c
Merge pull request #526 from mc-server/IniFileFix
...
Fixed cIniFile's SetValue().
2014-01-11 23:32:54 -08:00
madmaxoft
2e0fcbdcb7
Documented the cIniFile:AddValue* functions.
...
Now the documentation really matches the implementation.
2014-01-11 16:50:52 +01:00
Mattes D
e213769216
Merge pull request #522 from mc-server/LuaDlFix
...
Lua dl fix
2014-01-10 08:27:43 -08:00
madmaxoft
00af5d4d6e
Debuggers: Test code for WECUI plugin messaging.
2014-01-09 14:26:44 +01:00
madmaxoft
4a1b78787f
Windows nightbuild updated to generate .example.ini files.
...
Fixes #314 .
2014-01-09 09:47:16 +01:00
madmaxoft
18310752b8
Fixed a typo in the TestLuaRocks test plugin.
2014-01-09 08:05:34 +01:00
madmaxoft
71946f5671
Added a known working favicon.
2014-01-08 20:18:26 +01:00
Tiger Wang
6c65b050ca
Updated Core
2014-01-07 21:29:01 +00:00
Tiger Wang
524aecc106
Updated submodules
2014-01-07 17:25:20 +00:00
madmaxoft
e353f29d4a
Plugin messages are received and handed to plugins.
...
Note that MCS doesn't currently handle any channel registrations, this will come later on.
2014-01-07 17:47:20 +01:00
madmaxoft
8b6be58ad9
InfoDump: Removes indent and parses ParameterCombinations.
...
The DetailedHelp was a bad name for what it really contained, so it has been renamed to ParameterCombinations.
2014-01-06 10:25:52 +01:00
madmaxoft
84bf32f857
Fixed cPluginManager:AddHook() binding.
...
Fixes #401 . Old formats are still accepted, for compatibility reasons.
2014-01-05 15:46:45 +01:00
madmaxoft
44cf86dcf9
InfoDump: Removed an unneeded function.
2014-01-05 15:15:59 +01:00
madmaxoft
20da685002
InfoDump: All reasonable strings are forumized.
2014-01-04 22:11:19 +01:00
madmaxoft
b2ac227064
Added forum output for commands' DetailedHelp array.
...
Also added some coloring to simulate syntax highlighting.
2014-01-04 20:42:31 +01:00
madmaxoft
58e18b41f7
InfoDump: Implemented list and formatting Forumizing.
...
The exported strings are now parsed for basic formatting and list-related tags.
2014-01-04 19:24:39 +01:00
madmaxoft
da2e7c25b0
InfoDump: added AdditionalInfo to forum dumps.
2014-01-04 15:36:27 +01:00
madmaxoft
4c3d2a86a5
Added an InfoDump script for dumping all plugins' Info.lua into forum description.
...
GitHub description will follow later on.
2014-01-04 14:12:45 +01:00
Tau
0c095faac8
[Handy] updated for new API, fixed bugs, added warnings. Now v2.
2014-01-02 19:25:26 +02:00
madmaxoft
d4e29a0d18
Merge branch 'FishingHook'
2014-01-01 15:31:57 +01:00
STRWarrior
d656c253c0
Little more documentation for OnPlayerFishing.
2014-01-01 15:18:12 +01:00
STRWarrior
78a876ace3
Using documentation Xoft recommended.
2014-01-01 15:15:56 +01:00
STRWarrior
c5b89ea0f5
Fixed typo's in the documentation.
2014-01-01 15:02:43 +01:00
STRWarrior
db935c4194
Documented OnPlayerFished and OnPlayerFishing.
2013-12-31 14:50:46 +01:00
madmaxoft
61254d0356
APIDump: Fixed a factual error in OnPluginsLoaded description.
2013-12-29 14:48:58 +01:00
madmaxoft
61af77a5c5
APIDump: Static files overwrite their destination.
2013-12-29 13:24:38 +01:00
madmaxoft
8406a37ac2
APIDump: The PRE html tag has tab width set to 2 spaces.
2013-12-29 13:23:30 +01:00
madmaxoft
b84cd0b3c5
APIDump: Documented OnPluginsLoaded.
2013-12-29 13:15:46 +01:00
madmaxoft
248ba1ea9f
Added HOOK_PLUGINS_LOADED.
...
This fixes #482 .
2013-12-29 12:51:58 +01:00
madmaxoft
537d1c4e42
APIDump: Added the SettingUpDecoda article.
...
This implements #383 .
2013-12-27 20:56:01 +01:00
madmaxoft
9689896f9c
APIDump: Articles eplicitly declare being UTF-8.
...
This fixes display in firefox.
2013-12-27 20:48:11 +01:00
madmaxoft
e4c6e853ea
APIDump: Added quick links to index to each class and hook file.
...
Third part of #403 .
2013-12-27 15:48:01 +01:00
madmaxoft
9a9888a8cc
APIDump: Added a quick-nav menu to hook descriptions.
...
Second part of #403 .
2013-12-27 15:36:28 +01:00
madmaxoft
b99255820b
APIDump: Added a quick-nav menu to class descriptions.
...
First part of #403 .
2013-12-27 15:26:41 +01:00
madmaxoft
0c071c5937
APIDump: Split the huge DumpAPIHtml function into smaller ones.
2013-12-27 15:08:27 +01:00
madmaxoft
daeb37b27b
APIDump: Extra pages renamed to articles and moved to front.
2013-12-27 15:01:49 +01:00
madmaxoft
270d79d47b
APIDump: Fixed the WritingPlugin article.
...
The code is no longer weirdly indented in the browser, and links are relative to the API docs root.
2013-12-27 14:46:07 +01:00
madmaxoft
f0ca18d72a
APIDump: Added the WritingPlugin article to the exported pages.
2013-12-27 14:33:15 +01:00
madmaxoft
1a3a291bde
APIDump: Fixed bad for-loop.
...
How did I not see this before?
2013-12-27 14:32:40 +01:00
Tiger Wang
d41f724a40
Writing a plugin APIDump article ( #382 )
2013-12-26 15:11:48 +00:00
Alexander Harkness
8c6337ff20
Removed documentation for cChatColour:MakeColor()
2013-12-24 13:25:03 +00:00
Sam Mauldin
e593cef109
Store plugin in a local variable to fix error on disable
2013-12-23 20:58:39 -06:00
Alexander Harkness
1f03fc4bf9
Or not. Fixes #384
2013-12-20 17:35:59 +00:00
Alexander Harkness
ba5e42de40
done... finally
2013-12-20 17:12:39 +00:00
Alexander Harkness
d31fd1528b
fix the issues xoft pointed out
2013-12-20 16:38:10 +00:00
Alexander Harkness
837bbf0de3
@madmaxoft now?
2013-12-20 16:31:30 +00:00
Alexander Harkness
675c35708b
Possibly fixes #384
...
@madmaxoft, is this the right syntax for lua for loops?
2013-12-20 16:14:49 +00:00
Alexander Harkness
71006f5df5
Create a static folder for adding static files.
...
.gitignore is basically just an empty file that might serve a purpose someday.
2013-12-20 16:03:26 +00:00
madmaxoft
5d4e1725d4
APIDump: Ignoring the multi-inheritance members.
...
We may get to documenting them one day, but for now they are unused anyway, so there's no point in documenting them. They are a by-product of multiple inheritance, re-introduced due to #422 .
2013-12-16 22:13:46 +01:00
STRWarrior
6e30e54eb0
Documented ForceSetSpeed.
2013-12-15 20:27:19 +01:00
STRWarrior
ae061d717b
APIDump: Documented New functions
2013-12-15 15:18:53 +01:00
STRWarrior
a4393dbf6c
Documented cTNTEntity.
2013-12-14 16:40:51 +01:00
Tiger Wang
46787a8a1b
Update Core
2013-12-14 12:29:43 +00:00
Tiger Wang
4e11095441
Groups.ini and Users.ini are now generated
2013-12-14 02:02:26 +00:00
STRWarrior
e03e8b7b30
Documented OnWorldStarted.
2013-12-11 12:44:13 +01:00
madmaxoft
13dd1b0c94
Ignoring Gallery plugin settings.
2013-12-08 11:48:44 +01:00
Alexander Harkness
87680186ef
Updated core.
2013-12-07 16:34:38 +00:00
STRWarrior
02301bc987
Documented SpawnFallingBlock()
2013-12-07 14:30:17 +01:00
Alexander Harkness
38563db3ce
Updated TRANSAPI
2013-12-07 07:22:48 +00:00
Mattes D
dde1c3a7cd
Merge pull request #394 from SamJBarney/master
...
Fire no longer goes out when on top of nether rack
2013-12-06 02:41:37 -08:00
Samuel Barney
88d6454882
I don't know how this dissapeard.
2013-12-05 22:42:52 -07:00
madmaxoft
a02ed3b92e
APIDump: Documented the new cPluginManager:GetCurrentPlugin() function.
2013-12-05 22:06:52 +01:00
Samuel Barney
8acfe21503
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Simulator/FireSimulator.h
2013-12-05 07:32:19 -07:00
Alexander Harkness
5832781727
Updated TransAPI, fixes #389
...
@madmaxoft is this the right API usage?
2013-12-03 21:17:36 +00:00
madmaxoft
0a2fcf909c
Added a quick LuaRocks testing plugin.
...
You need to install the luarocks system and through it the luasocket and 30log rocks.
2013-12-03 21:48:40 +01:00
madmaxoft
70cf0c09a8
The server builds and uses Lua as DLL in Debug mode.
...
This is a test to see how LuaRocks will interact. Only debug mode on Windows is affected, all other platforms and modes are unchanged.
2013-12-02 22:36:59 +01:00