Commit Graph

6503 Commits

Author SHA1 Message Date
Lizzy Fleckenstein 05be20fcb8 Update mcl_enchanting translations 2021-04-26 11:00:53 +02:00
Lizzy Fleckenstein 5df1df8e21 Update cauldron code to use the corrected translation template string 2021-04-26 10:52:50 +02:00
Lizzy Fleckenstein fed4596cb4 Update german cauldron translation fully 2021-04-26 10:52:07 +02:00
Lizzy Fleckenstein a77a916cc2 Update cauldron translations 2021-04-26 10:50:23 +02:00
Lizzy Fleckenstein 8a59d7b9c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-26 10:36:42 +02:00
Lizzy Fleckenstein f6d34db76e Update german Minecart translation 2021-04-26 10:36:22 +02:00
NO11 8df9fe76d8 Add german translation for stripped wood 2021-04-26 08:23:26 +00:00
Lizzy Fleckenstein a2983e1fda Update boats translation 2021-04-26 10:17:07 +02:00
Lizzy Fleckenstein e710795eed Merge branch 'master' into damage 2021-04-26 10:06:09 +02:00
NO11 4d2210c4e5 Fix german translation mistake 2021-04-26 08:03:20 +00:00
NO11 749f1a4a62 Fix wrong template, sry 2021-04-26 07:50:25 +00:00
NO11 e5a44dcb75 Add template for fireworks translation 2021-04-26 07:45:26 +00:00
Lizzy Fleckenstein dd68b79782 Merge branch 'master' into damage 2021-04-26 09:29:03 +02:00
epCode aac9d6a105 impliment crash damage for elytra 2021-04-25 15:49:15 -07:00
NO11 dada1e9815 Add template for stripped wood translation 2021-04-25 21:47:12 +00:00
jordan4ibanez 8a78b1f8ef Update my name 2021-04-25 20:27:50 +00:00
Lizzy Fleckenstein edc89898bb Integrate fire resistance 2021-04-25 20:51:13 +02:00
Lizzy Fleckenstein fede04eaa6 Make armor listring work 2021-04-25 20:20:26 +02:00
Lizzy Fleckenstein 57662b319c Merge branch 'master' into damage 2021-04-25 20:04:15 +02:00
Lizzy Fleckenstein 3e3f53efbd New attempt to fix #1392 2021-04-25 19:59:08 +02:00
Lizzy Fleckenstein 97e69e04aa Implement assist death messages 2021-04-25 17:49:27 +02:00
Lizzy Fleckenstein cab2167520 Merge branch 'master' into damage 2021-04-25 17:32:24 +02:00
Lizzy Fleckenstein b2407e407a Add mob descriptions 2021-04-25 17:30:15 +02:00
Lizzy Fleckenstein aeaec68c1b Update german translations for mcl_death_messages 2021-04-25 17:11:47 +02:00
Lizzy Fleckenstein 302175691a Integrate death messages 2021-04-25 16:42:38 +02:00
AFCMS 228759e49b Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-25 14:37:17 +02:00
Lizzy Fleckenstein 6aecae6eea Simplify damage pipeline; Add on_death and on_damage callbacks 2021-04-25 13:50:07 +02:00
Lizzy Fleckenstein 939229cb21 Fix on_equip crash 2021-04-25 13:29:22 +02:00
Lizzy Fleckenstein 58d67aace6 Merge branch 'master' into damage 2021-04-25 13:29:07 +02:00
Lizzy Fleckenstein ddb7e8388a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-25 13:09:27 +02:00
Lizzy Fleckenstein 9eba2add3f Rewrite burning API 2021-04-25 13:09:20 +02:00
NO11 642351a1d2 Add #1553 fireworks rocket now makes particles when used for flying 2021-04-24 19:35:23 +00:00
Elias Åström 73cd482e55 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 16:30:56 +02:00
AFCMS 414adff8fb Fix bad API documentation od mcl_death_drop 2021-04-23 13:59:37 +00:00
Elias Åström 7f3e5bda7e Duplicate groupcaps before applying unbreaking 2021-04-23 15:49:37 +02:00
Lizzy Fleckenstein a03e7f6f3a Re-enable player ignition from lava 2021-04-23 13:46:20 +02:00
Lizzy Fleckenstein 62ed39bd76 Merge branch 'master' into damage 2021-04-23 13:43:00 +02:00
Lizzy Fleckenstein a836ac9879 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-23 13:42:47 +02:00
Lizzy Fleckenstein 827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Lizzy Fleckenstein 78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
Lizzy 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: MineClone2/MineClone2#1607
2021-04-23 08:20:13 +00:00
Lizzy 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
Lizzy Fleckenstein f9c2d710e2 Fix armor being taken even if it cannot be equipped 2021-04-22 13:52:02 +02:00
Lizzy Fleckenstein 222104b3cb Integrate dispensers 2021-04-22 13:51:36 +02:00
Lizzy Fleckenstein 9f7b371bfc Merge branch 'master' into damage 2021-04-22 13:29:32 +02:00
Lizzy Fleckenstein 8b23388d63 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:23:07 +02:00