Commit graph

6265 commits

Author SHA1 Message Date
Elias Fleckenstein
8cede8a5a3 Merge branch 'master' into mineclone5 2021-04-12 17:54:32 +02:00
Elias Fleckenstein
6f770bc962 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:54:09 +02:00
Elias Fleckenstein
d3d9351bac Merge branch 'master' into mineclone5 2021-04-12 15:45:16 +02:00
Elias Fleckenstein
0d5933b95e Remove debug printin mcl_mobs 2021-04-12 15:45:00 +02:00
Elias Fleckenstein
bb16512842 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master""
This reverts commit 615b15f133.
2021-04-12 15:28:28 +02:00
Elias Fleckenstein
06e8e8f463 Merge branch 'master' into mineclone5 2021-04-12 15:28:00 +02:00
Elias Fleckenstein
615b15f133 Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"
This reverts commit 7a8079bb64, reversing
changes made to 849823af1f.
2021-04-12 15:25:31 +02:00
Elias Fleckenstein
1ca95f9495 Revert "Fix crash with removed hoey diggroup"
This reverts commit ed7099fefc.
2021-04-12 15:19:36 +02:00
Elias Fleckenstein
9da82d44c5 Merge branch 'master' into mineclone5 2021-04-12 15:19:04 +02:00
Elias Fleckenstein
ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Elias Fleckenstein
7995ff0527 Revert "Revert "Make hoe dig some blocks faster""
This reverts commit db5626fcb4.
2021-04-12 15:09:48 +02:00
Elias Fleckenstein
8b5be69332 Merge branch 'master' into mineclone5 2021-04-12 15:06:49 +02:00
Elias Fleckenstein
db5626fcb4 Revert "Make hoe dig some blocks faster"
This reverts commit c1e295de5f.
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
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
4a3078f04b [mobs] Merge repeat/break/until instead of goto from master 2021-04-11 02:16:09 +04: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 ea41c82834.
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
kay27
647b5c1e8a [mcl_mobs, mobs_mc] TEMP! Remove goto to run on RasbPI4, Oil_boi free to revert 2021-04-10 21:15:04 +04:00
kay27
9e15c6f168 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-10 20:01:17 +04:00
kay27
7a8079bb64 Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1515
2021-04-10 12:21:19 +00: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
kay27
686fd5f844 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-10 02:12:13 +04: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
3addd4ebb1 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce
This reverts commit f5f6e232cc.
2021-04-09 19:06:11 +04:00
kay27
1cb060ea08 [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 19:06:11 +04:00
AFCMS
d2c65f14a3 Attemp to fix #1513 2021-04-09 19:06:11 +04:00
kay27
d50fd06c82 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce
This reverts commit f5f6e232cc.
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