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
7a6929f4cb
Add first part of netherite armor textures
2021-04-14 11:44:50 +00:00
bc23cd800e
Add code for netherite armor
2021-04-14 11:42:28 +00:00
5b93ee5e40
Improve rocket
2021-04-13 17:07:28 -07:00
7fa0767b13
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-14 01:18:34 +04:00
1c50f9aed6
fix typo
2021-04-13 20:52:55 +00:00
f768972469
add rocket texture (pixel perfection)
2021-04-13 20:38:00 +00:00
9c68528b8b
add german translation
2021-04-13 20:36:41 +00:00
1597e093b5
Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“
2021-04-13 20:35:40 +00:00
f15a28109c
add rocket for elytra boost
2021-04-13 20:33:34 +00:00
cd0d2d2296
Fix #1548
2021-04-13 13:57:45 +00:00
3077498a63
Fix screwdriver/door duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149
2021-04-13 16:49:10 +04:00
b340a3586d
Make mcl_backstone use the new mcl_torches API for soul torches instead of overwriting it
2021-04-13 10:05:22 +02:00
78d387e2df
Rewrite mcl_torches API
2021-04-13 09:59:51 +02:00
944a6325d0
Rewrite mcl_torches API
2021-04-13 09:59:32 +02:00
89c4720de1
Fix warning with leafdecay_distance
2021-04-13 08:53:22 +02:00
9ce4cd1281
Fix fire_enabled warning
2021-04-13 08:50:50 +02:00
fe5a8737b8
Fix light_source warning in mcl_mushroom
2021-04-13 08:49:57 +02:00
e1ccdef42a
Merge branch 'master' into mineclone5
2021-04-13 08:22:39 +02:00
037832a177
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-04-13 08:06:28 +02:00
424685d3d3
Add elytra (sprint in air to use)
2021-04-12 14:56:33 -07:00
5fb7913355
Revert "Revert "Merge pull request 'Add #490' ( #1515 ) from NO11/MineClone2:master into master""
...
This reverts commit 615b15f133
2021-04-12 16:36:08 +02:00
d3a3253563
Revert "Revert "Make hoe dig some blocks faster""
...
This reverts commit db5626fcb4
2021-04-12 16:34:40 +02:00
c3868084af
Revert "Fix crash with removed hoey diggroup"
...
This reverts commit ed7099fefc
2021-04-12 16:34:25 +02:00
bb16512842
Revert "Revert "Merge pull request 'Add #490' ( #1515 ) from NO11/MineClone2:master into master""
...
This reverts commit 615b15f133
2021-04-12 15:28:28 +02:00
06e8e8f463
Merge branch 'master' into mineclone5
2021-04-12 15:28:00 +02:00
615b15f133
Revert "Merge pull request 'Add #490' ( #1515 ) from NO11/MineClone2:master into master"
...
This reverts commit 7a8079bb64849823af1f
2021-04-12 15:25:31 +02:00
1ca95f9495
Revert "Fix crash with removed hoey diggroup"
...
This reverts commit ed7099fefc
2021-04-12 15:19:36 +02:00
9da82d44c5
Merge branch 'master' into mineclone5
2021-04-12 15:19:04 +02:00
ed7099fefc
Fix crash with removed hoey diggroup
2021-04-12 15:18:19 +02:00
7995ff0527
Revert "Revert "Make hoe dig some blocks faster""
...
This reverts commit db5626fcb4
2021-04-12 15:09:48 +02:00
8b5be69332
Merge branch 'master' into mineclone5
2021-04-12 15:06:49 +02:00
db5626fcb4
Revert "Make hoe dig some blocks faster"
...
This reverts commit c1e295de5f
2021-04-12 15:05:01 +02:00
4a3078f04b
[mobs] Merge repeat/break/until instead of goto from master
2021-04-11 02:16:09 +04:00
9ba1917209
Add end crystal beams
2021-04-10 20:58:34 +02:00
9e15c6f168
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-10 20:01:17 +04:00
cdd12a0c71
Charcoal made from debarked wood
2021-04-10 11:19:51 +00:00
652f8d48ed
Debark wood with an axe
2021-04-09 22:16:52 +00:00
988f298375
Add stripped wood crafting
2021-04-09 22:13:50 +00:00
c73cd8b810
Add stripped spruce textures
2021-04-09 22:11:32 +00:00
ebd4380c98
Add stripped oak textures
2021-04-09 22:10:47 +00:00
3d732c2412
Add stripped jungle textures
2021-04-09 22:10:10 +00:00
03e112ef9b
Add stripped dark oak textures
2021-04-09 22:09:16 +00:00
9b81a4d83e
Add stripped birch textures
2021-04-09 22:08:39 +00:00
cbcaef19c6
Add stripped acacia textures
2021-04-09 22:07:44 +00:00
9e5fb7f533
Add #490
2021-04-09 22:04:42 +00:00
3addd4ebb1
Revert "Attemp to fix #1513" in favour of next commit 3375e903ce
...
This reverts commit f5f6e232cc
2021-04-09 19:06:11 +04:00
1cb060ea08
[mesecons] Fix attempt to call upvalue in internal.lua
2021-04-09 19:06:11 +04:00
d2c65f14a3
Attemp to fix #1513
2021-04-09 19:06:11 +04:00
d50fd06c82
Revert "Attemp to fix #1513" in favour of next commit 3375e903ce
...
This reverts commit f5f6e232cc
2021-04-09 19:03:45 +04:00
3375e903ce
[mesecons] Fix attempt to call upvalue in internal.lua
2021-04-09 18:52:33 +04:00
f5f6e232cc
Attemp to fix #1513
2021-04-09 16:46:41 +02:00
bc16c33dde
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-09 02:15:15 +04:00
a733eb8e0c
[mesecons] Localise several things in internal.lua
2021-04-09 02:08:03 +04:00
7c8cf6f79f
Do not crash server if world border is depowered
2021-04-09 01:33:22 +04:00
f0c2eb86a2
Revert (3/3) "Fix extreme mesecons/redstone crashing at world border"
...
This reverts commit 0842a36aa6
2021-04-09 01:32:58 +04:00
26ce10d25c
Revert (2/3) "Add erlehmann fix to redstone world border crash"
...
This reverts commit b9d175e6a5
2021-04-09 01:32:27 +04:00
6b31e85385
Revert (1/3) "Revert fixes to crash world border"
...
This reverts commit 18f73ba31f
2021-04-09 01:31:21 +04:00
18f73ba31f
Revert fixes to crash world border
2021-04-08 15:48:53 -04:00
b9d175e6a5
Add erlehmann fix to redstone world border crash
2021-04-08 15:16:38 -04:00
871ad8d8d9
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-08 23:07:31 +04:00
0842a36aa6
Fix extreme mesecons/redstone crashing at world border
2021-04-08 14:28:07 -04:00
bfc1f253af
Allow kelp stems at half height to be treated like full-sized ones.
...
Remove debug information
2021-04-08 20:22:09 +04:00
ce66d99504
Fix bug where incorrect number of items are dropped.
2021-04-08 20:22:09 +04:00
70d1aba73e
Prevent param2 overflow when adding stems. Fix #1490
2021-04-08 20:22:08 +04:00
d50665d2d5
Allow kelp stems at half height to be treated like full-sized ones.
...
Remove debug information
2021-04-08 19:25:19 +08:00
5ccb12586d
Fix bug where incorrect number of items are dropped.
2021-04-08 13:35:49 +08:00
2db0e176b3
Prevent param2 overflow when adding stems. Fix #1490
2021-04-08 12:46:04 +08:00
227180035f
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-08 02:58:17 +04:00
8e30bc8dbd
[mcl_portals] Prevent from spawning Nether portals in Undertale when not enough air space in Nether
2021-04-08 02:54:33 +04:00
034af87cd7
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-07 20:40:07 +04:00
99563ab93a
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-07 17:19:41 +04:00
6e2a7c8a7e
Make gateway enderpearl teleports easier
2021-04-07 13:47:48 +02:00
c451866a36
Fix #1426
2021-04-07 09:56:00 +02:00
3c1a38904a
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2
2021-04-07 09:25:44 +02:00
b2c09c8ba0
Add gateway portals
2021-04-07 09:17:13 +02:00
069e089ae4
[mcl_portals, mcl_structures] Add End gateways W-I-P by Elias Fleckenstein with minor portals improvements and fixes
2021-04-07 03:34:15 +04:00
430f958fae
Move end exit portal to 0, 0; Add end gateway portals (WIP)
2021-04-06 20:08:20 +02:00
f65c40f805
Make dragon egg teleport on punching
2021-04-06 17:20:11 +02:00
51f121d516
Merge branch 'master' into ender_chest_fix
2021-04-06 14:57:19 +00:00
89a9b16465
Merge pull request 'Add End Credits' ( #1469 ) from credits into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1469
2021-04-06 14:39:47 +00:00
ea08fee9ba
Make the dragon stay within a 50 blocks range of the portal
2021-04-06 16:38:23 +02:00
1e17989ef2
Prevent opening an ender chest while block above it
2021-04-06 21:17:02 +07:00
91e2372df0
Merge branch 'master' into credits
2021-04-06 16:06:12 +02:00
058c6ef9f4
Merge pull request 'Fix chest entity textures' ( #1472 ) from Doloment/MineClone2:master into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1472
2021-04-06 14:03:30 +00:00
83b9cf3ad2
End exit portal openng / closing on dragon death / spawn
2021-04-06 15:48:17 +02:00
31a7a4fbb6
Merge branch 'master' into master
2021-04-06 13:42:07 +00:00
962a13847e
Fix dragons summoned using commands spawning an egg on the exit portal
2021-04-06 14:57:29 +02:00
055c406d7a
Fix chest entity textures (trapped chests were lighter)
2021-04-06 18:57:06 +07:00
a348909ba3
Enderdragon: Proper Egg and XP spawning
2021-04-06 12:50:36 +02:00
c93a865098
Remove empty line from mcl_portals
2021-04-06 11:59:22 +02:00
175cb44fb1
Merge branch 'master' into credits
2021-04-06 10:53:15 +02:00
a324ac0308
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-06 01:16:02 +04:00
91da727184
Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2
2021-04-05 15:22:57 +02:00
339e3e2792
fix some tools not using right var
2021-04-05 14:32:48 +02:00
28402ca663
store tool wield scale in a global var
2021-04-05 10:16:56 +02:00
90f312f772
Add credits overlay prototype
2021-04-04 19:13:46 +02:00
3e0bbda3f7
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-04 14:20:01 +04:00
598692cf8c
Add nil check to prevent crashes with mcl_throwing
2021-04-04 12:10:21 +02:00
4027c9fa29
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-03 01:25:40 +04:00
0db47dbf02
Merge branch 'remove-alpha-field'
2021-04-02 14:43:08 +02:00
TechDudie
Elias Fleckenstein
NO11
Elias Fleckenstein
kay27
jordan4ibanez
Doloment
Elias Åström
AFCMS
Code-Sploit
AFCMS
epCode
Nils Dagsson Moskopp
Code-Sploit
Benjamin Schötz
iliekprogrammar