Commit graph

10713 commits

Author SHA1 Message Date
FossFanatic
261b5dda98 Remove excessive code
This removes a piece of excessive code, which I accidentally left behind.
2023-03-05 12:45:45 +00:00
FossFanatic
b80dd0294c Change the grass LBM & generator
This commit makes the grass LBM & generator look for nodes in the `grass_palette` group, instead of looking at a local list.
2023-03-05 12:45:44 +00:00
FossFanatic
260a76e5ee Add grass palette nodes in a special group & more
This commit adds any nodes which make use of a grass palette to a `grass_palette` group, to avoid having to create a list of said nodes every time.

I also added one line of code to potted ferns, in preparation for when I get to adding biome coloured potted ferns, which currently use a fixed colour instead of the biome's colour.
2023-03-05 12:45:44 +00:00
FossFanatic
b4d41d1284 Prepare some things for future additions
Adds a couple of lines of code in preparation for when I try to add biome coloured potted ferns, which currently use a fixed colour instead of the biome's colour.
2023-03-05 12:45:44 +00:00
FossFanatic
e82ff4781a Add grass palette nodes in a special group
This commit adds any nodes which make use of a grass palette to a `grass_palette` group, to avoid having to create a list of said nodes every time.
2023-03-05 12:45:44 +00:00
ancientmarinerdev
22e7200ea0 Merge pull request 'Expanding music choices and adding in Jester's first 4 tracks' (#3464) from music_enable_multiple_track_choice into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3464
2023-03-04 20:37:26 +00:00
ancientmarinerdev
a116c67dcd Reduce size of Jester tracks 2023-03-04 20:22:04 +00:00
ancientmarinerdev
1937241a71 Fix logging 2023-03-04 20:22:04 +00:00
ancientmarinerdev
10fa91cc42 Adding the first 4 Jester trackers made for MineClone2 2023-03-04 20:22:04 +00:00
ancientmarinerdev
83ff2f1754 Enable expansion of music choices 2023-03-04 20:22:04 +00:00
PrairieWind
0e68014e23 Merge pull request 'Fix textures for item frame and glowing item frame' (#3485) from item-frame-texture-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3485
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-04 18:22:57 +00:00
SmokeyDope
d4be5dd88c Add in optimized item frame and glowing item frame textures 2023-03-04 18:13:24 +00:00
SmokeyDope
256803303d remove unoptimized item frame texture 2023-03-04 18:13:24 +00:00
SmokeyDope
b70d870004 remove unoptimized glowing item frame border texture 2023-03-04 18:13:24 +00:00
SmokeyDope
75fb64d6ea remove unoptimized glowing item frame texture 2023-03-04 18:13:24 +00:00
SmokeyDope
f6d6a59c01 Remove "mcl_itemframes_glow_item_frame_item.png"
Duplicate image of "mcl_itemframes_glow_item_frame.png", changed code to use base frame image thus making this duplicate for inventory item unnecessary.
2023-03-04 18:13:24 +00:00
SmokeyDope
551b0c31bb Change glowing item frame inventory image to "mcl_itemframes_glow_item_frame.png"
"mcl_itemframes_glow_item_frame_border.png" "mcl_itemframes_glow_item_frame_item.png" and "mcl_itemframes_glow_item_frame" are all the same image, can save a few kilobytes by editing the glowing item frame code to just use one and removing the other two of them.
2023-03-04 18:13:24 +00:00
SmokeyDope
4939ce3e75 Add in updated glowing item frame border and glowing item frame item texture 2023-03-04 18:13:24 +00:00
SmokeyDope
108e369e0c Delete glowing item frame item texture 2023-03-04 18:13:24 +00:00
SmokeyDope
8a48729aad delete glowing item frame border texture 2023-03-04 18:13:24 +00:00
SmokeyDope
f5fad2e8f5 Add in updated item frame and glowing item frame texture
New textures fill canvas completely which fixes visual bug.
2023-03-04 18:13:24 +00:00
SmokeyDope
ab6abc3876 Delete old glowing item frame texture 2023-03-04 18:13:24 +00:00
SmokeyDope
1855fa2b64 Delete old item frame texture
canvas not completely filled, has some alpha transparency on borders which lead to visual bug.
2023-03-04 18:13:24 +00:00
ancientmarinerdev
b4422402c9 Merge pull request 'Seagrass Param2 Fix' (#3465) from seagrass_param2_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3465
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-04 15:50:49 +00:00
FossFanatic
dbbac7962d Fix the seagrass param2 and more 2023-03-04 15:42:37 +00:00
ancientmarinerdev
3ba77e408c Merge pull request 'Map Colour Fixes' (#3493) from map_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3493
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-04 13:55:46 +00:00
FossFanatic
c0f52ad344 Fix maps to display coloured foliage and water 2023-03-04 13:47:51 +00:00
FossFanatic
8a408a5c7f Remove old .json file 2023-03-04 13:47:51 +00:00
ancientmarinerdev
5478c8f44f Merge pull request 'Fix spawn egg crashes in different dimensions' (#3504) from fix_spawn_eggs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3504
2023-03-04 02:19:26 +00:00
ancientmarinerdev
a25cced40e Remove comment now resolved 2023-03-04 02:18:36 +00:00
ancientmarinerdev
86a85bb487 Fix spawn egg crashes in different dimensions 2023-03-04 01:38:51 +00:00
ancientmarinerdev
48fa2608ed Merge pull request 'spawn-egg-crash-fix' (#3492) from GuyLiner/MineClone2:spawn-egg-crash-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3492
2023-03-04 00:34:45 +00:00
PrairieWind
cfaa6aa8c2 Merge pull request 'Disable beehive/nest drops in creative' (#3450) from beehive_drops_creative into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3450
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-03 23:11:42 +00:00
PrairieWind
2f10a8767b Beehives only go into inventory in creative when no beehive exists in the inventory 2023-03-03 23:05:18 +00:00
PrairieWind
c71aec6f9d Add beehives and bee nests to inventory in creative 2023-03-03 23:05:18 +00:00
PrairieWind
493839cf11 Disable beehive/nest drops in creative 2023-03-03 23:05:18 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
4c7c1fe176 Merge pull request 'Make hoppers push items to minecarts' (#3490) from anarquimico/MineClone2:hoppers_to_minecarts into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3490
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-03 22:35:29 +00:00
anarquimico
c37aad26c3 Make hoppers push items to minecarts 2023-03-03 16:13:49 -06:00
PrairieWind
0a93d67814 Merge pull request 'Water logging mangrove roots with water bucket' (#3499) from anarquimico/MineClone2:water_logged_mangrove_roots into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3499
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-02 02:44:52 +00:00
anarquimico
6bdc0f032f Fixed for river_water_logged_roots 2023-03-01 19:22:27 -07:00
anarquimico
0aa3c52263 Make it work with river water 2023-03-01 19:22:27 -07:00
anarquimico
f4c26fb578 Change the mangrove roots to a water logged roots after using a bucket with water on it 2023-03-01 19:22:27 -07:00
PrairieWind
85457cd3bf Merge pull request 'Create the Jockey api and use it on Skel/Spid' (#3494) from jockey_api into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3494
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-02-28 18:46:31 +00:00
epCode
dc9407701e fix crash skeleton jockey code 2023-02-28 17:46:21 +00:00
epCode
e48dabc8be Create the Jockey api and use it on Skel/Spid 2023-02-28 17:46:21 +00:00
PrairieWind
51c374b31f Merge pull request 'Vine Colouring Improvements' (#3480) from vine_rotation_calculation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3480
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-02-28 03:10:57 +00:00
FossFanatic
a457853938 Improve code relating to vines
This commit makes the LBM and `register_on_generated` for foliage now use the better calculation for the vines.
2023-02-27 20:25:36 +00:00
FossFanatic
4659d1a0f1 Add function for colorwallmounted node rotation
This commit adds a new utility function which helps find the rotation of `colorwallmounted` nodes.
2023-02-27 20:25:36 +00:00
PrairieWind
9972b055c5 Merge pull request 'Warped Wart Fix' (#3467) from warped_wart_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3467
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-02-27 17:59:16 +00:00
FossFanatic
fedae4fdd0 Fixed warped wart using stripped stem side texture 2023-02-27 17:51:14 +00:00