3205 Commits

Author SHA1 Message Date
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
Elias Fleckenstein
a2c3eb95bb Merge branch 'master' into damage 2021-04-18 19:51:46 +02:00
NO11
9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Elias Fleckenstein
1cf53caa7a Update armor stand entity in on_activate callback, remove debug print 2021-04-18 16:20:32 +02:00
Elias Fleckenstein
d1198e8d74 Register elytra texture 2021-04-18 16:19:12 +02:00
Elias Fleckenstein
4f0bb444fe Integrate armor stand 2021-04-18 16:03:23 +02:00
Elias Fleckenstein
f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02: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
AFCMS
4aa6421faf performance optimisation 2021-04-18 00:27:51 +02: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
Elias Fleckenstein
bbd115fde0 Update armor stand 2021-04-17 18:39:38 +02:00
Elias Fleckenstein
7c7af7d664 Merge branch 'master' into damage 2021-04-17 18:39:00 +02:00
Elias Fleckenstein
8e37b51cac Equip mob heads with rightclick 2021-04-17 14:07:47 +02:00
Elias Fleckenstein
6724a8d0ed Fix crash in damage handler 2021-04-17 13:59:46 +02:00
NO11
06699c2cc4 Fix that an ax wears out if you right-click another block 2021-04-17 11:55:50 +00:00
Elias Fleckenstein
6bbea11fb8 Fix crash with mcl_heads 2021-04-17 13:53:41 +02:00
Elias Fleckenstein
c7c47c1ca7 Increase mob_view_range_factor performance 2021-04-17 13:49:40 +02:00
Elias Fleckenstein
ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02: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
5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +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