Commit Graph

6815 Commits

Author SHA1 Message Date
Elias Fleckenstein
a03e7f6f3a Re-enable player ignition from lava 2021-04-23 13:46:20 +02:00
Elias Fleckenstein
62ed39bd76 Merge branch 'master' into damage 2021-04-23 13:43:00 +02:00
Elias Fleckenstein
a836ac9879 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 13:42:47 +02:00
Elias Fleckenstein
827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Elias Fleckenstein
78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
Elias Fleckenstein
50b6f03977 Integrate no fall damage in water & end portal 2021-04-23 12:34:24 +02:00
Elias Fleckenstein
3669ccf907 Merge pull request 'Mirrored foodbar icons to fit the right-to-left change' (#1607) from Sven792/MineClone2:foodbar-icon into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1607
2021-04-23 08:20:13 +00:00
Elias Fleckenstein
818f33ff74 Merge branch 'master' into damage 2021-04-23 10:16:58 +02:00
Sven792
038066f0c5 Mirrored foodbar icons to fit the right-to-left change 2021-04-23 09:52:09 +02:00
NO11
c46c07f836 Makes fireworks rockets infinite in creative mode 2021-04-22 19:18:05 +00:00
epCode
62adbb9625 Fix #1587 2021-04-22 10:39:21 -07:00
Elias Fleckenstein
f9c2d710e2 Fix armor being taken even if it cannot be equipped 2021-04-22 13:52:02 +02:00
Elias Fleckenstein
222104b3cb Integrate dispensers 2021-04-22 13:51:36 +02:00
Elias Fleckenstein
9f7b371bfc Merge branch 'master' into damage 2021-04-22 13:29:32 +02:00
Elias Fleckenstein
8b23388d63 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:23:07 +02:00
Elias Fleckenstein
acbdc937b4 Fix crash when trying to explode an unknown node 2021-04-22 13:19:44 +02:00
Elias Fleckenstein
74a3b2654f Create inventory if not present in mcl_armor.equip 2021-04-21 13:28:22 +02:00
Elias Fleckenstein
dccb71e2fb Fix view_range_factors warning 2021-04-21 11:34:22 +02:00
Elias Fleckenstein
1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Elias 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, https://git.minetest.land/MineClone2/MineClone2/issues/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
Elias Fleckenstein
4c25091430 Fix syntax error in mcl_inventory 2021-04-19 19:12:32 +02:00
Elias 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
Elias Fleckenstein
20a4e038f5 Fix crash when slain by named mob 2021-04-19 17:40:50 +02:00
Elias Fleckenstein
c80b1c5140 Re-add usage of mcl_colors.GRAY to book descriptions 2021-04-19 15:19:59 +02:00
Elias 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
Elias 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
Elias Fleckenstein
52a49e640e Merge branch 'master' into damage 2021-04-19 09:57:56 +02:00
Elias 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: https://git.minetest.land/MineClone2/MineClone2/pulls/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
Elias Fleckenstein
c9b4ddb923 Add command damage type (This is Non-MC) 2021-04-18 20:22:18 +02:00
Elias Fleckenstein
53b0ad7347 Implement magic damage 2021-04-18 20:21:11 +02:00
Elias 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
Elias Fleckenstein
a2c3eb95bb Merge branch 'master' into damage 2021-04-18 19:51:46 +02:00
Elias 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
Elias Fleckenstein
2827542002 Implement food poisoning damage properly~ 2021-04-18 18:49:00 +02:00
Elias Fleckenstein
3ad5b30ea5 Add cramming and fireworks damage types for future use 2021-04-18 17:38:19 +02: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