Commit graph

3084 commits

Author SHA1 Message Date
NO11
aa533edda2 Simplify debarking 2021-04-18 18:28:39 +00:00
NO11
49f6ccaa4a Remove old crafting recipes 2021-04-18 18:02:41 +00:00
NO11
3668b2dee6 Summarize all debarked types of wood 2021-04-18 18:02:37 +00:00
NO11
9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Doloment
956dab78ce Added LBM 2021-04-18 09:50:02 +00:00
Elias Åström
fc9928c0b6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 11:42:38 +02:00
Elias Åström
573b1dc44b Do not include unnecessary tool_capabilities
This commit makes enchanted tools which have no use for
tool_capabilities to not include it in their metadata.  It does this by
not including tool_capabilities in the metadata of an enchanted tool if
at least one of two cases is true:

(1) The tool is not enchanted with unbreaking or efficiency
(2) The tool does not have tool_capabilities defined in its definition

The first case covers situations like having a pickaxe only being
enchanted with silk_touch.  The second case covers situations like a
piece of armor being enchanted with unbreaking.
2021-04-18 11:40:43 +02:00
Elias Åström
dd69dcfd9f Fix efficiency and unbreaking not working together
This commit fixes an issue were tools enchanted with both efficiency and
unbreaking would loose the effect of one of the enchantments in some
conditions.
2021-04-18 11:40:13 +02:00
kay27
bb902caa57 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-18 04:29:59 +04:00
kay27
11b66e83a2 [mcl_portals] Better NP search, no more teleports on the roof, fix https://git.minetest.land/MineClone2/MineClone2/issues/1560 2021-04-18 04:29:30 +04:00
Elias Fleckenstein
811efcf9f3 Merge branch 'master' into mineclone5 2021-04-17 20:32:30 +02:00
Elias Fleckenstein
205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02:00
kay27
ff07ee5d93 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-17 21:02:07 +04:00
NO11
06699c2cc4 Fix that an ax wears out if you right-click another block 2021-04-17 11:55:50 +00:00
AFCMS
02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
Elias Fleckenstein
61f3b4c69e Fix merge conflict with mcl_smithing_table 2021-04-16 16:03:56 +02:00
Code-Sploit
77a645102b Git being weird 2021-04-16 14:01:15 +00:00
Code-Sploit
180d1f1140 Add first try of code for smithing table (Thanks to Fleckenstein), add _mcl_upgradable and _mcl_upgrade_item to every diamond tool/armor piece 2021-04-16 14:00:14 +00:00
AFCMS
742aa2becb fix inventory not initialised 2021-04-16 14:01:08 +02:00
AFCMS
6397b1349b fix crash 2021-04-16 13:51:57 +02:00
Code-Sploit
39ce3592e6 Merge branch 'netherite' of https://git.minetest.land/MineClone2/MineClone2 into netherite 2021-04-16 11:48:58 +00:00
Code-Sploit
9b5d9091d4 Remove some files 2021-04-16 11:47:54 +00:00
Code-Sploit
99fc209bf2 Add smithing table W.I.P 2021-04-16 11:47:21 +00: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
ebf1f1d96b Merge branch 'mineclone5' into netherite 2021-04-16 12:40:10 +02:00
Elias Fleckenstein
fbee510b42 Merge branch 'master' into mineclone5 2021-04-16 12:17:55 +02:00
Elias Fleckenstein
020c793762 Merge branch 'master' into netherite 2021-04-16 12:17:39 +02:00
Elias Fleckenstein
3b10e3bd0d Merge branch 'master' into netherite 2021-04-16 12:17:14 +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
Code-Sploit
e7f36ec7d2 Add crafting recipe for netheriteblock & make netheriteblock convertable to ingots. 2021-04-16 06:19:14 +00:00
epCode
31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -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
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
Code-Sploit
ab16690469 Add correct speeds for netherite shovel, pickaxe and axe 2021-04-15 16:07:19 +00:00
Code-Sploit
a792516851 Add netherite block 2021-04-15 15:47:15 +00:00
Code-Sploit
b0d33faec4 Add netheriteblock 2021-04-15 15:45:48 +00:00
NO11
a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00:00
kay27
93429549b8 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-15 15:50:38 +04: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
Code-Sploit
77657359c2 Set correct armor_points value for netherite_boots 2021-04-15 08:31:16 +00: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
epCode
18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Elias Fleckenstein
7f28f4a9d1 Merge branch 'master' into mineclone5 2021-04-14 18:16:24 +02:00
Elias Fleckenstein
c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Code-Sploit
d3dd6559a2 Add correct durability for netherite sword 2021-04-14 13:12:44 +00:00
Code-Sploit
464216ea0a Fix crash in netherite hoe by adding netherite to uses{} 2021-04-14 13:10:07 +00:00
Code-Sploit
5c9a78bea7 Add netherite hoe texture 2021-04-14 13:08:31 +00:00
Code-Sploit
7d22906f34 Add netherite tools 2021-04-14 13:07:25 +00:00
Code-Sploit
1247bcc039 Add: Netherite scrap, Netherite ingot. Add crafting recipe for netherite ingot. 2021-04-14 12:35:15 +00:00
Code-Sploit
93df51b223 Add ancient debris 2021-04-14 12:20:53 +00:00
Code-Sploit
7e7a635ed0 Add correct durability for netherite armor 2021-04-14 11:57:46 +00:00
Code-Sploit
35d2ef52c1 Add correct textures for netherite armor 2021-04-14 11:54:42 +00:00
Code-Sploit
a3ef3737d5 Remove invalid placed texture images 2021-04-14 11:52:23 +00:00
Code-Sploit
e1236d7547 Add second part of netherite armor textures 2021-04-14 11:46:34 +00:00
Code-Sploit
7a6929f4cb Add first part of netherite armor textures 2021-04-14 11:44:50 +00:00
Code-Sploit
bc23cd800e Add code for netherite armor 2021-04-14 11:42:28 +00:00
epCode
5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07:00
kay27
7fa0767b13 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-14 01:18:34 +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
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
Elias Fleckenstein
b340a3586d Make mcl_backstone use the new mcl_torches API for soul torches instead of overwriting it 2021-04-13 10:05:22 +02:00
Elias Fleckenstein
78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
Elias Fleckenstein
944a6325d0 Rewrite mcl_torches API 2021-04-13 09:59:32 +02:00
Elias Fleckenstein
89c4720de1 Fix warning with leafdecay_distance 2021-04-13 08:53:22 +02:00
Elias Fleckenstein
9ce4cd1281 Fix fire_enabled warning 2021-04-13 08:50:50 +02:00
Elias Fleckenstein
fe5a8737b8 Fix light_source warning in mcl_mushroom 2021-04-13 08:49:57 +02:00
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