Commit graph

3024 commits

Author SHA1 Message Date
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
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
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
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
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
kay27
ff07ee5d93 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-17 21:02:07 +04:00
NO11
06699c2cc4 Fix that an ax wears out if you right-click another block 2021-04-17 11:55:50 +00:00
AFCMS
02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
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
Elias Fleckenstein
fbee510b42 Merge branch 'master' into mineclone5 2021-04-16 12:17:55 +02: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
epCode
31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -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
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: https://git.minetest.land/MineClone2/MineClone2/pulls/1564
2021-04-15 16:18:51 +00:00
NO11
a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00: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
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
Elias Fleckenstein
7f28f4a9d1 Merge branch 'master' into mineclone5 2021-04-14 18:16:24 +02:00