Commit graph

10994 commits

Author SHA1 Message Date
José Muñoz
821fa8c1d9 Add spanish translations 2023-05-03 10:03:52 -06:00
José Muñoz
3fe88331bd Merge branch 'translations-to-spanish' of ssh://git.minetest.land:29418/megustanlosfrijoles/MineClone2 into translations-to-spanish 2023-05-02 16:39:28 -06:00
José Muñoz
de1b174ed7 Add spanish translations 2023-05-02 16:38:35 -06:00
megustanlosfrijoles
01da7e548d Merge branch 'master' into translations-to-spanish 2023-05-02 21:54:22 +00:00
José Muñoz
d8985b2b08 Merge branch 'translations-to-spanish' of ssh://git.minetest.land:29418/megustanlosfrijoles/MineClone2 into translations-to-spanish 2023-05-02 15:53:42 -06:00
José Muñoz
6f52c9a480 Update translation for consistency 2023-05-02 15:53:11 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
3e768c6a6f Merge pull request 'New sweet berry textures' (#3654) from sweet-berry-texture-change into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3654
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-02 18:54:57 +00:00
SmokeyDope
1448a5e098 Add new sweet berry textures 2023-05-02 13:46:37 -05:00
megustanlosfrijoles
2f7d4b7c24 Merge branch 'master' into translations-to-spanish 2023-05-02 00:08:55 +00:00
José Muñoz
2bf49f74c9 Add spanish translations 2023-05-01 18:08:07 -06: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
José Muñoz
b1400d1ca3 Add spanish translations 2023-05-01 15:47:40 -06:00
José Muñoz
09c45bc67e Add spanish translations 2023-05-01 15:42:43 -06:00
José Muñoz
51c8e8823f Add spanish translations 2023-05-01 12:58:02 -06:00
José Muñoz
d6613ad9ef Add spanish translations 2023-05-01 12:55:38 -06:00
José Muñoz
af0a725fad Add spanish translations 2023-05-01 12:44:26 -06: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
José Muñoz
f6af2d123f Add spanish translations 2023-05-01 10:24:49 -06:00
José Muñoz
0a5dcea4b2 Merge branch 'translations-to-spanish' of ssh://git.minetest.land:29418/megustanlosfrijoles/MineClone2 into translations-to-spanish 2023-05-01 01:01:32 -06:00
José Muñoz
1fa0ad779e Add spanish translations 2023-05-01 01:00:47 -06:00
megustanlosfrijoles
b2011eb4de Merge branch 'master' into translations-to-spanish 2023-05-01 03:55:36 +00:00
José Muñoz
063f3596e6 Add spanish translations 2023-04-30 21:38:43 -06: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