Commit Graph

6431 Commits

Author SHA1 Message Date
AFCMS 457f61a532 Fix #1570 2021-04-16 11:40:44 +00:00
AFCMS 1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
AFCMS 3dd490ed6b remove lengh limitation 2021-04-16 12:59:00 +02:00
Lizzy Fleckenstein fc34ec91e8 Merge branch 'netherite' of https://git.minetest.land/MineClone2/MineClone2 into netherite 2021-04-16 12:40:18 +02:00
Lizzy Fleckenstein ebf1f1d96b Merge branch 'mineclone5' into netherite 2021-04-16 12:40:10 +02:00
Elias Fleckenstein f1b7d3afb7 Merge branch 'mineclone5' into netherite 2021-04-16 10:39:05 +00:00
Lizzy Fleckenstein fbee510b42 Merge branch 'master' into mineclone5 2021-04-16 12:17:55 +02:00
Lizzy Fleckenstein 020c793762 Merge branch 'master' into netherite 2021-04-16 12:17:39 +02:00
Lizzy Fleckenstein 3b10e3bd0d Merge branch 'master' into netherite 2021-04-16 12:17:14 +02:00
Lizzy Fleckenstein 30546a3902 Make sure ancient debris is not generated exposed to air 2021-04-16 12:17:07 +02:00
Code-Sploit 622c236b4b Add ancient debris generation in nether 2021-04-16 10:03:31 +00:00
AFCMS 2d6e0241cd Merge branch 'master' into luacheck 2021-04-16 11:03:46 +02:00
AFCMS 1df916bd7b fix warning 2021-04-16 11:03:31 +02:00
Code-Sploit e7f36ec7d2 Add crafting recipe for netheriteblock & make netheriteblock convertable to ingots. 2021-04-16 06:19:14 +00:00
jordan4ibanez 044e9d22ad Re-enable mob-despawner 2021-04-15 21:13:19 -04:00
epCode 31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -07:00
epCode cd04f6d7ce Fix glitch with Stray 2021-04-15 14:53:22 -07:00
AFCMS 60e74fc41d fix excedent lines 2021-04-15 23:44:29 +02:00
AFCMS a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
epCode 9feaec95d9 Fix Stupid mistake with zombievillagers 2021-04-15 14:29:24 -07:00
epCode 0ca6c06198 add the other villager zombie textures 2021-04-15 14:11:35 -07:00
AFCMS b497778192 delete unused file 2021-04-15 22:22:39 +02:00
AFCMS b1f7294578 create python script 2021-04-15 22:22:23 +02:00
epCode f0fab4e708 Allow zombie villager to have visual armor 2021-04-15 12:04:25 -07:00
Elias Fleckenstein 0c5096db13 Merge pull request 'Fixes for german locales (2021-04-14_locales_german)' (#1564) from n_to/MineClone2:2021-04-14_locales_german into master
Reviewed-on: MineClone2/MineClone2#1564
2021-04-15 16:18:51 +00:00
Code-Sploit ab16690469 Add correct speeds for netherite shovel, pickaxe and axe 2021-04-15 16:07:19 +00:00
Code-Sploit a792516851 Add netherite block 2021-04-15 15:47:15 +00:00
Code-Sploit b0d33faec4 Add netheriteblock 2021-04-15 15:45:48 +00:00
NO11 3fbeab7c85 Merge pull request 'Make cactus destroy items' (#1567) from NO11/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#1567
2021-04-15 13:21:46 +00:00
AFCMS d865d95639 update config 2021-04-15 14:26:12 +02:00
NO11 a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00:00
AFCMS 54f81b7740 add basic .luacheckrc file 2021-04-15 14:19:11 +02:00
kay27 93429549b8 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-15 15:50:38 +04:00
NO11 bbffda3635 Make cactus destroy items 2021-04-15 11:21:15 +00:00
Nils Dagsson Moskopp 2575e20e7e Show preview of new banner pattern when crafting it 2021-04-15 13:25:59 +04:00
Code-Sploit 77657359c2 Set correct armor_points value for netherite_boots 2021-04-15 08:31:16 +00:00
epCode 5fe30d7287 Make Zmbs, Husks, Sklys, Strys, and WthrSklys support armor textures. 2021-04-14 16:51:17 -07:00
Benjamin Schötz bffd032a8b Fixes my own typo ;) 2021-04-14 22:06:03 +02:00
Benjamin Schötz e4c8ba795a Fixes typos, grammar errors, and some translation flaws in several german translation files. 2021-04-14 22:03:36 +02:00
epCode 18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Lizzy Fleckenstein 7f28f4a9d1 Merge branch 'master' into mineclone5 2021-04-14 18:16:24 +02:00
Lizzy Fleckenstein c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Elias Fleckenstein 76af838f4c Merge pull request 'Credit me' (#1558) from j1233/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#1558
2021-04-14 15:15:19 +00:00
j1233 46b1762872 credit me
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
2021-04-14 14:53:33 +00:00
j1233 a069406f40 credit me
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
2021-04-14 14:52:00 +00:00
Elias Fleckenstein 97f8c92d95 Merge pull request 'Update README files' (#1544) from beta into master
Reviewed-on: MineClone2/MineClone2#1544
2021-04-14 14:38:02 +00:00
Lizzy Fleckenstein 963adfb4e2 Move @Code-Sploit to devs section 2021-04-14 16:37:07 +02:00
Lizzy Fleckenstein 6d0abb2973 Merge branch 'master' into beta 2021-04-14 16:36:04 +02:00
Code-Sploit d3dd6559a2 Add correct durability for netherite sword 2021-04-14 13:12:44 +00:00
Code-Sploit 464216ea0a Fix crash in netherite hoe by adding netherite to uses{} 2021-04-14 13:10:07 +00:00