Commit Graph

7941 Commits

Author SHA1 Message Date
cora
a4e541bcd2 Merge pull request 'remove blend1 file / add blend1 files to gitignore (fix #2015)' (#2024) from AFCMS/MineClone2:remove-blend1 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2024
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2022-02-24 14:48:51 +00:00
AFCMS
89a930ace3
add .blend2 and .blend3 files to gitignore 2022-02-24 10:16:48 +01:00
AFCMS
129117efb3
add .blend1 files to gitignore 2022-02-24 10:16:47 +01:00
AFCMS
cbfc71705d
remove blender backup file 2022-02-24 10:16:47 +01:00
cora
4b89398b3b Merge pull request 'Fix hopper breakage in get_item_group return value. (Fixes: #2022)' (#2023) from kabou/MineClone2:fix-hoppers into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2023
Reviewed-by: AFCMS <afcms@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-02-24 02:23:09 +00:00
kabou
5431e206b0 Fix hopper breakage in get_item_group return value.
In commit 55009c257e253c49dacf017e4bd56bc36aca2e10 that added vectors to
mcl_composters, mcl_hoppers was accidentally patched with a unrelated
change, updating it to get_item_group().  This mostly works, but in one
particular case the semantics of the return value differs.  Instead of
returning 'nil' it returns '0'.  That altered the evaluation of an if
condition, breaking the abm that sucks in items.

This commit fixes the conditional by explicitly comparing  '~= 0'.
2022-02-24 03:18:25 +01:00
cora
c60fd92638 Merge pull request 'Traditional chinese by emojigit (partial)' (#2026) from emojigit-zh-trans into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2026
2022-02-23 23:29:52 +00:00
Emojigit
06deb92dd6 mcl_tools 2022-02-23 23:58:05 +01:00
Emojigit
7685b4758f mcl_flowers 2022-02-23 23:58:05 +01:00
Emojigit
9944abb328 mcl_books 2022-02-23 23:58:05 +01:00
Emojigit
5ce1852c1d mcl_dye 2022-02-23 23:58:05 +01:00
Emojigit
56a70025b8 mcl_flowerpots 2022-02-23 23:58:05 +01:00
Emojigit
9fe3bbd2fa mcl_mushrooms 2022-02-23 23:58:05 +01:00
Emojigit
fb1d189d40 mcl_doors 2022-02-23 23:58:05 +01:00
Emojigit
9cd24f4af5 mcl_commands 2022-02-23 23:58:05 +01:00
Emojigit
a64c3f87bc xpanes 2022-02-23 23:58:05 +01:00
Emojigit
5075f2ca56 mcl_armor 2022-02-23 23:58:05 +01:00
Emojigit
249dfac319 mcl_inventory 2022-02-23 23:58:05 +01:00
Emojigit
2b5a0242db mcl_fire 2022-02-23 23:58:05 +01:00
Emojigit
790ccf0812 mcl_fishing 2022-02-23 23:58:05 +01:00
Emojigit
8d639794f3 mcl_fences 2022-02-23 23:58:05 +01:00
Emojigit
af8681c143 mcl_buckets 2022-02-23 23:58:05 +01:00
Emojigit
1ef58f7250 mcl_walls 2022-02-23 23:58:05 +01:00
Emojigit
15747220f2 mcl_hoppers 2022-02-23 23:58:05 +01:00
Emojigit
925dad7f5e mcl_anvils 2022-02-23 23:58:05 +01:00
Emojigit
729f653c85 mcl_portals 2022-02-23 23:58:05 +01:00
Emojigit
d1e328e57a mcl_bows 2022-02-23 23:58:05 +01:00
Emojigit
615a968fbb mcl_skins 2022-02-23 23:58:05 +01:00
Emojigit
7e5a9bd8b6 mcl_throwing 2022-02-23 23:58:05 +01:00
Emojigit
d018bee00a mcl_cake 2022-02-23 23:58:05 +01:00
Emojigit
1365d0b257 mcl_jukebox 2022-02-23 23:58:05 +01:00
Emojigit
a289a00427 mcl_heads 2022-02-23 23:58:05 +01:00
Emojigit
a238aabbb0 mcl_cauldrons 2022-02-23 23:58:05 +01:00
Emojigit
b02f7cd974 mcl_mobs 2022-02-23 23:58:05 +01:00
Emojigit
e19113d4e0 findbiome 2022-02-23 23:58:05 +01:00
Emojigit
4deac632e6 mcl_sponges 2022-02-23 23:58:05 +01:00
Emojigit
c480e6891d mcl_maps 2022-02-23 23:58:05 +01:00
Emojigit
844eb3fb7c mcl_brewing 2022-02-23 23:58:05 +01:00
Emojigit
fc768cb1ad mcl_signs 2022-02-23 23:58:05 +01:00
Emojigit
1f9a919459 mcl_monster_eggs 2022-02-23 23:58:05 +01:00
Emojigit
70007e3453 mcl_furnaces 2022-02-23 23:58:05 +01:00
Emojigit
3aff1f8981 mcl_hunger 2022-02-23 23:58:05 +01:00
Emojigit
c86a506672 mcl_tnt 2022-02-23 23:58:05 +01:00
Emojigit
f348223da2 mcl_crafting_table 2022-02-23 23:58:05 +01:00
Emojigit
ca6469b959 mcl_weather 2022-02-23 23:58:05 +01:00
Emojigit
c52e09ddcd mcl_structures 2022-02-23 23:58:05 +01:00
Emojigit
bb55120adc mcl_experience 2022-02-23 23:58:05 +01:00
Emojigit
77339afbe2 mcl_cocoas 2022-02-23 23:58:05 +01:00
Emojigit
9b15599bee hudbars 2022-02-23 23:58:05 +01:00
Emojigit
a685c3bc83 mclx_core 2022-02-23 23:58:05 +01:00