6c0525f00e
Fix merge / rebase crossing massacre.
...
[Michieal] 83bc60722d449cbdb330a44566f8635dff9e199476507025d9dfa849e19aa5bdc8a16614383d6c6ff81d530912
2023-02-10 03:42:34 +00:00
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
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
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
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
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
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
bfe4b2fd31
Merge branch 'master' into biome_colored_foliage
2023-02-09 15:24:20 +00:00
cc8675602a
Optimised foliage 2
2023-02-09 13:02:02 +00:00
aff1d5f667
Optimised foliage 1
2023-02-09 13:01:23 +00:00
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
049db13b28
Add new waterlily texture
2023-02-09 09:40:17 +00:00
dfbee5cb93
Add "mushroom" to the warped fungus and crimson fungus item descriptions for creative search
2023-02-09 03:22:17 +00:00
378af531a9
remove "mushroom" from the names of crimson fungus and warped fungus
2023-02-09 03:22:17 +00:00
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
71671f8b5f
Make minecart rails unable to be broken with lava
2023-02-09 01:53:52 +00:00
c4d60e50cc
Make minecart rails unable to be broken with water
2023-02-09 01:53:52 +00:00
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
d9982e20d2
Make the footer more with the times
2023-02-08 19:57:00 +00:00
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
b834e790a7
Fix game crashes
2023-02-08 19:34:04 +00:00
39d4434df1
Reorder on_step calls
2023-02-08 19:34:04 +00:00
4b9482cb09
Mobs should not drop XP when dying by fire from sunlight
2023-02-08 19:34:04 +00:00
4757e62968
Add vine texture I forgot
...
I forgot to add this one with the batch.
2023-02-08 16:20:42 +00:00
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
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
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
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
c26cddeafc
Add batch 2 of the new leaf textures + foliage palette
2023-02-08 16:06:08 +00:00
714d159072
Add batch 1 of the new leaf textures
2023-02-08 16:05:34 +00:00
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
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
d5687716a0
Updated credits and contributing
2023-02-07 17:12:56 +00:00
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
e2de5908c7
5th ITEMS batch
2023-02-07 16:39:24 +00:00
439c879508
4th batch of ITEMs translation
2023-02-07 16:39:23 +00:00
67977b0d26
Third batch of ITEMS translation
2023-02-07 16:39:23 +00:00
ed8c3e7d26
Second batch of ITEMS translated
2023-02-07 16:39:22 +00:00
7add59992f
First batch of ITEMS translation
2023-02-07 16:39:22 +00:00
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
ef4e4b1b7b
Merge branch 'master' into fix_copper_blocks
2023-02-06 16:58:38 -05:00
0e000e6491
Merge branch 'master' into fix_dirt_dry_grass
2023-02-06 16:55:14 -05:00
ec7a97ba3e
Made LBM run at every load, so that it catches anything missed from previous passes.
2023-02-06 16:54:23 -05:00
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
48eb934d64
Add compostability to warped wart blocks and shroomlight
2023-02-06 13:08:28 -07:00
88cf3a5900
Add compostability to nether sprouts
2023-02-06 13:08:27 -07:00
1401652015
Add compostability to warped roots and crimson roots
2023-02-06 13:08:26 -07:00
cac6e15736
Add compostability to twisting vines and weeping vines
2023-02-06 13:08:24 -07:00
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
Michieal
ancientmarinerdev
PrairieWind
FossFanatic
SmokeyDope
emptyshore
anarquimico
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