f53f961122
Merge remote-tracking branch 'origin/master' into mineclone5
2021-05-08 14:09:32 +04:00
4bb27a0d79
[mcl_mobspawners] Fix random crash, https://git.minetest.land/MineClone2/MineClone2/issues/1707
2021-05-08 14:09:16 +04:00
b37cbbebb8
Fix ancient debris duplication glitch (remove fortune drop)
2021-05-07 22:50:35 +00:00
1bd647507b
Add proper end crystal death message
2021-05-05 13:20:06 +02:00
a9817fea4b
Merge branch 'master' into real_maps
2021-05-05 08:21:01 +02:00
70db02306f
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-05-05 08:19:59 +02:00
f7280dc4f0
Remove mod screenshots since they only take up space and are partly outdated
2021-05-04 20:16:30 +02:00
7513bc600a
Merge branch 'master' into compass_and_clock
2021-05-04 09:04:50 +02:00
f96258ca5c
Fix mob heads not showing their texture when worn as head armor
2021-05-04 09:01:53 +02:00
33c6e5cdad
Fix wearing pumpkin heads as armor
2021-05-04 08:59:01 +02:00
2c5eca3999
Make clocks work in itemframes
2021-05-04 08:49:21 +02:00
74e3c6555d
Globalize mcl_clock API
2021-05-03 13:43:46 +02:00
ecc2010fe5
Make compasses work in itemframes
2021-05-03 11:22:47 +02:00
5bb1657bd8
Add moving marker for the player
2021-05-03 10:46:59 +02:00
f063d14caf
Add craft predict for map copying
2021-05-02 19:30:27 +02:00
0d287001f7
Fix tt snippet to update wield filled maps as well
2021-05-02 19:18:30 +02:00
63d4e57a8d
Correct typo (ninetest -> minetest)
2021-05-02 17:19:11 +02:00
ecea8f1662
Prevent placing of wielded maps
2021-05-02 17:14:57 +02:00
ef08977112
Copy stack before accessing it in add_item
2021-05-02 17:11:33 +02:00
1f87874870
Make it look like the player is holding the map in their hand
2021-05-02 17:03:39 +02:00
9a3ae17564
Make maps show their image when in itemframes
2021-05-02 16:04:48 +02:00
bd74dbe321
Revert "Use PNG instead of TGA"
...
This reverts commit ca9cd8cbe0
2021-05-02 13:03:18 +02:00
ca9cd8cbe0
Use PNG instead of TGA
2021-05-02 12:55:04 +02:00
d9a670dcb8
Show empty map in creative inv, but don't show filled map there
2021-05-02 12:24:22 +02:00
f22b3fd457
Implement copying maps
2021-05-02 12:23:29 +02:00
1079ab74d4
Stack filled maps that have the same metadata
2021-05-02 11:42:16 +02:00
8c2f5bc3d2
Fix #1706
2021-05-02 08:31:26 +00:00
445af4e4c9
Remove unnessacary comments in mcl_smithing_table/init.lua
2021-05-02 08:11:11 +00:00
f430ebcc8d
Add #924 , cactus breaks minecart
2021-05-01 17:29:08 +00:00
2228b30658
Add API to create filled map
2021-05-01 17:36:51 +02:00
1ed6aeca5e
Remove map_background.png
2021-05-01 17:22:48 +02:00
c6e80b5882
Add Real Maps
2021-05-01 16:52:16 +02:00
1750929367
Merge remote-tracking branch 'origin/master' into mineclone5
2021-05-01 15:58:14 +04:00
1c05461e67
Add #924 (cactus breaks minecart now)
2021-04-30 23:05:40 +00:00
8cccbd7caa
Fix harming potion crash
2021-04-30 16:38:53 +02:00
e19d39f065
Add polish translation of mesecons_delayer
2021-04-29 17:26:47 +02:00
5b3a156c09
Add polish translation of mesecons_pressureplates
2021-04-29 17:13:54 +02:00
604af04849
Add polish translation of mesecons_noteblock
2021-04-29 17:08:11 +02:00
77597f9bac
Add polish translation of mesecons_torch
2021-04-29 16:53:47 +02:00
65846cb6d8
Add polish translation of mesecons_button
2021-04-29 16:47:41 +02:00
97e50714fe
Add polish translation of mesecons_lightstone
2021-04-29 16:43:08 +02:00
d74e1fd162
Add polish translation of mcl_dispensers
2021-04-29 16:34:26 +02:00
0e52e09cc8
Add polish translation of mesecons_wires
2021-04-29 16:21:08 +02:00
ffd28c259d
Add polish translation of mcl_droppers
2021-04-29 16:11:43 +02:00
f8b9f16799
Update mcl_chests translation template
2021-04-29 12:45:15 +02:00
404097dcc0
Update german mcl_core translations
2021-04-29 12:43:44 +02:00
db78c19880
Remove legacy mcl_potions translations
2021-04-29 12:42:08 +02:00
df8b4dddec
Merge branch 'master' into mineclone5
2021-04-29 11:59:04 +02:00
6550e3e8e2
Add per-element armor groups
2021-04-29 11:51:06 +02:00
87e41cc9a9
Add support for armor texture and preview being functions
2021-04-29 11:46:27 +02:00
ec08032b62
Add on_break callback
2021-04-29 11:40:09 +02:00
eae71fdf55
Merge branch 'master' into mineclone5
2021-04-29 10:58:22 +02:00
33c0aa23c5
Re-add thorns damage type
2021-04-29 10:58:10 +02:00
47aa5da242
Merge branch 'master' into mineclone5
2021-04-29 10:56:15 +02:00
6fac49550e
Fix kicking players from bed when it's destroyed
2021-04-29 08:18:33 +02:00
cf46f0d8b8
Fix crashing if null itemstack enchant when player is hacking
2021-04-29 01:32:57 -04:00
e0c94ccb8a
Stop thorns enchant from crashing server when dealing damage to mobs
2021-04-28 21:58:28 -04:00
83b96a80ca
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-29 03:22:01 +04:00
f1b7476825
Add #1488 (sponge drying in nether makes now particles)
2021-04-28 14:37:16 +00:00
33c235362e
Merge branch 'master' into mineclone5
2021-04-28 12:27:28 +02:00
13a0fa2314
Implement #1665
2021-04-28 12:16:01 +02:00
61c6d6e276
Add per element (un)equip callbacks
2021-04-28 12:00:44 +02:00
cca03bcbd2
Merge branch 'master' into mineclone5
2021-04-28 11:40:21 +02:00
ae83e44149
remove duplicated line
2021-04-27 23:50:18 +02:00
6eadeb21c0
Merge branch 'master' into mineclone5
2021-04-27 18:56:48 +02:00
b9cdb58ce5
Merge branch 'master' into mineclone5
2021-04-27 18:44:40 +02:00
a41aace9d7
Merge branch 'master' into damage
2021-04-27 18:33:35 +02:00
0867d6e406
Update german mcl_banners translations
2021-04-26 11:15:36 +02:00
347cc7ee7c
Update mcl_banner translations to new template
2021-04-26 11:13:36 +02:00
6dc6fc8ec3
Update mcl_flowerpots translations to new template
2021-04-26 11:05:27 +02:00
b43f59332a
Update mcl_enchanting translations to new template
2021-04-26 11:03:53 +02:00
3b1d71382f
Update es, fr and ru cauldron translations to use the new template
2021-04-26 11:01:52 +02:00
05be20fcb8
Update mcl_enchanting translations
2021-04-26 11:00:53 +02:00
5df1df8e21
Update cauldron code to use the corrected translation template string
2021-04-26 10:52:50 +02:00
fed4596cb4
Update german cauldron translation fully
2021-04-26 10:52:07 +02:00
a77a916cc2
Update cauldron translations
2021-04-26 10:50:23 +02:00
8df9fe76d8
Add german translation for stripped wood
2021-04-26 08:23:26 +00:00
91211ac1f7
Merge branch 'master' into mineclone5
2021-04-26 10:08:08 +02:00
e710795eed
Merge branch 'master' into damage
2021-04-26 10:06:09 +02:00
4d2210c4e5
Fix german translation mistake
2021-04-26 08:03:20 +00:00
749f1a4a62
Fix wrong template, sry
2021-04-26 07:50:25 +00:00
e5a44dcb75
Add template for fireworks translation
2021-04-26 07:45:26 +00:00
dd68b79782
Merge branch 'master' into damage
2021-04-26 09:29:03 +02:00
dada1e9815
Add template for stripped wood translation
2021-04-25 21:47:12 +00:00
edc89898bb
Integrate fire resistance
2021-04-25 20:51:13 +02:00
fede04eaa6
Make armor listring work
2021-04-25 20:20:26 +02:00
6260dad8fc
Merge branch 'master' into mineclone5
2021-04-25 19:58:02 +02:00
cab2167520
Merge branch 'master' into damage
2021-04-25 17:32:24 +02:00
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
eeaf4e09c6
Add polish translation of mesecons_solarpanel
2021-04-25 14:34:15 +02:00
29001086c3
Add polish translation of mesecons_walllever
2021-04-25 14:30:42 +02:00
1f07f5ba17
Add polish translation of mcl_stairs
2021-04-25 14:26:52 +02:00
095128b6b3
Add polish translation of mcl_fire
2021-04-25 13:55:30 +02:00
bcf5eef010
Add polish translation of mcl_torches
2021-04-25 13:41:04 +02:00
3917bb51a2
Add polish translation of mcl_signs
2021-04-25 13:39:59 +02:00
dd0e381e39
Add polish translation of mcl_beds
2021-04-25 13:33:57 +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
4975a516f5
Add polish translation of mcl_fishing
2021-04-25 13:24:42 +02:00
c0ce511ad0
Add polish translation of mcl_mobspawners
2021-04-25 13:14:56 +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
b93d3cf93c
Add polish translation of mcl_books
2021-04-25 12:58:32 +02:00
a038908acd
Add polish translation of mcl_crafting_table
2021-04-24 21:51:11 +02:00
a613da65c5
Add polish translation of mcl_walls
2021-04-24 21:47:42 +02:00
18903d5a09
Add polish translation of mcl_wool
2021-04-24 21:23:09 +02:00
c6a07b8007
Add polish translation of mcl_cocoas
2021-04-24 21:19:11 +02:00
67780f2159
Add polish translation of mcl_cake
2021-04-24 21:16:02 +02:00
7e9eb927f1
Add polish translation of mcl_colorblocks
2021-04-24 21:11:45 +02:00
ae7ea8edef
Add polish translation of mcl_buckets
2021-04-24 20:57:57 +02:00
0cf58ce98d
Add polish translation of mcl_jukebox
2021-04-24 20:57:57 +02:00
0ebf6b8f92
Add polish translation of mcl_tnt
2021-04-24 20:57:57 +02:00
0a8b6a63cb
Add polish translation of mcl_mobitems
2021-04-24 20:57:53 +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
kay27
NO11
Elias Fleckenstein
Code-Sploit
Marcin Serwin
jordan4ibanez
AFCMS
Elias Åström
epCode
TechDudie
Elias Fleckenstein
Doloment