Elias Fleckenstein
a41aace9d7
Merge branch 'master' into damage
2021-04-27 18:33:35 +02:00
Elias Fleckenstein
0867d6e406
Update german mcl_banners translations
2021-04-26 11:15:36 +02:00
Elias Fleckenstein
347cc7ee7c
Update mcl_banner translations to new template
2021-04-26 11:13:36 +02:00
Elias Fleckenstein
6dc6fc8ec3
Update mcl_flowerpots translations to new template
2021-04-26 11:05:27 +02:00
Elias Fleckenstein
b43f59332a
Update mcl_enchanting translations to new template
2021-04-26 11:03:53 +02:00
Elias Fleckenstein
3b1d71382f
Update es, fr and ru cauldron translations to use the new template
2021-04-26 11:01:52 +02:00
Elias Fleckenstein
05be20fcb8
Update mcl_enchanting translations
2021-04-26 11:00:53 +02:00
Elias Fleckenstein
5df1df8e21
Update cauldron code to use the corrected translation template string
2021-04-26 10:52:50 +02:00
Elias Fleckenstein
fed4596cb4
Update german cauldron translation fully
2021-04-26 10:52:07 +02:00
Elias Fleckenstein
a77a916cc2
Update cauldron translations
2021-04-26 10:50:23 +02:00
NO11
8df9fe76d8
Add german translation for stripped wood
2021-04-26 08:23:26 +00:00
Elias 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
Elias Fleckenstein
dd68b79782
Merge branch 'master' into damage
2021-04-26 09:29:03 +02:00
NO11
dada1e9815
Add template for stripped wood translation
2021-04-25 21:47:12 +00:00
Elias Fleckenstein
edc89898bb
Integrate fire resistance
2021-04-25 20:51:13 +02:00
Elias Fleckenstein
fede04eaa6
Make armor listring work
2021-04-25 20:20:26 +02:00
Elias Fleckenstein
cab2167520
Merge branch 'master' into damage
2021-04-25 17:32:24 +02:00
Elias 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
Elias Fleckenstein
939229cb21
Fix on_equip crash
2021-04-25 13:29:22 +02:00
Elias Fleckenstein
58d67aace6
Merge branch 'master' into damage
2021-04-25 13:29:07 +02:00
Elias Fleckenstein
ddb7e8388a
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-04-25 13:09:27 +02:00
Elias Fleckenstein
9eba2add3f
Rewrite burning API
2021-04-25 13:09:20 +02:00
Elias Åström
7f3e5bda7e
Duplicate groupcaps before applying unbreaking
2021-04-23 15:49:37 +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
818f33ff74
Merge branch 'master' into damage
2021-04-23 10:16:58 +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
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
9c3fcae9e1
Fix many things with player animation and update alex
2021-04-19 13:02:12 -07: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
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 d8d4cb5defcbe1ca1b71100441cc6636557752c8)
Reverts a2fcd28a3dcbf1aaa07c9f2c21ba7cd3872b7cd4 and partially reverts f8a627915e17779bec1a52fe867877036c043f72.
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 84819bf9f5164ab208b7be1e94d142906359a1af.
2021-04-19 14:44:20 +02:00
Elias Fleckenstein
52a49e640e
Merge branch 'master' into damage
2021-04-19 09:57:56 +02:00
NO11
0c5ca70187
remove wrong config
2021-04-19 07:35:53 +00:00