atomdmac
/
MineClone5
forked from MineClone5/MineClone5
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,962 Commits 32 Branches 24 Tags 71 MiB
Commit Graph

221 Commits

Author SHA1 Message Date
3raven 5f4327caf0 Update 2022-07-19 19:40:32 +00:00
kay27 7640edabcc Merge pull request 'Remove 2D preview + fix enchanting overlay by AFCMS' (#311) from MrRar/MineClone5:armor2d into master 
Reviewed-on: MineClone5/MineClone5#311
 2022-07-04 01:38:55 +00:00
balazsszalab 5b56acd415 Fix skipping growth stages of mcl_farming plants 
Because usually math.ceil(intervals_counter)>=1, stages + math.ceil(intervals_counter)>=2. It causes the plants to skip growth stages and they usually grow two stages at once. Changing ceil to floor seems to solve the problem.
 2022-06-18 16:40:50 +00:00
balazsszalab e2e4f7d2df Register sweet berry bush by add_plant function to enable plant growth 
Without calling the add_plant function, sweet berry bushes will not go through growth stages and it is impossible to farm them. Sweet berry bush and beetroot have the same number of growth stages, so I used beetroot's interval and chance values here. If somebody has a better approximation of these values, feel free to change them.
 2022-06-18 15:41:22 +00:00
AFCMS 48c8eaa6ed Remove 2D preview by AFCMS 2022-05-06 12:53:30 -05:00
Mark Roth c282324661 #248 move compostability rating to items groups instead of the list in the mod 2022-03-20 01:07:42 +02:00
kay27 1a6f4960bf Merge pull request 'Update Russian translation' (#216) from U.N.Owen/MineClone5-translate-ru:master into master 
Reviewed-on: MineClone5/MineClone5#216
 2022-02-20 09:57:05 +00:00
Sab Pyrope e817c1dbc6 Update Russian and other translations 2022-02-19 21:14:51 +08:00
3raven 82f63f01b6 Mise à jour de 'mods/ITEMS/mcl_farming/locale/mcl_farming.fr.tr' 2022-02-19 01:35:35 +00:00
Mikita Wiśniewski 69df4f261d Replace old weird sweet berry textures with the new ones by Nova_Wostra 2022-02-18 20:58:25 +07:00
kay27 749bc379e7 Merge MineClone 2/master into testing 2022-01-11 21:52:45 +04:00
NO11 627c37cd97 Fix pumpkin hud 2022-01-02 12:37:20 +00:00
cora 7ae73bcf47 fix crash and netherite hoes 
The item registration in mcl_farming for diamond hoes contains the wrong
upgrade_item id (mcl_tools:hoe_netherite, should me mcl_farming:). This
commit changes that.
 2021-09-10 21:41:15 +02:00
kay27 d10ab0d1ee [mineclone5] Tune sweet berries a bit 2021-06-21 04:51:05 +04:00
kay27 85b3fef4bf [mineclone5] Move sweet berries into farming as a quick fix 2021-06-21 03:58:18 +04:00
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: MineClone2/MineClone2#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: MineClone2/MineClone2#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
Lizzy Fleckenstein 33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Lizzy 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
Lizzy Fleckenstein 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
Lizzy 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
Lizzy 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
Lizzy Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 16:34:40 +02:00
Lizzy 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