kay27
106ecb0958
Merge remote-tracking branch 'origin/master' into mineclone5
2021-04-20 22:08:36 +04:00
kay27
7fa02e5a85
Merge pull request 'Emergency Bugfix' ( #1585 ) from TechDudie/MineClone2:sweet_berry into mineclone5
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1585
2021-04-20 18:06:12 +00: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
kay27
b0c8f47e91
Merge pull request 'Add Sweet Berries' ( #1583 ) from TechDudie/MineClone2:sweet_berry into mineclone5
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1583
2021-04-19 20:46:07 +00: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
Elias Fleckenstein
4c25091430
Fix syntax error in mcl_inventory
2021-04-19 19:12:32 +02:00
Elias Fleckenstein
ca74f23094
Merge branch 'master' into damage
2021-04-19 18:58:00 +02: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 d8d4cb5defcbe1ca1b71100441cc6636557752c8)
Reverts a2fcd28a3dcbf1aaa07c9f2c21ba7cd3872b7cd4 and partially reverts f8a627915e17779bec1a52fe867877036c043f72.
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 84819bf9f5164ab208b7be1e94d142906359a1af.
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
Elias Fleckenstein
52a49e640e
Merge branch 'master' into damage
2021-04-19 09:57:56 +02:00
Elias Fleckenstein
69485f8505
Integrate falling nodes damage
2021-04-19 09:49:29 +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
Elias Fleckenstein
c9b4ddb923
Add command damage type (This is Non-MC)
2021-04-18 20:22:18 +02:00
Elias Fleckenstein
53b0ad7347
Implement magic damage
2021-04-18 20:21:11 +02:00
Elias Fleckenstein
d9195cc520
Redesign damage modifier execution
2021-04-18 20:08:08 +02: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
Elias Fleckenstein
a2c3eb95bb
Merge branch 'master' into damage
2021-04-18 19:51:46 +02:00
Elias Fleckenstein
d08a226a51
Integrate critical hits
2021-04-18 19:50:48 +02:00
NO11
9bc2f2d866
Fix lying trunks that stand upright again after debarking
2021-04-18 17:18:27 +00:00