Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-23 16:39:33 +01:00
Code Issues Projects Releases Packages Wiki Activity
7546 commits 115 branches 83 tags 186 MiB
Commit graph

7546 commits

This branch
This branch
All branches
Author SHA1 Message Date
cora
511b7030e1 Merge pull request 'Generate podzol when planting huge spruce trees' (#2126) from spruce_podzol into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2126
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
 2022-04-21 22:27:10 +00:00
cora
a83a2e9aba generate podzol under huge spruce trees 2022-04-21 22:25:47 +00:00
cora
0c03d420b8 Merge pull request 'Check protection on dragon egg punch (#2127)' (#2129) from enderdragon_egg_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2129
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-04-21 19:41:27 +00:00
AFCMS
8396dfe7e3
enderdragon egg: check for protection on punch 2022-04-21 21:02:43 +02:00
cora
231b658c3f Merge pull request 'Lift clouds to 384 in valleys mapgen' (#2110) from raise_valleys_clouds into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2110
 2022-04-19 10:26:41 +00:00
kay27
dc4ccf91cc lift clouds to 384 in valleys mapgen 
Valleys has a much higher average elevation than v7 often leading
to "normal" looking terrain being in the clouds. This lifts the
clouds up higher.
 2022-04-19 10:23:10 +00:00
cora
8bf1d2b235 Merge pull request 'Fix sugarcane not getting param2 on mapgen' (#2118) from fix_sugarcane_color into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2118
 2022-04-19 10:22:22 +00:00
cora
3cb9947cf4 fix sugarcane not getting param2 on mapgen 2022-04-19 12:16:07 +02:00
cora
d1cd46e197 Merge pull request 'change version in readme to 0.74 (indev)' (#2115) from change-readme-074-indev into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2115
 2022-04-16 11:01:40 +00:00
cora
33097a7656 change version in readme to 0.74 (indev) 2022-04-16 11:59:10 +02:00
cora
9ad4222f35 Merge pull request 'update readme to 0.73.1' (#2114) from release_0731 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2114
 2022-04-16 09:52:56 +00:00
cora
feb1fcc5b4 update readme to 0.73.1 
Since "someone" had to make a huge deal publicly about supposed
copyright problems we need to do yet another release because
of this.
 2022-04-16 11:48:42 +02:00
cora
6976ffca62 Merge pull request 'Shuffle pixels in mcl_end_crystal_beam.png' (#2113) from fix_mcl_end_crystal_beam into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2113
 2022-04-16 09:23:32 +00:00
Nils Dagsson Moskopp
34b5002fc8
Shuffle pixels in mcl_end_crystal_beam.png 
A user claimed that this texture was a texture from Minecraft 1.8.9 –
see <https://git.minetest.land/MineClone2/MineClone2/issues/2099> for
further details. I have not verified that but I noticed that in commit
152e552458 the file was replaced with a
file containing the exact same pixels.

A visual inspection confirms that the file contains noise, so it is not
clear if it is even copyrightable. However, to ensure that it could not
be identical to a file from Minecraft, To get noise of the same quality,
I have shuffled all its pixels with the following POSIX sh shell script:

LANG=C
PREFIX=mcl_end_crystal_beam
convert $PREFIX.png $PREFIX.pnm
<$PREFIX.pnm  >$PREFIX.plainpnm pnmtoplainpnm
<$PREFIX.plainpnm >$PREFIX.seed tr '1234567890 ' ' 1356902468'
(
 <$PREFIX.plainpnm head -n+3
 <$PREFIX.plainpnm tail -n+4 \
  |tr ' ' '\n' \
  |shuf --random-source $PREFIX.seed
) >$PREFIX.shuffled.plainpnm

I then opened mcl_end_crystal_beam.shuffled.plainpnm using GIMP,
converted the color black to tranparency and saved the image as a
paletted PNG (which yields a smaller filesize than a grayscale PNG).
 2022-04-16 01:24:04 +02:00
cora
e63e3b3cbd Merge pull request 'Make shields work with all mobs' (#2107) from shield_mob_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2107
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-04-12 10:31:31 +00:00
NO411
2aa04519dd Merge branch 'shield_mob_fixes' of https://git.minetest.land/MineClone2/MineClone2 into shield_mob_fixes 2022-04-09 16:21:32 +02:00
NO411
e790bf90f4 Make shields work with all mobs 2022-04-09 16:21:22 +02:00
NO411
b108f58b2f NO11 2022-04-09 16:19:53 +02:00
cora
8e904e2ca9 Merge pull request 'mcl_weather: fix typo/crash' (#2105) from fix_weather_typo into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2105
Reviewed-by: NO11 <no11@noreply.git.minetest.land>
 2022-04-08 15:03:06 +00:00
cora
bb593159f1 mcl_weather: fix typo/crash 2022-04-08 06:23:14 +02:00
cora
83c91aba93 Merge pull request 'Shields: Fix crash when deflecting ghast fireball ( #2095 )' (#2103) from fix-shield-ghast-crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2103
Reviewed-by: NO11 <no11@noreply.git.minetest.land>
 2022-04-07 20:47:56 +00:00
cora
e7970ecce5 shields: Fix crash when deflecting ghast fireball 2022-04-07 22:40:48 +02:00
kabou
b96fb2af17 Merge pull request 'Replace mcl_end_crystal_beam.png with free version.' (#2100) from end_crystal_beam into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2100
 2022-04-06 21:22:57 +00:00
kabou
152e552458 Replace mcl_end_crystal_beam.png with free version. 
* Replace mcl_end_crystal_beam.png with unknown provenance with a
  version from the PixelPerfection texture pack that has a know good
  free licence.
 2022-04-06 23:04:01 +02:00
cora
f807ac5c70 Merge pull request 'Remove settlements_in_world and settlements.txt' (#2094) from villages-fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2094
 2022-04-02 20:32:21 +00:00
kabou
ace0dc00c7 Remove settlements_in_world and settlements.txt 
The global(!) table settlements_in_world` has no use, but is serialized and
saved to a file `settlements.txt` every time during generation of a new
village, adding more lag.  This commit removes all related code:
* Remove all instances of `settlements_in_world`.
* Remove `settlements.load()` and `settlements.save()`.
 2022-04-02 21:52:03 +02:00
cora
85d1f61188 Merge pull request 'More composters fixes and updates.' (#2093) from composters into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2093
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-04-02 02:01:34 +00:00
kabou
f3b28df6cc Rework function comments. 
* Move descriptive function comments to above the function definition.
* Adopt some luadoc styles.
* Update a stale reference to a renamed function in comments.
 2022-04-02 03:32:56 +02:00
kabou
f37f8b6bca Return itemstack in composter_harvest(). 
* `composter_harvest()` is a `on_rightclick` handler and should return
  what remains of the ItemStack that was passed to it.
 2022-04-02 03:32:56 +02:00
kabou
2ba801dfc7 Add protection support to composter. 
* Add checks for `minetest.is_protected()` and log any violations.
* Add local aliases for global functions.
 2022-04-02 03:32:56 +02:00
kabou
bba3aabb59 Add compostability to GROUPS.md 2022-04-02 03:32:56 +02:00
kabou
19eb31f389 Streamline use of vector ops. 
* Use vector.offset instead of vector.add.
* Define and use local alias for vector.offset.
 2022-04-02 03:32:56 +02:00
kabou
541a805a48 Logix fix and some simple optimizations. 
* Fix silly and mostly inconsequential logic bug that had gone unnoticed up
  till now.
* Condense a single use variable away by using a slightly more elaborate
  assignment statement.
* Add a few more local aliases for global minetest.* functions.
 2022-04-02 03:32:56 +02:00
kabou
cd12e1d78c Various little fixes. 
* Remove trailing whitespace.
* Remove `use_texture_alpha` setting from node definitions, the default
  value is already the correct one.
 2022-04-02 03:32:56 +02:00
kabou
4335d0d659 Use compostability group from node definitions. 
* Replace use of local table with compostability values with a call to
 `minetest.get_item_group()`.
* Define local alias for `minetest.get_item_group`.
* Remove the now unused static compostabilty values table.
 2022-04-02 03:32:56 +02:00
kabou
de16eb3c5a Add compostability to node definition group. 
* mcl_cake/init.lua (cake);
* mcl_core/craftitems.lua (apple);
* mcl_core/nodes_base.lua (dirt with grass);
* mcl_core/nodes_cactuscane.lua (cactus, sugarcane);
* mcl_core/nodes_climb.lua (vines);
* mcl_core/nodes_trees.lua (leaves, saplings);
* mcl_dye/init.lua (cocoa beans);
* mcl_farming/beetroot.lua (beetroot, & seeds);
* mcl_farming/carrots.lua (carrot);
* mcl_farming/melon.lua (melon, & slice, & seeds);
* mcl_farming/potatoes.lua (potato, baked potato);
* mcl_farming/pumpkin.lua (pumpkin, carved &, & seeds, & pie);
* mcl_farming/wheat.lua (wheat, cookie, bread, hay block);
* mcl_flowers/init.lua (flowers, ferns, grass, & tall variants);
* mcl_mushrooms/small.lua (red and brown mushrooms);
* mcl_mushrooms/huge.lua (red and brown huge mushrooms);
* mcl_nether/init.lua (nether wart block);
* mcl_nether/nether_wart.lua (nether wart);
* mcl_ocean/kelp.lua (kelp, dried &, & block);
* mcl_ocean/sea_pickle.lua (sea pickle);
* mcl_ocean/seagrass.lua (seagrass).
 2022-04-02 03:32:56 +02:00
cora
6851fa759e Merge pull request 'Fix weather lag' (#2091) from fix-weather-lag into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2091
 2022-03-30 10:25:44 +00:00
cora
7f1bb7af92 replace nether dust particles with p. spawners 
mcl2 uses add_particle for nether dust resulting in a 10-fold
increase in network traffic when in the nether. Nether dust is not
configurable making it impossible to turn this off for server admins.
this commit replaces the add_particle method with particle spawners
 2022-03-30 10:21:32 +00:00
cora
53715212a2 remove unnecessary on_dimensionchange 2022-03-30 10:21:32 +00:00
cora
c146426c5c fix snow not being properly removed 2022-03-30 10:21:32 +00:00
cora
dc24f45cfa add indoor detection for snow 2022-03-30 10:21:32 +00:00
cora
d2861c5955 remove unneccessary particle logic 2022-03-30 10:21:32 +00:00
cora
1e4494e85d let rain and thunder use particlespawners 2022-03-30 10:21:32 +00:00
cora
4eae95fa47 let snow use particlespawners 2022-03-30 10:21:32 +00:00
cora
ef7ebda90c Merge pull request 'fire-HUD-crashfix' (#2093) from fire-HUD-crashfix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2093

Tested and verified it fixes the crash
 2022-03-30 10:20:24 +00:00
kabou
1b99b73894 Fix wrong player name accessor. 
* Duh..
 2022-03-30 01:31:38 +02:00
kabou
14da059ce7 Add extra check and warning on missing player data. 
* For some unexplained reason, `mcl_burning.storage[player]` can
  sometimes be `nil`, causing a crash in `on_leaveplayer()`.  This
  commit adds a check for that.  If a `nil` is encountered, a sane
  value is substituted and a warning is set to the log.
 2022-03-29 12:06:00 +02:00
cora
04f0ea260d Merge pull request 'Add shields and offhand (Fix #295)' (#2073) from NO11/MineClone2:shields2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2073
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-03-28 14:55:11 +00:00
NO11
5974b6f609 Merge branch 'master' into shields2 2022-03-28 12:27:57 +00:00
NO411
148be4ea39 Fix shield behavior 2022-03-27 19:52:36 +02:00