Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-25 04:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,607 Commits 108 Branches 83 Tags 166 MiB
ba38f787e2
Commit Graph

6177 Commits

Author SHA1 Message Date
AFCMS
22a2fdbf5f fix more codestyle 2021-04-17 07:46:24 +02:00
AFCMS
5f076d372a fix many codestyle errors 2021-04-17 07:42:49 +02:00
Elias Fleckenstein
bd3c08d367 Improve mcl_burning player performance 2021-04-16 19:50:56 +02:00
Elias Fleckenstein
01c79c5a18 Fix mcl_burning.tick not being called at all for mobs 2021-04-16 18:37:07 +02:00
Elias Fleckenstein
095f78b785 Massive mcl_burning performance improvement 2021-04-16 18:34:29 +02:00
AFCMS
457f61a532 Fix #1570 2021-04-16 11:40:44 +00:00
AFCMS
1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
Elias Fleckenstein
5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +02:00
AFCMS
2d6e0241cd Merge branch 'master' into luacheck 2021-04-16 11:03:46 +02:00
AFCMS
1df916bd7b fix warning 2021-04-16 11:03:31 +02:00
jordan4ibanez
044e9d22ad Re-enable mob-despawner 2021-04-15 21:13:19 -04:00
epCode
31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -07:00
epCode
cd04f6d7ce Fix glitch with Stray 2021-04-15 14:53:22 -07:00
AFCMS
60e74fc41d fix excedent lines 2021-04-15 23:44:29 +02:00
AFCMS
a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
epCode
9feaec95d9 Fix Stupid mistake with zombievillagers 2021-04-15 14:29:24 -07:00
epCode
0ca6c06198 add the other villager zombie textures 2021-04-15 14:11:35 -07:00
AFCMS
b497778192 delete unused file 2021-04-15 22:22:39 +02:00
epCode
f0fab4e708 Allow zombie villager to have visual armor 2021-04-15 12:04:25 -07:00
Elias Fleckenstein
0c5096db13 Merge pull request 'Fixes for german locales (2021-04-14_locales_german)' (#1564) from n_to/MineClone2:2021-04-14_locales_german into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1564
 2021-04-15 16:18:51 +00:00
NO11
a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00:00
NO11
bbffda3635 Make cactus destroy items 2021-04-15 11:21:15 +00:00
Nils Dagsson Moskopp
2575e20e7e Show preview of new banner pattern when crafting it 2021-04-15 13:25:59 +04:00
epCode
5fe30d7287 Make Zmbs, Husks, Sklys, Strys, and WthrSklys support armor textures. 2021-04-14 16:51:17 -07:00
Benjamin Schötz
bffd032a8b Fixes my own typo ;) 2021-04-14 22:06:03 +02:00
Benjamin Schötz
e4c8ba795a Fixes typos, grammar errors, and some translation flaws in several german translation files. 2021-04-14 22:03:36 +02:00
Elias Fleckenstein
8931ffb7d3 Fix crash with armor enchantments 2021-04-14 20:39:35 +02:00
Elias Fleckenstein
727d7be6ab Call on_equip and on_unequip everytime needed 2021-04-14 20:39:05 +02:00
Elias Fleckenstein
ec6d68322a Make hbarmor work 2021-04-14 20:08:08 +02:00
epCode
18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Elias Fleckenstein
9c75cd1a79 Implement starve damage 2021-04-14 19:09:46 +02:00
Elias Fleckenstein
a3af1cdf6e Implement in_wall damage type 2021-04-14 19:07:58 +02:00
Elias Fleckenstein
4e37cc114c Implement out_of_world damage type 2021-04-14 19:06:30 +02:00
Elias Fleckenstein
5d9bb7cacd Fix armor not actually protecting lol 2021-04-14 19:06:11 +02:00
Elias Fleckenstein
49e7def70a Implement lightning_bolt damage reason 2021-04-14 18:40:41 +02:00
Elias Fleckenstein
ad3defdfb3 Merge branch 'master' into damage 2021-04-14 18:29:42 +02:00
Elias Fleckenstein
c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Elias Fleckenstein
875bb3db84 Use fire-like damage types properly 2021-04-14 17:20:51 +02:00
j1233
46b1762872 credit me 
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
 2021-04-14 14:53:33 +00:00
