Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
11,180 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

11180 Commits (03040917567d489d282ef93b1d919d76e2744676)

Author SHA1 Message Date
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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/3740
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-05-28 19:46:07 +00:00
Lars Mueller b866d5d98e Fix texture modifiers relying on undocumented behavior 2023-05-27 17:27:01 +02: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: https://git.minetest.land/MineClone2/MineClone2/pulls/3653
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-05-26 20:55:53 +00:00
Johannes Fritz f1d17e2c69 mcl_skins: PR feedback 2023-05-26 20:27:11 +00:00
MrRar 26f033932e Add mcl_custom_skins info to README 2023-05-26 20:27:11 +00:00
MrRar 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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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