fork update #10

Merged
chmodsayshello merged 220 commits from VoxeLibre/VoxeLibre:master into master 2023-06-04 12:44:03 +02:00

220 Commits

Author SHA1 Message Date
ancientmarinerdev 46d486c7cb Merge pull request 'Oxidation API' (#3748) from oxidation_api into master
Reviewed-on: MineClone2/MineClone2#3748
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-06-02 20:34:26 +00:00
PrairieWind 75e4000b30 Fix the scraped variants of certain waxed copper blocks
Also fix some wording in the oxidation api documentation
2023-06-02 20:28:54 +00:00
PrairieWind 46f6731cf5 Make oxidized slabs and stairs waxable, and fix the copper oxidation dupe 2023-06-02 20:28:54 +00:00
PrairieWind 0fba7eaed4 Fix a few crashes, make the abm work, and revive the wax off advancement 2023-06-02 20:28:54 +00:00
Michieal 7c46826958 Did what I should have done to begin with: changed _mcl_copper_waxed_variant to _mcl_waxed_variant so that it intuitively applies to more than just copper. 2023-06-02 20:28:54 +00:00
Michieal d6858b7e2a Made the scraped variants of the stairs & slabs.
Cleaned up commented out code.
2023-06-02 20:28:54 +00:00
Michieal 9e5a45e3fd Rebased; Changed the way that the abm handles being called.
Still have to make the scraped variants of the stairs & slabs.
2023-06-02 20:28:54 +00:00
PrairieWind 4b9fc7046b Add Oxidization API 2023-06-02 20:28:54 +00:00
ancientmarinerdev 3eb2f745e2 Merge pull request 'Change order of numbers passed into random that crash on some Lua versions' (#3775) from fix_random_ordering_crash into master
Reviewed-on: MineClone2/MineClone2#3775
2023-06-02 20:20:33 +00:00
ancientmarinerdev 4287a261c8 Change order of numbers passed into random that crash on some Lua versions 2023-06-02 21:14:52 +01:00
ancientmarinerdev 5cbb56d71b Merge pull request 'Split global cap for peaceful and hostile. Introduce underground water, ambient water, axolotl cap. Slight peaceful spawn balancing.' (#3765) from spawning_cap_tweaks into master
Reviewed-on: MineClone2/MineClone2#3765
2023-06-01 20:08:53 +00:00
ancientmarinerdev c65f8c9e51 Improved early game spawn balance 2023-06-01 20:05:25 +00:00
ancientmarinerdev 812269264b Add in caps for underground water and axolotl 2023-06-01 20:05:25 +00:00
ancientmarinerdev afb4540408 Clean up 2023-06-01 20:05:25 +00:00
ancientmarinerdev 4d3e8e25e5 Add water_ambient cap 2023-06-01 20:05:25 +00:00
ancientmarinerdev ae32ce4a0a Split hostile and non-hostile mob caps 2023-06-01 20:05:25 +00:00
ancientmarinerdev 4c3d726882 Merge pull request 'Add max_hear_distance flag to composter sounds' (#3767) from fix_composter_sound_hear_distance into master
Reviewed-on: MineClone2/MineClone2#3767
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-31 22:26:16 +00:00
ancientmarinerdev 90842c5f25 Fixed slight error. 2023-05-31 22:20:58 +00:00
ancientmarinerdev 428ae9ac0d Fix positional sounds based on mt docs. 2023-05-31 22:20:58 +00:00
SmokeyDope adee1a49af Add max_hear_distance flag to composter sounds 2023-05-31 22:20:58 +00:00
megustanlosfrijoles 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>
2023-05-31 21:22:49 +00:00
ancientmarinerdev ae486fa525 Merge pull request 'Fix a typo in the Acquire Hardware achievement' (#3740) from uqers/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#3740
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-28 19:46:07 +00:00
uqers 7133031caf Fix translations for ru, pl, ja, and fr 2023-05-27 01:42:59 +00:00
ancientmarinerdev 019717cab0 Merge pull request 'Add support for external custom skins mod' (#3653) from skins into master
Reviewed-on: MineClone2/MineClone2#3653
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-26 20:55:53 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 f1d17e2c69 mcl_skins: PR feedback 2023-05-26 20:27:11 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 26f033932e Add mcl_custom_skins info to README 2023-05-26 20:27:11 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 1e63f3931a Skins update 2023-05-26 20:27:11 +00:00
ancientmarinerdev 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>
2023-05-22 21:47:14 +00:00
PrairieWind 5ed92a2695 Make pigs mountable without carrot on a stick, but require the carrot on a stick to actually control the pig 2023-05-22 21:40:23 +00:00
ancientmarinerdev 8f60fb08d3 Merge pull request 'Fix global variable references and exit mob_step if missing pos' (#3741) from mobs_tweaks into master
Reviewed-on: MineClone2/MineClone2#3741
2023-05-22 21:12:43 +00:00
ancientmarinerdev 10a3d06360 Fix global variable references and exit mob_step if missing pos 2023-05-22 21:05:12 +00:00
ancientmarinerdev 08cbd95a5e Merge pull request 'Make sure dying sign text respects protection' (#3727) from sign_dye_protection into master
Reviewed-on: MineClone2/MineClone2#3727
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-22 20:53:58 +00:00
PrairieWind a5a035d9bb Make sure dying sign text respects protection 2023-05-22 20:47:49 +00:00
uqers 9c8b942e26 Fix a typo in Acquire Hardware achievement
Fixes a minor typo with an achievement name
2023-05-21 03:17:07 +00:00
ancientmarinerdev 4651bd7e7d Merge pull request 'merge_0.83.1_asset_fixes' (#3745) from merge_0.83.1_asset_fixes into master
Reviewed-on: MineClone2/MineClone2#3745
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-05-19 14:24:05 +00:00
ancientmarinerdev 62ca6faab1 Updated credits for new assets 2023-05-19 14:18:49 +00:00
ancientmarinerdev ccf063999e New crimson fungus texture 2023-05-19 14:18:49 +00:00
ancientmarinerdev 4a7a50e78c New warped and crimson hyphae plank textures 2023-05-19 14:18:49 +00:00
ancientmarinerdev 00a950721d Merge pull request 'Make end crystals explode when nearby crystals are punched and explode' (#3714) from end_crystal_explosion into master
Reviewed-on: MineClone2/MineClone2#3714
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-17 21:25:43 +00:00
PrairieWind 6294a61d0d Make end crystals explode when nearby crystals are punched and explode 2023-05-17 21:17:46 +00:00
ancientmarinerdev 393c24d32a Merge pull request 'Make Piglin Brutes drop golden axes' (#3719) from piglin_brute_drops into master
Reviewed-on: MineClone2/MineClone2#3719
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-17 20:57:39 +00:00
PrairieWind 873297d2cf Make Piglin Brutes drop golden axes
Instead of dropping crossbows
2023-05-17 20:55:09 +00:00
ancientmarinerdev 681ea9b515 Merge pull request 'Zombie piglin no longer prevent sleep unless hostile.' (#3731) from allow_sleep_near_ziglin into master
Reviewed-on: MineClone2/MineClone2#3731
2023-05-17 19:55:50 +00:00
ancientmarinerdev e2688c03e3 Zombie piglin no longer prevent sleep unless hostile. 2023-05-17 19:49:37 +00:00
ancientmarinerdev d6192dda67 Merge pull request 'Update dead bush generation' (#3725) from dead_bush_mapgen into master
Reviewed-on: MineClone2/MineClone2#3725
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-05-16 23:16:21 +00:00
PrairieWind e2963f88a7 Update dead bush generation
Removed Taiga biome and changed the generation values
2023-05-16 23:13:11 +00:00
ancientmarinerdev 11b371a107 Merge pull request 'Fix sign color requirement and translation issue' (#3677) from sign_color_fix into master
Reviewed-on: MineClone2/MineClone2#3677
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-16 21:44:12 +00:00
PrairieWind 5071a7c789 Fix translator translating sign description api side instead of mod side 2023-05-16 21:38:28 +00:00
PrairieWind 0903ac60e4 Make custom sign registration not absolutely require color 2023-05-16 21:38:28 +00:00
ancientmarinerdev f093050c76 Merge pull request 'Fix waterlogged mangrove roots leaving water in the nether' (#3724) from waterlog_mangrove_roots_nether into master
Reviewed-on: MineClone2/MineClone2#3724
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-16 19:38:52 +00:00
PrairieWind d467b80491 Fix waterlogged mangrove roots leaving water in the nether 2023-05-16 19:35:56 +00:00
ancientmarinerdev 6ded4d2322 Merge pull request 'Optimise mobs' (#3720) from optimise_mobs into master
Reviewed-on: MineClone2/MineClone2#3720
2023-05-15 14:03:54 +00:00
ancientmarinerdev 5a059379b2 Group damage logic. Remove physics falling logic out of suspend with duplicate falling call 2023-05-15 13:54:23 +00:00
ancientmarinerdev 952a90bfde Re-organise mob_step for better clarity 2023-05-15 13:54:23 +00:00
ancientmarinerdev f326fa620f Optimise do states and env danger check 2023-05-15 13:54:23 +00:00
ancientmarinerdev 3d1fb8cf4a Clean up and optimise falling 2023-05-15 13:54:23 +00:00
ancientmarinerdev 519b237ba8 Jumping check only called once per mob_step and refactor duplicate water danger, cliff fall logic 2023-05-15 13:54:23 +00:00
ancientmarinerdev 72c3f87925 Reduce excessive mob overhead 2023-05-15 13:54:23 +00:00
ancientmarinerdev 818052dc6c Fix mob textures getting reset on shutdown/startup 2023-05-15 13:54:23 +00:00
ancientmarinerdev b3a6970370 Merge pull request 'Remove zombie pigmen and ensure zombie piglin named correctly. Add Piglin description names.' (#3718) from zombie_piglin_fixes into master
Reviewed-on: MineClone2/MineClone2#3718
2023-05-14 16:15:51 +00:00
ancientmarinerdev 53637bbc19 Group attack configured so that sword piglins and piglins will also respond to aggression on other piglins. 2023-05-14 15:56:26 +00:00
ancientmarinerdev 92a8f23d22 Fix creeper name 2023-05-14 15:56:26 +00:00
ancientmarinerdev 2d89440972 Fix Piglin naming and add localisation entries 2023-05-14 15:56:26 +00:00
ancientmarinerdev 92c0809dbe Remove zombie pigman file as no longer needed 2023-05-14 15:56:26 +00:00
ancientmarinerdev 530c8ec0da Remove zombie pigmen and ensure zombie piglin named correctly. Add Piglin description names. 2023-05-14 15:56:26 +00:00
ancientmarinerdev 47e26bbfe6 Merge pull request 'Lightning rod param2 is now saved upon being struck' (#3712) from lightning_rod_param_strike into master
Reviewed-on: MineClone2/MineClone2#3712
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-14 11:54:06 +00:00
PrairieWind f019f4ae45 Lightning rod param2 is now saved upon being struck 2023-05-14 11:50:27 +00:00
FossFanatic 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>
2023-05-14 11:41:39 +00:00
ancientmarinerdev 0a0bb3ff9a Merge pull request 'Remove Flower Forest Beaches from Wolf biome spawn list' (#3722) from wolf_flower_biome into master
Reviewed-on: MineClone2/MineClone2#3722
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-12 22:57:10 +00:00
PrairieWind be32ffde6b Remove Flower Forest Beaches from Wolf biome spawn list 2023-05-12 22:50:33 +00:00
PrairieWind 0364c8d2a6 Merge pull request 'Piglins no longer aggro for enchanted gold armour' (#3713) from fix_piglin_gold_aggression into master
Reviewed-on: MineClone2/MineClone2#3713
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-05-12 22:30:32 +00:00
ancientmarinerdev 3aed71fb85 Piglins no longer aggro for enchanted gold armour 2023-05-12 22:21:56 +00:00
PrairieWind 8a2c90406f Merge pull request 'Fix dropped out bamboo lines from translation work' (#3717) from bamboo_fix into master
Reviewed-on: MineClone2/MineClone2#3717
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-05-12 22:16:42 +00:00
ancientmarinerdev d42260cea3 Fix dropped out bamboo lines from translation work 2023-05-11 23:49:46 +01:00
3raven 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>
2023-05-11 22:39:49 +00:00
ancientmarinerdev ede98cda80 Merge pull request 'Clean up crash code and convert to new style vectors' (#3703) from cleanup_crash_code into master
Reviewed-on: MineClone2/MineClone2#3703
2023-05-11 19:25:20 +00:00
ancientmarinerdev 09619a62ee Clean up is_as_cliff code and convert to new style vector part 2 2023-05-11 20:22:49 +01:00
ancientmarinerdev 31e6e38013 Clean up is_as_cliff code and convert to new style vector 2023-05-11 20:22:49 +01:00
ancientmarinerdev 8092fd573c Cleanup self.acc code and convert to new style vectors 2023-05-11 20:22:19 +01:00
ancientmarinerdev 0185609b01 Merge pull request 'Reduce network activity for elytra flying rocket particles' (#3702) from optimisations_ely into master
Reviewed-on: MineClone2/MineClone2#3702
2023-05-11 17:33:47 +00:00
ancientmarinerdev 7726e576f0 Remove oopsie 2023-05-11 17:30:28 +00:00
ancientmarinerdev d920441a01 Reduce network activity for elytra flying rocket particles 2023-05-11 17:30:28 +00:00
ancientmarinerdev c62694f9e4 Merge pull request 'Hoglins attack frequency reduced now due to new attack_frequency mob setting' (#3700) from hoglin_attack_fix into master
Reviewed-on: MineClone2/MineClone2#3700
2023-05-11 17:07:55 +00:00
ancientmarinerdev 39872f8ef6 Fix hoglin reach and view_range 2023-05-11 16:33:55 +00:00
ancientmarinerdev 0787d7a988 Remove duplicate code that has been moved. 2023-05-11 16:33:55 +00:00
ancientmarinerdev 8a771ebfce Allow adjustment of attack frequency. Reduce attack frequency of Hoglins. Move on_step and do_states functionality off of the attack timer on to their own timer. 2023-05-11 16:33:55 +00:00
megustanlosfrijoles 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>
2023-05-10 23:12:37 +00:00
ancientmarinerdev 42c70ee622 Merge pull request 'Fix sheep wool farm crash' (#3699) from redstone_sheep_shear_crash into master
Reviewed-on: MineClone2/MineClone2#3699
2023-05-10 22:41:11 +00:00
ancientmarinerdev ff426412ef Fix sheep wool farm crash 2023-05-10 22:37:55 +00:00
ancientmarinerdev 6151507442 Merge pull request 'Beds mesecons dependency incorrectly named' (#3704) from incorrect_dependency_name into master
Reviewed-on: MineClone2/MineClone2#3704
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-05-09 23:36:43 +00:00
ancientmarinerdev 3785dcda48 Beds mesecons dependency incorrectly named 2023-05-09 23:34:07 +00:00
ancientmarinerdev 1694780d3f Merge pull request 'Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with.' (#3688) from despawn_refactor into master
Reviewed-on: MineClone2/MineClone2#3688
2023-05-09 23:18:27 +00:00
ancientmarinerdev ea4ea3f05e Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with. 2023-05-09 22:24:40 +00:00
ancientmarinerdev 453e90741d Merge pull request 'Fix crash when parrot sits on shoulder' (#3696) from fix_parrot_rotation_crash into master
Reviewed-on: MineClone2/MineClone2#3696
2023-05-09 22:04:09 +00:00
ancientmarinerdev 6f75932a4b Fix crash when parrot sits on shoulder 2023-05-09 21:43:54 +00:00
ancientmarinerdev 2d00e1e203 Merge pull request 'Remove slimes from mushroom islands' (#3705) from fix_mushroom_island_spawn into master
Reviewed-on: MineClone2/MineClone2#3705
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-05-09 21:33:00 +00:00
ancientmarinerdev 8b45cb2672 Remove slimes from mushroom islands 2023-05-09 14:56:51 +01:00
PrairieWind 848003de85 Merge pull request 'Fix crash when creeper explodes in minecart' (#3698) from creeper_in_mc_explosion_crash into master
Reviewed-on: MineClone2/MineClone2#3698
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-05-08 16:04:31 +00:00
ancientmarinerdev be8d9122ee Fix crash when creeper explodes in minecart 2023-05-07 21:11:48 +01:00
ancientmarinerdev 5507e99582 Merge pull request 'Hostile mobs should lose aggro if they cannot see their target' (#3682) from fix_mobs_aggressive_through_blocks into master
Reviewed-on: MineClone2/MineClone2#3682
2023-05-06 21:54:28 +00:00
ancientmarinerdev fb9a630a5b Hostile mobs should lose aggro if they cannot see their target 2023-05-06 21:51:47 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-05-05 18:11:16 +00:00
Mikita Wiśniewski 387b79e582 Remove useless comments 2023-05-05 07:41:50 +07:00
Mikita Wiśniewski 21694879be Clean-up mcl_bamboo code
make it less dramatic ('Bamboo Door.') and fix inventory_image inconsistency with trapdoors
2023-05-05 07:41:50 +07:00
SmokeyDope 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>
2023-05-04 21:48:07 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-05-02 18:54:57 +00:00
SmokeyDope 1448a5e098 Add new sweet berry textures 2023-05-02 13:46:37 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8ef653fb77 Merge pull request 'Fix issue with drops turning black due to clipping into walls and floors and visually demonstrate drops merging' (#3667) from fix_clipping_mining_drops into master
Reviewed-on: MineClone2/MineClone2#3667
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-01 22:00:42 +00:00
ancientmarinerdev 938ee7a832 Pick highest y and kick it up a little for visual spice and to fix occassional drop falling into floor 2023-05-01 16:53:00 -05:00
ancientmarinerdev c48510244e Before merging same stacks, move to middle to show merging occurs. 2023-05-01 16:53:00 -05:00
ancientmarinerdev 52e64a6f75 Fix issue with drops turning black due to clipping into walls and floors 2023-05-01 16:53:00 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-05-01 17:29:08 +00:00
cora 13df9ec46c Fix crash when using a named spawn egg 2023-04-27 21:16:19 +00:00
ancientmarinerdev 2c01240a56 Merge pull request 'Make elytra enchantable and the enchanted elytra usable' (#3637) from elytra_enchantable into master
Reviewed-on: MineClone2/MineClone2#3637
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-27 20:58:12 +00:00
PrairieWind b001e4e06f Make elytra active checks use groups instead
So that modders can easily add their own varients of elytra that work
2023-04-27 20:53:49 +00:00
FlamingRCCars 1a7f9fe8ec Make elytra enchantable 2023-04-27 20:53:49 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ec5b0903be Make enchanted elytra usable 2023-04-27 20:53:49 +00:00
megustanlosfrijoles 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>
2023-04-27 19:50:10 +00:00
ancientmarinerdev 0d80f1126c Merge pull request 'Migrate beacons back to abm' (#3631) from beacon-abm into master
Reviewed-on: MineClone2/MineClone2#3631
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-27 18:09:37 +00:00
ancientmarinerdev b15482012e Implement review feedback. 2023-04-27 18:05:44 +00:00
chmodsayshello a8c989edd8 don't get all objects in radius 2023-04-27 18:05:44 +00:00
chmodsayshello 1a1473e8c0 insert missing end 2023-04-27 18:05:44 +00:00
chmodsayshello 80cde37e65 remove empty lines and unneeded code 2023-04-27 18:05:44 +00:00
chmodsayshello 181cb73e45 remove commented out code 2023-04-27 18:05:44 +00:00
chmodsayshello 198eb630e1 replace globalstep with abm 2023-04-27 18:05:44 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6c99a63419 Merge pull request 'playerbound music toggle' (#3658) from playerMusicToggle into master
Reviewed-on: MineClone2/MineClone2#3658
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-04-25 18:43:47 +00:00
chmodsayshello 5db1e1876c playerbound music toggle (between 94e554aa1a and 5481f0109c) 2023-04-25 17:24:17 +02:00
ancientmarinerdev 32a60c888b Merge pull request 'solar panels: No crash when minetest.get_natural_light() return nil' (#3640) from spanels into master
Reviewed-on: MineClone2/MineClone2#3640
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-04-20 13:30:26 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 cdb2bc20b0 solar panels: No crash when minetest.get_natural_light() return nil 2023-04-20 12:25:45 +00:00
ancientmarinerdev becf98875f Merge pull request 'Add global cooldown for the bed quick chat feature' (#3645) from bedantispam into master
Reviewed-on: MineClone2/MineClone2#3645
2023-04-19 13:35:27 +00:00
ancientmarinerdev b374301ebf Throttle applies to default or custom sleep message 2023-04-19 13:25:42 +00:00
chmodsayshello 326e805798 update translation stuff 2023-04-19 13:25:42 +00:00
chmodsayshello 65aa185ffa global 'bed button' cooldown 2023-04-19 13:25:42 +00:00
ancientmarinerdev 90b9263f03 Merge pull request 'Mapgen Performance Improvements' (#3626) from mapgen_performance_improvements into master
Reviewed-on: MineClone2/MineClone2#3626
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-16 17:02:31 +00:00
ancientmarinerdev 3b1464ecc8 Tweak leaf generator numbers to catch missed jungle leaves 2023-04-16 17:50:22 +01:00
ancientmarinerdev 1015f5a569 Optimize folliage fixes code 2023-04-16 16:20:45 +00:00
ancientmarinerdev 31b65bac91 Move generator code to functions to aid in profiling 2023-04-16 16:20:45 +00:00
FossFanatic 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.
2023-04-16 16:20:45 +00:00
FossFanatic d28dcb1b10 Another small change to account for mangrove leaves
This one should actually work as expected.
2023-04-16 16:20:45 +00:00
FossFanatic aac6af4c20 Small change to account for mangrove leaves 2023-04-16 16:20:45 +00:00
FossFanatic 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.
2023-04-16 16:20:45 +00:00
FossFanatic 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.
2023-04-16 16:20:44 +00:00
FossFanatic d53ea65da8 Remove some code
Some code has been moved to `mcl_mapgen_core` for consistency.
2023-04-16 16:20:44 +00:00
ancientmarinerdev 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>
2023-04-15 11:36:52 +00:00
ancientmarinerdev 0de9685914 Post-release set version 0.84.0-SNAPSHOT 2023-04-15 12:28:27 +01:00
ancientmarinerdev 3ed3f16702 Pre-release update credits and set version 0.83.0 2023-04-15 12:25:17 +01:00
chmodsayshello 99918c192c Merge pull request 'add the ability to chat whilst being in bed' (#3634) from bedchat into master
Reviewed-on: MineClone2/MineClone2#3634
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 19:00:48 +00:00
ancientmarinerdev 20638c482d Merge pull request 'Make shield block sounds not play across infinite distance' (#3629) from shield_sound_distance into master
Reviewed-on: MineClone2/MineClone2#3629
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 17:37:54 +00:00
PrairieWind f8d338d731 Add position to shield sound 2023-04-11 17:16:57 +00:00
PrairieWind 5165730da8 Make shield block sounds not play across infinite distance 2023-04-11 17:16:57 +00:00
ancientmarinerdev d0f7d7c90d Merge pull request 'Fix French translation' (#3636) from syl/MineClone2:translationfr into master
Reviewed-on: MineClone2/MineClone2#3636
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-04-11 16:53:17 +00:00
chmodsayshello 0719d6038c add missing '=' to the translation template 2023-04-09 19:53:28 +02:00
chmodsayshello bf9989beb9 add default message button 2023-04-09 19:51:55 +02:00
chmodsayshello 62c014363d 'fix' multiline comment 2023-04-09 18:50:34 +02:00
chmodsayshello 75595115a0 move rate checks to seperate function 2023-04-09 18:45:23 +02:00
chmodsayshello d9ac803f5b update translations 2023-04-09 18:37:02 +02:00
chmodsayshello 899d619624 fix translator syntax 2023-04-09 18:35:03 +02:00
chmodsayshello 145be4c830 remove debug logging 2023-04-09 18:32:52 +02:00
chmodsayshello a55cbaadd6 take 'chat_message_limit_per_10sec' into account 2023-04-09 18:32:15 +02:00
ancientmarinerdev 56175d839f Merge pull request 'Slow down the pressure plate timer' (#3627) from pplates into master
Reviewed-on: MineClone2/MineClone2#3627
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-08 23:17:57 +00:00
ancientmarinerdev 7b748efa64 Merge branch 'master' into pplates 2023-04-08 23:11:16 +00:00
syl ac4073a259 Improve french translation 2023-04-07 17:05:06 +02:00
chmodsayshello 2366969e00 update german translation 2023-04-07 12:00:36 +02:00
chmodsayshello fca23ba47f update traslation template 2023-04-07 11:59:07 +02:00
chmodsayshello 4b1cc017a9 fix syntax 2023-04-07 11:58:27 +02:00
chmodsayshello 786aaf7a6d check for shout priv 2023-04-07 11:58:03 +02:00
ancientmarinerdev 1b4d9cfab7 Merge pull request 'Add error handling to sunlight checking to prevent crashing and improve diagnosis.' (#3624) from fix_crash_solarpanel into master
Reviewed-on: MineClone2/MineClone2#3624
2023-04-06 14:13:13 +00:00
ancientmarinerdev 7fe1be2c18 Add error handling to sunlight checking to prevent crashing and improve diagnosis. 2023-04-06 13:35:38 +00:00
chmodsayshello 645e20afa4 translation updates 2023-04-05 15:45:48 +02:00
chmodsayshello a026bbd3c4 minor bed changes 2023-04-05 15:45:16 +02:00
chmodsayshello 9c8463d2e3 add basic bed-chat 2023-04-05 14:43:07 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 93bc5bb5f8 Slow down the pressure plate timer 2023-04-04 07:38:50 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-04-03 18:12:53 +00:00
ancientmarinerdev 6817a8535b Get item name correctly. 2023-04-03 17:50:48 +01:00
ancientmarinerdev c83574802f Ensure enchanted netherite armour is fire immune to lava etc. 2023-04-03 02:06:58 +01:00
PrairieWind 0f64fb79c5 Merge pull request 'Don't drop dug banners in creative mode' (#3623) from banners into master
Reviewed-on: MineClone2/MineClone2#3623
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-04-02 22:08:46 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 87bf3aed59 Don't drop banners in creative mode 2023-04-02 21:58:34 +00:00
ancientmarinerdev 0ee31bd322 Merge pull request 'Elytra moves quicker than mapgen can cope. A bit performance hit on servers. Make this configurable.' (#3613) from ely_speed_toned_down into master
Reviewed-on: MineClone2/MineClone2#3613
2023-04-02 20:36:41 +00:00
ancientmarinerdev 3e6b43ad47 Elytra moves quicker than mapgen can cope. A bit performance hit on servers. Make this configurable. 2023-04-02 20:27:02 +00:00
ancientmarinerdev ed8953dfe3 Merge pull request 'Do not run kelp lbm every time' (#3612) from lbm_run_every_time_fixes into master
Reviewed-on: MineClone2/MineClone2#3612
2023-04-02 20:11:04 +00:00
ancientmarinerdev 8edffeb40d Map gen kelp should init age also 2023-04-02 20:04:32 +00:00
ancientmarinerdev 80f038da4a Do not run kelp lbm every time 2023-04-02 20:04:32 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-04-02 16:29:45 +00:00
PrairieWind 088922dc33 Make sure banner drops, even if banner entity doesn't exist 2023-04-02 11:22:26 -05:00
PrairieWind a98f79763b Remove unused digger variable that I forgot 2023-04-02 11:22:26 -05:00
PrairieWind 9c83755f53 Make banners drop when support node is dug and when banner node is dug 2023-04-02 11:22:26 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-04-02 16:18:50 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 771044236f Don't drop beds in creative 2023-04-02 11:06:37 -05:00
ancientmarinerdev bfea20dd00 Merge pull request 'Mapgen optimisations' (#3607) from mapgen_optimisation into master
Reviewed-on: MineClone2/MineClone2#3607
2023-04-01 19:03:09 +00:00
ancientmarinerdev 0abc0ffc48 Mapgen optimisations 2023-04-01 18:53:51 +00:00
ancientmarinerdev 4205915a0b Merge pull request 'Update ruined portal loot table' (#3595) from ruined_portal_loot into master
Reviewed-on: MineClone2/MineClone2#3595
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-04-01 02:27:11 +00:00
PrairieWind f7bdf7481c Update ruined portal loot table 2023-04-01 00:11:56 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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>
2023-03-31 18:43:16 +00:00
ancientmarinerdev 53923dd5fa Move on_step code to functions to help see profiling impact 2023-03-31 13:40:36 -05:00
ancientmarinerdev 59f4a62fd6 Move hopper minecarts off item entity. Do not run every on_step. Use more accurate object search location. Cut down object search distance. 2023-03-31 13:40:36 -05:00
ancientmarinerdev f8e994ae78 Create new dtime timer utility. 2023-03-31 13:40:36 -05:00
ancientmarinerdev 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>
2023-03-30 18:27:08 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 bef204f548 Remove mcl_player_init 2023-03-30 18:18:57 +00:00
ancientmarinerdev 80225bb8df Merge pull request 'Add texture making & optimization documentation' (#3588) from Add-texture-documentation into master
Reviewed-on: MineClone2/MineClone2#3588
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 02:26:06 +00:00
SmokeyDope 8a1c885faf Update optipng command to ACFMS' recommendation 2023-03-30 02:18:46 +00:00
SmokeyDope c3e37cb840 One more formatting adjust 2023-03-30 02:18:46 +00:00
SmokeyDope 4226b2a8ba Add link to optipng in textures.md and fix some formatting 2023-03-30 02:18:46 +00:00
SmokeyDope b08b6034ac Add texture making documentation 2023-03-30 02:18:46 +00:00
PrairieWind 2a3fbdead0 Merge pull request 'Make Lecterns use wooden slabs for crafting' (#3605) from lectern_slab_issues into master
Reviewed-on: MineClone2/MineClone2#3605
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 02:09:48 +00:00
PrairieWind f284b1ca0e Fix minor issue with mcl_stairs.register_stair function 2023-03-30 02:03:08 +00:00
PrairieWind 2bd36b5d66 Make lecterns require wood slabs for crafting
Otherwise you can use stone slabs to craft lecterns, which doesn't make sense
2023-03-30 02:03:08 +00:00
ancientmarinerdev d5c150d46c Merge pull request 'Add slab and stair groups to crimson and warped slabs and stairs' (#3603) from crimson_slab_fix into master
Reviewed-on: MineClone2/MineClone2#3603
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 01:37:46 +00:00
PrairieWind 8a129fa00c Add slab and stair groups to crimson and warped slabs and stairs 2023-03-29 09:47:29 -06:00
ancientmarinerdev 12b9def9ad Merge pull request 'Fix dark day right and light night rain' (#3592) from rain_light_level_fix into master
Reviewed-on: MineClone2/MineClone2#3592
2023-03-29 02:45:39 +00:00
ancientmarinerdev 61a4595c1b Fix rain light levels so that day rain is brighter and night rain is darker 2023-03-29 02:21:16 +00:00
ancientmarinerdev 2426570871 Fix for light night rain and dark day rain issue 2023-03-29 02:21:16 +00:00
PrairieWind ce1393af0c Merge pull request 'Fixed. Add polished blackstone button and pressure plate' (#3590) from Wbjitscool/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#3590
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-27 00:30:34 +00:00
Wbjitscool bfa5662421 Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt' 2023-03-27 00:24:40 +00:00
Wbjitscool 87ca144c4e Update 'mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt' 2023-03-27 00:23:53 +00:00
Wbjitscool a10235f330 Update 'mods/ITEMS/REDSTONE/mesecons_button/init.lua'
added in a Polished Blackstone Button
2023-03-27 00:07:48 +00:00
Wbjitscool e3978c4d22 Update 'mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt'
updated template.txt for buttons
2023-03-27 00:05:52 +00:00
Wbjitscool c0fa2c38bd Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua'
added polished blackstone pressure plate
2023-03-27 00:02:29 +00:00
Wbjitscool 049a4a11f4 Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt'
updated template.txt
2023-03-27 00:00:09 +00:00
PrairieWind 114e640132 Merge pull request 'Remove deprecated usages of image property in tile defs' (#3582) from dumpnodes into master
Reviewed-on: MineClone2/MineClone2#3582
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-26 23:06:50 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 692758bd6d Remove deprecated usages of image property in tile defs 2023-03-26 22:56:33 +00:00