302175691a
Integrate death messages
2021-04-25 16:42:38 +02:00
228759e49b
Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2
2021-04-25 14:37:17 +02:00
939229cb21
Fix on_equip crash
2021-04-25 13:29:22 +02:00
58d67aace6
Merge branch 'master' into damage
2021-04-25 13:29:07 +02:00
073e7b81f8
Merge branch 'master' into mineclone5
2021-04-25 13:11:20 +02:00
ddb7e8388a
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-04-25 13:09:27 +02:00
9eba2add3f
Rewrite burning API
2021-04-25 13:09:20 +02:00
988a44148e
Merge branch 'master' into mineclone5
2021-04-23 18:11:41 +02:00
ef86eb0779
Fix wrong sweet berry item path
2021-04-23 14:18:31 +00:00
7f3e5bda7e
Duplicate groupcaps before applying unbreaking
2021-04-23 15:49:37 +02:00
99ee5f05d3
Merge branch 'mineclone5' into netherite
2021-04-23 13:43:27 +02:00
f80eb5633b
Merge branch 'master' into mineclone5
2021-04-23 13:43:12 +02:00
827cd2d7b1
Fix heads crash
2021-04-23 13:42:42 +02:00
78355c5c57
Integrate totems
2021-04-23 13:40:51 +02:00
818f33ff74
Merge branch 'master' into damage
2021-04-23 10:16:58 +02:00
c46c07f836
Makes fireworks rockets infinite in creative mode
2021-04-22 19:18:05 +00:00
0486c7c468
[mineclone5] fix sweeet berry depends
2021-04-22 23:07:56 +04:00
62adbb9625
Fix #1587
2021-04-22 10:39:21 -07:00
d12b192785
Add forgotten textures for netherite ingot, scrap and ancient debris
2021-04-22 14:38:17 +00:00
4baea9f420
Add all pixel-perfection textures for netherite
2021-04-22 13:59:53 +00:00
0147da7270
Add unofficial MC-textures (credits to NO11)
2021-04-22 13:38:00 +00:00
24cc4318e2
Add crafting recipe for smithing table
2021-04-22 12:11:47 +00:00
498b1c792a
Fix not able to put diamond tools in the smithing_table
2021-04-22 12:07:30 +00:00
f9c2d710e2
Fix armor being taken even if it cannot be equipped
2021-04-22 13:52:02 +02:00
222104b3cb
Integrate dispensers
2021-04-22 13:51:36 +02:00
9f7b371bfc
Merge branch 'master' into damage
2021-04-22 13:29:32 +02:00
8b23388d63
Fix #1590 (Bed drops itself when gets exploded)
2021-04-22 13:23:07 +02:00
951a24c684
Fix #1590 (Bed drops itself when gets exploded)
2021-04-22 13:22:20 +02:00
74a3b2654f
Create inventory if not present in mcl_armor.equip
2021-04-21 13:28:22 +02:00
dccb71e2fb
Fix view_range_factors warning
2021-04-21 11:34:22 +02:00
1e7ba2b605
Merge branch 'master' into damage
2021-04-21 11:32:50 +02:00
a0a6eaee48
Merge branch 'master' into mineclone5
2021-04-21 11:32:32 +02:00
fe5f61c747
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-04-21 11:31:53 +02:00
f3c4dd699d
Merge branch 'master' into mineclone5
2021-04-21 11:31:39 +02:00
bec86ece0b
Merge branch 'mineclone5' of https://git.minetest.land/MineClone2/MineClone2 into mineclone5
2021-04-21 11:31:29 +02:00
1e5ae0bbac
[mcl_beds] Fix screwdriver/bed duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149
2021-04-21 00:36:07 +04:00
106ecb0958
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-20 22:08:36 +04:00
1db8c21ec2
Emergency
2021-04-20 17:57:07 +00:00
6b005a9214
Fix missing texture warning
2021-04-20 19:31:42 +02:00
0c9314fba7
Use different textures for blackstone top and side
2021-04-20 19:28:35 +02:00
9c3fcae9e1
Fix many things with player animation and update alex
2021-04-19 13:02:12 -07:00
feda530bff
Update 'mods/ITEMS/mcl_sweet_berry/init.lua'
2021-04-19 18:39:09 +00:00
5d98662a60
Update 'mods/ITEMS/mcl_sweet_berry/init.lua'
2021-04-19 18:32:47 +00:00
cea1078a16
Upload files to 'mods/ITEMS/mcl_sweet_berry/textures'
2021-04-19 18:30:44 +00:00
d347b829c0
Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_2.png'
2021-04-19 18:30:11 +00:00
ade55cee33
Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_3.png'
2021-04-19 18:29:57 +00:00
9efefc2d85
Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_1.png'
2021-04-19 18:28:33 +00:00
85e693e1e1
Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_0.png'
2021-04-19 18:28:16 +00:00
32c773cdea
Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry.png'
2021-04-19 18:28:01 +00:00
49f8df85ee
Upload files to 'mods/ITEMS/mcl_sweet_berry'
2021-04-19 18:26:59 +00:00
b012c3b739
Add 'mods/ITEMS/mcl_sweet_berry/init.lua'
2021-04-19 18:20:44 +00:00
f517d82885
Add 'mods/ITEMS/mcl_sweet_berry/mod.conf'
2021-04-19 18:11:48 +00:00
ca74f23094
Merge branch 'master' into damage
2021-04-19 18:58:00 +02:00
7a5ce1c717
Simplify debarking again
2021-04-19 16:53:48 +00:00
e8c15867ad
Add mcl_stripped_varient node def
2021-04-19 16:50:21 +00:00
c80b1c5140
Re-add usage of mcl_colors.GRAY to book descriptions
2021-04-19 15:19:59 +02:00
7efc177188
Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.
...
(Follow-up of d8d4cb5defa2fcd28a3df8a627915e
2021-04-19 15:16:59 +02:00
d8d4cb5def
Revert color changes to GUI.
...
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5
2021-04-19 14:44:20 +02:00
58c20a7542
Merge branch 'mineclone5' into netherite
2021-04-19 11:13:01 +02:00
1bf9455065
Merge branch 'master' into mineclone5
2021-04-19 11:12:21 +02:00
52a49e640e
Merge branch 'master' into damage
2021-04-19 09:57:56 +02:00
0c5ca70187
remove wrong config
2021-04-19 07:35:53 +00:00
ec1ef1affa
Merge pull request 'Fix #1422' ( #1474 ) from Doloment/MineClone2:ender_chest_fix into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1474
2021-04-19 07:25:57 +00:00
e2d3f2a194
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-19 09:58:55 +04:00
c03717139b
Add mod.conf to mcl_fireworks
2021-04-18 23:23:07 -04:00
44a25de12f
Fix crashing with unknown slot description when enchanting
2021-04-18 23:18:18 -04:00
96694692d8
[mineclone5] Put ITEMS/mcl_core/nodes_trees.lua from master
2021-04-19 00:15:20 +04:00
aa533edda2
Simplify debarking
2021-04-18 18:28:39 +00:00
53b0ad7347
Implement magic damage
2021-04-18 20:21:11 +02:00
d9195cc520
Redesign damage modifier execution
2021-04-18 20:08:08 +02:00
49f6ccaa4a
Remove old crafting recipes
2021-04-18 18:02:41 +00:00
3668b2dee6
Summarize all debarked types of wood
2021-04-18 18:02:37 +00:00
a2c3eb95bb
Merge branch 'master' into damage
2021-04-18 19:51:46 +02:00
9bc2f2d866
Fix lying trunks that stand upright again after debarking
2021-04-18 17:18:27 +00:00
1cf53caa7a
Update armor stand entity in on_activate callback, remove debug print
2021-04-18 16:20:32 +02:00
d1198e8d74
Register elytra texture
2021-04-18 16:19:12 +02:00
4f0bb444fe
Integrate armor stand
2021-04-18 16:03:23 +02:00
f0d7715080
Merge branch 'master' into damage
2021-04-18 14:51:45 +02:00
956dab78ce
Added LBM
2021-04-18 09:50:02 +00:00
fc9928c0b6
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-04-18 11:42:38 +02:00
573b1dc44b
Do not include unnecessary tool_capabilities
...
This commit makes enchanted tools which have no use for
tool_capabilities to not include it in their metadata. It does this by
not including tool_capabilities in the metadata of an enchanted tool if
at least one of two cases is true:
(1) The tool is not enchanted with unbreaking or efficiency
(2) The tool does not have tool_capabilities defined in its definition
The first case covers situations like having a pickaxe only being
enchanted with silk_touch. The second case covers situations like a
piece of armor being enchanted with unbreaking.
2021-04-18 11:40:43 +02:00
dd69dcfd9f
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-18 11:40:13 +02:00
bb902caa57
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-18 04:29:59 +04:00
11b66e83a2
[mcl_portals] Better NP search, no more teleports on the roof, fix https://git.minetest.land/MineClone2/MineClone2/issues/1560
2021-04-18 04:29:30 +04:00
4aa6421faf
performance optimisation
2021-04-18 00:27:51 +02:00
811efcf9f3
Merge branch 'master' into mineclone5
2021-04-17 20:32:30 +02:00
205572cc69
Fix elytra code style
2021-04-17 19:34:23 +02:00
ff07ee5d93
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-17 21:02:07 +04:00
bbd115fde0
Update armor stand
2021-04-17 18:39:38 +02:00
7c7af7d664
Merge branch 'master' into damage
2021-04-17 18:39:00 +02:00
8e37b51cac
Equip mob heads with rightclick
2021-04-17 14:07:47 +02:00
6724a8d0ed
Fix crash in damage handler
2021-04-17 13:59:46 +02:00
06699c2cc4
Fix that an ax wears out if you right-click another block
2021-04-17 11:55:50 +00:00
6bbea11fb8
Fix crash with mcl_heads
2021-04-17 13:53:41 +02:00
c7c47c1ca7
Increase mob_view_range_factor performance
2021-04-17 13:49:40 +02:00
ca75a893db
Merge branch 'master' into damage
2021-04-17 12:58:19 +02:00
02f393998f
fix many warnings (644 remaining)
2021-04-17 09:26:37 +02:00
61f3b4c69e
Fix merge conflict with mcl_smithing_table
2021-04-16 16:03:56 +02:00
77a645102b
Git being weird
2021-04-16 14:01:15 +00:00
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
742aa2becb
fix inventory not initialised
2021-04-16 14:01:08 +02:00
6397b1349b
fix crash
2021-04-16 13:51:57 +02:00
39ce3592e6
Merge branch 'netherite' of https://git.minetest.land/MineClone2/MineClone2 into netherite
2021-04-16 11:48:58 +00:00
9b5d9091d4
Remove some files
2021-04-16 11:47:54 +00:00
99fc209bf2
Add smithing table W.I.P
2021-04-16 11:47:21 +00:00
457f61a532
Fix #1570
2021-04-16 11:40:44 +00:00
1a58b0c510
fix many codestyle issues
2021-04-16 13:35:03 +02:00
ebf1f1d96b
Merge branch 'mineclone5' into netherite
2021-04-16 12:40:10 +02:00
5d5ed91519
Merge branch 'master' into damage
2021-04-16 12:20:53 +02:00
fbee510b42
Merge branch 'master' into mineclone5
2021-04-16 12:17:55 +02:00
020c793762
Merge branch 'master' into netherite
2021-04-16 12:17:39 +02:00
3b10e3bd0d
Merge branch 'master' into netherite
2021-04-16 12:17:14 +02:00
2d6e0241cd
Merge branch 'master' into luacheck
2021-04-16 11:03:46 +02:00
1df916bd7b
fix warning
2021-04-16 11:03:31 +02:00
e7f36ec7d2
Add crafting recipe for netheriteblock & make netheriteblock convertable to ingots.
2021-04-16 06:19:14 +00:00
31dfeae445
Fix female player model for footglitch/elytra
2021-04-15 14:57:55 -07:00
60e74fc41d
fix excedent lines
2021-04-15 23:44:29 +02:00
a602f64ea5
fix many warnings
2021-04-15 23:41:34 +02:00
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: https://git.minetest.land/MineClone2/MineClone2/pulls/1564
2021-04-15 16:18:51 +00:00
ab16690469
Add correct speeds for netherite shovel, pickaxe and axe
2021-04-15 16:07:19 +00:00
a792516851
Add netherite block
2021-04-15 15:47:15 +00:00
b0d33faec4
Add netheriteblock
2021-04-15 15:45:48 +00:00
a8760c0375
Reduce the radius in which a cactus destroys items
2021-04-15 12:23:08 +00:00
93429549b8
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-15 15:50:38 +04:00
bbffda3635
Make cactus destroy items
2021-04-15 11:21:15 +00:00
2575e20e7e
Show preview of new banner pattern when crafting it
2021-04-15 13:25:59 +04:00
77657359c2
Set correct armor_points value for netherite_boots
2021-04-15 08:31:16 +00:00
bffd032a8b
Fixes my own typo ;)
2021-04-14 22:06:03 +02:00
e4c8ba795a
Fixes typos, grammar errors, and some translation flaws in several german translation files.
2021-04-14 22:03:36 +02:00
8931ffb7d3
Fix crash with armor enchantments
2021-04-14 20:39:35 +02:00
727d7be6ab
Call on_equip and on_unequip everytime needed
2021-04-14 20:39:05 +02:00
ec6d68322a
Make hbarmor work
2021-04-14 20:08:08 +02:00
18cdd13c06
Partialy fix #1559
2021-04-14 11:01:50 -07:00
5d9bb7cacd
Fix armor not actually protecting lol
2021-04-14 19:06:11 +02:00
ad3defdfb3
Merge branch 'master' into damage
2021-04-14 18:29:42 +02:00
7f28f4a9d1
Merge branch 'master' into mineclone5
2021-04-14 18:16:24 +02:00
c41bd3932c
Add global smoke spawning API
2021-04-14 18:14:21 +02:00
875bb3db84
Use fire-like damage types properly
2021-04-14 17:20:51 +02:00
d0ddd38d4e
Merge branch 'master' into damage
2021-04-14 16:14:00 +02:00
ce0148d9a8
Rewrite armor; new damage system
2021-04-14 15:46:52 +02:00
d3dd6559a2
Add correct durability for netherite sword
2021-04-14 13:12:44 +00:00
464216ea0a
Fix crash in netherite hoe by adding netherite to uses{}
2021-04-14 13:10:07 +00:00
5c9a78bea7
Add netherite hoe texture
2021-04-14 13:08:31 +00:00
7d22906f34
Add netherite tools
2021-04-14 13:07:25 +00:00
1247bcc039
Add: Netherite scrap, Netherite ingot. Add crafting recipe for netherite ingot.
2021-04-14 12:35:15 +00:00
93df51b223
Add ancient debris
2021-04-14 12:20:53 +00:00
7e7a635ed0
Add correct durability for netherite armor
2021-04-14 11:57:46 +00:00
35d2ef52c1
Add correct textures for netherite armor
2021-04-14 11:54:42 +00:00
a3ef3737d5
Remove invalid placed texture images
2021-04-14 11:52:23 +00:00
e1236d7547
Add second part of netherite armor textures
2021-04-14 11:46:34 +00:00
Elias Fleckenstein
AFCMS
NO11
Elias Åström
kay27
epCode
Code-Sploit
TechDudie
Elias Fleckenstein
jordan4ibanez
Doloment
AFCMS
Nils Dagsson Moskopp
Code-Sploit
Benjamin Schötz