chmodsayshello
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fork update #10

Merged
chmodsayshello merged 220 commits from VoxeLibre/VoxeLibre:master into master 2023-06-04 12:44:03 +02:00
Conversation 0 Commits 220 Files Changed 278 +3311 -1913
chmodsayshello commented 2023-06-04 12:43:31 +02:00
Owner
Copy Link

Tell us about your pull request! Reference related issues, if necessary

Testing

Tell us how to test your changes!

<!-- Please follow our contributing guidelines first: https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer By submitting this pull request, you agree to follow our Code of Conduct: https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md --> Tell us about your pull request! Reference related issues, if necessary ### Testing Tell us how to test your changes!
chmodsayshello added 220 commits 2023-06-04 12:43:34 +02:00
2bd36b5d66 Make lecterns require wood slabs for crafting 
Otherwise you can use stone slabs to craft lecterns, which doesn't make sense
deb393ae32 Merge pull request 'Remove mcl_player_init' (#3594) from player_init into master 
Reviewed-on: MineClone2/MineClone2#3594
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
6e107a77b5 Merge pull request 'Hopper minecart optimisation' (#3596) from hopper_minecart_optimisation into master 
Reviewed-on: MineClone2/MineClone2#3596
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
acfcb7528c Merge pull request 'Don't drop beds in creative' (#3602) from beds into master 
Reviewed-on: MineClone2/MineClone2#3602
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
952c72c414 Merge pull request 'Make banners drop when the support node is dug' (#3606) from banner_node_support into master 
Reviewed-on: MineClone2/MineClone2#3606
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
b19cc8a5e6 Merge pull request 'Ensure enchanted netherite armour is fire immune to lava etc.' (#3625) from enchanted_netherite_lava_immune into master 
Reviewed-on: MineClone2/MineClone2#3625
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
cf174c110a Merge pull request 'release/0.83' (#3644) from release/0.83 into master 
Reviewed-on: MineClone2/MineClone2#3644
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
d53ea65da8 Remove some code 
Some code has been moved to `mcl_mapgen_core` for consistency.
76bf98b26c Use voxelmanip to set the correct param2 for nodes 
Voxelmanip is now used to set the correct `param2` for the nodes which use biome colouring or, in the case of seagrass, the correct meshoption.
d8d83dd21c Make vines use voxelmanip colouring as well 
This commit adds some code to the `set_foliage_palette` function which checks for the `param2` of the foliage node in question to see whether or not said `param2` value is `0` upon first being generated.

If it isn't, then it's safe to assume that said foliage is a vine, and therefore needs to use the other method of calculating the final `param2` value.
d28dcb1b10 Another small change to account for mangrove leaves 
This one should actually work as expected.
01ac9ad685 Add old method back for foliage 
This commit adds back the old `set_node` method for the foliage, since the foliage is much more difficult to work with via the VoxelManip method due to them being part of schematics that could span across mapblocks in some cases.

The old method will complement the new one by running after the VoxelManip has done its job, and fixes any foliage that the VoxelManip had missed.
6c99a63419 Merge pull request 'playerbound music toggle' (#3658) from playerMusicToggle into master 
Reviewed-on: MineClone2/MineClone2#3658
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
7dc09e3ebd Add spanish translations (#3659) 
I just added some translations to Spanish that were missing

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: MineClone2/MineClone2#3659
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
b001e4e06f Make elytra active checks use groups instead 
So that modders can easily add their own varients of elytra that work
0568c18081 Merge pull request 'Fix crash when using a named spawn egg' (#3674) from spawn_egg_name_crash into master 
Reviewed-on: MineClone2/MineClone2#3674
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
3e768c6a6f Merge pull request 'New sweet berry textures' (#3654) from sweet-berry-texture-change into master 
Reviewed-on: MineClone2/MineClone2#3654
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
3b64ceb5b2 add barrel sounds (#3670) 
This PR Adds sounds to opening and closing barrels. The sounds are properly attributed in the 'attribution.txt' file. They are published under Creative Commons 0 (CC0) and the source for them is [here](https://freesound.org/people/quantumriver/sounds/552153/)

Reviewed-on: MineClone2/MineClone2#3670
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: SmokeyDope <smokey@tilde.team>
Co-committed-by: SmokeyDope <smokey@tilde.team>
21694879be Clean-up mcl_bamboo code 
make it less dramatic ('Bamboo Door.') and fix inventory_image inconsistency with trapdoors
10459f51b1 Merge pull request 'Clean-up mcl_bamboo code' (#3662) from bamboofix into master 
Reviewed-on: MineClone2/MineClone2#3662
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
d14c074d6c Add spanish translations (#3678) 
I'm working on adding more translations. I made this pull request to let everyone now I'm working on this.

So far I've completed 1 file/mod

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: MineClone2/MineClone2#3678
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
9518d47662 (french) translation enhancements (#3643) 
- Add missing translation
- Fix broken translations
- Fix unacurate description
- Correct/improve/change for cohesion french translation

Translations templates have been updated,other translations must be updated.

<!--
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer

By submitting this pull request, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->

Tell us about your pull request! Reference related issues, if necessary

### Testing
Tell us how to test your changes!

Co-authored-by: 3raven <elise_declerck@laposte.net>
Reviewed-on: MineClone2/MineClone2#3643
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Co-authored-by: 3raven <3raven@noreply.git.minetest.land>
Co-committed-by: 3raven <3raven@noreply.git.minetest.land>
998983445b Rename Bucket Textures (#3708) 
This pull request renames buckets so that they use the `mcl_` naming convention.

I originally was going to do some renaming on a bigger scope, but decided against it for now.

Reviewed-on: MineClone2/MineClone2#3708
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
e2963f88a7 Update dead bush generation 
Removed Taiga biome and changed the generation values
873297d2cf Make Piglin Brutes drop golden axes 
Instead of dropping crossbows
9c8b942e26 Fix a typo in Acquire Hardware achievement 
Fixes a minor typo with an achievement name
bd37ed178c Merge pull request 'Fix pig riding' (#3675) from fix_pig_riding into master 
Reviewed-on: MineClone2/MineClone2#3675
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
06077d1633 Spanish translations (#3753) 
<!--
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer

By submitting this pull request, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->

Tell us about your pull request! Reference related issues, if necessary

### Testing
Tell us how to test your changes!

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: MineClone2/MineClone2#3753
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
9e5a45e3fd Rebased; Changed the way that the abm handles being called. 
Still have to make the scraped variants of the stairs & slabs.
75e4000b30 Fix the scraped variants of certain waxed copper blocks 
Also fix some wording in the oxidation api documentation
46d486c7cb Merge pull request 'Oxidation API' (#3748) from oxidation_api into master 
Reviewed-on: MineClone2/MineClone2#3748
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
chmodsayshello merged commit 1599202353 into master 2023-06-04 12:44:03 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: chmodsayshello/MineClone2#10
No description provided.
Delete Branch "VoxeLibre/VoxeLibre:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?