Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,321 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

206 Commits (d509d76d1322b7293536e8bffdb297f68a050533)

Author SHA1 Message Date
kay27 f30a2ab6bc Merge remote-tracking branch 'origin/master' into mineclone5 2021-06-21 02:42:19 +04:00
Elias Fleckenstein 64d3a28578 Merge pull request 'Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled)' (#1796) from pumpkin_hud into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1796
 2021-06-14 11:44:21 +00:00
kay27 b3e3b91b7c Merge master 2021-06-12 15:12:33 +04:00
AFCMS e11dc4b58e fix some luacheck warnings 2021-06-12 00:28:07 +02:00
NO11 3577585d74 Use get_bool 2021-06-10 15:34:57 +00:00
NO11 c350b5158b Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled) 2021-06-09 18:31:21 +00:00
Elias Fleckenstein 4324e97db0 Merge pull request 'Pumpkin hud' (#1754) from pumpkin_hud into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1754
 2021-06-08 11:06:22 +00:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
NO11 ec542a142a Improve pumkin hud a bit 2021-05-29 08:56:11 +00:00
NO11 47b6a8d7f8 Remove unused variable 2021-05-25 09:03:06 +00:00
NO11 ba38f787e2 Fix local function code style 2021-05-24 11:09:47 +00:00
NO11 8b11e2fec8 Add multiplayer support for pumpkin hud 2021-05-23 22:31:13 +00:00
NO11 9b9ec13967 „mods/ITEMS/mcl_farming/pumpkin.lua“ ändern 2021-05-23 19:38:49 +00:00
NO11 d5a2e5e514 Add "fake" crosshair when the player is wearing a pumpkin 2021-05-23 17:38:53 +00:00
NO11 dddaed42b6 Obstruct the view of the player when wearing a pumpkin 2021-05-23 16:50:09 +00:00
NO11 973a8201ad Pumpkin blur texture 2021-05-23 16:44:01 +00:00
AFCMS fcc2087b97 [mcl_farming] fix warnings 2021-05-22 23:50:28 +02:00
kay27 f53f961122 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-08 14:09:32 +04:00
Elias Fleckenstein 33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Elias Fleckenstein 6eadeb21c0 Merge branch 'master' into mineclone5 2021-04-27 18:56:48 +02:00
Code-Sploit 4baea9f420 Add all pixel-perfection textures for netherite 2021-04-22 13:59:53 +00:00
Elias Fleckenstein 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
Elias Fleckenstein ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00
Code-Sploit 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
AFCMS a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
Marcin Serwin 2a06be02b3 Add polish translation of mcl_farming 2021-04-14 21:20:58 +02:00
Elias Fleckenstein ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
Code-Sploit 464216ea0a Fix crash in netherite hoe by adding netherite to uses{} 2021-04-14 13:10:07 +00:00
Code-Sploit 5c9a78bea7 Add netherite hoe texture 2021-04-14 13:08:31 +00:00
Code-Sploit 7d22906f34 Add netherite tools 2021-04-14 13:07:25 +00:00
Elias Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 16:34:40 +02:00
Elias Fleckenstein db5626fcb4 Revert "Make hoe dig some blocks faster" 
This reverts commit c1e295de5f.
 2021-04-12 15:05:01 +02:00
AFCMS 339e3e2792 fix some tools not using right var 2021-04-05 14:32:48 +02:00
AFCMS 84819bf9f5 MAKE EVERY SINGLE MOD USE PROPER COLORS!!! 2021-03-30 00:01:29 +02:00
Elias Åström c1e295de5f Make hoe dig some blocks faster 
- Sponges
- Hay and kelp blocks
- Nether wart
- Leaves
 2021-03-21 12:39:14 +01:00
Nicu a40e1c4737 Reduce the size of the pumpkin texture 
2732 -> 303 bytes

* We need smaller file sizes for better game startup time, especially for multiplayer and mobile gaming.
 2021-03-19 17:41:37 +00:00
Elias Fleckenstein d168bfa791 Fix pumpking breaking armor display 2021-03-19 14:47:52 +01:00
Elias Åström ed30fa0868 Move data from deprecated files to mod.conf 
Move data from deprecated files (depends.txt and description.txt) into
fields in mod.conf for all mods.

This was done with a shell script :)
 2021-03-18 17:37:12 +01:00
AFCMS 06e8e972cc add help text to mcl_farming 2021-03-12 00:48:53 +01:00
AFCMS bed3dd87ad Add API for mcl_jukebox 2021-03-12 00:10:50 +01:00
AFCMS 1a60d08a37 mcl_farming make plantlist copy global and mcl_jukebox cleanup 
Sorry, I forgot to commit between the 2 features :-(
 2021-03-11 23:39:26 +01:00
Elias Fleckenstein aeb7078c05 Update use_texture_alpha to the minetest 5.4 conventions 2021-02-18 14:00:17 +01:00
Elias Fleckenstein 9b349a1684 More flexible wield rotation determination 2021-02-18 09:28:12 +01:00
Midgard f27fbd866e
Correct hoe repair material 2021-02-12 17:13:58 +01:00
kay27 fd4ce3c688 Scale mcl_farming_pumpkin_face_preview.png 32x64 to 16x32 according to https://git.minetest.land/Wuzzy/MineClone2/issues/974 2021-01-08 14:30:11 +01:00
Wuzzy 39a0fdd24c No enchant 4 flint&steel,pumpkin,head,screwdriver 2020-12-19 16:26:12 +01:00
Elias Fleckenstein ed738da016 Added Enchanting Table 2020-11-25 12:47:27 +01:00
Elias Fleckenstein 86b2cd70f9 Fortune 2020-11-06 13:46:52 +01:00
Elias Fleckenstein 7c28bf8507 Silk Touch 2020-11-02 19:09:23 +01:00