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

9871 Commits (e7457b9ea8b4bf7997737dbf1c48f1d7079fcd4d)

Author SHA1 Message Date
SmokeyDope b911f99d23 fix barrel sound code for proper max hear distance 2023-08-31 22:55:21 +00:00
SmokeyDope aa08a176fc lower ruined portal structure spawn rate 2023-08-31 22:47:02 +00:00
Van 7b764adbc0 Banners color editing (#3868) 
### Changing banner colors
Reason: I think the current colors of the banners do not match the palette of the surrounding world.
Solution: Muting Banner Tones

### Testing
Check out the new colors on 12 color banners.

### Attachments
Changed banner colors/Current banner appearance

UPDATE: Adjusted colors, see the third attachment

UPDATE: Changed the color of the white flag. Fixed a bug with different colors of patterns and banners, increased the contrast of folds. The last four attachments display all.
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3868
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
Co-authored-by: Van <vanicgame@yandex.ru>
Co-committed-by: Van <vanicgame@yandex.ru>
 2023-08-31 22:27:08 +00:00
chmodsayshello 1502757732 Merge pull request 'Replace spaces in itemstrings with underscore' (#3895) from basxto/MineClonXX:fixspace into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3895
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-08-31 17:08:18 +00:00
Sab Pyrope 5b4a79a26d Update russian translation 2023-08-31 14:16:42 +08:00
ancientmarinerdev 3c266f5cfd Merge pull request 'Enable enchanting on sheers & allow enchanted shears to shear.' (#3884) from Codiac/MineClone2:shears_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3884
Reviewed-by: AFCMS <afcm.contact@gmail.com>
 2023-08-27 23:42:53 +00:00
ancientmarinerdev 5f0944062c Merge pull request 'Improve mob floating' (#3883) from Codiac/MineClone2:mob_float_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3883
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-08-27 23:30:16 +00:00
AFCMS 2eabeb119a
Fix creative node placement 2023-08-23 21:48:49 +02:00
Sebastian Riedel 28d77a3e5b Replace spaces in itemstrings with underscore 2023-08-20 03:19:17 +02:00
AFCMS 149cb5d17c
Fix gramar mistakes 2023-08-19 18:30:03 +02:00
AFCMS 1b5b2e4dc7
Use new vectors in several places 2023-08-19 18:27:00 +02:00
AFCMS 560aead57f
Use `table.indexof` in `mcl_anvils` 2023-08-19 18:18:27 +02:00
AFCMS 4f0620c7c1
Fix meshhand not updating correctly 2023-08-19 18:06:31 +02:00
AFCMS 4efb5bf8b9
Make creative inventory page buttons vertical 2023-08-19 18:01:32 +02:00
AFCMS 158ff8e860
Add commented basic scrollbar support to replace pages system 2023-08-19 18:01:32 +02:00
AFCMS e936cede03
Update meshhand 2023-08-19 18:01:32 +02:00
AFCMS df2ab1fd8c
Remove duplicated armor update code 2023-08-19 18:01:32 +02:00
AFCMS dc20267b4f
Update inventory when player visuals change 2023-08-19 18:01:32 +02:00
AFCMS 9d184e9897
Remove duplicated creative inventory code 2023-08-19 18:01:32 +02:00
AFCMS 3fe3153a40
Remove duplicated creative digging code 2023-08-19 18:01:32 +02:00
AFCMS bf28bab427
Remove duplicated creacode 2023-08-19 18:01:31 +02:00
AFCMS f7c251e7f2
Fix `mcl_grindstone` auto formating 2023-08-19 18:01:31 +02:00
AFCMS 1bdbdc365d
Fix `mcl_enchanting` auto formating 2023-08-19 18:01:31 +02:00
AFCMS a77930d4a1
Fix `mcl_chests` auto formating 2023-08-19 18:01:31 +02:00
AFCMS bb3771c0d2
Fix formating in `mcl_anvils` 2023-08-19 18:01:31 +02:00
AFCMS 40bc219a86
Fix `mcl_books` formating? 2023-08-19 18:01:31 +02:00
AFCMS 054dc22432
Use new vectors in `mcl_chests` 2023-08-19 18:01:31 +02:00
AFCMS 06e2022c6d
Fix `mcl_enchanting` formating 2023-08-19 18:01:30 +02:00
AFCMS 2cb9eca8e1
Use new vectors in `mcl_blast_furnace` 2023-08-19 18:01:30 +02:00
AFCMS ae632fe773
Fixes in `mcl_inventory` 
- Fix (yet another) rebase conflict
- Remove unused code and annotations
- Fix annotations in `mcl_gamemode` to https://github.com/minetest-toolkit/minetest-lsp-api
 2023-08-19 18:01:30 +02:00
AFCMS 4db0631133
`mcl_inventory` creative fixes 
- Add many comments (I had a really hard time understanding the code)
- Add some more type annotations (https://github.com/minetest-toolkit/minetest-lsp-api)
- Rename non english variable
 2023-08-19 18:01:30 +02:00
AFCMS 0e13190ea4
Fix reabse problem with `mcl_inventory` 2023-08-19 18:01:30 +02:00
AFCMS cd6dd4d851
Fix merge conflict (huge chests) 2023-08-19 18:01:30 +02:00
AFCMS 653f82198e
Apply MysticTempest fixes to enchanting table 2023-08-19 18:01:29 +02:00
AFCMS 3bbae86baf
Fix this stupid merge conflict 2023-08-19 18:01:29 +02:00
cora ee4f7d1b88
Fix rebase breaking creative digging 2023-08-19 18:01:29 +02:00
AFCMS 7cf91c79cb
Smithing Table 2023-08-19 18:01:29 +02:00
AFCMS c8620685c0
Move stack size button label lower 2023-08-19 18:01:29 +02:00
AFCMS 6a2ad4e618
Materialize the fact that bookshelves only store books 2023-08-19 18:01:29 +02:00
AFCMS 7d8a1e1e5f
Fix some merging stuff 2023-08-19 18:01:29 +02:00
AFCMS ecb4c82600
Anvil Formspec 
- anvil formspec
- hammer icon
- use new vectors
- add some type annotations
- optimize textures (some of them by 95%)
 2023-08-19 18:01:28 +02:00
AFCMS 9831f2c25b
Document `mcl_formspec` API 2023-08-19 18:01:28 +02:00
AFCMS 4055555ec1
Redo Creative Inventory 2023-08-19 18:01:28 +02:00
AFCMS 7c15fe6ac9
Furnaces formspec redo 2023-08-19 18:01:28 +02:00
AFCMS 5011e12209
mcl_inventory API documentation + fix 2023-08-19 18:01:28 +02:00
AFCMS f6804600ba
Grindstone menu 2023-08-19 18:01:28 +02:00
AFCMS bf57cf3aa3
Barrel formspec 2023-08-19 18:01:28 +02:00
AFCMS 093d55861c
Basic mcl_gamemode documentation 2023-08-19 18:01:27 +02:00
AFCMS 0da1822d26
Code style fixes in mcl_chests 2023-08-19 18:01:27 +02:00
AFCMS 0ae76776b1
Bookshelf menu redo 2023-08-19 18:01:27 +02:00
AFCMS e5ee0c4afc
Crafting table formspec redo 2023-08-19 18:01:27 +02:00
AFCMS 842363464d
Enchanting table formspec redo 2023-08-19 18:01:27 +02:00
AFCMS 37176976b6
Dropper + Dispenser inventory 2023-08-19 18:01:27 +02:00
AFCMS 1065eb4d8c
Hooper formspec 2023-08-19 18:01:26 +02:00
AFCMS 452cd26558
Reenable creative formspec armor update 2023-08-19 18:01:26 +02:00
AFCMS 9e83e531bd
Make function local 2023-08-19 18:01:26 +02:00
AFCMS 04a58ddd24
Disable test tab 2023-08-19 18:01:26 +02:00
AFCMS fbb51835b3
survival inventory tabs API + mcl_gamemode 2023-08-19 18:01:26 +02:00
AFCMS fb79465052
Fixes 2023-08-19 18:01:26 +02:00
AFCMS e093c69328
Remove the label size thing (too breaking change) 2023-08-19 18:01:26 +02:00
AFCMS c2032fe4de
Fix 2023-08-19 18:01:25 +02:00
AFCMS 691b93ac68
Modern Survival Inventory (9 slice images, formspec v6) 2023-08-19 18:01:25 +02:00
AFCMS 4ee6a67516
survival inventory 2023-08-19 18:01:25 +02:00
AFCMS 54b119cffa
some things 2023-08-19 18:01:25 +02:00
AFCMS 558df5e4bd
fix all chest formspecs 2023-08-19 18:01:25 +02:00
AFCMS cf01c0630c
chest + shulkerbox formspec 2023-08-19 18:01:25 +02:00
AFCMS f20fbfb95a
ender chest formspec v4 2023-08-19 18:01:25 +02:00
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
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
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
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
Nicu a99daf4294 Fixed typo in mcl_damage 
Fixed typo that invalidated the cached reason for damage
 2023-08-01 15:53:17 -05: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 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 650cb39606 Update release credits for 0.84 2023-07-07 22:51:34 +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
ancientmarinerdev cf95a31066 Fix credits 2023-06-29 17:56:19 +00:00
ancientmarinerdev 102f1a1490 Adding extra translations credit in. 2023-06-29 17:56:19 +00:00
ancientmarinerdev 47e78d473c Update credits based on feedback. 2023-06-29 17:56:19 +00:00