Commit Graph

5938 Commits

Author SHA1 Message Date
Lizzy Fleckenstein dccb71e2fb Fix view_range_factors warning 2021-04-21 11:34:22 +02:00
Lizzy Fleckenstein 1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Lizzy Fleckenstein fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
kay27 1e5ae0bbac [mcl_beds] Fix screwdriver/bed duplication glitch, MineClone2/MineClone2#1149 2021-04-21 00:36:07 +04:00
epCode c7d91baadf rid some mobs of bouncing animation 2021-04-19 14:29:12 -07:00
epCode 9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
Lizzy Fleckenstein 4c25091430 Fix syntax error in mcl_inventory 2021-04-19 19:12:32 +02:00
Lizzy Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
NO11 7a5ce1c717 Simplify debarking again 2021-04-19 16:53:48 +00:00
NO11 e8c15867ad Add mcl_stripped_varient node def 2021-04-19 16:50:21 +00:00
Lizzy Fleckenstein 20a4e038f5 Fix crash when slain by named mob 2021-04-19 17:40:50 +02:00
Lizzy Fleckenstein c80b1c5140 Re-add usage of mcl_colors.GRAY to book descriptions 2021-04-19 15:19:59 +02:00
Lizzy Fleckenstein 7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
2021-04-19 15:16:59 +02:00
Lizzy Fleckenstein d8d4cb5def Revert color changes to GUI.
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5.
2021-04-19 14:44:20 +02:00
Lizzy Fleckenstein 52a49e640e Merge branch 'master' into damage 2021-04-19 09:57:56 +02:00
Lizzy Fleckenstein 69485f8505 Integrate falling nodes damage 2021-04-19 09:49:29 +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
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
NO11 aa533edda2 Simplify debarking 2021-04-18 18:28:39 +00:00
Lizzy Fleckenstein c9b4ddb923 Add command damage type (This is Non-MC) 2021-04-18 20:22:18 +02:00
Lizzy Fleckenstein 53b0ad7347 Implement magic damage 2021-04-18 20:21:11 +02:00
Lizzy Fleckenstein d9195cc520 Redesign damage modifier execution 2021-04-18 20:08:08 +02: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
Lizzy Fleckenstein a2c3eb95bb Merge branch 'master' into damage 2021-04-18 19:51:46 +02:00
Lizzy Fleckenstein d08a226a51 Integrate critical hits 2021-04-18 19:50:48 +02:00
NO11 9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Lizzy Fleckenstein 2827542002 Implement food poisoning damage properly~ 2021-04-18 18:49:00 +02:00
Lizzy Fleckenstein 3ad5b30ea5 Add cramming and fireworks damage types for future use 2021-04-18 17:38:19 +02:00
Lizzy Fleckenstein 1cf53caa7a Update armor stand entity in on_activate callback, remove debug print 2021-04-18 16:20:32 +02:00
Lizzy Fleckenstein d1198e8d74 Register elytra texture 2021-04-18 16:19:12 +02:00
Lizzy Fleckenstein 4f0bb444fe Integrate armor stand 2021-04-18 16:03:23 +02:00
Lizzy Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02: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 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 205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02: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 bbd115fde0 Update armor stand 2021-04-17 18:39:38 +02:00
Lizzy Fleckenstein 7c7af7d664 Merge branch 'master' into damage 2021-04-17 18:39:00 +02:00
Lizzy Fleckenstein f79e12c8ae Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-17 18:16:19 +02:00