Commit graph

5998 commits

Author SHA1 Message Date
Elias Fleckenstein
f3c4dd699d Merge branch 'master' into mineclone5 2021-04-21 11:31:39 +02:00
Elias Fleckenstein
bec86ece0b Merge branch 'mineclone5' of https://git.minetest.land/MineClone2/MineClone2 into mineclone5 2021-04-21 11:31:29 +02:00
kay27
106ecb0958 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-20 22:08:36 +04:00
TechDudie
1db8c21ec2 Emergency 2021-04-20 17:57:07 +00:00
Elias Fleckenstein
6b005a9214 Fix missing texture warning 2021-04-20 19:31:42 +02:00
Elias Fleckenstein
0c9314fba7 Use different textures for blackstone top and side 2021-04-20 19:28:35 +02:00
epCode
c7d91baadf rid some mobs of bouncing animation 2021-04-19 14:29:12 -07:00
epCode
9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
TechDudie
feda530bff Update 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:39:09 +00:00
TechDudie
5d98662a60 Update 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:32:47 +00:00
TechDudie
cea1078a16 Upload files to 'mods/ITEMS/mcl_sweet_berry/textures' 2021-04-19 18:30:44 +00:00
TechDudie
d347b829c0 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_2.png' 2021-04-19 18:30:11 +00:00
TechDudie
ade55cee33 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_3.png' 2021-04-19 18:29:57 +00:00
TechDudie
9efefc2d85 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_1.png' 2021-04-19 18:28:33 +00:00
TechDudie
85e693e1e1 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_0.png' 2021-04-19 18:28:16 +00:00
TechDudie
32c773cdea Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry.png' 2021-04-19 18:28:01 +00:00
TechDudie
49f8df85ee Upload files to 'mods/ITEMS/mcl_sweet_berry' 2021-04-19 18:26:59 +00:00
TechDudie
b012c3b739 Add 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:20:44 +00:00
TechDudie
f517d82885 Add 'mods/ITEMS/mcl_sweet_berry/mod.conf' 2021-04-19 18:11:48 +00:00
NO11
7a5ce1c717 Simplify debarking again 2021-04-19 16:53:48 +00:00
NO11
e8c15867ad Add mcl_stripped_varient node def 2021-04-19 16:50:21 +00:00
Elias Fleckenstein
20a4e038f5 Fix crash when slain by named mob 2021-04-19 17:40:50 +02:00
Elias Fleckenstein
c80b1c5140 Re-add usage of mcl_colors.GRAY to book descriptions 2021-04-19 15:19:59 +02:00
Elias Fleckenstein
7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
2021-04-19 15:16:59 +02:00
Elias Fleckenstein
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
Elias Fleckenstein
1bf9455065 Merge branch 'master' into mineclone5 2021-04-19 11:12:21 +02:00
NO11
0c5ca70187 remove wrong config 2021-04-19 07:35:53 +00:00
Elias Fleckenstein
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
kay27
e2d3f2a194 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-19 09:58:55 +04:00
jordan4ibanez
c03717139b Add mod.conf to mcl_fireworks 2021-04-18 23:23:07 -04:00
jordan4ibanez
44a25de12f Fix crashing with unknown slot description when enchanting 2021-04-18 23:18:18 -04:00
kay27
96694692d8 [mineclone5] Put ITEMS/mcl_core/nodes_trees.lua from master 2021-04-19 00:15:20 +04:00
NO11
aa533edda2 Simplify debarking 2021-04-18 18:28:39 +00:00
NO11
49f6ccaa4a Remove old crafting recipes 2021-04-18 18:02:41 +00:00
NO11
3668b2dee6 Summarize all debarked types of wood 2021-04-18 18:02:37 +00:00
NO11
9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Elias Fleckenstein
5d9c3cd85b Fix #1572 2021-04-18 14:41:44 +02:00
Doloment
956dab78ce Added LBM 2021-04-18 09:50:02 +00:00
Elias Åström
fc9928c0b6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 11:42:38 +02:00
Elias Åström
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
Elias Åström
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
Elias Fleckenstein
76271199c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 08:39:04 +02:00
kay27
bb902caa57 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-18 04:29:59 +04:00
kay27
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
Elias Fleckenstein
a7e102426a Add time_of_day to get_light crash fix 2021-04-17 21:01:09 +02:00
Elias Fleckenstein
bcd058feb1 Fix get_light crash 2021-04-17 21:00:32 +02:00
Elias Fleckenstein
baebe3c2d2 Fix namtags being invisible 2021-04-17 20:57:12 +02:00
Elias Fleckenstein
48a2e4212a Fix namtags being invisible 2021-04-17 20:55:08 +02:00
Elias Fleckenstein
811efcf9f3 Merge branch 'master' into mineclone5 2021-04-17 20:32:30 +02:00
Elias Fleckenstein
205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02:00