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

11107 Commits (bc3da8dab8dcf3bfc4a841ef383001ccfa030366)

Author SHA1 Message Date
chmodsayshello bc3da8dab8 add armor trim color support 2023-06-07 21:01:55 +02:00
chmodsayshello ed5232411b remove raw trim textures 2023-06-07 20:31:54 +02:00
chmodsayshello 6c6a27320d add trim boot textures 2023-06-07 20:30:10 +02:00
chmodsayshello 82f2f4784e add helm trim textures 2023-06-07 20:13:18 +02:00
chmodsayshello 8476865ea7 add chestplate trim texture 2023-06-07 19:47:51 +02:00
chmodsayshello b4273af245 fix color overlay 2023-06-07 17:22:57 +02:00
chmodsayshello 483285a612 loop through tools instead of items 2023-06-07 17:12:02 +02:00
chmodsayshello b154f2def1 armor trims: inventory overlay 2023-06-07 17:06:53 +02:00
chmodsayshello c62195662c trims: blacklist certain iems 2023-06-07 16:42:34 +02:00
chmodsayshello 4dc5ad3bdb add mcl_armor dependency 2023-06-07 16:11:07 +02:00
chmodsayshello cc186cc588 add durability back 2023-06-07 15:58:28 +02:00
chmodsayshello df8c9625e4 armor trims: proof of concept 2023-06-07 15:41:53 +02:00
ancientmarinerdev 47f64f63a3 Merge pull request 'Incorperate sheep eating animation.' (#3768) from sheep_eat_animation into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3768
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-06-05 14:06:49 +00:00
ancientmarinerdev cc5a0971ac Object reference check before setting velocity 2023-06-05 15:03:45 +01:00
epCode df8592df41 Revert add punch node 2023-06-04 21:53:39 -07:00
epCode 5e4fa30aae Punch node after change 2023-06-04 20:19:18 -07:00
epCode e49eac6d85 Fix sheep not regrowing wool after eating 2023-06-04 16:24:37 -07:00
epCode e53b6c124c Make sheep always drop 1 wool (MC continuity) 2023-06-04 22:41:35 +00:00
epCode 92887f5501 fix sheep replace rate 2023-06-04 22:41:35 +00:00
epCode 86cd5711ca Rearange on replace code to be more general purpous 2023-06-04 22:41:35 +00:00
epCode 908ba9fba6 Put on_replace call in correct place (wool regrow on grass to dirt) 2023-06-04 22:41:35 +00:00
epCode 91d94800d7 Adjust grass replace timer 2023-06-04 22:41:35 +00:00
epCode 74e55ca361 Fix eat replace timer for sheep 2023-06-04 22:41:35 +00:00
epCode c049113f26 Fix sheep sliding, make eating timed, fix animation repeat 2023-06-04 22:41:35 +00:00
epCode 1f5247df06 Make mobs slide less, and fix ageold jump dilema 2023-06-04 22:41:35 +00:00
epCode 2e2f56122d Incorperate sheep eating animation. #3734 2023-06-04 22:41:35 +00:00
ancientmarinerdev 46d486c7cb Merge pull request 'Oxidation API' (#3748) from oxidation_api into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/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: 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
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