c2ba70a601
Merge branch 'master' into mcl-item-entity-fixes
2022-12-30 18:34:41 +00:00
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
661afed46c
Merge branch 'master' into mcl-init-fixes
2022-12-30 18:11:08 +00:00
3d2955c394
Merge branch 'master' into simplified_palette_index
2022-12-30 10:36:35 +00:00
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
9605e2ae0d
Make the theme less loud
2022-12-30 01:27:03 +00:00
80bb954814
Delete 'menu/theme_alt.ogg'
2022-12-30 01:27:03 +00:00
10dc83b2a6
softer menu music ogg file
2022-12-30 01:27:02 +00:00
b95c623a74
Add a more original footer and headers
2022-12-30 01:27:02 +00:00
0ab4553648
Add more credits
2022-12-30 01:27:02 +00:00
65557152fb
Add a menu theme
2022-12-30 01:27:02 +00:00
1357193a78
Add a template for making splashes
2022-12-30 01:27:02 +00:00
aacbaddfe0
Add warped hyphae texture to the right folder
2022-12-30 01:27:02 +00:00
e246bf7ddf
Remove stray warped hyphae texture?
2022-12-30 01:27:02 +00:00
11bd29ed44
Add a couple of splash texts
2022-12-30 01:27:02 +00:00
de574729a2
Make footer have shadow and look better on 1080p monitors
2022-12-30 01:27:02 +00:00
95e269a61f
Add last background
2022-12-30 01:27:02 +00:00
5bdc145872
Add second batch of backgrounds
2022-12-30 01:27:02 +00:00
20e178d5d1
Add first batch of backgrounds
2022-12-30 01:27:01 +00:00
bdbc484c48
Delete 'menu/overlay.1.png'
2022-12-30 01:27:01 +00:00
56c62e9fba
Delete 'menu/overlay.2.png'
2022-12-30 01:27:01 +00:00
3b1acc60db
Delete 'menu/overlay.3.png'
2022-12-30 01:27:01 +00:00
6026687e93
Delete 'menu/overlay.4.png'
2022-12-30 01:27:01 +00:00
e813c48ed5
Delete 'menu/overlay.5.png'
2022-12-30 01:27:01 +00:00
75716d97e3
Delete 'menu/overlay.png'
2022-12-30 01:27:01 +00:00
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
9574ba7f09
Update Code of Conduct email
2022-12-29 23:47:03 +00:00
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
3ee4a62107
Added credit for Japanese translations
2022-12-29 22:17:16 +00:00
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
87327abfb9
Restructure Commit.
...
Recipes are in recipes.lua
Bamboo Basic nodes are in bamboo_base.lua
Bamboo items are in bamboo_items.lua
Bamboo api / globals are in globals.lua.
2022-12-29 13:16:48 -05:00
34263c2ef3
Change bamboo back to Axey, instead of swordy.
2022-12-29 12:28:42 -05:00
38c6969292
Fix mod.conf in mcl_fishing
...
Fix bamboo nodes on_destruct to handle the alt nodes too.
clean up ToDos
2022-12-29 11:31:13 -05:00
54548ecfdf
Merge branch 'master' into simplified_palette_index
2022-12-29 14:51:17 +00:00
5ec7b8ed89
Add LBM to fix grass palette indexes
...
Adds a LBM which basically fixes the grass palette indexes of the nodes from older worlds. I have also added some more nodes to `block_fixes`.
2022-12-29 14:18:37 +00:00
137179ac8e
revert 3afb42b2f7
...
revert Add a LBM to fix grass palette indexes on older worlds
2022-12-29 14:13:50 +00:00
3afb42b2f7
Add a LBM to fix grass palette indexes on older worlds
2022-12-29 14:12:00 +00:00
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
d5f8129ea7
Merge branch 'master' into fix_v6_sky_color
2022-12-29 07:55:49 +00:00
1d0968f4f5
Fix bamboo nodes on_destruct to handle the alt nodes too.
...
clean up ToDos
2022-12-29 01:38:10 -05:00
0f9d263e02
Add Bamboo to the Fishing Junk table.
...
Update the mod.conf to be aware of mcl_bamboo.
2022-12-29 01:29:25 -05:00
26c1be3722
Fix bamboo node to be Swordy.
...
Added in secondary bamboo node types.
Changed the grow_bamboo function to make use of new alt nodes, and removed unneccessary "force" parameter.
2022-12-29 01:03:25 -05:00
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
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
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
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
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
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
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
60b0cfe89a
Remove FIXME about slimes spawning in swamps.
...
* This has been fixed.
2022-12-29 02:13:57 +00:00
iliekprogrammar
FossFanatic
ancientmarinerdev
Michieal
kabou