1
0
Fork 0
Commit Graph

10059 Commits (csm-enabled)

Author SHA1 Message Date
iliekprogrammar 08e2daefb9 Merge branch 'master' into csm-enabled 2022-12-31 05:52:22 +00:00
iliekprogrammar 3249c13752 Merge pull request '`mcl_meshhand` fixes' (#2939) from mcl-meshhand-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2939
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:50:46 +00:00
iliekprogrammar 2ea72ccda8 Merge branch 'master' into mcl-meshhand-fixes 2022-12-30 18:47:55 +00:00
iliekprogrammar 5237eca31e Merge pull request '`mcl_item_entity` fixes' (#2936) from mcl-item-entity-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2936
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:39:34 +00:00
iliekprogrammar c2ba70a601 Merge branch 'master' into mcl-item-entity-fixes 2022-12-30 18:34:41 +00:00
iliekprogrammar 723fe9c532 Merge pull request 'mcl_init fixes' (#2862) from mcl-init-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2862
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:18:21 +00:00
iliekprogrammar 661afed46c Merge branch 'master' into mcl-init-fixes 2022-12-30 18:11:08 +00:00
ancientmarinerdev e7ace0c87c Merge pull request 'Main Menu Rework' (#3193) from main_menu_rework into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3193
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-30 01:27:49 +00:00
FossFanatic 9605e2ae0d Make the theme less loud 2022-12-30 01:27:03 +00:00
FossFanatic 80bb954814 Delete 'menu/theme_alt.ogg' 2022-12-30 01:27:03 +00:00
Michieal 10dc83b2a6 softer menu music ogg file 2022-12-30 01:27:02 +00:00
FossFanatic b95c623a74 Add a more original footer and headers 2022-12-30 01:27:02 +00:00
FossFanatic 0ab4553648 Add more credits 2022-12-30 01:27:02 +00:00
FossFanatic 65557152fb Add a menu theme 2022-12-30 01:27:02 +00:00
FossFanatic 1357193a78 Add a template for making splashes 2022-12-30 01:27:02 +00:00
FossFanatic aacbaddfe0 Add warped hyphae texture to the right folder 2022-12-30 01:27:02 +00:00
FossFanatic e246bf7ddf Remove stray warped hyphae texture? 2022-12-30 01:27:02 +00:00
FossFanatic 11bd29ed44 Add a couple of splash texts 2022-12-30 01:27:02 +00:00
FossFanatic de574729a2 Make footer have shadow and look better on 1080p monitors 2022-12-30 01:27:02 +00:00
FossFanatic 95e269a61f Add last background 2022-12-30 01:27:02 +00:00
FossFanatic 5bdc145872 Add second batch of backgrounds 2022-12-30 01:27:02 +00:00
FossFanatic 20e178d5d1 Add first batch of backgrounds 2022-12-30 01:27:01 +00:00
FossFanatic bdbc484c48 Delete 'menu/overlay.1.png' 2022-12-30 01:27:01 +00:00
FossFanatic 56c62e9fba Delete 'menu/overlay.2.png' 2022-12-30 01:27:01 +00:00
FossFanatic 3b1acc60db Delete 'menu/overlay.3.png' 2022-12-30 01:27:01 +00:00
FossFanatic 6026687e93 Delete 'menu/overlay.4.png' 2022-12-30 01:27:01 +00:00
FossFanatic e813c48ed5 Delete 'menu/overlay.5.png' 2022-12-30 01:27:01 +00:00
FossFanatic 75716d97e3 Delete 'menu/overlay.png' 2022-12-30 01:27:01 +00:00
ancientmarinerdev 6fe5bf8674 Merge pull request 'Update Code of Conduct email' (#3214) from update_coc_email into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3214
2022-12-29 23:47:50 +00:00
ancientmarinerdev 9574ba7f09 Update Code of Conduct email 2022-12-29 23:47:03 +00:00
ancientmarinerdev 0df4f9518a Merge pull request 'Added credit for Japanese translations' (#3213) from add_japanese_credits into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3213
2022-12-29 22:18:44 +00:00
ancientmarinerdev 3ee4a62107 Added credit for Japanese translations 2022-12-29 22:17:16 +00:00
ancientmarinerdev e6e898671a Merge pull request 'add japanese translation' (#3149) from SakuraRiu/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2022-12-29 22:14:48 +00:00
FossFanatic ab1cfde34d Merge pull request 'Put back default sky and fog color.' (#3201) from fix_v6_sky_color into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3201
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2022-12-29 07:59:28 +00:00
FossFanatic d5f8129ea7 Merge branch 'master' into fix_v6_sky_color 2022-12-29 07:55:49 +00:00
ancientmarinerdev 1295b2dc12 Merge pull request 'Dye refactoring; untangle bone meal, lapis, ink sac and cocoa beans from dye items.' (#3176) from redo_dyes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3176
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-29 03:11:33 +00:00
kabou 44f724f677 Minor refactoring of mcl_dye, fix dye texture names.
* Reorganize dyes table.
* Rename dye item textures to conform to mcl naming standard.
* Refactor dye item registration.
* Shuffle recipes around in a more logical order.
* Remove unused dye names from lists that are probably equally unused.
2022-12-29 03:08:50 +00:00
kabou 92ee402971 Separate white dye from bone meal.
* Add craftitem for ":mcl_bone_meal:bone_meal" to mcl_dye (temporarily.)
* Add crafting recipe for bone meal.
* Add texture for white dye item.
* Merge craftitem registration for "mcl_dye:white" with generic dyes.
* Add crafting recipe for white dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update mcl_crimson and sweet berry on_rightclick handlers.
* Update composter output, both as freestanding and to hoppers.
* Update bone block crafting recipes.
* Update tropical fish, cod and salmon mob drops.
2022-12-29 03:08:50 +00:00
kabou 7d8fdc6ec3 Separate brown dye from cocoa beans.
* Add craftitem "mcl_cocoas:cocoa_beans".
* Add texture for brown dye item.
* Merge craftitem registration for "mcl_dye:brown" with generic dyes.
* Add crafting recipe for brown dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update cookie recipe.
2022-12-29 03:08:49 +00:00
kabou d2edc75407 Separate blue dye from lapis lazuli.
* Add craftitem "mcl_core:lapis".
* Add texture for blue dye item.
* Add crafting recipe for blue dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update lapis block crafting recipes.
* Update lapis ore drops.
* Update dungeon and shipwreck loot.
* Update enchanting table input.
* Update villager trade.
2022-12-29 03:08:49 +00:00
kabou 7311071303 Separate black dye from squid ink sac.
* Add craftitem "mcl_mobitems:ink_sac".
* Add texture for black dye item.
* Add crafting recipe for black dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update fishing loot.
2022-12-29 03:08:49 +00:00
ancientmarinerdev 437842134e Merge pull request 'Slime, magma cube and cow spawning fixes.' (#3162) from slime_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3162
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-29 02:14:32 +00:00
kabou 60b0cfe89a Remove FIXME about slimes spawning in swamps.
* This has been fixed.
2022-12-29 02:13:57 +00:00
kabou d8a883e81f Limit size of cow herds spawning.
* Cows should spawn in herds of max 4, not 8.
2022-12-29 02:13:57 +00:00
kabou 15f5c3c30a Make slimes spawn at night in swamps.
* Adds spawn definitions for large, small and tiny slimes to spawn in
  Swampland and MangroveSwamp biomes when light levels are less than 7.
2022-12-29 02:13:57 +00:00
kabou 4af8148850 Refactor spawn registrations.
* Unduplicate spawnable biome lists for slimes and magma cubes.
* Rename min and max spawndepth identifiers.
2022-12-29 02:13:57 +00:00
kabou ea6201d32f Add missing biome to slime spawn list.
* Add "MangroveSwamp_underground" to the lists of spawnable biomes for
  big, small and tiny slimes.
2022-12-29 02:13:57 +00:00
kabou da17ff8ea0 Remove stray dependency.
While mobs_mc_gameconfig was deleted at some point during the mob
refactoring, it was still listed in mobs_mc's mod.conf.
2022-12-29 02:13:57 +00:00
kabou 6756ee340c Mob spawning chatcommand refactoring.
* Put calculations that are only used conditionally inside the
  related `if` block.
* Make code logic more explicit.
* Take logging statement out of return value assignment.
* Remove duplicate assignment.
* Fix a typo in the function's description.
2022-12-29 02:13:57 +00:00
kabou 0c454a34c9 Use vectors in `get_next_mob_spawn_pos()` 2022-12-29 02:13:57 +00:00