test1
7c7521ff15
Merge pull request 'Update readme' ( #3223 ) from updated_readme into master
...
Reviewed-on: MineClone2/MineClone2#3223
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-31 13:23:03 +00:00
test1
50d8e95c16
Update readme
2022-12-31 13:16:52 +00:00
iliekprogrammar
fc74bd5cfe
Merge pull request 'fix-cocoa-place' ( #3221 ) from fix-cocoa-place into master
...
Reviewed-on: MineClone2/MineClone2#3221
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-31 10:49:57 +00:00
kabou
2a37d38f6c
Reformat cocoa pod node definition groups.
2022-12-31 11:18:04 +01:00
kabou
89821a8329
Rename cocoa pod placement function.
...
* Rename cocoa pod placement function to match the `on_place` call in
the cocoa pods item definition.
* Make the function local, there are no callers outside of mcl_cocoas.
2022-12-31 10:41:39 +01:00
iliekprogrammar
3249c13752
Merge pull request '`mcl_meshhand` fixes' ( #2939 ) from mcl-meshhand-fixes into master
...
Reviewed-on: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2022-12-29 22:14:48 +00:00
Michieal
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
Michieal
34263c2ef3
Change bamboo back to Axey, instead of swordy.
2022-12-29 12:28:42 -05:00
Michieal
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
FossFanatic
ab1cfde34d
Merge pull request 'Put back default sky and fog color.' ( #3201 ) from fix_v6_sky_color into master
...
Reviewed-on: MineClone2/MineClone2#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
Michieal
1d0968f4f5
Fix bamboo nodes on_destruct to handle the alt nodes too.
...
clean up ToDos
2022-12-29 01:38:10 -05:00
Michieal
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
Michieal
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
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: MineClone2/MineClone2#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