Commit graph

6762 commits

Author SHA1 Message Date
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
58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +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
jordan4ibanez
85e531bf10 Remove unneeded mobs:protect from code 2021-04-18 21:24:31 -04:00
jordan4ibanez
4d589dfb2a Remove literally unneeded mobs:capture_mob 2021-04-18 21:22:39 -04:00
jordan4ibanez
39985aa558 Up fallback max xp to 3 2021-04-18 21:22:21 -04:00
jordan4ibanez
1920ddf915 Change all enemy attack info to more workable and understandable attacks 2021-04-18 21:02:03 -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
jordan4ibanez
719bb2a3c9 Add in prototype jump-only mobs api 2021-04-17 18:21:33 -04:00
jordan4ibanez
db87b8e0a3 fix chicken rotation 2021-04-17 17:09:57 -04:00
jordan4ibanez
e2987245fd Balance out collision forces for mobs 2021-04-17 17:00:34 -04:00
jordan4ibanez
3cf263d292 Add in dynamic pitch in flying/swimming mobs 2021-04-17 16:23:38 -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
jordan4ibanez
5ade34115c Remove random state initialization in set_up.lua 2021-04-17 13:17:29 -04:00
jordan4ibanez
d9729fc865 Fix parrot's rotation 2021-04-17 13:13:45 -04:00
jordan4ibanez
58d9670e77 Remove collisionbox addition for y position for fly mobs 2021-04-17 13:11:39 -04:00
jordan4ibanez
a20f272e08 re-adjust logic gate for mobs floating in water and lava 2021-04-17 13:05:53 -04:00
jordan4ibanez
0794bc5437 Make flying mobs float in water and lava 2021-04-17 13:04:55 -04:00
kay27
ff07ee5d93 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-17 21:02:07 +04:00
Elias Fleckenstein
f8b54db392 Fix controls.register_on_press being called for every player in a globalstep 2021-04-17 18:55:56 +02:00
jordan4ibanez
8783912938 Add in mobs api swimming animation 2021-04-17 12:48:57 -04:00
jordan4ibanez
f2e909ab8d Add in fly logic gate 2021-04-17 12:41:14 -04:00
jordan4ibanez
07841c8963 Swap name of quick_rotate_45 to quick_rotate 2021-04-17 12:38:48 -04:00
jordan4ibanez
240d6ea211 Add note about quick_rotate_45 actually rotating 11.25 degrees 2021-04-17 12:37:04 -04:00
jordan4ibanez
e8148f81ab Make underwater mobs try to continuously swim around with quick_rotate_45 2021-04-17 12:36:19 -04:00
jordan4ibanez
061602d9d4 Overhaul separation of swimming and flying for ease of use with writing mobs api 2021-04-17 12:28:07 -04:00
Elias Fleckenstein
f79e12c8ae Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-17 18:16:19 +02:00