Commit graph

6562 commits

Author SHA1 Message Date
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
Elias Fleckenstein
8a59d7b9c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-26 10:36:42 +02:00
Elias 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
Elias Fleckenstein
a2983e1fda Update boats translation 2021-04-26 10:17:07 +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
kay27
b488064058 Merge commit '956dab78ceb49aaed98f12b6b88acc3efac81957' into production 2021-04-26 00:35:36 +00:00
kay27
38c4869b7f Merge (latest mcl_tools/init.lua) 2021-04-26 00:35:23 +00:00
Doloment
819dbc6224 Added LBM 2021-04-26 00:34:35 +00:00
NO11
4b2a82e5b8 Remove old crafting recipes 2021-04-26 00:34:35 +00:00
NO11
661c80bd1d Summarize all debarked types of wood 2021-04-26 00:34:35 +00:00
NO11
e73cb56085 Fix lying trunks that stand upright again after debarking 2021-04-26 00:34:35 +00:00
kay27
0a6c3a4414 Merge (latest mcl_enchanting) 2021-04-26 00:34:15 +00:00
AFCMS
b21c43e38c performance optimisation 2021-04-26 00:33:27 +00:00
AFCMS
8dda13f143 remove unuseful code 2021-04-26 00:33:27 +00:00
Elias Åström
731dc4947b 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-26 00:33:27 +00:00
kay27
91762f24b6 Merge (latest mcl_mobs/api.lua) 2021-04-26 00:33:12 +00:00
kay27
975be19f50 Merge (latest mcl_mobs/api.lua) 2021-04-26 00:32:35 +00:00
kay27
23150d60ac Merge (latest playerplus) 2021-04-26 00:31:53 +00:00
kay27
36bd151398 Merge (latest playerplus) 2021-04-26 00:31:26 +00:00
kay27
d66671ae76 Merge (latest playerplus) 2021-04-26 00:30:14 +00:00
kay27
75f20eb3a5 Merge (latest playerplus) 2021-04-26 00:29:35 +00:00
NO11
5fd5ebe4d4 Fix that an ax wears out if you right-click another block 2021-04-26 00:29:06 +00:00
AFCMS
05ba837de4 fix many warnings (644 remaining) 2021-04-26 00:29:06 +00:00
AFCMS
3722d2e8fe fix more codestyle 2021-04-26 00:29:06 +00:00
kay27
7e6abe8398 Merge (latest .luacheckrc) 2021-04-26 00:28:47 +00:00
Elias Fleckenstein
64a15d1eea Improve mcl_burning player performance 2021-04-26 00:28:25 +00:00
Elias Fleckenstein
28c12df6cd Change max mcl_bossbars default to 5 (Minecraft value) 2021-04-26 00:28:25 +00:00
kay27
61a6929c40 Merge (latest mcl_mobs/api.lua) 2021-04-26 00:28:08 +00:00
Elias Fleckenstein
f94ab6c8a5 Massive mcl_burning performance improvement 2021-04-26 00:27:25 +00:00
AFCMS
9a6331adde Fix #1570 2021-04-26 00:27:25 +00:00
AFCMS
2fa7e870ee fix many codestyle issues 2021-04-26 00:27:25 +00:00
kay27
7683fa6a17 Merge (latest .luacheckrc) 2021-04-26 00:27:10 +00:00
AFCMS
dc5bac8d86 fix warning 2021-04-26 00:26:44 +00:00
jordan4ibanez
f08ada08eb Re-enable mob-despawner 2021-04-26 00:26:44 +00:00
epCode
234a9cc746 Fix female player model for footglitch/elytra 2021-04-26 00:26:44 +00:00
epCode
397f22b907 Fix glitch with Stray 2021-04-26 00:26:44 +00:00
AFCMS
597b66ddcb fix excedent lines 2021-04-26 00:26:44 +00:00
kay27
46379b924d Merge (latest playerplus) 2021-04-26 00:26:19 +00:00
kay27
753795dfcd Merge (latest villager_zombie) 2021-04-26 00:25:34 +00:00
epCode
5aac1e71cb Allow zombie villager to have visual armor 2021-04-26 00:24:52 +00:00
AFCMS
81844f8f74 delete unused file 2021-04-26 00:24:52 +00:00
AFCMS
ed72a7075f create python script 2021-04-26 00:24:52 +00:00