Commit graph

3154 commits

Author SHA1 Message Date
Elias Fleckenstein
33c235362e Merge branch 'master' into mineclone5 2021-04-28 12:27:28 +02:00
Elias Fleckenstein
13a0fa2314 Implement #1665 2021-04-28 12:16:01 +02:00
Elias Fleckenstein
61c6d6e276 Add per element (un)equip callbacks 2021-04-28 12:00:44 +02:00
Elias Fleckenstein
cca03bcbd2 Merge branch 'master' into mineclone5 2021-04-28 11:40:21 +02:00
AFCMS
ae83e44149 remove duplicated line 2021-04-27 23:50:18 +02:00
Elias Fleckenstein
6eadeb21c0 Merge branch 'master' into mineclone5 2021-04-27 18:56:48 +02:00
Elias Fleckenstein
b9cdb58ce5 Merge branch 'master' into mineclone5 2021-04-27 18:44:40 +02:00
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
91211ac1f7 Merge branch 'master' into mineclone5 2021-04-26 10:08:08 +02: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
6260dad8fc Merge branch 'master' into mineclone5 2021-04-25 19:58:02 +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
073e7b81f8 Merge branch 'master' into mineclone5 2021-04-25 13:11:20 +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 Fleckenstein
988a44148e Merge branch 'master' into mineclone5 2021-04-23 18:11:41 +02:00
NO11
ef86eb0779 Fix wrong sweet berry item path 2021-04-23 14:18:31 +00:00
Elias Åström
7f3e5bda7e Duplicate groupcaps before applying unbreaking 2021-04-23 15:49:37 +02:00
Elias Fleckenstein
99ee5f05d3 Merge branch 'mineclone5' into netherite 2021-04-23 13:43:27 +02:00
Elias Fleckenstein
f80eb5633b Merge branch 'master' into mineclone5 2021-04-23 13:43:12 +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
kay27
0486c7c468 [mineclone5] fix sweeet berry depends 2021-04-22 23:07:56 +04:00
epCode
62adbb9625 Fix #1587 2021-04-22 10:39:21 -07:00
Code-Sploit
d12b192785 Add forgotten textures for netherite ingot, scrap and ancient debris 2021-04-22 14:38:17 +00:00
Code-Sploit
4baea9f420 Add all pixel-perfection textures for netherite 2021-04-22 13:59:53 +00:00
Code-Sploit
0147da7270 Add unofficial MC-textures (credits to NO11) 2021-04-22 13:38:00 +00:00