1
0
Fork 0
Commit Graph

6430 Commits

Author SHA1 Message Date
Code-Sploit 24cc4318e2 Add crafting recipe for smithing table 2021-04-22 12:11:47 +00:00
Code-Sploit 498b1c792a Fix not able to put diamond tools in the smithing_table 2021-04-22 12:07:30 +00:00
Lizzy Fleckenstein 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
Lizzy Fleckenstein 1bf9455065 Merge branch 'master' into mineclone5 2021-04-19 11:12:21 +02:00
NO11 0c5ca70187 remove wrong config 2021-04-19 07:35:53 +00:00
Elias Fleckenstein ec1ef1affa Merge pull request 'Fix #1422' (#1474) from Doloment/MineClone2:ender_chest_fix into master
Reviewed-on: MineClone2/MineClone2#1474
2021-04-19 07:25:57 +00:00
kay27 e2d3f2a194 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-19 09:58:55 +04:00
jordan4ibanez c03717139b Add mod.conf to mcl_fireworks 2021-04-18 23:23:07 -04:00
jordan4ibanez 44a25de12f Fix crashing with unknown slot description when enchanting 2021-04-18 23:18:18 -04:00
kay27 96694692d8 [mineclone5] Put ITEMS/mcl_core/nodes_trees.lua from master 2021-04-19 00:15:20 +04:00
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
Lizzy Fleckenstein 5d9c3cd85b Fix #1572 2021-04-18 14:41:44 +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
Lizzy Fleckenstein 76271199c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 08:39:04 +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 MineClone2/MineClone2#1560 2021-04-18 04:29:30 +04:00
Lizzy Fleckenstein a7e102426a Add time_of_day to get_light crash fix 2021-04-17 21:01:09 +02:00
Lizzy Fleckenstein bcd058feb1 Fix get_light crash 2021-04-17 21:00:32 +02:00
Lizzy Fleckenstein baebe3c2d2 Fix namtags being invisible 2021-04-17 20:57:12 +02:00
Lizzy Fleckenstein 48a2e4212a Fix namtags being invisible 2021-04-17 20:55:08 +02:00
Lizzy Fleckenstein 811efcf9f3 Merge branch 'master' into mineclone5 2021-04-17 20:32:30 +02:00
Lizzy 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
Lizzy Fleckenstein f8b54db392 Fix controls.register_on_press being called for every player in a globalstep 2021-04-17 18:55:56 +02:00
Lizzy Fleckenstein f79e12c8ae Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-17 18:16:19 +02:00
Lizzy Fleckenstein 5c928575f8 Fix #1572, server crash during login 2021-04-17 18:15:45 +02:00
NO11 06699c2cc4 Fix that an ax wears out if you right-click another block 2021-04-17 11:55:50 +00:00
AFCMS 6a55136517 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-17 09:26:49 +02:00
AFCMS 02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
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
Lizzy Fleckenstein bd3c08d367 Improve mcl_burning player performance 2021-04-16 19:50:56 +02:00
Lizzy Fleckenstein 10f81dbf0c Change max mcl_bossbars default to 5 (Minecraft value) 2021-04-16 18:41:10 +02:00
Lizzy Fleckenstein 01c79c5a18 Fix mcl_burning.tick not being called at all for mobs 2021-04-16 18:37:07 +02:00
Lizzy Fleckenstein 095f78b785 Massive mcl_burning performance improvement 2021-04-16 18:34:29 +02:00
Lizzy 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