Commit graph

10078 commits

Author SHA1 Message Date
CyberMango
5e969ba928 Added sweet berries death messages. 2023-01-04 23:04:19 +02:00
CyberMango
17e02aec3c Applying bone meal on a stage 3 sweet berry no longer grows it.
It now ignores the bone meal and harvests the sweet berry as normal.
2023-01-04 23:04:19 +02:00
CyberMango
fb28e192e6 Bone meal applied on sweet berries only grows them by 1 stage now.
The interface of the grow plant is a bit confusing since even with
stages set to 0 the plant grows by 1 stage (if other conditions such as
light are met). Therefore changing it to 0 makes the plant grow by 1.
2023-01-04 23:04:19 +02:00
CyberMango
0f569fdbaa Bone meal on sweet berries in creative mode is no longer wasted and
minor fixes.

removed an unnecessary -- in a comment.
Removed a redundant concatination.
2023-01-04 23:04:19 +02:00
CyberMango
8a7fcfde82 Fixed sweet berries bugs.
Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
2023-01-04 23:04:19 +02:00
CyberMango
fb51067c78 Created a shared function for planting a seed that can also be consumed. 2023-01-04 23:04:19 +02:00
ancientmarinerdev
7ea41a2f21 Merge pull request 'Fix baby zombies going through 1 node high space' (#3241) from short_baby_zombies into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3241
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-04 14:56:26 +00:00
Johannes Fritz
0b1916b807 Fix baby zombies going through 1 node high space 2023-01-04 07:52:48 -06:00
ancientmarinerdev
0fca1ce469 Merge pull request 'Fix crash for sky colour if cannot find biome' (#3239) from fix_colour_crash_risk into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3239
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-03 01:02:19 +00:00
ancientmarinerdev
df6d1c026a Fix crash for sky colour if cannot find biome 2023-01-02 21:48:58 +00:00
ancientmarinerdev
46052e5b7e Merge pull request 'Add templates for issues and pull requests' (#3220) from gitea_templates into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3220
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-01 19:04:12 +00:00
iliekprogrammar
6430fcf103 Clarify *missing feature request* template 2023-01-01 19:03:34 +00:00
iliekprogrammar
7376b08c61 Better headers. More distinct *missing feature* template 2023-01-01 19:03:34 +00:00
iliekprogrammar
2e28a3386b Revert "Add "Testing/Review needed" tag to pull request templates"
This reverts commit 45656d8b747eac6400b2752fe2de603308ca69ef.
2023-01-01 19:03:34 +00:00
iliekprogrammar
98dac6dcd7 Add "Testing/Review needed" tag to pull request templates 2023-01-01 19:03:34 +00:00
iliekprogrammar
3026808a71 Add templates for issues and pull requests 2023-01-01 19:03:34 +00:00
test1
7c7521ff15 Merge pull request 'Update readme' (#3223) from updated_readme into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3223
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-31 13:23:03 +00:00
test1
50d8e95c16 Update readme 2022-12-31 13:16:52 +00:00
iliekprogrammar
fc74bd5cfe Merge pull request 'fix-cocoa-place' (#3221) from fix-cocoa-place into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3221
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-31 10:49:57 +00:00
kabou
2a37d38f6c Reformat cocoa pod node definition groups. 2022-12-31 11:18:04 +01:00
kabou
89821a8329 Rename cocoa pod placement function.
* Rename cocoa pod placement function to match the `on_place` call in
  the cocoa pods item definition.
* Make the function local, there are no callers outside of mcl_cocoas.
2022-12-31 10:41:39 +01:00
iliekprogrammar
3249c13752 Merge pull request 'mcl_meshhand fixes' (#2939) from mcl-meshhand-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2939
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:50:46 +00:00
iliekprogrammar
2ea72ccda8 Merge branch 'master' into mcl-meshhand-fixes 2022-12-30 18:47:55 +00:00
iliekprogrammar
5237eca31e Merge pull request 'mcl_item_entity fixes' (#2936) from mcl-item-entity-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2936
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:39:34 +00:00
iliekprogrammar
c2ba70a601 Merge branch 'master' into mcl-item-entity-fixes 2022-12-30 18:34:41 +00:00
iliekprogrammar
723fe9c532 Merge pull request 'mcl_init fixes' (#2862) from mcl-init-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2862
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:18:21 +00:00
iliekprogrammar
661afed46c Merge branch 'master' into mcl-init-fixes 2022-12-30 18:11:08 +00:00
ancientmarinerdev
e7ace0c87c Merge pull request 'Main Menu Rework' (#3193) from main_menu_rework into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3193
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-30 01:27:49 +00:00
FossFanatic
9605e2ae0d Make the theme less loud 2022-12-30 01:27:03 +00:00
FossFanatic
80bb954814 Delete 'menu/theme_alt.ogg' 2022-12-30 01:27:03 +00:00
Michieal
10dc83b2a6 softer menu music ogg file 2022-12-30 01:27:02 +00:00
FossFanatic
b95c623a74 Add a more original footer and headers 2022-12-30 01:27:02 +00:00
FossFanatic
0ab4553648 Add more credits 2022-12-30 01:27:02 +00:00
FossFanatic
65557152fb Add a menu theme 2022-12-30 01:27:02 +00:00
FossFanatic
1357193a78 Add a template for making splashes 2022-12-30 01:27:02 +00:00
FossFanatic
aacbaddfe0 Add warped hyphae texture to the right folder 2022-12-30 01:27:02 +00:00
FossFanatic
e246bf7ddf Remove stray warped hyphae texture? 2022-12-30 01:27:02 +00:00
FossFanatic
11bd29ed44 Add a couple of splash texts 2022-12-30 01:27:02 +00:00
FossFanatic
de574729a2 Make footer have shadow and look better on 1080p monitors 2022-12-30 01:27:02 +00:00
FossFanatic
95e269a61f Add last background 2022-12-30 01:27:02 +00:00
FossFanatic
5bdc145872 Add second batch of backgrounds 2022-12-30 01:27:02 +00:00
FossFanatic
20e178d5d1 Add first batch of backgrounds 2022-12-30 01:27:01 +00:00
FossFanatic
bdbc484c48 Delete 'menu/overlay.1.png' 2022-12-30 01:27:01 +00:00
FossFanatic
56c62e9fba Delete 'menu/overlay.2.png' 2022-12-30 01:27:01 +00:00
FossFanatic
3b1acc60db Delete 'menu/overlay.3.png' 2022-12-30 01:27:01 +00:00
FossFanatic
6026687e93 Delete 'menu/overlay.4.png' 2022-12-30 01:27:01 +00:00
FossFanatic
e813c48ed5 Delete 'menu/overlay.5.png' 2022-12-30 01:27:01 +00:00
FossFanatic
75716d97e3 Delete 'menu/overlay.png' 2022-12-30 01:27:01 +00:00
ancientmarinerdev
6fe5bf8674 Merge pull request 'Update Code of Conduct email' (#3214) from update_coc_email into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3214
2022-12-29 23:47:50 +00:00
ancientmarinerdev
9574ba7f09 Update Code of Conduct email 2022-12-29 23:47:03 +00:00