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

11701 Commits (c1e3c698006f26d113b529cfa1f9d1fcae5e6970)

Author SHA1 Message Date
AFCMS 767c904258
create some files 2023-08-19 18:01:24 +02:00
AFCMS ac4db102b2
add basic temp function to get v4 itemslots 2023-08-19 18:01:24 +02:00
codiac 85c1c57e95 Fix formatting. Remove plain terracotta. 2023-08-19 11:36:04 +10:00
chmodsayshello 64bc57c6a4 replace trim textures with CC ones 2023-08-18 16:47:17 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 d3fb221641 Merge pull request 'Fix meshhand with mcl_skins disabled' (#3864) from skins into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3864
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
 2023-08-16 13:12:52 +00:00
Johannes Fritz 6756358307 Fix meshhand with mcl_skins disabled 2023-08-16 08:06:12 -05:00
cora dd96af15c4 Shears are not enchantable on enchanting table 2023-08-15 13:52:33 +10:00
ancientmarinerdev 6cdd679baf Merge pull request 'Fix attribution and typo' (#3886) from basxto/MineClonXX:basxto-attrfix-again into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3886
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-08-14 12:04:08 +00:00
Sebastian Riedel 11d275a471 Increase copper needed for blocks from 4 to 9 2023-08-14 12:57:36 +02:00
Sebastian Riedel d7ea628270 Revert reversion of 822071c66b 2023-08-14 11:27:36 +02:00
codiac 0d16acdd42 Use a vector and fix the merge fail >_< 2023-08-14 10:48:27 +10:00
codiac 246a95f973 Fix typo 2023-08-14 10:39:31 +10:00
codiac 8c64fdfa5d Enable enchanting on sheers & allow enchanted shears to shear. 2023-08-13 14:02:15 +10:00
codiac 034382c883 Fix float check :( 2023-08-13 12:14:52 +10:00
cora 898a183ccd Prevent floating mobs from drowning all the time 
Less dieing for mobs in deep water.
 2023-08-13 12:12:03 +10:00
codiac 6ae597c97f This changes mob floating so they stay inside the top water node instead of 
standing on it. The head of the mod should still be above water.

Changes drowning so that mobs will not drown in one block of water. They will
drown in 2 or more blocks of water.

Does not appear to affect them getting out of deep water :( But they do seem to
die somewhat faster when they stay in deep water.
 2023-08-12 14:01:26 +10:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 e3bdedb4d5 Merge pull request 'Markdown fix' (#3879) from markdownfix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3879
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-08-10 16:46:23 +00:00
Mikita Wiśniewski f884de5f87 Fix a link and a typo in LEGAL.md 2023-08-09 12:06:50 +07:00
Mikita Wiśniewski a609639585 Add spaces after #, make the commands monospaced 2023-08-09 12:02:04 +07:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 aa3b3421d5 Merge pull request 'Allow villager to claim filled cauldrons.' (#3856) from Codiac/MineClone2:cauldron_job_site_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3856
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-08-05 16:44:27 +00:00
codiac 4f2cb955b8 Use minetest.get_item_group for more flexibility 2023-08-05 15:09:53 +10:00
codiac a3bbb3694c Allow villager to claim filled cauldrons. 
Fixes #3733
 2023-08-05 15:09:53 +10:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 b911da121e Merge pull request 'Fixed typo in mcl_damage' (#3858) from mcl_cached_reason-fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3858
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-08-01 21:08:11 +00:00
Nicu a99daf4294 Fixed typo in mcl_damage 
Fixed typo that invalidated the cached reason for damage
 2023-08-01 15:53:17 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 f9eb31ed46 Merge pull request 'Remove mcl_base_textures mod' (#3855) from mcl_base_textures into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3855
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
 2023-07-31 12:52:15 +00:00
Johannes Fritz 80b21759d9 Remove mcl_base_textures mod 2023-07-26 09:56:13 -05:00
codiac 2cf5183638 Import villager trade changes by Alessandra_Lozoya 2023-07-25 13:44:28 +10:00
Wbjitscool 86b5648442 updates the warped, crimson and mangrove trapdoor side textures (#3844) 
updates the side textures for the warped, crimson and mangrove trapdoors.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3844
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Wbjitscool <wilsonjonathan131@gmail.com>
Co-committed-by: Wbjitscool <wilsonjonathan131@gmail.com>
 2023-07-22 20:50:07 +00:00
ADLON dd3969ff56 Russian translation (#3842) 
Add in Russian translations.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3842
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: ADLON <hgkacin303@proinko.com>
Co-committed-by: ADLON <hgkacin303@proinko.com>
 2023-07-22 20:17:33 +00:00
ancientmarinerdev 80ac4aa930 Merge pull request 'Fix syntax errors in Brazilian Portuguese' (#3824) from isaacdennis/MineClone2:fix-pt-br into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3824
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-07-22 20:05:21 +00:00
ancientmarinerdev 13fc47751d Merge pull request 'Multishot angular spread is constant, no matter the player's orientation' (#3833) from seventeenthShulker/MineClone2:relative_multishot into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3833
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-07-22 20:01:31 +00:00
ancientmarinerdev 2ff98f0d27 Merge pull request 'Stop consuming bamboo item when placement is invalid' (#3829) from seventeenthShulker/MineClone2:bamboo_disappearing into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3829
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-07-22 19:31:08 +00:00
ancientmarinerdev bfde7445df Merge pull request 'Update documentation and links' (#3847) from update_docs into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3847
 2023-07-20 21:40:16 +00:00
ancientmarinerdev 8cc0b1a85f Fix links for fosstodon and matrix 2023-07-20 22:37:49 +01:00
ancientmarinerdev 9e7ade8ae2 Fix incorrect credit. 2023-07-20 22:35:14 +01:00
chmodsayshello f83f11bdaa Merge pull request 'Cherry saplings can be potted.' (#3827) from potted_cherry_sapling into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3827
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-07-10 14:49:56 +00:00
ancientmarinerdev 48bab788f0 Merge pull request 'release_0_48_very_nice' (#3838) from release_0_48_very_nice into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3838
 2023-07-07 22:59:00 +00:00
ancientmarinerdev 0304091756 Post-release set version 0.85.0-SNAPSHOT 2023-07-07 23:54:03 +01:00
ancientmarinerdev b998066391 Set version 0.84.0 2023-07-07 23:52:56 +01:00
ancientmarinerdev 9bc48fec13 Fix release note 0.84 2023-07-07 23:51:19 +01:00
ancientmarinerdev 650cb39606 Update release credits for 0.84 2023-07-07 22:51:34 +01:00
ancientmarinerdev 445370de09 Add release notes for 0.84 2023-07-07 22:47:22 +01:00
ancientmarinerdev 73af332262 Updated release process 2023-07-07 22:46:44 +01:00
seventeenthShulker 4365f4df77 Remove whitespace 2023-07-06 19:10:00 +02:00
seventeenthShulker 99af25fba3 Side arrow directions are relative to player orientation 2023-07-06 19:08:52 +02:00
seventeenthShulker bd95528e73 Stop consuming bamboo item when placement is invalid 2023-06-30 17:53:03 +02:00
PrairieWind 3255b7f754 Cherry saplings can be potted. 
Change by 3raven
 2023-06-29 18:38:22 -06:00
chmodsayshello d346aa07ee reduce filesize for a FINAL time 2023-06-29 20:46:39 +02:00
ancientmarinerdev 40e072ab89 Merge pull request 'Credits update and docs tidy 0.84' (#3822) from credits_0_84 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3822
 2023-06-29 18:01:21 +00:00
ancientmarinerdev cf95a31066 Fix credits 2023-06-29 17:56:19 +00:00