Commit graph

2956 commits

Author SHA1 Message Date
Elias Fleckenstein
e1ccdef42a Merge branch 'master' into mineclone5 2021-04-13 08:22:39 +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
5fb7913355 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master""
This reverts commit 615b15f133.
2021-04-12 16:36:08 +02:00
Elias Fleckenstein
d3a3253563 Revert "Revert "Make hoe dig some blocks faster""
This reverts commit db5626fcb4.
2021-04-12 16:34:40 +02:00
Elias Fleckenstein
c3868084af Revert "Fix crash with removed hoey diggroup"
This reverts commit ed7099fefc.
2021-04-12 16:34:25 +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
kay27
4a3078f04b [mobs] Merge repeat/break/until instead of goto from master 2021-04-11 02:16:09 +04:00
Elias Fleckenstein
9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02:00
kay27
9e15c6f168 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-10 20:01:17 +04: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
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
kay27
bc16c33dde Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-09 02:15:15 +04: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 0842a36aa6.
2021-04-09 01:32:58 +04:00
kay27
26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash"
This reverts commit b9d175e6a5.
2021-04-09 01:32:27 +04:00
kay27
6b31e85385 Revert (1/3) "Revert fixes to crash world border"
This reverts commit 18f73ba31f.
2021-04-09 01:31:21 +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
kay27
871ad8d8d9 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-08 23:07:31 +04:00
jordan4ibanez
0842a36aa6 Fix extreme mesecons/redstone crashing at world border 2021-04-08 14:28:07 -04:00
iliekprogrammar
bfc1f253af Allow kelp stems at half height to be treated like full-sized ones.
Remove debug information
2021-04-08 20:22:09 +04:00
iliekprogrammar
ce66d99504 Fix bug where incorrect number of items are dropped. 2021-04-08 20:22:09 +04:00
iliekprogrammar
70d1aba73e Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 20:22:08 +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