FossFanatic
c75ec6916c
Conflict fix attempt 2
2023-01-17 12:52:50 +00:00
FossFanatic
4b6b4d8398
revert 26e032687a
...
revert Fix conflict with most recent master
2023-01-17 12:49:43 +00:00
FossFanatic
26e032687a
Fix conflict with most recent master
2023-01-17 12:39:15 +00:00
FossFanatic
18c0e1f050
Change the indexes back to the older ones
2023-01-14 10:05:00 +00:00
FossFanatic
fb8e41047d
Use older palette PNG file
2023-01-14 10:00:42 +00:00
FossFanatic
2bd5e6a84f
Delete text file
2023-01-14 10:00:19 +00:00
FossFanatic
23a13f14e0
Merge branch 'master' into simplified_palette_index
2023-01-14 09:51:47 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
dd15092052
Merge pull request 'Give an option for players to disable the in game music' ( #3299 ) from music_settings_switch into master
...
Reviewed-on: MineClone2/MineClone2#3299
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-13 21:31:20 +00:00
ancientmarinerdev
ce485e89cd
In game music review feedback fix
2023-01-13 15:04:40 -06:00
ancientmarinerdev
09a7348256
Give an option for players to disable the in game music
2023-01-13 15:04:40 -06:00
FossFanatic
a500528613
Make the LBM run only once
...
Since some people complained about the LBM running at every load, I changed it so it only runs once instead. It shouldn't even need to run more than once anyways, unless somebody could prove the contrary.
2023-01-13 17:58:51 +00:00
FossFanatic
292e7129f2
Merge branch 'master' into simplified_palette_index
2023-01-13 17:50:39 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
899cfd5157
Merge pull request 'Added protection violation checker functions.' ( #3274 ) from CyberMango/MineClone2:dev/mango/generic_protection_violation_functions into master
...
Reviewed-on: MineClone2/MineClone2#3274
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-12 21:03:26 +00:00
CyberMango
64a7f76d5b
Replaced positions check with an area check.
...
This one is using the minetest.is_area_protected so it should work
faster. It also doesnt require the user to manually add all the points
that should be checked so its nicer to use.
2023-01-12 21:22:36 +02:00
CyberMango
b0d9eed3e1
Removed specific functions and added usage examples.
...
The specific functions didnt end up adding much simplicity, but did add
some degree of confusion.
2023-01-12 20:04:44 +02:00
CyberMango
685a7ff256
Added a function for a single position and better naming.
...
Now the functions are named with "position" instead of "node" to better
reflect what they do and what args they expect.
Also added a function for cehcking just a single position since thats
the most common use case, so it saves a small performance overhead.
2023-01-12 20:04:44 +02:00
CyberMango
949a2b787e
Added protection violation checker functions.
...
1 completley generic and 3 more that use it for more specific cases -
placing a node, modifying a node and planting over a node.
2023-01-12 20:04:44 +02:00
FossFanatic
8849b2e98f
Merge branch 'master' into simplified_palette_index
2023-01-12 15:32:46 +00:00
ancientmarinerdev
482a6071f5
Merge pull request 'Beetroot Seed fix' ( #3294 ) from beetroot_seed_fix into master
...
Reviewed-on: MineClone2/MineClone2#3294
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-11 22:27:58 +00:00
Michieal
ff7299a444
Fix beetroot seeds not dropping.
...
Changed drop rate to 1-4.
Added in Fortune drops too. (Per the minecraft wiki.)
2023-01-10 21:38:42 -05:00
ancientmarinerdev
2ed3c1c480
Merge pull request 'Mob Fixes' ( #3242 ) from mob_fixes into master
...
Reviewed-on: MineClone2/MineClone2#3242
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-11 01:11:07 +00:00
ancientmarinerdev
111c885417
Added burger alias
2023-01-11 01:07:18 +00:00
ancientmarinerdev
8e1f00d428
Villager breeding is now unburgered. Burger now needs right click to initiate follow.
2023-01-11 01:07:18 +00:00
ancientmarinerdev
4fd4425aae
Improved mob debug
2023-01-11 01:07:18 +00:00
ancientmarinerdev
ac4cd2c325
Improve performance for head swivel check
2023-01-11 01:07:18 +00:00
ancientmarinerdev
01c8009c6a
Tidy on_step function
2023-01-11 01:07:18 +00:00
ancientmarinerdev
ef90820f67
Fix farm animals so they don't get into combat state
2023-01-11 01:07:18 +00:00
ancientmarinerdev
d6d11b9526
Zombie villagers cannot despawn during curing process
2023-01-11 01:07:17 +00:00
ancientmarinerdev
b0264b2736
Endermen now despawn when not holding a block.
2023-01-11 01:07:17 +00:00
PrairieWind
b3da85be64
Merge pull request 'mcl_music_without_menu_music' ( #3291 ) from mcl_music_without_menu_music into master
...
Reviewed-on: MineClone2/MineClone2#3291
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-01-10 19:15:22 +00:00
ancientmarinerdev
3ed32abc4e
Add credit for nether music
2023-01-10 19:05:56 +00:00
kay27
9db6050638
Fix music interruption
2023-01-10 19:05:56 +00:00
kay27
7ceb953a56
Add different music for different dimensions
2023-01-10 19:05:56 +00:00
kay27
1894d8c5f0
Fix mcl_music: play to all players, play every day, overworld only
2023-01-10 19:05:56 +00:00
kay27
419d61edde
Add trivial mcl_music mod and a piano track by diminixed
2023-01-10 19:05:55 +00:00
PrairieWind
9820309762
Merge pull request 'mcl_crimson_update' ( #3289 ) from mcl_crimson_update into master
...
Reviewed-on: MineClone2/MineClone2#3289
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-01-10 18:17:39 +00:00
Michieal
f46581905a
Added veins to the Hyphae log sides.
2023-01-10 04:30:29 -05:00
Michieal
4f6de581dd
fixed the warped fungus mushroom texture.
...
fixed the warped fungus selection box.
2023-01-10 04:29:47 -05:00
ancientmarinerdev
db62631540
Merge pull request 'mcl_lectern' ( #3282 ) from mcl_lectern into master
...
Reviewed-on: MineClone2/MineClone2#3282
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-09 22:33:31 +00:00
ancientmarinerdev
fb30564827
Ooooooh, lecterns. My favourite.
2023-01-09 22:32:14 +00:00
Michieal
8c355db3ce
Made Lecterns solid.
2023-01-09 22:32:14 +00:00
Michieal
eae08f3010
Finished Lecterns.
...
Added in License.txt.
2023-01-09 22:32:14 +00:00
Michieal
4701c4d6e7
Built basic lectern model, texture, and node definition.
...
Created crafting recipe.
Marked Lecterns as WIP.
Started defining placement.
Added in README.txt.
2023-01-09 22:32:14 +00:00
ancientmarinerdev
66f368531d
Merge pull request 'Fix Country Lode HUD Issue' ( #3268 ) from advancement_bug_fix into master
...
Reviewed-on: MineClone2/MineClone2#3268
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-09 21:17:41 +00:00
PrairieWind
7cb5c55d68
Update Translation Files
...
Fixes the translation error for other languages
2023-01-09 13:36:36 -07:00
PrairieWind
6fd799ac42
Fix Country Lode HUD Issue
...
Fixed the error that was thrown when the advancement is unlocked and also fixed the popup HUD so the advancement title fits correctly
2023-01-06 16:35:59 +00:00
ancientmarinerdev
01bb753549
Merge pull request 'Refactor mob_step and do_states' ( #3231 ) from mob_tweaks into master
...
Reviewed-on: MineClone2/MineClone2#3231
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-06 14:10:39 +00:00
ancientmarinerdev
59694ebc7c
Fix merge conflict
2023-01-06 13:52:03 +00:00
ancientmarinerdev
00c4ecf643
Merge pull request 'Villagers and pathfinding improvements' ( #3083 ) from village_town_bell_pathfix into master
...
Reviewed-on: MineClone2/MineClone2#3083
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-06 02:59:48 +00:00
ancientmarinerdev
e4db91d35c
Fix crash bug
2023-01-06 02:59:02 +00:00