Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-14 23:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,006 Commits 107 Branches 83 Tags 166 MiB
ede98cda80
Commit Graph

11006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FossFanatic
197d3ae00b Make sapling foliage grab biome colour 2023-02-10 08:04:13 +00:00
ancientmarinerdev
6b8226dae3 Merge pull request 'Bamboo Piston Fix.' (#3424) from Bamboo_Piston_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3424
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 03:49:40 +00:00
Michieal
f6b77aa458 reformated code. 2023-02-10 03:42:34 +00:00
Michieal
1558c852d8 Undo mesecon.register_mvps_dropper() and use abms until more research can be done. 2023-02-10 03:42:34 +00:00
Michieal
6c0525f00e Fix merge / rebase crossing massacre. 
[Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation.

[Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons.

[Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes.

[Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons.
Probably not the most elegant, but hey. It works.

[Michieal] 76507025d9 Cleaned up the global function to match the current ABM.

[Michieal] dfa849e19a Merge branch 'master' into Bamboo-Piston-Dig

[Michieal] a5bdc8a166 fix bamboo mosaic recipe.

[Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps

[Michieal] f81d530912 Update init.lua to register dropper callback.
 2023-02-10 03:42:34 +00:00
ancientmarinerdev
3c13ce1d6b Merge pull request 'Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index.' (#3408) from fix_dirt_dry_grass into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3408
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 02:50:27 +00:00
ancientmarinerdev
c1d5d4280e Merge pull request 'Fixed weather not clearing after sleep' (#3414) from rain_bed_skip into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3414
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 02:00:23 +00:00
PrairieWind
70fb4f8a0d Fixed weather not clearing after sleep 
Isnt as clean as it should be because making it clean made some very funky results
 2023-02-10 01:51:28 +00:00
ancientmarinerdev
620a0af483 Merge pull request 'Fix damage desyncing entity from chest node, making it invisible' (#3385) from emptyshore/MineClone2:fix-lightning-chests into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3385
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 00:38:55 +00:00
ancientmarinerdev
428b1b2c12 Merge pull request 'remove "mushroom" from the names of crimson fungus and warped fungus' (#3406) from SmokeyDope/MineClone2:change_fungus_name into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3406
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2023-02-09 18:22:04 +00:00
FossFanatic
4ddab8bdf1 Remove the ABMs 
There are likely better ways to fix any palettes that the LBMs missed.
 2023-02-09 16:16:13 +00:00
FossFanatic
bfe4b2fd31 Merge branch 'master' into biome_colored_foliage 2023-02-09 15:24:20 +00:00
FossFanatic
cc8675602a Optimised foliage 2 2023-02-09 13:02:02 +00:00
FossFanatic
aff1d5f667 Optimised foliage 1 2023-02-09 13:01:23 +00:00
FossFanatic
169019096e Change the waterlily code 
Waterlilies now use a brownish grey texture with a coded hex colour.
 2023-02-09 09:46:18 +00:00
FossFanatic
049db13b28 Add new waterlily texture 2023-02-09 09:40:17 +00:00
SmokeyDope
dfbee5cb93 Add "mushroom" to the warped fungus and crimson fungus item descriptions for creative search 2023-02-09 03:22:17 +00:00
SmokeyDope
378af531a9 remove "mushroom" from the names of crimson fungus and warped fungus 2023-02-09 03:22:17 +00:00
ancientmarinerdev
088cda4f1c Merge pull request 'Make minecart rails unable to be broken with water & lava' (#3415) from minecart_track_water_breaking_3 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3415
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-09 02:03:47 +00:00
SmokeyDope
71671f8b5f Make minecart rails unable to be broken with lava 2023-02-09 01:53:52 +00:00
SmokeyDope
c4d60e50cc Make minecart rails unable to be broken with water 2023-02-09 01:53:52 +00:00
ancientmarinerdev
9421c7ca6b Merge pull request 'Make The Footer Correct' (#3423) from beta_footer into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3423
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-09 01:22:58 +00:00
FossFanatic
d9982e20d2 Make the footer more with the times 2023-02-08 19:57:00 +00:00
ancientmarinerdev
30bb1ab075 Merge pull request 'Mobs fix crash and not drop XP when dying by fire from sunlight' (#3398) from mob_death_xp_drop into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3398
 2023-02-08 19:44:12 +00:00
ancientmarinerdev
b834e790a7 Fix game crashes 2023-02-08 19:34:04 +00:00
ancientmarinerdev
39d4434df1 Reorder on_step calls 2023-02-08 19:34:04 +00:00
ancientmarinerdev
4b9482cb09 Mobs should not drop XP when dying by fire from sunlight 2023-02-08 19:34:04 +00:00
FossFanatic
4757e62968 Add vine texture I forgot 
I forgot to add this one with the batch.
 2023-02-08 16:20:42 +00:00
FossFanatic
b95ebb3fca Add LBMs, ABMs, and more 
This commit adds 1 new LBM (for foliage) and 2 new ABMs (one for foliage, and one for grass).

This also adds a new generator so any new maps created will have biome coloured leaves with a faster method. (Vines are excluded from this generator since I don't know yet how to get those to work with this.)
 2023-02-08 16:17:33 +00:00
FossFanatic
07f332f0cd Add foliage palette indexes 
This commit adds foliage palette indexes to every biome, this makes it possible for foliage to use biome colouring.
 2023-02-08 16:15:04 +00:00
FossFanatic
f4e8088e60 Improve mangrove leaves 
This commit makes it so mangrove leaves also no longer use `param2` to see if they rot or not. The leaves also use the biome colours now.
 2023-02-08 16:13:13 +00:00
FossFanatic
198375a18e Change stuff in mcl_core 
Simply put, this commit changes some code so that leaves don't use `param2` to see if they rot or not, and will now use the biome colours.

This commit also makes it so vines do the same (use biome colours).
 2023-02-08 16:11:38 +00:00
FossFanatic
c26cddeafc Add batch 2 of the new leaf textures + foliage palette 2023-02-08 16:06:08 +00:00
FossFanatic
714d159072 Add batch 1 of the new leaf textures 2023-02-08 16:05:34 +00:00
emptyshore
bdc82b76b5 Respect immortal armor group, ensuring objects are not dealt damage 
Context: some objects such as chest, frame or sign entities are set to
be immortal, because they are tied to a node and should not be removed
on their own.

However since immortality wasn't respected, it would lead to odd desync
issues between nodes and accompanying entities. An example is a chest
that becomes invisible when struck by lightning or anvil.
 2023-02-08 15:59:36 +13:00
ancientmarinerdev
6f67f0e095 Merge pull request 'Updated credits and contributing' (#3413) from translation_credit_anarquimico into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3413
 2023-02-07 17:15:11 +00:00
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
Michieal
0e000e6491 Merge branch 'master' into fix_dirt_dry_grass 2023-02-06 16:55:14 -05:00
Michieal
ec7a97ba3e Made LBM run at every load, so that it catches anything missed from previous passes. 2023-02-06 16:54:23 -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