Elias Fleckenstein
963adfb4e2 Move @Code-Sploit to devs section 2021-04-14 16:37:07 +02:00
Elias Fleckenstein
6d0abb2973 Merge branch 'master' into beta 2021-04-14 16:36:04 +02:00
Elias Fleckenstein
e74838136d Use cactus damage type 2021-04-14 16:27:21 +02:00
Elias Fleckenstein
d0ddd38d4e Merge branch 'master' into damage 2021-04-14 16:14:00 +02:00
Elias Fleckenstein
ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
epCode
5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07:00
epCode
8d22102c66 remove abitrary minetest.chat_send_all( 2021-04-13 16:28:38 -07:00
epCode
a93562a60c Merge pull request 'Add Firework Rocket for elytra boost' (#1551) from NO11/MineClone2:elytra_rocket into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1551
 2021-04-13 23:27:23 +00:00
epCode
399ed85717 Make flying w elytra use pitch and not sneak 2021-04-13 16:14:37 -07:00
jordan4ibanez
67c1bc973a Add lua locals into mcl_dungeons for performance 2021-04-14 01:19:01 +04:00
NO11
1c50f9aed6 fix typo 2021-04-13 20:52:55 +00:00
NO11
f768972469 add rocket texture (pixel perfection) 2021-04-13 20:38:00 +00:00
NO11
9c68528b8b add german translation 2021-04-13 20:36:41 +00:00
NO11
1597e093b5 Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“ 2021-04-13 20:35:40 +00:00
NO11
f15a28109c add rocket for elytra boost 2021-04-13 20:33:34 +00:00
epCode
f498d3ae02 make elytra activate mor MC-like 2021-04-13 11:45:31 -07:00
Code-Sploit
cd0d2d2296 Fix #1548 2021-04-13 13:57:45 +00:00
kay27
3077498a63 Fix screwdriver/door duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149 2021-04-13 16:49:10 +04:00
Code-Sploit
84764389dc Fix #1538 2021-04-13 11:34:53 +00:00
Elias Fleckenstein
78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
Elias Fleckenstein
421ab9f660 Add timeout to static hudbars 2021-04-13 08:42:17 +02:00
Elias Fleckenstein
5ddd1d0193 Merge branch 'master' into beta 2021-04-13 08:33:31 +02:00
Elias Fleckenstein
037832a177 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-13 08:06:28 +02:00
epCode
424685d3d3 Add elytra (sprint in air to use) 2021-04-12 14:56:33 -07:00
Elias Fleckenstein
5028728fbc Merge branch 'master' into faithful 2021-04-12 17:54:20 +02:00
Elias Fleckenstein
6f770bc962 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:54:09 +02:00
Elias Fleckenstein
f540bc2bb1 Merge branch 'master' into beta 2021-04-12 17:31:58 +02:00
Elias Fleckenstein
5fb7913355 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"" 
This reverts commit 615b15f1331d34c1b5c8e339cc025309b13eecca.
 2021-04-12 16:36:08 +02:00
Elias Fleckenstein
d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb480a7ec3fcb1b2dd064cf8b14d2a260.
 2021-04-12 16:34:40 +02:00
Elias Fleckenstein
c3868084af Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc3f0091426cc2b61c9bb19ed8b96846.
 2021-04-12 16:34:25 +02:00
Elias Fleckenstein
0d5933b95e Remove debug printin mcl_mobs 2021-04-12 15:45:00 +02:00
Elias Fleckenstein
615b15f133 Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master" 
This reverts commit 7a8079bb64e02691352001927514bdeed40ce12b, reversing
changes made to 849823af1f4d381f85fe8fed4faa96171c92284a.
 2021-04-12 15:25:31 +02:00
Elias Fleckenstein
ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Elias Fleckenstein
db5626fcb4 Revert "Make hoe dig some blocks faster" 
This reverts commit c1e295de5fbe09c2fa6973f14b48dd73b2405eb3.
 2021-04-12 15:05:01 +02:00
Elias Fleckenstein
523a0c54d6 Localize c_x and c_y in mcl_playerplus 2021-04-12 14:54:14 +02:00
Elias Fleckenstein
b914e088cc Update README files 2021-04-12 14:03:51 +02:00
Elias Fleckenstein
c0a31f0e9c Fix #1535 2021-04-11 17:30:32 +02:00
Elias Fleckenstein
24f8f9166b Fix #1528 2021-04-11 17:29:05 +02:00
Elias Fleckenstein
af044e6a96 Bossbars: Add support for non-mob bosses 2021-04-11 11:15:09 +02:00
Elias Fleckenstein
2313012f60 Fix #1528 2021-04-11 10:41:11 +02:00
epCode
ce49cd02ac make player collision box MUCH closer to MC 2021-04-10 15:41:50 -07:00
kay27
40c733c913 [mobs_mc] Remove goto from enderman.lua 2021-04-11 02:11:14 +04:00
kay27
a76fe2b487 [mcl_mobs] Replace goto to repeat-break-until true in spawning.lua 2021-04-11 02:11:06 +04:00
kay27
b14ca5a843 Revert "[mcl_mobs, mobs_mc] TEMP! Remove goto to run on RasbPI4, Oil_boi free to revert" 
This reverts commit ea41c82834d1664ba29d41adddf532c4d5121250.
 2021-04-11 02:10:27 +04:00
epCode
3ff214ec2d lessen the push strength for players 2021-04-10 15:06:16 -07:00
epCode
f6db31eae3 add criticle and sprint hits. 2021-04-10 14:47:26 -07:00
Elias Fleckenstein
9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02:00
kay27
ea41c82834 [mcl_mobs, mobs_mc] TEMP! Remove goto to run on RasbPI4, Oil_boi free to revert 2021-04-10 20:47:55 +02:00
Elias Fleckenstein
2116b2b9d0 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-10 20:05:09 +02:00
epCode
08b7340ff5 Fix crash with player near unknown object 2021-04-10 10:20:38 -07:00
NO11
cdd12a0c71 Charcoal made from debarked wood 2021-04-10 11:19:51 +00:00
NO11
652f8d48ed Debark wood with an axe 2021-04-09 22:16:52 +00:00
NO11
988f298375 Add stripped wood crafting 2021-04-09 22:13:50 +00:00
NO11
c73cd8b810 Add stripped spruce textures 2021-04-09 22:11:32 +00:00
NO11
ebd4380c98 Add stripped oak textures 2021-04-09 22:10:47 +00:00
NO11
3d732c2412 Add stripped jungle textures 2021-04-09 22:10:10 +00:00
NO11
03e112ef9b Add stripped dark oak textures 2021-04-09 22:09:16 +00:00
NO11
9b81a4d83e Add stripped birch textures 2021-04-09 22:08:39 +00:00
NO11
cbcaef19c6 Add stripped acacia textures 2021-04-09 22:07:44 +00:00
NO11
9e5fb7f533 Add #490 2021-04-09 22:04:42 +00:00
epCode
849823af1f Add player pushing ;) 2021-04-09 14:33:14 -07:00
kay27
d50fd06c82 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce 
This reverts commit f5f6e232cc9e1f6e33810a8b04a8f652fb90091e.
 2021-04-09 19:03:45 +04:00
kay27
3375e903ce [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 18:52:33 +04:00
AFCMS
f5f6e232cc Attemp to fix #1513 2021-04-09 16:46:41 +02:00
Elias Fleckenstein
c6ffccfef5 Add priority to bossbars; display bossbars of closest bosses first 2021-04-09 13:35:58 +02:00
Elias Fleckenstein
cbd2731e06 Improve mcl_bossbars performance 2021-04-09 13:22:45 +02:00
kay27
a733eb8e0c [mesecons] Localise several things in internal.lua 2021-04-09 02:08:03 +04:00
Nils Dagsson Moskopp
7c8cf6f79f Do not crash server if world border is depowered 2021-04-09 01:33:22 +04:00
kay27
f0c2eb86a2 Revert (3/3) "Fix extreme mesecons/redstone crashing at world border" 
This reverts commit 0842a36aa6f4a45a10a3ec1182dedcec1d4aac61.
 2021-04-09 01:32:58 +04:00
kay27
26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash" 
This reverts commit b9d175e6a5d6654b19098c7943a4e14ca8e43eb1.
 2021-04-09 01:32:27 +04:00
kay27
6b31e85385 Revert (1/3) "Revert fixes to crash world border" 
This reverts commit 18f73ba31f3669b49a573fe6cc15050c81fe31db.
 2021-04-09 01:31:21 +04:00
jordan4ibanez
6279f5eb41 test 2021-04-08 23:58:12 +04:00
jordan4ibanez
9789cf5dcd Adjust spawning to be closer and more frequent 2021-04-08 23:58:12 +04:00
jordan4ibanez
26847bbb54 Finish mob limiter 2021-04-08 23:58:12 +04:00
jordan4ibanez
4fca50dead Fix spawn timer reset debug 2021-04-08 23:58:12 +04:00
jordan4ibanez
310dcf9660 Fix forgotten biome check 2021-04-08 23:58:11 +04:00
jordan4ibanez
ba9866db49 merge 2021-04-08 23:58:11 +04:00
jordan4ibanez
282ba2614a merge 2021-04-08 23:58:11 +04:00
jordan4ibanez
26ef8c2674 Fix silverfish typo 2021-04-08 23:58:11 +04:00
jordan4ibanez
f5cc2bab09 Readjust mobs internal settings to not cause insane memory usage 2021-04-08 23:58:11 +04:00
jordan4ibanez
71c50042e6 Fix typo 2021-04-08 23:58:11 +04:00
jordan4ibanez
ae0c235c1f Combine air and ground type spawning into ground 2021-04-08 23:58:11 +04:00
jordan4ibanez
668b67158c merge 2021-04-08 23:58:11 +04:00
jordan4ibanez
c259fc2a28 Add in all biome information to mobs 2021-04-08 23:58:11 +04:00
jordan4ibanez
249a3c8891 Add bats, chicken, and blaze spawn info 2021-04-08 23:58:11 +04:00
jordan4ibanez
34b66acc9d Make reference list copy-pastable 2021-04-08 23:58:11 +04:00
jordan4ibanez
89f35c06af Ignore default or void dimensions 2021-04-08 23:58:11 +04:00
jordan4ibanez
cb093b774c Add biome list 2021-04-08 23:58:10 +04:00
jordan4ibanez
abc68f4dc6 Refactor spawning into it's own file 2021-04-08 23:58:10 +04:00
jordan4ibanez
38dcbcb3d4 Fix mobs colliding with other mobs/players 2021-04-08 23:58:10 +04:00
jordan4ibanez
d65a5e3be0 Fix mobs colliding with objects 2021-04-08 23:58:10 +04:00
kay27
de41a4c26b merge 2021-04-08 23:58:10 +04:00
kay27
5e0bd2281c Revert "Revert "Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master"" 
This reverts commit 6a1a634cba4e0530a4cb72cf319f203f4a770d7f.
 2021-04-08 23:58:10 +04:00
jordan4ibanez
18f73ba31f Revert fixes to crash world border 2021-04-08 15:48:53 -04:00
jordan4ibanez
b9d175e6a5 Add erlehmann fix to redstone world border crash 2021-04-08 15:16:38 -04:00
jordan4ibanez
0842a36aa6 Fix extreme mesecons/redstone crashing at world border 2021-04-08 14:28:07 -04:00
iliekprogrammar
d50665d2d5 Allow kelp stems at half height to be treated like full-sized ones. 
Remove debug information
 2021-04-08 19:25:19 +08:00
iliekprogrammar
5ccb12586d Fix bug where incorrect number of items are dropped. 2021-04-08 13:35:49 +08:00
iliekprogrammar
2db0e176b3 Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 12:46:04 +08:00
kay27
8e30bc8dbd [mcl_portals] Prevent from spawning Nether portals in Undertale when not enough air space in Nether 2021-04-08 02:54:33 +04:00
Elias Fleckenstein
d77affca91 Change max_bossbars default to 4 2021-04-07 17:39:13 +02:00
Elias Fleckenstein
6a1a634cba Revert "Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master" 
This reverts commit 4f2a6b2db001b98abd99e32e531aedc243118161, reversing
changes made to 0970981252e32901b18ce00fa7498507818c0245.
 2021-04-07 17:20:56 +02:00
Elias Fleckenstein
6c35ff1fc5 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 17:02:46 +02:00
Elias Fleckenstein
567f157541 Add a bossbar limit setting 2021-04-07 17:02:03 +02:00
Elias Fleckenstein
f282cd0c4d Allow bossbars to be grouped 2021-04-07 16:56:21 +02:00
Elias Fleckenstein
3449b3eb7c Improve bossbars API 2021-04-07 16:47:14 +02:00
iliekprogrammar
986ae950ec Merge remote-tracking branch 'upstream/master' 2021-04-07 22:30:44 +08:00
iliekprogrammar
61cef21cd1 Add right-to-left statbars, for hunger and air. 2021-04-07 22:26:42 +08:00
TechDudie
db9e8d23d9 Update 'mods/ENTITIES/mobs_mc/creeper.lua' 2021-04-07 17:16:38 +04:00
TechDudie
f664a87dac Update 'mods/ENTITIES/mobs_mc/creeper.lua' 2021-04-07 17:16:38 +04:00
Elias Fleckenstein
6e2a7c8a7e Make gateway enderpearl teleports easier 2021-04-07 13:47:48 +02:00
Elias Fleckenstein
c451866a36 Fix #1426 2021-04-07 09:56:00 +02:00
Elias Fleckenstein
3c1a38904a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 09:25:44 +02:00
Elias Fleckenstein
b2c09c8ba0 Add gateway portals 2021-04-07 09:17:13 +02:00
jordan4ibanez
4f2a6b2db0 Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1487
 2021-04-07 06:40:21 +00:00
jordan4ibanez
ec6eb51726 Massively overhaul spawning algorithm for mobs 2021-04-07 02:39:15 -04:00
jordan4ibanez
6cdf7c98c2 Rework all mobs spawning - preprototype stage 2021-04-07 00:55:57 -04:00
jordan4ibanez
0970981252 Merge pull request 'Adjust enderman projectile behavior, add snowballs to avoidance' (#1485) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1485
 2021-04-07 02:22:44 +00:00
jordan4ibanez
6c4c22e3b9 Adjust enderman projectile behavior, add snowballs to avoidance 2021-04-06 22:22:05 -04:00
jordan4ibanez
9b1cc19718 Merge pull request 'Make mobs not collide with objects to stop weird glitches' (#1484) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1484
 2021-04-07 02:08:39 +00:00
jordan4ibanez
7cecc71b91 Make mobs not collide with objects to stop weird glitches 2021-04-06 22:08:10 -04:00
jordan4ibanez
da057ee9e8 Merge pull request 'Increase unmounting force' (#1483) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1483
 2021-04-07 02:03:25 +00:00
jordan4ibanez
6aaf25bbc9 Increase unmounting force 2021-04-06 22:02:52 -04:00
jordan4ibanez
7826311175 Merge pull request 'Make unmounting a mob less of a jolt' (#1482) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1482
 2021-04-07 02:00:32 +00:00
jordan4ibanez
4a1faa44de Make unmounting a mob less of a jolt 2021-04-06 21:59:51 -04:00
jordan4ibanez
8ab9de74dc Merge pull request 'Add line of sight calculations to the enderman' (#1481) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1481
 2021-04-07 01:30:19 +00:00
jordan4ibanez
acd2b8e691 Add line of sight calculations to the enderman 2021-04-06 21:29:52 -04:00
jordan4ibanez
21334bc49d Merge pull request 'Massive enderman sight check calculation overhaul' (#1480) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1480
 2021-04-07 01:15:40 +00:00
jordan4ibanez
56f94af6ce Massively overhaul enderman sight calculations 2021-04-06 21:13:20 -04:00
jordan4ibanez
9f7899c01a Enderman use vectors to check distance between player and self 2021-04-06 20:37:48 -04:00
jordan4ibanez
4ec3fd0ba6 Merge pull request 'Fix insane enderman 64 node radius check for players' (#1479) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1479
 2021-04-07 00:25:52 +00:00
jordan4ibanez
00db03320b Fix insane enderman 64 node radius check for players 2021-04-06 20:24:46 -04:00
kay27
069e089ae4 [mcl_portals, mcl_structures] Add End gateways W-I-P by Elias Fleckenstein with minor portals improvements and fixes 2021-04-07 03:34:15 +04:00
Elias Fleckenstein
430f958fae Move end exit portal to 0, 0; Add end gateway portals (WIP) 2021-04-06 20:08:20 +02:00
Elias Fleckenstein
f65c40f805 Make dragon egg teleport on punching 2021-04-06 17:20:11 +02:00
Doloment
51f121d516 Merge branch 'master' into ender_chest_fix 2021-04-06 14:57:19 +00:00
jordan4ibanez
9e1b662c03 Merge pull request 'Remove 47 node object check from mobs' (#1473) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1473
 2021-04-06 14:41:03 +00:00
jordan4ibanez
8e2493dd9a Remove 47 node object check from mobs 2021-04-06 10:40:16 -04:00
Elias Fleckenstein
89a9b16465 Merge pull request 'Add End Credits' (#1469) from credits into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1469
 2021-04-06 14:39:47 +00:00
Elias Fleckenstein
ea08fee9ba Make the dragon stay within a 50 blocks range of the portal 2021-04-06 16:38:23 +02:00
Doloment
1e17989ef2 Prevent opening an ender chest while block above it 2021-04-06 21:17:02 +07:00
Elias Fleckenstein
3c73ad3b98 Add ztianyang to credits 2021-04-06 16:06:44 +02:00
Elias Fleckenstein
91e2372df0 Merge branch 'master' into credits 2021-04-06 16:06:12 +02:00
Elias Fleckenstein
058c6ef9f4 Merge pull request 'Fix chest entity textures' (#1472) from Doloment/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1472
 2021-04-06 14:03:30 +00:00
Elias Fleckenstein
38a12e59da Fix comment indentation in wieldview 2021-04-06 16:02:18 +02:00
Elias Fleckenstein
1d587b8895 Fix crash in wieldview 2021-04-06 15:59:59 +02:00
Elias Fleckenstein
83b9cf3ad2 End exit portal openng / closing on dragon death / spawn 2021-04-06 15:48:17 +02:00
Doloment
31a7a4fbb6 Merge branch 'master' into master 2021-04-06 13:42:07 +00:00
Elias Fleckenstein
962a13847e Fix dragons summoned using commands spawning an egg on the exit portal 2021-04-06 14:57:29 +02:00
Elias Fleckenstein
f350fa6272 Add bossbars 2021-04-06 14:50:34 +02:00
Doloment
055c406d7a Fix chest entity textures (trapped chests were lighter) 2021-04-06 18:57:06 +07:00
Elias Fleckenstein
a348909ba3 Enderdragon: Proper Egg and XP spawning 2021-04-06 12:50:36 +02:00
Elias Fleckenstein
5bdb3bc274 Add MineClone5 section to credits 2021-04-06 12:14:43 +02:00
Elias Fleckenstein
ba15f01ca9 Add translations; Duplicate listing of people 2021-04-06 12:08:25 +02:00
Elias Fleckenstein
c93a865098 Remove empty line from mcl_portals 2021-04-06 11:59:22 +02:00
Elias Fleckenstein
d07e415b37 Add credits screen 2021-04-06 11:55:21 +02:00
Elias Fleckenstein
175cb44fb1 Merge branch 'master' into credits 2021-04-06 10:53:15 +02:00
AFCMS
91da727184 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-05 15:22:57 +02:00
AFCMS
339e3e2792 fix some tools not using right var 2021-04-05 14:32:48 +02:00
kay27
beb2484224 Merge https://git.minetest.land/MineClone2/MineClone2/pulls/1366 2021-04-05 13:50:26 +04:00
AFCMS
28402ca663 store tool wield scale in a global var 2021-04-05 10:16:56 +02:00
Elias Fleckenstein
e407ad2254 Fix #1447 2021-04-05 09:25:03 +02:00
Elias Fleckenstein
b1c4476a04 Merge pull request 'Add End main island generation' (#1459) from end_main_island into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1459
 2021-04-05 07:02:48 +00:00
kay27
b1f27dba6a Merge pull request 'Make horse taming more similar to minecraft (#1249)' (#1460) from slaesvuo/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1460
 2021-04-05 01:00:17 +00:00
ztianyang
1e1d31b57b Merge branch 'master' into master 2021-04-04 23:57:20 +00:00
epCode
a6f0ad13a0 Make blaze burning better 2021-04-04 16:46:44 -07:00
epCode
93684baa86 Make Blazes have more Mc-likeness ;) 2021-04-04 16:32:58 -07:00
Tianyang Zhang
8bb8a0e3b2 Fix large and small slimes and magma cubes not dropping xp and loot 2021-04-04 15:40:10 -07:00
Saku Laesvuori
c5e1734c1c Make horse taming more similar to minecraft (#1249) 
In minecraft horses are tamed by trying to ride them and they can also
be fed to speed up taming. This commit implements both of those
features and disables the old and broken taming system for horses.
 2021-04-04 23:24:28 +03:00
Elias Fleckenstein
90f312f772 Add credits overlay prototype 2021-04-04 19:13:46 +02:00
Elias Fleckenstein
1144006cdd Add End main island generation 2021-04-04 15:16:06 +02:00
kay27
f54f4ebcf9 Merge pull request 'Fix passive mobs despawning' (#1458) from slaesvuo/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1458
 2021-04-04 10:18:36 +00:00
Elias Fleckenstein
598692cf8c Add nil check to prevent crashes with mcl_throwing 2021-04-04 12:10:21 +02:00
Elias Fleckenstein
ff538d51bd Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-04 12:01:59 +02:00
Elias Fleckenstein
49446bbb7b Make enderdragon spawn upon exit portal generation 2021-04-04 12:01:45 +02:00
Saku Laesvuori
4a085c9526 Fix passive mobs despawning 
According to the wiki most passive mobs do not despawn. The ones that do
have already been explicity marked as despawning.

<https://minecraft.fandom.com/wiki/Spawn#Despawning>
<https://minecraft.fandom.com/wiki/Mob#Despawning>
 2021-04-04 09:15:25 +03:00
epCode
ac87e0604e make ghast firing more MC-like 2021-04-03 18:39:20 -07:00
jordan4ibanez
f8229def5e Merge pull request 'Fix locationless playing when picking up items' (#1457) from jordan4ibanez/MineClone2-PopSounds:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1457
 2021-04-04 01:10:19 +00:00
jordan4ibanez
90fd65ac66 Fix locationless playing 2021-04-03 21:09:43 -04:00
epCode
40b07e466b make ghast fireballs deflectible 2021-04-03 18:07:51 -07:00
jordan4ibanez
1b511936f5 Fix local name memory leak 2021-04-03 21:05:31 -04:00
jordan4ibanez
a807ee6372 Adjust the volume even more to perfectly match the gameplay 2021-04-03 20:55:46 -04:00
jordan4ibanez
0641f09915 Adjust volume of item collection sound 2021-04-03 20:53:34 -04:00
jordan4ibanez
c572db92aa Add sound buffer and different item collection sound 2021-04-03 20:39:08 -04:00
jordan4ibanez
844db8aa7b Revert to previous style of interpolated move_to with tweaks 2021-04-02 22:02:19 -04:00
jordan4ibanez
0840ad98a2 Adjust the item collection magnet even more 2021-04-02 21:57:38 -04:00
jordan4ibanez
1cbd3a998d Use manual move_to to account for move_to interpolation issues 2021-04-02 21:50:47 -04:00
jordan4ibanez
61e812e40a Add in manual interpolation into the item magnet 2021-04-02 21:40:04 -04:00
jordan4ibanez
18d7be4a4f More fixes to item collection on laggy servers 2021-04-03 00:42:20 -04:00
AFCMS
b68c4b07c1 tweak hudbars 2021-04-02 17:20:19 +02:00
AFCMS
ca01b3641b make endermen not teleport everytime when hitted 2021-04-02 15:04:21 +02:00
AFCMS
0db47dbf02 Merge branch 'remove-alpha-field' 2021-04-02 14:43:08 +02:00
AFCMS
59d687c579 fix API.md 2021-04-02 14:30:46 +02:00
AFCMS
c457c4ce3c fix undeacleared vars in mcl_fishing 2021-04-02 14:28:43 +02:00
AFCMS
ead33e3520 fix undeacleared vars in mcl_throwing 2021-04-02 14:27:35 +02:00
AFCMS
e20e0fab71 remobe backward compatibility for portals 2021-04-02 14:16:14 +02:00
AFCMS
695ad9120b remove backward compatibility for water 2021-04-02 14:12:44 +02:00
NO11
39aaf0f21f Fix #1391 2021-04-02 11:09:45 +00:00
AFCMS
cbc1052f6b Merge branch 'master' into doc-refactoring 2021-04-02 10:27:22 +02:00
jordan4ibanez
1e3676c391 Remove debug info from item magnet 2021-04-02 05:38:53 +00:00
jordan4ibanez
2f272b3dff Fix item drop on laggy servers 2021-04-01 23:48:00 -04:00
epCode
0dbe66f3b4 make mob drops similar to MC 2021-04-01 14:12:07 -07:00
AFCMS
15803fddc2 Merge branch 'master' into doc-refactoring 2021-03-31 20:33:37 +02:00
epCode
5356e97b77 fix copy/pasted arrow texture to pixel-perfection 2021-03-31 11:23:59 -07:00
AFCMS
626990adeb Merge branch 'master' into doc-refactoring 2021-03-31 16:15:34 +02:00
iliekprogrammar
9885f36c62 Fix missing age metadata and timer initialization in on_place. 2021-03-31 19:27:57 +08:00
iliekprogrammar
bfff643ff4 Allow age to override during initialization. 2021-03-31 17:38:38 +08:00
iliekprogrammar
ccea673dcc Fix updating age metadata. Remove kelp.lock_drop. 2021-03-31 17:31:28 +08:00
iliekprogrammar
08e280d9b4 Comment out debug stuff 2021-03-31 14:17:50 +08:00
iliekprogrammar
52c788f197 Merge branch 'master' into kelp 2021-03-31 13:59:27 +08:00
iliekprogrammar
089d6aa5c8 Add dug sounds to kelp when unsubmerged 2021-03-31 13:55:07 +08:00
iliekprogrammar
9518086b6b Kelp store age metadata by bulk on a queue, improve API, etc. 
Highlights:
- Implement storing age metadata by bulk on a queue, with maximum interval and queue length.
- "Flexible" initial growth probability. Will provide helper APIs.
- Fix various bugs with unsubmerged kelp detection, submerged tip detection, age metadata.
- Various optimizations.
 2021-03-31 13:41:52 +08:00
AFCMS
0740854b5d Merge branch 'master' into doc-refactoring 2021-03-30 22:28:48 +02:00
epCode
86b63c8bc4 Make player model easier to use 2021-03-30 13:26:46 -07:00
epCode
38e4e7293a fix female player anim XD 2021-03-30 10:29:46 -07:00
epCode
97424f7d0a Fix #1414 2021-03-30 10:24:39 -07:00
epCode
a14959ac70 add player death animation and particles 2021-03-30 09:53:55 -07:00
AFCMS
3b8916ef65 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-03-30 15:48:18 +02:00
AFCMS
a040355dce Revert "Revert "Revert "improve wieldview API (!)""" 
This reverts commit d4e0d4d1c107d4c0ce6b6093ccac7cfe44c169ae.
 2021-03-30 01:00:51 +02:00
AFCMS
d4e0d4d1c1 Revert "Revert "improve wieldview API (!)"" 
This reverts commit 613779a851049feb4fa8bc067490cdba45c12962.
 2021-03-30 01:00:17 +02:00
AFCMS
c35dab1d08 try to fix crash 2021-03-30 00:59:52 +02:00
AFCMS
613779a851 Revert "improve wieldview API (!)" 
This reverts commit 600e8bede231906cecf7dbb00e7675df465b2a67.
 2021-03-30 00:59:00 +02:00
AFCMS
59c13b6df8 Revert "Revert "remove hard depend to mcl_wip in mcl_minecarts"" 
This reverts commit 857a0c55658a316c7adf64815218c36fe6da12e4.
 2021-03-30 00:58:45 +02:00
AFCMS
857a0c5565 Revert "remove hard depend to mcl_wip in mcl_minecarts" 
This reverts commit 369c8b9b8aed6af23f6e41c7861a55345568b9b1.
 2021-03-30 00:58:36 +02:00
AFCMS
41a8cd0e15 Revert "Revert "remove hard depend to mcl_wip in mcl_minecarts"" 
This reverts commit 7a5c2d617b2af0993965bc1b0be11e3e37b6489d.
 2021-03-30 00:58:02 +02:00
AFCMS
7a5c2d617b Revert "remove hard depend to mcl_wip in mcl_minecarts" 
This reverts commit 369c8b9b8aed6af23f6e41c7861a55345568b9b1.
 2021-03-30 00:57:46 +02:00
AFCMS
369c8b9b8a remove hard depend to mcl_wip in mcl_minecarts 2021-03-30 00:54:58 +02:00
AFCMS
7ec7012572 fix indentation 2021-03-30 00:50:58 +02:00
AFCMS
c70ea7c843 fix crash :-/ 
I am stupid
 2021-03-30 00:49:54 +02:00
AFCMS
f60941003d fix the stupidiest typo ever :-/ 2021-03-30 00:49:05 +02:00
AFCMS
3a514ecdad remove duplicated code 2021-03-30 00:44:38 +02:00
AFCMS
600e8bede2 improve wieldview API (!) 
to support transform registration without groups
this will make detaching screwdriver from mcl more easy
 2021-03-30 00:35:29 +02:00
AFCMS
84819bf9f5 MAKE EVERY SINGLE MOD USE PROPER COLORS!!! 2021-03-30 00:01:29 +02:00
AFCMS
f8a627915e use proper colors in mcl_books 2021-03-29 22:57:05 +02:00
AFCMS
a2fcd28a3d use proper colors in mcl_skins 2021-03-29 22:23:00 +02:00
AFCMS
f51deb0737 use propers colors in mcl_jukebox 2021-03-29 22:21:14 +02:00
epCode
5a7d128861 Add wither functions from MC 2021-03-29 11:29:39 -07:00
ArTee3
1b9737b431 Prevent beds from appearing and disappearing if they cannot be placed, fix #1419 2021-03-29 18:19:46 +02:00
iliekprogrammar
ecdbc30b63 Overhaul kelp interactions. 
Highlights:
- Added locking system to drops. Will be removed after testing.
- Expose more variables and functions. Will be finalized soon.
- Implement MC-like age and natural growth mechanics.
- Implement correct piston interactions with kelp and its surface.
- Implement correct falling node interactions for its surface.
- ABMs are now nonfunction. Will be fixed.
- Various optimizations and fixes.
 2021-03-29 14:09:09 +08:00
kay27
d1a0299b92 [mcl_dungeons] Remove empty code section, add debug info 2021-03-29 03:34:41 +04:00
kay27
80d845adb6 [mcl_mapgen_core] Fix Nether generation chain reaction 2021-03-29 03:18:17 +04:00
kay27
2e3a5efaf9 [mcl_spawn] Ignore 'ignore' nodes when checking the point, fix https://git.minetest.land/MineClone2/MineClone2/issues/1230 2021-03-29 03:08:21 +04:00
kay27
b587b1f2a5 [mcl_spawn] Cleanup 2021-03-29 02:48:45 +04:00
kay27
1818fcf592 [mcl_mapgen_core] Remove water from End, fix https://git.minetest.land/MineClone2/MineClone2/issues/1394 2021-03-29 02:43:08 +04:00
kay27
bbd52043f1 [mcl_portals] Make '/spawnstruct nether_portal' chat command work in obsidian nodes (immediate destruction triggered) 2021-03-29 02:17:32 +04:00
kay27
05260d03d5 [mcl_portals] Fix crash on access empty index trying to find portal after its destruction 2021-03-29 01:33:01 +04:00
kay27
cb2aae5a55 [mcl_mapgen_core] Redesign, mostly to remove water from End and restore static lvm_buffer to speed it up 2021-03-28 22:57:11 +04:00
AFCMS
d07cf64d11 Merge pull request 'mcl_death_drop refactoring' (#1415) from mcl-death-drop-refactoring into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1415
 2021-03-28 18:13:57 +00:00
AFCMS
5a4355b859 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-03-28 19:44:43 +02:00
kay27
628ca226a6 [mcl_portals] Additionally index source Nether portals from 0.71 and earlier before teleporting, to make possible returning through them 2021-03-28 20:36:35 +04:00
iliekprogrammar
24da94ec3b Disable ABMs in favor of nodetimers to check if kelp is unsubmerged. 2021-03-28 20:29:29 +08:00
iliekprogrammar
e76a0ba6e8 Added kelp API and additional refactorings. 
WIP: register nodetimers for kelp
 2021-03-28 14:51:21 +08:00
AFCMS
c7389dc0a4 add basic API to mcl_item_entity 2021-03-28 08:13:24 +02:00
AFCMS
890a569b13 add API documentation to mcl_worlds 2021-03-28 07:40:36 +02:00
kay27
54e7529754 [mcl_achievements] Add mcl:stoneAge, mcl:hotStuff, mcl:obsidian 2021-03-28 04:32:57 +04:00
AFCMS
cdb67d96a6 add API documentation to mcl_explosions 2021-03-28 01:00:18 +01:00
AFCMS
6f9c1856b8 add API documentation to mcl_colors (!) 2021-03-28 00:48:24 +01:00
AFCMS
e56d9d2ab8 add API documentation to controls 2021-03-28 00:44:36 +01:00
AFCMS
52939ff6a4 add API documentation to flowlib (part 5) 2021-03-28 00:32:52 +01:00
AFCMS
39ac3f208d add API documentation to flowlib (part 4) 2021-03-28 00:25:54 +01:00
AFCMS
2a5dcd1634 add API documentation to flowlib (part 3) 2021-03-28 00:23:57 +01:00
AFCMS
19db2a479f add API documentation to flowlib (part 2) 2021-03-28 00:18:19 +01:00
AFCMS
fb50b256ed add API documentation to flowlib (part 1) 2021-03-28 00:12:41 +01:00
AFCMS
ce123d4676 add API documentation to mcl_autogroup 2021-03-28 00:02:35 +01:00
AFCMS
57ce5143b9 Clarify API documentation 2021-03-27 23:39:22 +01:00
AFCMS
3ba7a40251 Add API documentation 2021-03-27 23:07:46 +01:00
AFCMS
6a6b5970b3 fix API 2021-03-27 20:23:51 +01:00
AFCMS
30e50a64ef basic API (WIP) 2021-03-27 20:12:48 +01:00
AFCMS
cb294a5cad Add documentation to mcl_wip (pretty useless...) 2021-03-27 15:27:34 +01:00
AFCMS
9bb5e748b9 Add documentation to mcl_crafting_table API 2021-03-27 15:20:01 +01:00
AFCMS
61c9d065fb Fix  #1400 2021-03-27 07:19:35 +01:00
AFCMS
e2fd0823b9 Fix #1398 2021-03-27 07:10:50 +01:00
AFCMS
e2adead700 use proper colors 2021-03-26 22:50:37 +01:00
AFCMS
e11941c107 Add API documentation for mcl_throwing 2021-03-26 22:43:18 +01:00
AFCMS
e3c99c5be2 add basic API to mcl_throwing 
remove hard depends to mcl_fishing
 2021-03-26 22:31:15 +01:00
AFCMS
202e30a782 Add API to mcl_tmp_message 2021-03-26 21:37:10 +01:00
AFCMS
8c002671c0 make helmet protect from falling anvils 2021-03-26 18:24:08 +01:00
AFCMS
9c8ec7d4ec Merge branch 'master' into anvil-entity-damage 2021-03-26 17:40:55 +01:00
Elias Fleckenstein
0372057fe3 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-03-26 17:51:16 +01:00
Elias Fleckenstein
6f8d0d4de0 Fix #1375 2021-03-26 17:51:13 +01:00
AFCMS
041300cde4 remove unuseful code 2021-03-26 17:39:25 +01:00
AFCMS
88fc515cff make mobs take damage of falling anvils 2021-03-26 17:38:25 +01:00
AFCMS
01eba30058 Fix #1234 2021-03-26 14:32:08 +01:00
AFCMS
35b2bd72f8 Merge pull request 'Add a server setting to disable command blocks usage' (#1381) from command-block-setting into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1381
 2021-03-26 10:54:53 +00:00
AFCMS
41768e95a1 fix 2021-03-26 11:50:14 +01:00
AFCMS
c0308c7c08 fix weird death message (#1378) 2021-03-26 11:49:41 +01:00
AFCMS
50c35ff5e8 Merge branch 'master' into command-block-setting 2021-03-26 10:06:18 +00:00
AFCMS
53d7134437 remove unuseful spamming messages 2021-03-26 10:00:48 +01:00
AFCMS
78bad87a72 fix transation 2021-03-26 09:59:58 +01:00
AFCMS
0e5bbd6d3d fix msg to be mc like 
https://www.digminecraft.com/game_commands/enable_command_blocks.php
 2021-03-26 09:57:28 +01:00
kay27
25f6a9ee23 [mcl_core] Set obsidian.is_ground_content to false, see https://git.minetest.land/MineClone2/MineClone2/issues/1372 2021-03-26 09:29:05 +04:00
AFCMS
8258dae1b8 setting working 2021-03-25 22:13:37 +01:00
AFCMS
e4a6244fdd add basic setting 2021-03-25 22:07:38 +01:00
AFCMS
b9301f12ce Update mod.conf 2021-03-25 21:59:21 +01:00
AFCMS
86a18802dc use proper colors 2021-03-25 21:57:07 +01:00
Elias Fleckenstein
97991d138c Revert "Do a secre thing even more secret then the secret thing of secret" 
This reverts commit 630e7e8acb517a06aec56cad1839e05728e6f7a4.
 2021-03-25 17:34:03 +01:00
Code-Sploit
630e7e8acb Do a secre thing even more secret then the secret thing of secret 2021-03-25 16:20:02 +00:00
Elias Fleckenstein
d555fce8bc Bruh. kay27 has 20 times more commits than you. 
This reverts commit 322578df6a9c1aff193bd41eeeaa7c387c66d737.
 2021-03-25 17:29:15 +01:00
Code-Sploit
322578df6a Something even more secret! 2021-03-25 16:03:54 +00:00
epCode
dbc6dd8cb3 Add villager sounds 2021-03-25 08:52:32 -07:00
Elias Fleckenstein
46c6328432 Something secret :P 2021-03-25 09:24:38 +01:00
Elias Fleckenstein
43a60e0c57 Fix #1357 2021-03-24 09:00:31 +01:00
Elias Fleckenstein
a47eda44e9 Slimes can burn 2021-03-24 08:54:23 +01:00
Elias Fleckenstein
fe937665f9 Fix #1336 2021-03-24 08:27:31 +01:00
kay27
6addb7db18 Merge pull request 'Move item renaming to tt to fix enchanted named items' (#1364) from BlueBlancmanche/MineClone2:anvil-fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1364
 2021-03-24 05:09:54 +00:00
Elias Åström
0d7c2c4988 Fix #1358 for real 2021-03-23 12:02:00 +01:00
kay27
3e58e989a1 [mcl_portals] Support Nether portals from 0.71 and earlier 2021-03-23 03:19:17 +04:00
kay27
06280e3bba [mcl_portals] Generate target map chunks on portal creation 2021-03-23 03:17:23 +04:00
Blue Blancmange
44c4999b37 Move item renaming to tt. This allows additional information such as enchantments to be displayed on named items 2021-03-22 23:02:11 +00:00
ArTee3
910c9083e5 Fix player speed on soul sand, https://git.minetest.land/MineClone2/MineClone2/issues/1356 2021-03-22 21:55:57 +01:00
kay27
66a64439c6 [mcl_weather] Fix crash on saving uninitialized data, https://git.minetest.land/MineClone2/MineClone2/issues/1361 2021-03-22 17:31:24 +04:00