Commit graph

10975 commits

Author SHA1 Message Date
SmokeyDope
1448a5e098 Add new sweet berry textures 2023-05-02 13:46:37 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
8ef653fb77 Merge pull request 'Fix issue with drops turning black due to clipping into walls and floors and visually demonstrate drops merging' (#3667) from fix_clipping_mining_drops into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3667
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-01 22:00:42 +00:00
ancientmarinerdev
938ee7a832 Pick highest y and kick it up a little for visual spice and to fix occassional drop falling into floor 2023-05-01 16:53:00 -05:00
ancientmarinerdev
c48510244e Before merging same stacks, move to middle to show merging occurs. 2023-05-01 16:53:00 -05:00
ancientmarinerdev
52e64a6f75 Fix issue with drops turning black due to clipping into walls and floors 2023-05-01 16:53:00 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
0568c18081 Merge pull request 'Fix crash when using a named spawn egg' (#3674) from spawn_egg_name_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3674
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-01 17:29:08 +00:00
cora
13df9ec46c Fix crash when using a named spawn egg 2023-04-27 21:16:19 +00:00
ancientmarinerdev
2c01240a56 Merge pull request 'Make elytra enchantable and the enchanted elytra usable' (#3637) from elytra_enchantable into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3637
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-27 20:58:12 +00:00
PrairieWind
b001e4e06f Make elytra active checks use groups instead
So that modders can easily add their own varients of elytra that work
2023-04-27 20:53:49 +00:00
FlamingRCCars
1a7f9fe8ec Make elytra enchantable 2023-04-27 20:53:49 +00:00
MrRar
ec5b0903be Make enchanted elytra usable 2023-04-27 20:53:49 +00:00
megustanlosfrijoles
7dc09e3ebd Add spanish translations (#3659)
I just added some translations to Spanish that were missing

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3659
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
2023-04-27 19:50:10 +00:00
ancientmarinerdev
0d80f1126c Merge pull request 'Migrate beacons back to abm' (#3631) from beacon-abm into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3631
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-27 18:09:37 +00:00
ancientmarinerdev
b15482012e Implement review feedback. 2023-04-27 18:05:44 +00:00
chmodsayshello
a8c989edd8 don't get all objects in radius 2023-04-27 18:05:44 +00:00
chmodsayshello
1a1473e8c0 insert missing end 2023-04-27 18:05:44 +00:00
chmodsayshello
80cde37e65 remove empty lines and unneeded code 2023-04-27 18:05:44 +00:00
chmodsayshello
181cb73e45 remove commented out code 2023-04-27 18:05:44 +00:00
chmodsayshello
198eb630e1 replace globalstep with abm 2023-04-27 18:05:44 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
6c99a63419 Merge pull request 'playerbound music toggle' (#3658) from playerMusicToggle into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3658
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-04-25 18:43:47 +00:00
chmodsayshello
5db1e1876c playerbound music toggle (between 94e554aa1a and 5481f0109c) 2023-04-25 17:24:17 +02:00
ancientmarinerdev
32a60c888b Merge pull request 'solar panels: No crash when minetest.get_natural_light() return nil' (#3640) from spanels into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3640
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-04-20 13:30:26 +00:00
Johannes Fritz
cdb2bc20b0 solar panels: No crash when minetest.get_natural_light() return nil 2023-04-20 12:25:45 +00:00
ancientmarinerdev
becf98875f Merge pull request 'Add global cooldown for the bed quick chat feature' (#3645) from bedantispam into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3645
2023-04-19 13:35:27 +00:00
ancientmarinerdev
b374301ebf Throttle applies to default or custom sleep message 2023-04-19 13:25:42 +00:00
chmodsayshello
326e805798 update translation stuff 2023-04-19 13:25:42 +00:00
chmodsayshello
65aa185ffa global 'bed button' cooldown 2023-04-19 13:25:42 +00:00
ancientmarinerdev
90b9263f03 Merge pull request 'Mapgen Performance Improvements' (#3626) from mapgen_performance_improvements into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3626
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-16 17:02:31 +00:00
ancientmarinerdev
3b1464ecc8 Tweak leaf generator numbers to catch missed jungle leaves 2023-04-16 17:50:22 +01:00
ancientmarinerdev
1015f5a569 Optimize folliage fixes code 2023-04-16 16:20:45 +00:00
ancientmarinerdev
31b65bac91 Move generator code to functions to aid in profiling 2023-04-16 16:20:45 +00:00
FossFanatic
01ac9ad685 Add old method back for foliage
This commit adds back the old `set_node` method for the foliage, since the foliage is much more difficult to work with via the VoxelManip method due to them being part of schematics that could span across mapblocks in some cases.

The old method will complement the new one by running after the VoxelManip has done its job, and fixes any foliage that the VoxelManip had missed.
2023-04-16 16:20:45 +00:00
FossFanatic
d28dcb1b10 Another small change to account for mangrove leaves
This one should actually work as expected.
2023-04-16 16:20:45 +00:00
FossFanatic
aac6af4c20 Small change to account for mangrove leaves 2023-04-16 16:20:45 +00:00
FossFanatic
d8d83dd21c Make vines use voxelmanip colouring as well
This commit adds some code to the `set_foliage_palette` function which checks for the `param2` of the foliage node in question to see whether or not said `param2` value is `0` upon first being generated.

If it isn't, then it's safe to assume that said foliage is a vine, and therefore needs to use the other method of calculating the final `param2` value.
2023-04-16 16:20:45 +00:00
FossFanatic
76bf98b26c Use voxelmanip to set the correct param2 for nodes
Voxelmanip is now used to set the correct `param2` for the nodes which use biome colouring or, in the case of seagrass, the correct meshoption.
2023-04-16 16:20:44 +00:00
FossFanatic
d53ea65da8 Remove some code
Some code has been moved to `mcl_mapgen_core` for consistency.
2023-04-16 16:20:44 +00:00
ancientmarinerdev
cf174c110a Merge pull request 'release/0.83' (#3644) from release/0.83 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3644
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-04-15 11:36:52 +00:00
ancientmarinerdev
0de9685914 Post-release set version 0.84.0-SNAPSHOT 2023-04-15 12:28:27 +01:00
ancientmarinerdev
3ed3f16702 Pre-release update credits and set version 0.83.0 2023-04-15 12:25:17 +01:00
chmodsayshello
99918c192c Merge pull request 'add the ability to chat whilst being in bed' (#3634) from bedchat into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3634
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 19:00:48 +00:00
ancientmarinerdev
20638c482d Merge pull request 'Make shield block sounds not play across infinite distance' (#3629) from shield_sound_distance into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3629
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 17:37:54 +00:00
PrairieWind
f8d338d731 Add position to shield sound 2023-04-11 17:16:57 +00:00
PrairieWind
5165730da8 Make shield block sounds not play across infinite distance 2023-04-11 17:16:57 +00:00
ancientmarinerdev
d0f7d7c90d Merge pull request 'Fix French translation' (#3636) from syl/MineClone2:translationfr into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3636
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-04-11 16:53:17 +00:00
chmodsayshello
0719d6038c add missing '=' to the translation template 2023-04-09 19:53:28 +02:00
chmodsayshello
bf9989beb9 add default message button 2023-04-09 19:51:55 +02:00
chmodsayshello
62c014363d 'fix' multiline comment 2023-04-09 18:50:34 +02:00
chmodsayshello
75595115a0 move rate checks to seperate function 2023-04-09 18:45:23 +02:00
chmodsayshello
d9ac803f5b update translations 2023-04-09 18:37:02 +02:00