Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-05 07:13:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,943 Commits 109 Branches 83 Tags 165 MiB
d28dcb1b10
Commit Graph

10943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ancientmarinerdev
85fe29e5d3 Merge pull request 'Remove aggro for iron golem when out of range' (#3510) from iron_golem_grudge_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3510
 2023-03-10 03:18:43 +00:00
ancientmarinerdev
655c130956 Remove aggro for iron golem when out of range 2023-03-10 03:03:53 +00:00
ancientmarinerdev
325de7f2cd Merge pull request 'Fix waxing duplication of shulker box' (#3527) from waxing into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3527
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-10 00:18:38 +00:00
Johannes Fritz
3c9b3497bb Fix waxing duplication of shulker box 2023-03-09 15:16:11 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
8d318dfaa2 Merge pull request 'Fix Explosions Griefing Setting' (#3509) from fix_tnt_griefing_setting into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3509
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-03-09 19:09:56 +00:00
FossFanatic
6304502173 Rename some things 
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
 2023-03-09 12:52:22 -06:00
FossFanatic
b1a52a3243 Rename some things 
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
 2023-03-09 12:52:22 -06:00
FossFanatic
1a1ea29f6e Rename some things 
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
 2023-03-09 12:52:22 -06:00
FossFanatic
af8c4ded93 Try different fix for broken setting 2023-03-09 12:52:22 -06:00
FossFanatic
8b0d195906 Fix broken setting 
This commit adds some lines of code which make sure that nothing gets destroyed when TNT griefing is disabled.
 2023-03-09 12:52:22 -06:00
ancientmarinerdev
e15d0cd5a0 Merge pull request 'Make enderman hostile towards endermites and fix it's behavior on other dimensions' (#3501) from anarquimico/MineClone2:enderman_hostile_endermite into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3501
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-08 21:47:40 +00:00
ancientmarinerdev
1a24df5073 Merge pull request 'Add in some basic modeling documentation' (#3496) from modeling_documentation into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3496
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-07 16:28:54 +00:00
SmokeyDope
38b8f551d4 Note that .bmp and .tga image formats are depreciated 2023-03-07 16:16:29 +00:00
SmokeyDope
c18a851dd3 Add MODELS.md 2023-03-07 16:16:29 +00:00
ancientmarinerdev
6e6aa83fd8 Merge pull request 'Adding new Exhale & Tim Unwin tracks!' (#3511) from add_new_tracks into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3511
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
 2023-03-07 16:08:26 +00:00
ancientmarinerdev
695cbc54ae Adding in credits for Valley of Ghosts and Lonely Blossom 2023-03-07 15:56:24 +00:00
ancientmarinerdev
4c5b057038 Removed duplicate track 2023-03-07 15:56:24 +00:00
ancientmarinerdev
1dcdbbef79 Adding Exhale & Tim Unwin tracks into the playlists 2023-03-07 15:56:24 +00:00
ancientmarinerdev
37b42a1033 Shrink audio files with added metadata 2023-03-07 15:56:24 +00:00
ancientmarinerdev
d32e968682 Add original Exhale & Tim Unwin first two tracks 2023-03-07 15:56:24 +00:00
FossFanatic
887269f6de Merge pull request 'Fix grass not growing issue' (#3516) from fix_grass_not_growing into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3516
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
 2023-03-07 08:45:50 +00:00
ancientmarinerdev
67ddad987d Fix grass not growing issue 2023-03-06 17:45:38 +00:00
ancientmarinerdev
25aff57076 Merge pull request 'Add Grass Palette Group' (#3481) from grass_palette_group into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3481
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-05 12:53:46 +00:00
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