1
0
Fork 0
Commit Graph

111 Commits (f30a2ab6bc9ba5338592dfa70351aa6d09ce6fd5)

Author SHA1 Message Date
kay27 b3e3b91b7c Merge master 2021-06-12 15:12:33 +04:00
Elias Fleckenstein 525599d340 [BUGFIX] Allow fixing netherite armors on anvil #1787 (#1792)
Fixes the old broken pull request, #1787.

Co-authored-by: Emojigit <emojigit@noreply.git.minetest.land>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1792
Co-authored-by: Elias Fleckenstein <eliasfleckenstein03@noreply.git.minetest.land>
Co-committed-by: Elias Fleckenstein <eliasfleckenstein03@noreply.git.minetest.land>
2021-06-08 11:02:22 +00:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
Elias Fleckenstein 772f48ed58 Fix crash / luacheck warning caused by armor with thorns level > 10 2021-05-26 20:51:39 +02:00
Elias Fleckenstein 0133f94a36 Fix upgrading of diamond armor 2021-05-09 12:48:53 +02:00
Code-Sploit 71d98892d4 Prevent crash in fix 2021-05-08 17:03:59 +00:00
Code-Sploit 72d4cf5906 Second part of fix try stupid bug 2021-05-08 16:58:10 +00:00
Code-Sploit 1dcd555149 Try 1 to fix the stupid changes to mcl_armor that caused non-upgradable diamond armor 2021-05-08 16:53:46 +00:00
Elias Fleckenstein df8b4dddec Merge branch 'master' into mineclone5 2021-04-29 11:59:04 +02:00
Elias Fleckenstein 6550e3e8e2 Add per-element armor groups 2021-04-29 11:51:06 +02:00
Elias Fleckenstein 87e41cc9a9 Add support for armor texture and preview being functions 2021-04-29 11:46:27 +02:00
Elias Fleckenstein ec08032b62 Add on_break callback 2021-04-29 11:40:09 +02:00
Elias Fleckenstein eae71fdf55 Merge branch 'master' into mineclone5 2021-04-29 10:58:22 +02:00
Elias Fleckenstein 33c0aa23c5 Re-add thorns damage type 2021-04-29 10:58:10 +02:00
Elias Fleckenstein 47aa5da242 Merge branch 'master' into mineclone5 2021-04-29 10:56:15 +02:00
jordan4ibanez e0c94ccb8a Stop thorns enchant from crashing server when dealing damage to mobs 2021-04-28 21:58:28 -04:00
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 6eadeb21c0 Merge branch 'master' into mineclone5 2021-04-27 18:56:48 +02:00
Elias Fleckenstein fede04eaa6 Make armor listring work 2021-04-25 20:20:26 +02:00
Elias Fleckenstein 302175691a Integrate death messages 2021-04-25 16:42:38 +02:00
Elias Fleckenstein 939229cb21 Fix on_equip crash 2021-04-25 13:29:22 +02:00
Elias Fleckenstein 99ee5f05d3 Merge branch 'mineclone5' into netherite 2021-04-23 13:43:27 +02:00
Code-Sploit 4baea9f420 Add all pixel-perfection textures for netherite 2021-04-22 13:59:53 +00:00
Elias Fleckenstein f9c2d710e2 Fix armor being taken even if it cannot be equipped 2021-04-22 13:52:02 +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
epCode 9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
Elias Fleckenstein 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
Elias Fleckenstein d9195cc520 Redesign damage modifier execution 2021-04-18 20:08:08 +02:00
Elias Fleckenstein d1198e8d74 Register elytra texture 2021-04-18 16:19:12 +02:00
Elias Fleckenstein 4f0bb444fe Integrate armor stand 2021-04-18 16:03:23 +02:00
Elias Fleckenstein 6724a8d0ed Fix crash in damage handler 2021-04-17 13:59:46 +02:00
Elias Fleckenstein c7c47c1ca7 Increase mob_view_range_factor performance 2021-04-17 13:49:40 +02:00
Code-Sploit 180d1f1140 Add first try of code for smithing table (Thanks to Fleckenstein), add _mcl_upgradable and _mcl_upgrade_item to every diamond tool/armor piece 2021-04-16 14:00:14 +00:00
AFCMS 457f61a532 Fix #1570 2021-04-16 11:40:44 +00:00
Elias Fleckenstein 5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +02:00
Elias Fleckenstein 020c793762 Merge branch 'master' into netherite 2021-04-16 12:17:39 +02:00
epCode 31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -07:00
Code-Sploit 77657359c2 Set correct armor_points value for netherite_boots 2021-04-15 08:31:16 +00:00
Elias Fleckenstein 8931ffb7d3 Fix crash with armor enchantments 2021-04-14 20:39:35 +02:00
Elias Fleckenstein 727d7be6ab Call on_equip and on_unequip everytime needed 2021-04-14 20:39:05 +02:00
Elias Fleckenstein ec6d68322a Make hbarmor work 2021-04-14 20:08:08 +02:00
epCode 18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Elias Fleckenstein 5d9bb7cacd Fix armor not actually protecting lol 2021-04-14 19:06:11 +02:00
Elias Fleckenstein ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
Code-Sploit 7e7a635ed0 Add correct durability for netherite armor 2021-04-14 11:57:46 +00:00