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
madmaxoft
e07c54f7f8
APIDump: Added missing params to OnPlayerRightClick() hook.
2013-12-02 22:36:59 +01:00
madmaxoft
ca79a1a6a6
APIDump: Updated the project file to include all partial docs files.
2013-11-30 13:36:40 +01:00
STRWarrior
686e0c12e2
cWorld::SpawnExperienceOrb() now returns the entity ID of the spawned orb.
...
Documented etExpOrb.
2013-11-26 15:37:15 +01:00
STRWarrior
a0c6342a29
Documented SpawnExperienceOrb in cWorld
2013-11-25 21:51:52 +01:00
madmaxoft
e683c54b49
APIDump: Moved projectiles' documentation to a separate file.
2013-11-24 10:08:04 +01:00
madmaxoft
51b02854f9
APIDump: Removed needless whitespace output.
2013-11-24 10:03:02 +01:00
madmaxoft
38fe16d8b6
APIDump: Removed unwanted functions.
2013-11-23 21:43:38 +01:00
madmaxoft
3ef7f2008f
APIDump: Reformatted the sqlite docs.
2013-11-23 21:32:18 +01:00
madmaxoft
d9dc241e6f
APIDump: The descriptions are read from multiple files.
...
All the files in the Classes subfolder are read for class descriptions, and in the Hooks subfolder for the hook descriptions.
2013-11-23 21:27:02 +01:00
STRWarrior
cc77ffd069
Documented sqlite functions. Used: http://lua.sqlite.org/index.cgi/doc/tip/doc/lsqlite3.wiki#sqlite3_functions
2013-11-23 21:13:55 +01:00
madmaxoft
520088fc7c
APIDump: Added more constant groups.
...
Also fixed the parsing of the Include data in the constant groups, and added linkification to group texts.
2013-11-23 19:40:35 +01:00
madmaxoft
b8aaf13a12
APIDump: Added a few constant groups to the descriptions.
2013-11-22 22:12:46 +01:00
madmaxoft
7a2170f6b3
APIDump: Implemented constant groups.
...
Fix #289 .
2013-11-22 21:46:06 +01:00
madmaxoft
63753c5e84
Added cFile:GetFolderContents().
...
Fix 162.
2013-11-22 20:11:24 +01:00
madmaxoft
4fbfe59ea0
APIDump: Fixed cRoot's furnace query API.
2013-11-22 16:52:09 +01:00
madmaxoft
281bf8f90b
Added cRoot:GetFurnaceFuelBurnTime() to Lua API.
2013-11-22 16:50:03 +01:00
madmaxoft
7fd3fda5d3
APIDump: Documented new cRoot:GetFurnaceRecipe().
2013-11-22 12:37:55 +01:00
madmaxoft
07a1de8ebb
Debuggers: Added a test harness for cRoot:GetFurnaceRecipe().
...
The "/fr" command lists the furnace recipe for the currently held item.
2013-11-22 12:26:39 +01:00
madmaxoft
98be3ca0e4
APIDump: Documented cPlayer XP-related functions.
2013-11-21 22:12:52 +01:00
madmaxoft
e9a8b96479
APIDump: Documented cWorld:ForEachBlockEntityInChunk() and cWorld:DoWithBlockEntityAt().
2013-11-20 22:04:16 +01:00
madmaxoft
fed37bca4d
Debuggers: Test harness for cWorld:ForEachBlockEntityInChunk().
...
The fill command will fill all empty slots in block entities with containment with gold nuggets, one per slot.
2013-11-20 21:54:37 +01:00
Mattes D
ced076c561
Merge pull request #350 from mc-server/arrows
...
Fixed arrow bugs
2013-11-19 01:13:49 -08:00
madmaxoft
7567f19052
Merge branch 'master' of git://github.com/nesco/MCServer.
2013-11-19 10:01:25 +01:00
madmaxoft
e2ea6b59f5
APIDump: Slight performance improvement.
...
Strings don't need concatenation when using write().
2013-11-19 09:56:36 +01:00
madmaxoft
4844422e06
APIDump: Documented Vector3i.
2013-11-19 06:49:21 +01:00
nesco
44385fba28
flower=38
2013-11-18 16:55:30 +01:00
madmaxoft
9bc79722c7
APIDump: Documented Vector3f.
2013-11-17 23:27:07 +01:00
Daniel O'Brien
b3bb34974f
updated plugin again...
2013-11-16 22:17:46 +11:00
Daniel O'Brien
25ccc33252
updated plugin
2013-11-16 22:05:34 +11:00
Daniel O'Brien
b72ced3164
removed SpendExperience and changed AddExperience to handle removing Xp
2013-11-16 22:00:45 +11:00
Daniel O'Brien
df4aa6c864
Merge remote-tracking branch 'upstream/master' into playerxp
2013-11-16 17:30:19 +11:00
madmaxoft
d96f622437
APIDump: Documented lxp, the XML parser class.
2013-11-15 22:39:27 +01:00
madmaxoft
905cd0e73e
APIDump: Functions that are documented are never ignored.
...
This simplifies exclude-filters for functions such as lxp.new() that need inclusion.
2013-11-15 22:39:02 +01:00
Daniel O'Brien
04dff4882a
finished #143 I believe
2013-11-16 02:23:50 +11:00
nesco
d3269f37fa
Update items.ini
2013-11-15 14:18:53 +01:00
Daniel O'Brien
5e3614ce87
Merge remote-tracking branch 'upstream/master' into playerxp
2013-11-16 00:07:42 +11:00
madmaxoft
2ed8e38419
APIDump: Small fixes and additions.
2013-11-15 13:44:07 +01:00
madmaxoft
26d3dd3466
APIDump: Documented cSignEntity.
2013-11-15 13:34:20 +01:00
madmaxoft
7586e832bf
APIDump: Documented cNoteEntity.
2013-11-15 13:10:36 +01:00
madmaxoft
194aa1decb
APIDump: Documented the cJukeboxEntity.
2013-11-15 12:42:35 +01:00
Daniel O'Brien
1b2e6e7473
added cProtocol function to pass xp to client
2013-11-15 22:42:09 +11:00
madmaxoft
4f2645d0e5
APIDump: Documented cChunkDesc:GetBlockEntity().
2013-11-15 11:34:43 +01:00
madmaxoft
5eb67dbdfc
Debuggers: Removed the old OnChunkGenerated code testing the cBlockArea writing.
2013-11-15 11:28:11 +01:00
madmaxoft
90fc51c4d0
cRoot::SaveAllChunks() doesn't wait for the save (deadlocks).
...
Rather, it only queues the save task onto each world's tick thread.
2013-11-15 10:13:32 +01:00
madmaxoft
6e5d7b70a1
APIDump: Removed the BlockEntity constructors' docs.
2013-11-15 10:09:54 +01:00
madmaxoft
9048a3b66d
Re-added rose to items.ini.
2013-11-15 09:56:07 +01:00
madmaxoft
7fddf4479d
Debuggers: Added the BlockEntity test harness when generating chunks.
2013-11-15 09:49:56 +01:00
Tiger Wang
15c330664a
Fixed arrow bugs
...
* Fixed arrows hitting blocks wrong
2013-11-14 22:39:14 +00:00
Daniel O'Brien
f6e16ce150
cProtocol add SendExperience() and debugging
2013-11-15 08:35:02 +11:00
madmaxoft
e48dabfb10
Updated the Core.
2013-11-13 23:01:57 +01:00
nesco
b377072312
Update items.ini
2013-11-13 20:43:31 +01:00
nesco
69d711b407
Update items.ini
2013-11-13 20:43:24 +01:00
nesco
c854314208
Update crafting.txt with StainedGlass and StainedGlassPane
2013-11-13 20:43:09 +01:00
madmaxoft
9287349cc2
APIDump: Documented Vector3d.
2013-11-11 16:02:10 +01:00
madmaxoft
0762893ee1
APIDump: Documented cServer:IsHardCore()
2013-11-09 21:18:03 +01:00
madmaxoft
148f723632
APIDump: Documented TakeDamageInfo.
2013-11-09 19:25:03 +01:00
madmaxoft
d74b0dbd5b
APIDump: Documented the relevant tolua functions.
2013-11-09 19:16:44 +01:00
madmaxoft
157bd150fd
APIDump: Added logging to see what takes so long.
2013-11-09 18:55:24 +01:00
madmaxoft
9e38c00b5e
Updated Core and ProtectionAreas.
2013-11-09 14:22:59 +01:00
Mattes D
12eeb3f6c8
Merge pull request #309 from mc-server/configautogen
...
Autogeneration of settings.ini and webadmin.ini
2013-11-05 13:24:23 -08:00
madmaxoft
13800a0023
APIDump: Documented ItemCategory.
2013-11-05 22:16:42 +01:00
Mattes D
e65ce13012
Merge pull request #307 from mc-server/MobImprovements
...
Mob projectiles
2013-11-05 08:22:31 -08:00
Tiger Wang
0c2c803a16
Removed settings/webadmin.example.ini files
...
Additionally, added some default plugins to autogeneration. Also moved
nbt examples to docs/NBT Examples.
2013-11-04 22:06:23 +00:00
STRWarrior
445a221d15
Small update to the monster.ini.
2013-11-02 21:30:37 +01:00
madmaxoft
d1e51886e5
APIDump: Fixed HOOK_LOGIN short desc.
2013-10-31 23:47:46 +01:00
madmaxoft
d41d5c15b1
Debuggers: Fixed after the cWindow API change.
2013-10-28 13:44:57 +01:00
madmaxoft
2bb1dd5015
APIDump: Documented cWindow.
2013-10-28 13:32:10 +01:00
madmaxoft
1a29c19619
APIDump: Documented HTTPFormData and HTTPRequest.
2013-10-28 13:08:14 +01:00
madmaxoft
aca526d158
APIDump: Fixed a failure in documented classes with no functions.
2013-10-28 13:07:30 +01:00
madmaxoft
4f32079692
APIDump: Documented cWorld.
2013-10-27 09:45:02 +01:00
madmaxoft
4871968bc9
APIDump: Documented cRoot.
2013-10-27 09:39:11 +01:00
madmaxoft
5d58457c9e
APIDump: Documented cProjectileEntity.
2013-10-27 09:29:02 +01:00
madmaxoft
73e7d21387
APIDump: Documented cPickup.
2013-10-26 19:54:51 +02:00
madmaxoft
e7b3ced70b
APIDump: Documented cIniFile.
2013-10-26 10:33:44 +02:00
madmaxoft
de6f628d2e
ChunkWorx: Updated for the cIniFile changes.
2013-10-25 12:36:39 +02:00
madmaxoft
c875b88758
APIDump: Documented cMonster.
2013-10-24 17:20:52 +02:00
madmaxoft
7c2ba55442
APIDump: Documented cEnchantments.
...
The constants are self-documenting, no need to describe them further.
2013-10-24 16:32:51 +02:00
madmaxoft
785301c9a0
APIDump: Documented cPickup.
2013-10-24 16:27:48 +02:00
madmaxoft
6cad07c429
APIDump: Documented cItemGrid and cPlayer.
2013-10-24 12:24:40 +02:00
madmaxoft
2cf196a892
APIDump: Added cChatColor constants.
...
They don't really need much documentation, so just ignoring them in the Undocumented output.
2013-10-23 13:34:44 +02:00
madmaxoft
60abe99d5e
APIDump: Documented the cHopperEntity class.
2013-10-23 12:19:43 +02:00
madmaxoft
a91b422594
APIDump: Linkified cEntity returns.
2013-10-23 12:09:34 +02:00
madmaxoft
34de5210d6
APIDump: member variables without a setter are considered constants.
...
This fixes cChatColor constants being reported erroneously as member variables.
2013-10-22 22:07:39 +02:00
madmaxoft
ec94104a3c
APIDump: Inheritance is tested properly.
...
This fixes #195 's second iteration.
2013-10-22 21:53:35 +02:00
madmaxoft
628eebefd3
Ignoring a few generated files.
2013-10-21 21:40:14 +02:00
madmaxoft
b571294b6e
APIDump: Added link from cItem to the global ItemToString() et al.
2013-10-20 23:43:09 +02:00
madmaxoft
83d2d375c9
APIDump: Fixed link in cPawn's desc.
2013-10-20 23:36:00 +02:00
madmaxoft
70a734d4f9
APIDump: Various small fixes and additions.
2013-10-20 15:32:33 +02:00
madmaxoft
16afec96de
APIDump: Fixed a few broken links.
2013-10-20 15:08:30 +02:00
madmaxoft
0230936f61
APIDump: Statistics have a graphical meter; added hooks.
2013-10-20 14:56:09 +02:00
madmaxoft
07a117b096
APIDump: Added basic statistics about the docs.
2013-10-20 11:12:33 +02:00
madmaxoft
4f40eb7f55
APIDump: Fixed listing undocumented objects.
...
Classes with undefined "Functions" section would not list their functions as undocumented; similar for "Constants" and "Variables".
2013-10-20 10:33:40 +02:00
madmaxoft
0258213d24
Merge branch 'htmlescape'.
2013-10-20 09:14:30 +02:00
madmaxoft
769c98403b
APIDump: Undocumented member variables are listed.
2013-10-19 22:44:28 +02:00
madmaxoft
bbcb0ead73
APIDump: Extra pages use the local prettify and CSS.
2013-10-19 22:28:58 +02:00
madmaxoft
3f2813d6ff
APIDump: Added member-variable filtering.
2013-10-19 22:21:38 +02:00
Alexander Harkness
d1ddd2492b
Added a APIDump description for GetHTMLEscapedString.
2013-10-19 21:18:27 +01:00
madmaxoft
9f8df5f702
APIDump: Member variables are read from the API.
2013-10-19 22:07:06 +02:00
madmaxoft
b59329bf3a
APIDump: Better header text for classes.
2013-10-19 21:47:59 +02:00
madmaxoft
be996c1662
APIDump: Added cIniFile additional info.
2013-10-18 23:22:26 +02:00
madmaxoft
1b7a84d494
APIDump: Offline prettify is working.
2013-10-18 22:02:06 +02:00
madmaxoft
1e67ff3499
APIDump: Added example code to cItem.
2013-10-18 21:49:07 +02:00
madmaxoft
373900964c
APIDump: Documented cItem's variables.
2013-10-18 21:38:44 +02:00
madmaxoft
07ba48840d
APIDump: Added support for member variables.
2013-10-18 21:29:38 +02:00
madmaxoft
314c7d98fb
APIDump: Added prettify's license.
2013-10-18 21:27:35 +02:00
madmaxoft
db2d4aa4e3
APIDump: Fixed offline JS.
...
This time it's really offline :)
2013-10-18 21:02:43 +02:00
madmaxoft
77af5c6fe7
APIDump: Do not list empty Constants or Functions sections.
...
Also implemented writing inherited constants.
2013-10-18 20:49:30 +02:00
madmaxoft
778d786349
APIDump: Split long code into functions.
2013-10-18 20:32:36 +02:00
madmaxoft
41270dc02e
APIDump: Ignore internal APIDump stuff.
2013-10-18 20:22:24 +02:00
madmaxoft
201c84afb3
APIDump: using local JS files instead of networked.
...
This allows offline API browsing.
2013-10-18 20:21:26 +02:00
madmaxoft
1c0ab57d12
APIDump: Renamed output for helper stuff.
...
Undocumented objects are output to _undocumented.lua
Overdocumented objects are output to _unexported-documented.txt
Missing pages are output to _missingPages.txt
2013-10-18 12:33:46 +02:00
madmaxoft
22102b4a64
APIDump: Makes a list of bad links.
...
This fixes #219 .
2013-10-18 12:30:06 +02:00
madmaxoft
5992c41501
APIDump: Improved page titles.
2013-10-18 11:56:58 +02:00
madmaxoft
9776b89fb7
APIDump: Documented HOOK_PLAYER_RIGHT_CLICKING_ENTITY.
2013-10-18 10:04:44 +02:00
madmaxoft
5a31d191eb
APIDump: Documented HOOK_PLAYER_SHOOTING.
2013-10-18 09:57:35 +02:00
madmaxoft
8020cbd3d7
APIDump: Documented HOOK_PLAYER_SPAWNED.
2013-10-18 09:47:21 +02:00
madmaxoft
1f6498de22
APIDump: Documented HOOK_PLAYER_TOSSING_ITEM.
2013-10-18 09:40:18 +02:00
madmaxoft
fd7c1754d0
APIDump: Documented HOOK_PLAYER_USED_BLOCK.
2013-10-17 17:14:57 +02:00
madmaxoft
dfd4c78c87
APIDump: Documented HOOK_PLAYER_USED_ITEM.
2013-10-17 17:10:46 +02:00
madmaxoft
91f7662a51
APIDump: Documented HOOK_PLAYER_USING_BLOCK.
2013-10-17 16:38:46 +02:00
madmaxoft
96072c9e0c
APIDump: Documented HOOK_PLAYER_USING_ITEM.
2013-10-17 16:31:35 +02:00
madmaxoft
ed935d82bb
APIDump: Documented HOOK_UPDATED_SIGN.
2013-10-17 16:18:16 +02:00
madmaxoft
d3f5a979b4
APIDump: Documented HOOK_TICK.
2013-10-17 16:07:18 +02:00
madmaxoft
36f6ffaadf
APIDump: Documented HOOK_TAKE_DAMAGE.
2013-10-17 15:20:44 +02:00
madmaxoft
424807e331
APIDump: Documented HOOK_UPDATING_SIGN.
2013-10-17 13:54:53 +02:00
madmaxoft
1ef2e0e6a6
APIDump: More robust against missing APIDesc items.
2013-10-17 13:54:41 +02:00
madmaxoft
d688ac8e50
APIDump: Documented HOOK_WEATHER_CHANGED.
2013-10-16 15:47:27 +02:00
madmaxoft
0aa20762bc
APIDump: Documented HOOK_WEATHER_CHANGING.
2013-10-16 15:44:04 +02:00
madmaxoft
f8e3cbe44f
APIDump: Documented HOOK_WORLD_TICK.
2013-10-16 15:33:56 +02:00
madmaxoft
dbd925a7a4
APIDump: Nicer HTML visage.
...
* Fixed whacky HTML indentation
+ Added fancy CSS!
+ Now HTML5 compatible!
2013-10-16 08:04:06 +02:00
Tiger Wang
cb9ccb36ac
Merge remote-tracking branch 'upstream/master'
2013-10-15 21:14:47 +01:00
Alexander Harkness
17aff20666
Added HOOK_PLAYER_RIGHT_CLICK
2013-10-15 19:57:00 +01:00
madmaxoft
c9a9a30fa5
APIDump: Linkification supports #anchors.
...
This implements #198 .
2013-10-15 18:44:13 +02:00
madmaxoft
9c7ca813d2
APIDump: Documented HOOK_SPAWNING_MONSTER.
2013-10-15 18:12:37 +02:00
madmaxoft
ba6c2b9ef4
APIDump: Documented HOOK_SPAWNING_ENTITY.
2013-10-15 18:06:06 +02:00
madmaxoft
44ec010e15
APIDump: Documented HOOK_SPAWNED_MONSTER.
2013-10-15 17:58:39 +02:00
madmaxoft
167d8d346e
APIDump: Documented HOOK_SPAWNED_ENTITY.
2013-10-15 17:55:01 +02:00
madmaxoft
edd1a670ed
APIDump: Documented HOOK_PRE_CRAFTING.
2013-10-15 17:43:41 +02:00
madmaxoft
b079676290
APIDump: Documented HOOK_POST_CRAFTING.
2013-10-15 17:35:34 +02:00
madmaxoft
9be35e1222
APIDump: Documented HOOK_PLAYER_PLACING_BLOCK.
2013-10-15 14:58:33 +02:00
madmaxoft
deb2d89506
APIDump: Documented HOOK_PLAYER_MOVING and HOOK_PLAYER_PLACED_BLOCK.
2013-10-15 14:48:29 +02:00
madmaxoft
19e176be20
APIDump: Documented HOOK_PLAYER_LEFT_CLICK.
2013-10-15 11:30:48 +02:00
madmaxoft
90dc2c55d8
APIDump: Documented HOOK_PLAYER_JOINED.
2013-10-15 08:24:44 +02:00
madmaxoft
b902c0b29e
APIDump: Documented HOOK_PLAYER_EATING.
2013-10-15 08:18:08 +02:00
madmaxoft
eb466334ad
APIDump: Documented HOOK_PLAYER_BROKEN_BLOCK.
2013-10-15 08:11:01 +02:00
madmaxoft
5e71b30116
APIDump: Documented HOOK_PLAYER_BREAKING_BLOCK.
2013-10-15 08:03:46 +02:00
madmaxoft
d34fa4970a
APIDump: Documented HOOK_PLAYER_ANIMATION.
2013-10-14 22:01:10 +02:00
madmaxoft
e4bb796c6b
APIDump: Removed HOOK_MAX and HOOK_NUM_HOOKS from documentation.
...
They're not really hooks, just constants for the maximum.
2013-10-14 21:57:23 +02:00
madmaxoft
862397856d
APIDump: Documented HOOK_LOGIN.
2013-10-14 21:46:25 +02:00
madmaxoft
a632f1d579
APIDump: Documented HOOK_KILLING.
2013-10-14 21:45:47 +02:00
madmaxoft
315af4450d
APIDump: Documented HOOK_HOPPER_PUSHING_ITEM.
2013-10-14 21:45:08 +02:00
madmaxoft
9969c19060
APIDump: Documented HOOK_HOPPER_PULLING_ITEM.
2013-10-14 21:16:28 +02:00
Alexander Harkness
bf5f4603d9
Add the first line back.
2013-10-14 16:57:57 +01:00