Commit graph

10467 commits

Author SHA1 Message Date
ancientmarinerdev
d5687716a0 Updated credits and contributing 2023-02-07 17:12:56 +00:00
ancientmarinerdev
5f0d91cf26 Merge pull request 'anarquimico_translations_1' (#3412) from anarquimico_translations_1 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3412
2023-02-07 16:53:53 +00:00
anarquimico
e2de5908c7 5th ITEMS batch 2023-02-07 16:39:24 +00:00
anarquimico
439c879508 4th batch of ITEMs translation 2023-02-07 16:39:23 +00:00
anarquimico
67977b0d26 Third batch of ITEMS translation 2023-02-07 16:39:23 +00:00
anarquimico
ed8c3e7d26 Second batch of ITEMS translated 2023-02-07 16:39:22 +00:00
anarquimico
7add59992f First batch of ITEMS translation 2023-02-07 16:39:22 +00:00
ancientmarinerdev
d72a674097 Merge pull request 'fix_copper_blocks' (#3390) from fix_copper_blocks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3390
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-06 23:16:11 +00:00
Michieal
ef4e4b1b7b Merge branch 'master' into fix_copper_blocks 2023-02-06 16:58:38 -05:00
PrairieWind
290680fb3d Merge pull request 'Add compostability to nether plants' (#3404) from SmokeyDope/MineClone2:nether_plants_composting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3404
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-02-06 20:20:42 +00:00
SmokeyDope
48eb934d64 Add compostability to warped wart blocks and shroomlight 2023-02-06 13:08:28 -07:00
SmokeyDope
88cf3a5900 Add compostability to nether sprouts 2023-02-06 13:08:27 -07:00
SmokeyDope
1401652015 Add compostability to warped roots and crimson roots 2023-02-06 13:08:26 -07:00
SmokeyDope
cac6e15736 Add compostability to twisting vines and weeping vines 2023-02-06 13:08:24 -07:00
SmokeyDope
156d096a78 Add compostability to warped fungus and crimson fungus 2023-02-06 13:08:23 -07:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
db3483a6cb Merge pull request 'Fix mapgen issue for mcl5 to mcl2 conversion' (#3349) from fix_villages_crash_mcl5 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3349
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-02-06 19:25:49 +00:00
ancientmarinerdev
ace6f8db43 Ensure index for heightmap entry is within bounds 2023-02-06 13:16:15 -06:00
ancientmarinerdev
9aeafe6053 Fix mapgen issue for mcl5 to mcl2 conversion 2023-02-06 13:16:15 -06:00
ancientmarinerdev
d454697953 Merge pull request 'More Sky Improvements' (#3391) from more_sky_improvements into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3391
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-06 01:48:38 +00:00
FossFanatic
ce2011218c Make the default sunrisebg invisible 2023-02-06 01:42:10 +00:00
FossFanatic
ccef2d1147 More sky improvements 2023-02-06 01:40:25 +00:00
ancientmarinerdev
5fbec2f6b5 Merge pull request 'Added conditional based on existing fire damage conditional that will apply fire damage to a' (#3405) from magma_damage_guy into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3405
2023-02-06 00:22:48 +00:00
GuyLiner
4d922d9edf Added conditional based on existing fire damage conditional that will apply fire damage to a
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
2023-02-06 00:10:52 +00:00
Michieal
46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal
c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal
08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev
7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 03:23:13 +00:00
ancientmarinerdev
58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 00:27:48 +00:00
Michieal
50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope
08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope
bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope
cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope
16a6dcb66c Completely remove selection box for warped fungus
Recommended by Michael
2023-02-02 22:45:06 +00:00
SmokeyDope
89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope
eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope
27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope
b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope
659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope
88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00
ancientmarinerdev
cdc922d4ac Merge pull request 'Make fletcher buy sticks' (#3383) from mrminer/MineClone2-Fletcher-Fix:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3383
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 15:37:35 +00:00
ancientmarinerdev
060732cd66 Merge pull request 'Adjust amethyst bud growth' (#3374) from Amethyst_Bud_Growth into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3374
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 15:26:20 +00:00
Michieal
ad43fbd237 Adjust amethyst bud growth speed. 2023-02-02 15:25:33 +00:00
Michieal
618313f0af Merge branch 'master' into fix_copper_blocks 2023-02-01 23:51:29 -05:00
ancientmarinerdev
31fb7faf16 Merge pull request 'feat: Rain particles move straight down, increase acceleration slightly' (#3369) from atomdmac/MineClone2:adjust-rain-velocity into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3369
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Reviewed-by: epCode <epcode@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 04:50:00 +00:00
Michieal
a3bc3fd9b9 Removed old commented code to prevent accidental re-enabling, and put the todo into the correct spot. 2023-02-01 23:49:04 -05:00
Michieal
c370f1884b Fixed the unwax copper blocks variants to be able to properly remove oxidization levels properly.
MCL_COPPER Blocks off all types (not stairs and slabs) now function properly.
2023-02-01 23:34:02 -05:00
Michieal
b771f314fe Removed "scraping_copper_block" function.
Fixed the wax copper blocks variants to have the wax removed.
2023-02-01 23:24:59 -05:00
ancientmarinerdev
f6a5004eab Merge pull request 'Fix wither crash on certain version of Lua.' (#3365) from fix_wither_head_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3365
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-02 02:23:27 +00:00
ancientmarinerdev
7daa79a3f8 Fix wither crash on certain version of Lua. 2023-02-02 02:22:21 +00:00
Michieal
4b0b3217e2 added in TODO 2023-02-01 19:55:23 -05:00