kay27
7640edabcc
Merge pull request 'Remove 2D preview + fix enchanting overlay by AFCMS' ( #311 ) from MrRar/MineClone5:armor2d into master
...
Reviewed-on: MineClone5/MineClone5#311
2022-07-04 01:38:55 +00:00
FlamingRCCars
88935cbcbd
Update 'mods/ITEMS/mcl_armor/register.lua'
2022-06-17 21:27:46 +00:00
FlamingRCCars
73d67792ee
Merge branch 'master' into fixed-elytra
2022-06-17 21:08:08 +00:00
FlamingRCCars
5ceed2672e
fixed-elytras
2022-06-17 16:04:30 -05:00
FlamingRCCars
5d2552eb97
Fixed elytra not working when enchanted
2022-06-17 13:36:19 -05:00
unknown
fb7390f61d
fixed elytras
2022-06-17 12:37:03 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
6889c672c0
Remove wield view from player models
2022-06-11 18:00:42 -05:00
AFCMS
48c8eaa6ed
Remove 2D preview by AFCMS
2022-05-06 12:53:30 -05:00
AFCMS
4af046500d
Remove preview files
2022-05-06 08:35:37 -05:00
Sab Pyrope
e817c1dbc6
Update Russian and other translations
2022-02-19 21:14:51 +08:00
kay27
9f67432865
Merge MineClone2/master
2021-07-23 01:43:22 +04:00
NO11
31d3ea8a87
Fix #1801 (add better texture for golden boots)
2021-07-20 20:09:43 +00:00
SmallJoker
9d9e213012
Fix some implicit hard and soft-dependencies
...
These issues were found while testing minetest#8603 and are caused by relying on the undefined mod loading order
2021-07-16 06:18:54 +04:00
SmallJoker
3e36cf3500
Fix some implicit hard and soft-dependencies
...
These issues were found while testing minetest#8603 and are caused by relying on the undefined mod loading order
2021-07-15 01:38:02 +04:00
kay27
56a82d5a82
Merge remote-tracking branch 'origin/master' into mineclone5
2021-07-13 01:00:03 +04:00
epCode
960b653979
fix #1299
2021-07-12 11:50:37 -07:00
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: MineClone2/MineClone2#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
Lizzy Fleckenstein
772f48ed58
Fix crash / luacheck warning caused by armor with thorns level > 10
2021-05-26 20:51:39 +02:00
Lizzy 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
Lizzy Fleckenstein
df8b4dddec
Merge branch 'master' into mineclone5
2021-04-29 11:59:04 +02:00
Lizzy Fleckenstein
6550e3e8e2
Add per-element armor groups
2021-04-29 11:51:06 +02:00
Lizzy Fleckenstein
87e41cc9a9
Add support for armor texture and preview being functions
2021-04-29 11:46:27 +02:00
Lizzy Fleckenstein
ec08032b62
Add on_break callback
2021-04-29 11:40:09 +02:00
Lizzy Fleckenstein
eae71fdf55
Merge branch 'master' into mineclone5
2021-04-29 10:58:22 +02:00
Lizzy Fleckenstein
33c0aa23c5
Re-add thorns damage type
2021-04-29 10:58:10 +02:00
Lizzy 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
Lizzy Fleckenstein
33c235362e
Merge branch 'master' into mineclone5
2021-04-28 12:27:28 +02:00
Lizzy Fleckenstein
13a0fa2314
Implement #1665
2021-04-28 12:16:01 +02:00
Lizzy Fleckenstein
61c6d6e276
Add per element (un)equip callbacks
2021-04-28 12:00:44 +02:00
Lizzy Fleckenstein
6eadeb21c0
Merge branch 'master' into mineclone5
2021-04-27 18:56:48 +02:00
Lizzy Fleckenstein
fede04eaa6
Make armor listring work
2021-04-25 20:20:26 +02:00
Lizzy Fleckenstein
302175691a
Integrate death messages
2021-04-25 16:42:38 +02:00
Lizzy Fleckenstein
939229cb21
Fix on_equip crash
2021-04-25 13:29:22 +02:00
Lizzy 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
Lizzy Fleckenstein
f9c2d710e2
Fix armor being taken even if it cannot be equipped
2021-04-22 13:52:02 +02:00
Lizzy Fleckenstein
74a3b2654f
Create inventory if not present in mcl_armor.equip
2021-04-21 13:28:22 +02:00
Lizzy Fleckenstein
dccb71e2fb
Fix view_range_factors warning
2021-04-21 11:34:22 +02:00
Lizzy 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
Lizzy Fleckenstein
58c20a7542
Merge branch 'mineclone5' into netherite
2021-04-19 11:13:01 +02:00
Lizzy Fleckenstein
d9195cc520
Redesign damage modifier execution
2021-04-18 20:08:08 +02:00
Lizzy Fleckenstein
d1198e8d74
Register elytra texture
2021-04-18 16:19:12 +02:00