98e7cd6e8e
Merge branch 'master' into trades
2023-09-02 04:15:42 +00:00
4853018bb0
Merge pull request 'Increase copper needed for blocks from 4 to 9' ( #3887 ) from basxto/MineClonXX:copper into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3887
2023-09-01 12:20:28 +00:00
c6256295a7
Merge pull request 'fix barrel sound code for proper max hear distance' ( #3900 ) from fix_barrel_sound_distance into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3900
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-31 22:56:20 +00:00
b911f99d23
fix barrel sound code for proper max hear distance
2023-08-31 22:55:21 +00:00
273165ce3b
Merge pull request 'lower ruined portal structure spawn rate' ( #3901 ) from lower_ruined_portal_generation_rate into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3901
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-31 22:47:51 +00:00
aa08a176fc
lower ruined portal structure spawn rate
2023-08-31 22:47:02 +00:00
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
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
49bd28e109
add/remove comments
2023-08-31 18:16:34 +02:00
6c107ce990
fix for enchanted items
2023-08-31 17:59:46 +02:00
7c43c15fda
update loottables
2023-08-31 17:17:38 +02:00
5b4a79a26d
Update russian translation
2023-08-31 14:16:42 +08:00
291cbaf434
move armor trim license info to LEGAL.md
2023-08-28 18:48:37 +02:00
fb74689f3d
resolve merge conflicts
2023-08-28 16:47:31 +02:00
da024bb4b8
move mcl_armor_trims to mcl_armor
2023-08-28 15:09:48 +02:00
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
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
2f8bb9726b
meta based: proof of concept
2023-08-27 21:44:43 +02:00
8176e7319f
update 'armor trim credits'
2023-08-27 19:42:40 +02:00
f008fa3323
Merge pull request 'Formspec Refactoring' ( #2635 ) from AFCMS/MineClone2:formspec-v4 into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2635
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-26 07:27:25 +00:00
2eabeb119a
Fix creative node placement
2023-08-23 21:48:49 +02:00
28d77a3e5b
Replace spaces in itemstrings with underscore
2023-08-20 03:19:17 +02:00
149cb5d17c
Fix gramar mistakes
2023-08-19 18:30:03 +02:00
1b5b2e4dc7
Use new vectors in several places
2023-08-19 18:27:00 +02:00
560aead57f
Use `table.indexof` in `mcl_anvils`
2023-08-19 18:18:27 +02:00
438998de6a
Remove unused files
2023-08-19 18:06:34 +02:00
4f0620c7c1
Fix meshhand not updating correctly
2023-08-19 18:06:31 +02:00
4efb5bf8b9
Make creative inventory page buttons vertical
2023-08-19 18:01:32 +02:00
158ff8e860
Add commented basic scrollbar support to replace pages system
2023-08-19 18:01:32 +02:00
e936cede03
Update meshhand
2023-08-19 18:01:32 +02:00
df2ab1fd8c
Remove duplicated armor update code
2023-08-19 18:01:32 +02:00
dc20267b4f
Update inventory when player visuals change
2023-08-19 18:01:32 +02:00
9d184e9897
Remove duplicated creative inventory code
2023-08-19 18:01:32 +02:00
3fe3153a40
Remove duplicated creative digging code
2023-08-19 18:01:32 +02:00
bf28bab427
Remove duplicated creacode
2023-08-19 18:01:31 +02:00
f7c251e7f2
Fix `mcl_grindstone` auto formating
2023-08-19 18:01:31 +02:00
1bdbdc365d
Fix `mcl_enchanting` auto formating
2023-08-19 18:01:31 +02:00
a77930d4a1
Fix `mcl_chests` auto formating
2023-08-19 18:01:31 +02:00
bb3771c0d2
Fix formating in `mcl_anvils`
2023-08-19 18:01:31 +02:00
40bc219a86
Fix `mcl_books` formating?
2023-08-19 18:01:31 +02:00
054dc22432
Use new vectors in `mcl_chests`
2023-08-19 18:01:31 +02:00
06e2022c6d
Fix `mcl_enchanting` formating
2023-08-19 18:01:30 +02:00
2cb9eca8e1
Use new vectors in `mcl_blast_furnace`
2023-08-19 18:01:30 +02:00
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
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
0e13190ea4
Fix reabse problem with `mcl_inventory`
2023-08-19 18:01:30 +02:00
cd6dd4d851
Fix merge conflict (huge chests)
2023-08-19 18:01:30 +02:00
653f82198e
Apply MysticTempest fixes to enchanting table
2023-08-19 18:01:29 +02:00
3bbae86baf
Fix this stupid merge conflict
2023-08-19 18:01:29 +02:00
ee4f7d1b88
Fix rebase breaking creative digging
2023-08-19 18:01:29 +02:00
Codiac
ancientmarinerdev
SmokeyDope
Van
chmodsayshello
Sab Pyrope
AFCMS
Sebastian Riedel
cora