1
0
Fork 0

Compare commits

..

2018 Commits

Author SHA1 Message Date
nixnoxus 760fe1aa68 more items usable to smelt (#4184)
- group:bee_nest
- group:beehive
- mcl_cartography_table:cartography_table
- mcl_core:deadbush
- mcl_fletching_table:fletching_table
- mcl_lectern:lectern
- mcl_loom:loom
- mcl_mangrove:mangrove_roots
- mcl_smithing_table:table

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4184
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>
2024-04-30 14:26:10 +00:00
Eliy21 f78ad93fd3 Make destroying boats with punch easier (#4159)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4159
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2024-04-30 14:24:24 +00:00
the-real-herowl d321b166ea Merge pull request 'trading gives the player experience' (#4210) from nixnoxus/MineClone2:add-trading-xp into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4210
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
2024-04-30 10:47:17 +00:00
JoseDouglas26 18342e44c8 Change lectern wdir check to allow placement on node sides (#4263)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4263
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-authored-by: JoseDouglas26 <josedouglas20002014@gmail.com>
Co-committed-by: JoseDouglas26 <josedouglas20002014@gmail.com>
2024-04-30 10:45:00 +00:00
JoseDouglas26 2430953a81 Set use_texture_alpha for some nodes (#4262)
* Tall flowers with mesh drawtype (sunflower)
* Clovers
* End rod and its colored variants

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4262
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-authored-by: JoseDouglas26 <josedouglas20002014@gmail.com>
Co-committed-by: JoseDouglas26 <josedouglas20002014@gmail.com>
2024-04-30 10:41:23 +00:00
SmokeyDope 538c206985 Remove stray pixels in leather cap texture (#4256)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4256
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: SmokeyDope <smokey@tilde.team>
Co-committed-by: SmokeyDope <smokey@tilde.team>
2024-04-29 16:14:46 +00:00
Doods 31facbd902 Texture converter add signs (#4238)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4238
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Doods <yusufalishabaka@tutanota.com>
Co-committed-by: Doods <yusufalishabaka@tutanota.com>
2024-04-29 15:50:32 +00:00
the-real-herowl 5f70189e08 Don't touch description if tt snippets did nothing (#4264)
This should prevent problems like the ones described in https://git.minetest.land/MineClone2/MineClone2/pulls/4196#issuecomment-77558 or https://git.minetest.land/MineClone2/MineClone2/pulls/4130#issuecomment-77571

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4264
Co-authored-by: the-real-herowl <wiktor_t-i@proton.me>
Co-committed-by: the-real-herowl <wiktor_t-i@proton.me>
2024-04-28 15:04:39 +00:00
the-real-herowl 4e12c6747c Merge pull request 'Fix #4189 - Make hoppers move items if there is space for one item' (#4190) from teknomunk/MineClone2:hopper-changes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4190
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-27 13:51:34 +00:00
the-real-herowl 1d8fc7abac Merge pull request 'Bed Fixes' (#4253) from teknomunk/MineClone2:bed-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4253
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-27 12:35:14 +00:00
teknomunk 09c595c363 Fix two hopper clocks 2024-04-27 08:41:09 +00:00
teknomunk 6fbe60f1ac Fix crash with undefined nodes 2024-04-27 08:41:09 +00:00
teknomunk 3705be24d7 Fix 'Undeclared global variable' warning 2024-04-27 08:41:09 +00:00
teknomunk 681075df5a Correct null -> nil 2024-04-27 08:41:09 +00:00
teknomunk 6ecb304946 make hoppers behave the same say regardless of the order the server processes the nodes by following a chain of hoppers to the end and processing back to the starting node and marking all those nodes as processed 2024-04-27 08:41:09 +00:00
teknomunk 034b0142c6 Make sure the inventory slot has at least the number of items requsted in it before selecting it 2024-04-27 08:41:09 +00:00
teknomunk e02d1c0e27 Update to comply with coding guidelines 2024-04-27 08:41:09 +00:00
teknomunk bdcd89e1bf Modify mcl_util.select_stack to allow specifying the number of items that will be moved, modify hopper on_try_push functions to specify only 1 item will be moved at a time, general cleanup of touched code (reduce indent - 1 place, break filter functions out of function call parameter - 4 places) 2024-04-27 08:41:09 +00:00
teknomunk 62ab68637a Stop beds from dropping as items when players in creative mode dig them 2024-04-27 07:17:24 +00:00
teknomunk 0839f35a12 Add additional bed placing attempts 2024-04-27 10:42:20 +00:00
teknomunk 84d6b593b2 Fix bed duplication bug when destroyed by TNT 2024-04-27 10:42:20 +00:00
the-real-herowl 3bcbb99878 Merge pull request 'The Pull Request that Fixed the Creative Inventory' (#4237) from creative_inv_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4237
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-27 06:19:11 +00:00
the-real-herowl 9e8661ae95 Merge pull request 'Added eating animation' (#4169) from eating_animation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4169
2024-04-22 01:18:11 +00:00
SOS-Games 4f37c1600f Able to see all mobs in the lookup help menu (#4186)
added a Mobs category that has pages for all mobs

Co-authored-by: SOS-Games <101518564+SOS-Games@users.noreply.github.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4186
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: SOS-Games <gruberscomplete@gmail.com>
Co-committed-by: SOS-Games <gruberscomplete@gmail.com>
2024-04-21 08:16:15 +00:00
Doods bd4337a2dc Make Editorconfig compliant with the spec. (#4245)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4245
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Doods <yusufalishabaka@tutanota.com>
Co-committed-by: Doods <yusufalishabaka@tutanota.com>
2024-04-20 15:23:59 +00:00
MysticTempest 57409973b9 Fix creative inv tabs showing item tooltips. 2024-04-17 16:53:59 +07:00
Mikita Wiśniewski 312ad5b63b Fix creative inventory search not working on Android (fixes #3402) 2024-04-17 16:53:59 +07:00
Mikita Wiśniewski 46ed6a6dda Fix switching items in the creative inventory (fixes #3941) 2024-04-17 16:53:59 +07:00
the-real-herowl 0f20e18e53 Merge pull request 'fix_xp_reload_bug' (#4226) from teknomunk/MineClone2:fix_xp_reload_bug into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4226
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-14 07:10:33 +00:00
the-real-herowl 69d3fa5f85 Merge pull request 'Added a check for the bone meal's applied position.' (#4201) from CyberMango/MineClone2:dev/mango/add_bone_meal_protection_check into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4201
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-14 07:07:21 +00:00
the-real-herowl 5e673b8fee Merge pull request 'Add partial item stack pickup' (#4193) from teknomunk/MineClone2:grouped-item-pickup into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4193
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-14 06:53:37 +00:00
Araca 596c56d31f Add possibility to edit a sign (#4188)
We can edit a sign by right-clicking in it. If in hand you have a color or a glow ink, the behaviour didn't change. Also some refactorization.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4188
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Araca <araca.prod@gmail.com>
Co-committed-by: Araca <araca.prod@gmail.com>
2024-04-14 06:50:19 +00:00
the-real-herowl e582c3bb97 Improved look on the mobile device
Now the food doesn't cover the full screen on mobile devices...
...at the cost of stretching at ultrawide or portrait aspect ratios.
2024-04-14 08:34:41 +02:00
the-real-herowl b5b8d4f336 Merge pull request 'more piglin bartering items (and drop stack instead of single items)' (#4181) from nixnoxus/MineClone2:piglin-bartering into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4181
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-04-14 00:01:13 +00:00
Doods c1971b662a Fireproof certain wood nodes & add planks crafting recipes (#4166)
* Make Crimson and Warped Planks, Double Slab Planks, Fences, Fence Gates, Doors, Trapdoors, Pressure Plates, Wood, Bark, Stripped Wood, Stripped Bark, and Stairs Immune to fire by removing them from the 'flammable', 'fire_encouragement', and 'fire_flammability' groups.
* Add crafting recipes which allow Cherry, Mangrove, Crimson, and Warped planks to be crafted from Wood, Bark, Stripped Wood, and Stripped Bark variants, to make them consistent with with all other planks.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4166
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Doods <yusufalishabaka@tutanota.com>
Co-committed-by: Doods <yusufalishabaka@tutanota.com>
2024-04-13 23:52:46 +00:00
nixnoxus a86e8e2c8e fix strider breeding & increase riding speed (#4096)
- Striders follow `mcl_crimson:warped_fungus`
- Striders can be bred with `mcl_crimson:warped_fungus`
- Riding speed increased to 2 m/s
- Warning fixed

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4096
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>
2024-04-13 23:38:46 +00:00
Doods a3db7bd504 Fix texture converter for sandstone (#4233)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4233
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Doods <yusufalishabaka@tutanota.com>
Co-committed-by: Doods <yusufalishabaka@tutanota.com>
2024-04-08 19:02:43 +00:00
ancientmarinerdev ac4aff12ea Enable custom biome check in spawning. This allows mods to overide the check in singlenode and other mapgens that do not support biome API. (#4217)
Some older mapgens do not support the MT biome API. Singlenode and I think v6 also. This allows mods to overide the biomecheck in mob spawning to return valid biomenames and customise this.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4217
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-committed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2024-04-01 15:40:14 +00:00
emptyshore 003288bc80 Update comments in the nether portals script (#4227)
Co-authored-by: Mateusz Uzdowski <mateusz@silverstripe.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4227
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: emptyshore <emptyshore@noreply.git.minetest.land>
Co-committed-by: emptyshore <emptyshore@noreply.git.minetest.land>
2024-04-01 00:30:06 +00:00
teknomunk 13ce4f9092 Additional cleanup, impelemnt partial item stack pickup 2024-03-31 02:32:24 +00:00
teknomunk 0a294c55a1 Move object pickup code to try_object_pickup(...) and refactor to remove most indentation for readability 2024-03-31 02:32:24 +00:00
teknomunk 44bb07507d Cleanup comment, whitespace for readability 2024-03-31 02:28:46 +00:00
cora 3509b85a3e Fix possible crash due to engine bug reloading XP orbs 2024-03-31 02:28:46 +00:00
emptyshore 55653fe37b Nether portals rewrite (#4128)
See https://git.minetest.land/MineClone2/MineClone2/issues/4120

Co-authored-by: Mateusz Uzdowski <mateusz@silverstripe.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4128
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: emptyshore <emptyshore@noreply.git.minetest.land>
Co-committed-by: emptyshore <emptyshore@noreply.git.minetest.land>
2024-03-31 02:20:23 +00:00
the-real-herowl 0170619866 Merge pull request 'Imported the tga_encoder as subtree' (#4222) from tga_encoder_update into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4222
2024-03-27 00:31:39 +00:00
ancientmarinerdev 0b521ef92b Fix - New game load crashes. Add defensive check. (#4216)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4216
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-committed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2024-03-27 00:22:22 +00:00
nixnoxus 8931576c50 fix 'WARNING[Main]: Undeclared global variable ' in mcl_colorblocks (#4203)
fix WARNING: Undeclared global variable

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4203
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>
2024-03-27 00:20:12 +00:00
the-real-herowl c65176af81 Merge pull request 'Added clovers' (#4224) from clovers into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4224
2024-03-27 00:15:32 +00:00
the-real-herowl a71a634168 Merge pull request 'Make end rods use a mesh model' (#4177) from end_rod_model into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4177
2024-03-27 00:14:13 +00:00
the-real-herowl 89e8cf0213 Merge branch 'skeleton_sounds' 2024-03-24 06:38:35 +01:00
nixnoxus 08b41a3b39 accelerate non-moving carts on `mcl_minecarts:golden_rail_on` (#4097)
accelerate a non-moving minecart away from a solid opaque block the powered rail is facing

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4097
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>
2024-03-24 05:29:44 +00:00
the-real-herowl 26fc0cd4d8 Merge pull request 'update melon and pumpkin biomes' (#4037) from michaljmalinowski/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4037
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-03-24 05:17:20 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 e50ad7d6de Merge pull request 'Fix a crash with rocket explosion' (#4178) from fix_rocket_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4178
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2024-03-21 00:15:50 +00:00
the-real-herowl 4b6d63739c Fix a crash with rocket explosion
Defensive check
2024-03-20 19:13:44 -05:00
the-real-herowl c6a112d200 Clovers now generate
Also added a way to alter flower rarity
2024-03-20 22:29:03 +01:00
the-real-herowl ade2a1a6a2 Add clovers and four-leaf clovers 2024-03-20 22:18:47 +01:00
the-real-herowl b04493dcb6 Add 'mods/CORE/tga_encoder/' from commit 'aad231f5e406a7c1eaafe6595a64b9c55f230692'
git-subtree-dir: mods/CORE/tga_encoder
git-subtree-mainline: a5740f8edf
git-subtree-split: aad231f5e4
2024-03-19 19:28:16 +01:00
the-real-herowl a5740f8edf Remove old tga_encoder 2024-03-19 19:27:12 +01:00
nixnoxus 9809c627dc trading gives the player experience 2024-03-09 15:06:38 +01:00
syl 21dbc25f13 Improve french translation (#4194)
Made a few improvements in the french translation.
Revert a change (oeil->œil) which make harder to search items by typing theirs names. Because "œ" is not in the AZERTY keyboard.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4194
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: syl <syl@gresille.org>
Co-committed-by: syl <syl@gresille.org>
2024-03-07 20:04:02 +00:00
CyberMango 4a22287eb6 Added a check for the bone meal's applied position.
protection the position above as well to prevent growing high grass on
areas in which you are not allowed to place blocks. Because, if you cant
place a block there, why should you be able to grow grass/flowers there?
2024-02-29 13:36:02 +02:00
nixnoxus 497f1dcd80 drop stack instead of items 2024-02-05 00:24:27 +01:00
nixnoxus 01cace413f update bartering items 2024-02-05 00:11:22 +01:00
Eliy21 7bfbaac772 Fix damage animation and player invul crash in mcl_playerplus (#4176)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4176
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2024-02-04 17:31:11 +00:00
the-real-herowl 8d5c9996a2 Centered the eating animation 2024-02-02 04:28:20 +01:00
the-real-herowl 87abd0f4dc Merge pull request 'Colored Leather Armor' (#4024) from AFCMS/MineClone2:colored-leather-2 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4024
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-02-02 03:25:08 +00:00
the-real-herowl 03b8ad15e3 Privs for colorizing command and comment cleanup 2024-02-02 04:07:41 +01:00
the-real-herowl fc6fe3f1ed Crafting colorized leather armor 2024-02-02 03:05:57 +00:00
the-real-herowl 3fa4cf6d52 Cauldron leather armor washing 2024-02-02 03:05:57 +00:00
the-real-herowl 3d799266c3 Finished leather armor colorizing 2024-02-02 03:05:57 +00:00
AFCMS caa82c40c9 Colored Leather Armor 2024-02-02 03:05:57 +00:00
the-real-herowl 8c19d4b9b8 Merge pull request 'Add glazed terracotta pillars' (#4117) from Potiron/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4117
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-02-02 02:50:36 +00:00
the-real-herowl 1476c7ae59 Make end rods use a mesh model
* merged the 3 textures of the end rod into one
* made a proper image mask for the colored end rods
* (used to be hardcoded & didn't work for higher-res texture packs)
2024-02-02 02:31:57 +01:00
the-real-herowl 13825763b0 Added eating animation 2024-01-29 04:24:39 +01:00
the-real-herowl c31226041f Merge pull request 'Fixed ghast hitbox' (#4156) from ghast_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4156
2024-01-28 12:56:06 +00:00
the-real-herowl b3bcd949b9 Merge pull request 'Change on scaffolding placement checking' (#4164) from JoseDouglas26/MineClone2:scaffolding_bug_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4164
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-25 13:30:41 +00:00
the-real-herowl a8ad631864 Added ghast achievement and nerfed ghast
* ghast now attacks less frequently
* killing ghast with a ghast fireball now awards an achievement
2024-01-25 14:29:08 +01:00
the-real-herowl 1478960b7f Improved ghast combat
* ghast fireballs can now hit the shooter (used to just fly through)
* improved ghast aim
* increased ghast fireball lifetime
* mob projectile lifetime is now counted in seconds (was in ticks)
* improved variable naming
* improved default mob projectile deflecting (applies to ghast fireball)
2024-01-25 02:51:36 +00:00
the-real-herowl f41990c1d0 Fixed ghast hitbox 2024-01-25 02:51:36 +00:00
José Douglas da Silva Souza 77a6ac1ef3 Protection check 2024-01-25 02:23:15 +00:00
José Douglas da Silva Souza 9b9271e5df Change on scaffolding placement checking 2024-01-25 02:23:15 +00:00
the-real-herowl 1175be45fb Merge pull request 'Add MC hold to eat delay' (#4144) from Eliy21/MineClone2:eating_delay into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4144
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-25 02:06:14 +00:00
the-real-herowl f444efbb03 Merge pull request 'Make cactus be able to damage mobs' (#4149) from Eliy21/MineClone2:cactus_mob_damage into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4149
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-25 01:57:22 +00:00
chmodsayshello a2a38b7b3d Merge pull request 'Fixed a crash' (#4154) from fix_capes_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4154
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2024-01-22 20:20:31 +00:00
Eliy21 aa4f8ba6cc Add medium size mob distinction in the cactus mob damage area reach code 2024-01-21 09:18:43 +00:00
Eliy21 b645a2ab67 Remove commented out cactus mob damage code 2024-01-21 09:18:43 +00:00
Eliy21 d41d29be58 Add distinction between regular sized mobs and large mobs in the cactus mob damage area reach 2024-01-21 09:18:43 +00:00
Eliy21 434bb33f72 Add mob cactus damage logic to /mcl_mobs/physics.lua 2024-01-21 09:18:43 +00:00
Eliy21 d37840e022 Comment out cactus mob damage logic in preperation to move code logic to /mcl_mobs/physics.lua 2024-01-21 09:18:43 +00:00
Eliy21 aea5c6f7be Make cactus be able to damage mobs 2024-01-21 09:18:43 +00:00
Eliy21 5154dce8d0 Use table.update() on mcl_hunger.eat_internal[name] in the item eat code 2024-01-21 09:03:27 +00:00
Eliy21 c0a5c63601 Fix sus stew item frame duplication bug 2024-01-21 09:03:27 +00:00
Eliy21 473c85c543 Fix bucket milk item frame duplication bug 2024-01-21 09:03:27 +00:00
Eliy21 86c10002a6 Fix golden apple item frame duplication bug 2024-01-21 09:03:27 +00:00
Eliy21 b56424a0b6 Integrate mcl_hunger.is_eating(name) API into item eat code 2024-01-21 09:03:27 +00:00
Eliy21 93dff87a5e Add mcl_hunger.is_eating(name) API 2024-01-21 09:03:27 +00:00
Eliy21 be711ea727 Change beetroot soup food group to not be categorized as a drink and be eaten with particles 2024-01-21 09:03:27 +00:00
Eliy21 7b42779fe2 Change rabbit stew food group to not be categorized as a drink and be eaten with particles 2024-01-21 09:03:27 +00:00
Eliy21 11d0062255 Change mushroom stew food group to not be categorized as a drink and be eaten with particles 2024-01-21 09:03:27 +00:00
Eliy21 4dd04b4c91 Fix sus stew not leaving bowl after use 2024-01-21 09:03:27 +00:00
Eliy21 109aed75df Fix sus stew not having eating particle & sound effects and eating slow speed getting stuck on login 2024-01-21 09:03:27 +00:00
James David Clarke 184f1575ee Added mcl_eating_delay setting in settingtypes.txt 2024-01-21 09:03:27 +00:00
Eliy21 7561e1dc95 Make sus stew handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 bee44f41b6 Make milk bucket handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 b2b2dc4090 Make golden apples handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 a78b308a75 Make potions handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 cc7a2e0b41 Add eating delay entry to changelog.txt 2024-01-21 09:03:27 +00:00
Eliy21 996a5a6d47 Integrate delayed eating to item eat code 2024-01-21 09:03:27 +00:00
Eliy21 4c8efca4e6 Add eating delay code 2024-01-21 09:03:27 +00:00
SmokeyDope 2d2b64006b add nether vine placement checks for top and bottom of nodes (#4129)
This adds placement checks to weeping and twisting vines, weeping vines should only be placed on bottom of nodes and twisting vines should only be placed on top of nodes.

Most of the work for this was done by JoseDouglas26. This was made with their permission, I just had to tweak the code a bit to get twisting vines to place right. Thank you Jose!

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4129
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: SmokeyDope <smokey@tilde.team>
Co-committed-by: SmokeyDope <smokey@tilde.team>
2024-01-21 06:28:41 +00:00
emptyshore 8e103cf615 Mobs should not anger towards the player if damage is disabled. (#4114)
Co-authored-by: Mateusz Uzdowski <mateusz@silverstripe.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4114
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: emptyshore <emptyshore@noreply.git.minetest.land>
Co-committed-by: emptyshore <emptyshore@noreply.git.minetest.land>
2024-01-21 05:37:54 +00:00
the-real-herowl d1ac98a019 Fixed a crash
Crash when the cape field is not set.
It is not set when joining an old world with the capes PR applied.
Also trimmed trailing.
2024-01-21 03:09:11 +00:00
codiac d3c591915f Fix light check and limit Y level for slime chunk spawn. (#4139)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4139
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: codiac <codiac@inbox.lv>
Co-committed-by: codiac <codiac@inbox.lv>
2024-01-21 02:52:36 +00:00
the-real-herowl b507838e13 Merge pull request 'Overhaul Texture_Converter.py and Conversion_Table.csv' (#4133) from Impulse/MineClone2:texture-conversion-120 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4133
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-21 02:25:22 +00:00
Doods b944a70059 added piglin (did I fix git?) 2024-01-21 02:19:29 +00:00
Doods 9397e736a8 just a hotfix, doesn't count (true finish (at least for the conversion table.csv) 2024-01-21 02:19:29 +00:00
Doods b7ea609422 last minute changes 4 (hopefully final) 2024-01-21 02:19:29 +00:00
Doods 23a3d53ca6 last minute change 3 2024-01-21 02:19:29 +00:00
Doods 7e31f015fe Last minute changes #2 2024-01-21 02:19:29 +00:00
Doods f1fda9b412 last minute changes 2024-01-21 02:19:29 +00:00
James David Clarke 1a2b9e5930 More fixes 2024-01-21 02:19:29 +00:00
Doods bb29dade32 Added: trapdoors (partial), berrels, blackstone, basalt, beehive, bee nest, bell item, soul soil, light items (0 to 15), honey(comb) and things I forgot 2024-01-21 02:19:29 +00:00
James David Clarke 961ee13ba1 Converted utils os.system commands to useing the more pythonic: wand, library. And partially converted armor os.system commands to wand too. 2024-01-21 02:19:29 +00:00
James David Clarke efd19bd0ee Added requirements.txt 2024-01-21 02:19:29 +00:00
James David Clarke fe8612d944 Made terms clearer in gui.py 2024-01-21 02:19:29 +00:00
James David Clarke c586e480ed Fixed crash bug with GUI 2024-01-21 02:19:29 +00:00
James David Clarke 0da8428eef Made minetest directory handling, platform indiependent 2024-01-21 02:19:29 +00:00
James David Clarke ddfbd331c9 Refactor convert_textures code, seperated special cases into its own module 2024-01-21 02:19:29 +00:00
James David Clarke 47b6bd5539 GUI Now functional 2024-01-21 02:19:29 +00:00
James David Clarke 16cdc9fd12 Seperated common convert code from CLI and GUI so they can both use it 2024-01-21 02:19:29 +00:00
James David Clarke 2904e3119f Started on GUI and seperating code so GUI and CLI can share it 2024-01-21 02:19:29 +00:00
James David Clarke e04f4d3b2a Added --all flag. 2024-01-21 02:19:29 +00:00
James David Clarke 0584fc4ebf Fixed find_highest_minecraft_version, got rid of hardcoded major-minor version string. 2024-01-21 02:19:29 +00:00
James David Clarke 1147a9715a Added --default flag 2024-01-21 02:19:29 +00:00
James David Clarke e05e46bc59 Added Conversion Table validator. 2024-01-21 02:19:29 +00:00
Doods 7793a31f0e Added: stripped logs, planks, recovery compass, amethyst, netherite stuff 2024-01-21 02:19:29 +00:00
James David Clarke a6753806cc Refactored code: split up into different functions and modules. 2024-01-21 02:19:29 +00:00
Doods a25bdfbc90 added: loom, lodestone, tropical fish patterens, trim templates, fletching table (partial), craftguide seach icon, renamed armor stand item, renames dyes 2024-01-21 02:19:29 +00:00
James David Clarke 254fe4d98e Replace getopt code with argparse as its more modern. 2024-01-21 02:19:29 +00:00
James David Clarke 6324c805eb Added PIL dependency and added pixel dimentions autodetection 2024-01-21 02:19:29 +00:00
James David Clarke 3103969bdc Got rid of redundent "Target path" field as its always "./textures" 2024-01-21 02:19:29 +00:00
Doods 7cb17eefa1 testing to make sure I know how to use git + adding 10 textures 2024-01-21 02:19:29 +00:00
James David Clarke 4f0ad6de6d Extra tools 2024-01-21 02:19:29 +00:00
James David Clarke 59ffda6e86 Added my internal tools 2024-01-21 02:19:29 +00:00
James David Clarke 1b7cde697a Updated Grass,Fern,Vine,Lily Pad and leaves to MC 1.19+ 2024-01-21 02:19:29 +00:00
James David Clarke bae95fea09 Updated rails to MC1.19+ 2024-01-21 02:19:29 +00:00
James David Clarke 5f6173b999 Some fixes to the conversion script to make rails work in MC1.9+ Packs 2024-01-21 02:19:29 +00:00
James David Clarke bd113dd902 Added Missing textures to Conversion_Table.csv 2024-01-21 02:19:29 +00:00
James David Clarke 557ea75c5d Added more textures to Conversion_Table.csv 2024-01-21 02:19:29 +00:00
James David Clarke 98a5f07ef8 Added support for cherry blossoms MC 1.20+ 2024-01-21 02:19:29 +00:00
James David Clarke 29fe5e5b40 Added more entries and modified existing to Conversion_Table.csv 2024-01-21 02:19:29 +00:00
James David Clarke a5573aab26 Updated Conversion Table 2024-01-21 02:19:29 +00:00
James David Clarke 17da379269 Changed 108 textures to work with 1.19 MC 2024-01-21 02:19:29 +00:00
James David Clarke 566bc8a02b Added support for MC1.19 Resource Packs 2024-01-21 02:19:29 +00:00
Eliy21 44bd1c7b71 Reduce sweet berry bush slowdown (#4150)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4150
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2024-01-21 01:07:14 +00:00
the-real-herowl ac8ff800ec Merge pull request 'Farming fortune drop bug fix' (#4121) from JoseDouglas26/MineClone2:mcl_farming_fortune into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4121
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-20 04:46:02 +00:00
JoseDouglas26 3b60a8eb18 Farming fortune drop bug fix 2024-01-20 04:03:25 +00:00
the-real-herowl 681175c463 Merge pull request 'Show elytra animation when using elytra' (#4108) from elytra into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4108
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-20 04:02:44 +00:00
the-real-herowl 3dafeb7505 Merge pull request 'Set all mob spawn chance weights according to mc now that weights are actually taken into account' (#4035) from Bakawun/MineClone2:mob_chance into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4035
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-20 04:00:13 +00:00
Johannes Fritz 4c0bad754e Show elytra animation when using elytra 2024-01-20 03:41:38 +00:00
PrWalterB 899c45534f Adding occitan translation for CORE and ENTITIES 2024-01-20 04:28:46 +01:00
the-real-herowl cfd41d458a Merge pull request 'Add capes' (#4046) from capes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4046
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-20 03:26:10 +00:00
the-real-herowl 41c6773fd4 Merge pull request 'Spawning: fix random weighted choice' (#4025) from Bakawun/MineClone2:random_select into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4025
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-20 03:15:24 +00:00
the-real-herowl 27c3760da1 Merge pull request 'Ghast: align attributes with mc' (#4014) from Bakawun/MineClone2:ghast into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4014
2024-01-20 03:14:16 +00:00
James David Clarke aa4d5738c7 Fix Survival Inventory Tab API (#4147)
* restored some old code that had gone missing
* fixed the survival inventory tab API not working
* fixed some grammar

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4147
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: James David Clarke <james@jamesdavidclarke.com>
Co-committed-by: James David Clarke <james@jamesdavidclarke.com>
2024-01-20 00:42:56 +00:00
the-real-herowl 59ad110e6b Merge pull request 'Fix mcl_shields is_blocking crash when object not found under player' (#4134) from Impulse/MineClone2:mcl-shields-crash-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4134
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-15 14:22:33 +00:00
James David Clarke ee24b24c68 Fix indentation 2024-01-15 14:19:51 +00:00
James David Clarke f94e7fc52f Fix mcl_shields is_blocking crash when object not found under player 2024-01-15 14:19:51 +00:00
chmodsayshello 45c84b1f1d fix formspec 2024-01-13 19:50:09 +01:00
chmodsayshello 96dbcc45d0 fix cape being registered twice 2024-01-13 19:50:09 +01:00
chmodsayshello bfe333ef60 fix cape rendering conflicts
The elytra and the normal cape were able to render at the same time while wearing an elytra.
2024-01-13 19:50:09 +01:00
chmodsayshello 89eb0f9b3e remove test selector_func 2024-01-13 19:50:09 +01:00
chmodsayshello 146b0ade37 update elytra cape instantly 2024-01-13 19:50:09 +01:00
chmodsayshello 0f91b763e9 add cape api 2024-01-13 19:50:09 +01:00
chmodsayshello aeccc94687 remove sha1 unlocking for minetest cape 2024-01-13 19:50:09 +01:00
the-real-herowl d3881fc1d1 Fix crash and trim trailing 2024-01-13 19:50:09 +01:00
chmodsayshello b47fae0ed4 fix string length method call 2024-01-13 19:50:08 +01:00
chmodsayshello 180c8fb73e add capes 2024-01-13 19:50:04 +01:00
the-real-herowl c70ae8e535 Merge pull request 'Add hunger debug setting' (#4127) from add-hunger-debug-setting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4127
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-13 03:47:41 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 c1115c9cef Merge pull request 'Fixed an invalid player object crash' (#4131) from player_crash_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4131
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2024-01-11 20:00:02 +00:00
pineaulo 7af5e79afc Colors rework 2024-01-11 09:11:27 +01:00
the-real-herowl 12b3e34f88 Fix a crash
Defensive check for nonexistent player
2024-01-11 03:45:10 +00:00
bakawun 4d90dfab0e Spawning: add a comment to clarify what the random select is doing 2024-01-10 11:22:13 +01:00
bakawun b2b63266b7 Spawning: break mob selection loop when out of bounds 2024-01-10 11:22:13 +01:00
bakawun d151e79fb9 Spawning: remove unused summary_chance 2024-01-10 11:22:13 +01:00
bakawun e419e6d63b Spawning: remove another unused perlin var 2024-01-10 11:22:13 +01:00
cora 55517154bd Mob spawning: Remove unused vars 2024-01-10 11:22:13 +01:00
bakawun 402e4e7b79 Spawning: fix random weighted choice 2024-01-10 11:22:13 +01:00
the-real-herowl 59c5d54cbe Merge pull request 'Add and fix some german translations' (#4132) from Tuxilio/MineClone2:german-translation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4132
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-08 13:54:55 +00:00
tuxilio 4b5afee4bb Add and fix some german translations 2024-01-08 13:35:41 +00:00
the-real-herowl 3c2247d7c8 Merge pull request 'mobs:piglin: use (alt) zombified piglin sounds' (#4083) from Bakawun/MineClone2:piglin_sounds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4083
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-08 08:47:16 +00:00
the-real-herowl 324fd0dc4a Merge pull request 'Add missing Hoglin/Zoglin sounds' (#4082) from Bakawun/MineClone2:hoglin_sounds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4082
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-08 08:45:33 +00:00
bakawun cd033aa4ff mobs:zoglin:sounds: adress review comment 2024-01-08 09:30:12 +01:00
bakawun 1f3c7913dd mobs:piglin:sounds: adress review comment 2024-01-08 09:26:03 +01:00
bakawun 49aa32d2ee mobs:skeletons:sounds: fix code review issue and add todo 2024-01-08 09:16:05 +01:00
the-real-herowl 18db66c431 Merge pull request 'Changes in mcl_util.rotate_axis_and_place and bamboo on_place callback' (#4123) from JoseDouglas26/MineClone2:bamboo_rotation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4123
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-08 07:14:12 +00:00
JoseDouglas26 cc3f092185 Changes in rotation code and bamboo rotation 2024-01-08 05:55:36 +00:00
the-real-herowl 9f64facbf9 Merge pull request 'Nylium can be turned into netherrack' (#4124) from JoseDouglas26/MineClone2:nylium_into_netherrack into master 2024-01-08 03:12:54 +01:00
JoseDouglas26 6694babbde nylium can be turned into netherrack 2024-01-08 03:08:56 +01:00
SmokeyDope fc204c8717 Merge pull request 'Fix typo in pumpkin.lua' (#4122) from fix_pumpkin_typo_pumkin into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4122
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-08 02:02:20 +00:00
SmokeyDope c664216104 Merge pull request 'Compressed Cobblestone' (#4119) from mcl_compressed_blocks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4119
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2024-01-08 01:20:14 +00:00
SmokeyDope cd3426b5ce Adjust hardness & blast resistance for compressed cobblestone blocks 2024-01-08 01:07:46 +00:00
the-real-herowl 9867c73eb3 Merge pull request 'Added colored end rod variants' (#4111) from end_rods_variants into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4111
2024-01-08 00:57:31 +00:00
the-real-herowl 3db02bb022 Merge pull request 'Added colored redstone lamps' (#4115) from redstone_lamp_variants into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4115
2024-01-08 00:56:36 +00:00
SmokeyDope 3c7597b75e Add hunger debug to settingtypes.txt 2024-01-06 22:50:40 +00:00
SmokeyDope 7bf3fbf13c Fix typo in pumpkin.lua 2024-01-05 17:06:22 +00:00
SmokeyDope fc7133f1a8 compressed cobblestone textures pt 2 2024-01-03 18:23:17 +00:00
SmokeyDope 05eb3bb8aa compressed cobblestone textures pt 1 2024-01-03 18:22:47 +00:00
SmokeyDope 7583caca9b mcl_compressed_blocks initial comit 2024-01-03 18:21:51 +00:00
pineaulo 411e3e161f Add terracotta pillars 2024-01-02 21:03:39 +01:00
the-real-herowl 882531b9fc Refactored end rod coloring code 2024-01-01 02:53:20 +01:00
the-real-herowl 0b5c15d05f Updated translation files 2024-01-01 02:18:01 +01:00
the-real-herowl cd930365b0 Added colored redstone lamps 2024-01-01 02:07:06 +01:00
the-real-herowl ce56f396b1 Merge pull request 'Fix translation files syntax errors' (#4092) from megustanlosfrijoles/frijolesclone2:fix-translation-files-syntax-errors into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4092
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-30 23:25:49 +00:00
the-real-herowl ba297001b4 Merge pull request 'mcl_tt Spanish translation' (#4093) from megustanlosfrijoles/frijolesclone2:mcl_tt-spanish-translation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4093
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-30 23:23:53 +00:00
the-real-herowl 24eca01c3f Added translations for colored end rods 2023-12-31 00:20:15 +01:00
the-real-herowl 4e3cf9e04b Added colored end rod variants 2023-12-31 00:07:16 +01:00
the-real-herowl d285a48fed Merge pull request 'release/0.86.2' (#4110) from release/0.86.2 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4110
2023-12-30 04:38:49 +00:00
the-real-herowl d3d1bdf8d2 Post-hotfix revert game.conf to SNAPSHOT version 2023-12-30 05:34:24 +01:00
the-real-herowl f306d3768e Update game.conf for hotfix release 0.86.2 2023-12-30 05:33:27 +01:00
the-real-herowl 7463b97c69 Added hotfix notes to the release notes for 0.86 2023-12-30 05:32:10 +01:00
the-real-herowl d11526f8e8 Merge pull request 'Finish PVP Combat Parity with the rest + PVP Tweaks' (#4078) from Eliy21/MineClone2:combat_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4078
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-30 04:21:18 +00:00
the-real-herowl 8021a6a723 Merge pull request 'Hotfix 0.86.2' (#4109) from hotfix_0_86_2_branch into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4109
2023-12-30 04:01:05 +00:00
the-real-herowl 1bad5659cf Fixed a cryptic error message
Migrated it to mcl_log and maded it clearer
2023-12-30 04:53:17 +01:00
the-real-herowl befd98b83e Fixed XP orb texture breaking randomly
It used undefined engine behaviour.
It's unclear how it even worked *sometimes*.
2023-12-30 04:13:13 +01:00
the-real-herowl 13341df20b Optimized some textures for size 2023-12-29 13:50:22 +01:00
the-real-herowl f866b56d06 Merge pull request 'Workaround for bows, crossbow and spyglass on mobile' (#4104) from mobile_bow_workaround into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4104
2023-12-27 19:41:57 +00:00
José M 4a407679c0 Translate mcl_tt to spanish 2023-12-25 23:41:49 -06:00
the-real-herowl 39f98ec6fb Updated doc strings for bow and crossbow
Mentioned the zoom key
2023-12-25 23:56:39 +01:00
the-real-herowl 9e3d7ce0f4 Added a workaround for mobile using zoom key
* Bow can now be used with zoom key aside of RMB
* Crossbow can now be loaded with zoom key as well
* Spyglass can now be used with zoom key
2023-12-25 23:50:06 +01:00
the-real-herowl cb7878249d Merge pull request 'release_0_86_another_look' (#4100) from release_0_86_another_look into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4100
2023-12-24 05:35:00 +00:00
the-real-herowl 939905b9d8 Post-release set version 0.87.0-SNAPSHOT 2023-12-24 06:31:35 +01:00
the-real-herowl b1f7fecb59 Add release notes for 0.86 2023-12-24 06:29:39 +01:00
the-real-herowl 3d58878750 Updated release credits and set version for v0.86 2023-12-24 06:27:13 +01:00
the-real-herowl b6938bad90 Merge pull request 'Fix a heisenbug' (#4098) from depends_patch into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4098
2023-12-24 05:04:49 +00:00
the-real-herowl 9df4e2e95e Merge pull request 'Added shepherd functionality' (#4099) from shepherd into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4099
2023-12-24 05:00:35 +00:00
the-real-herowl a2a4da5aed Added shepherd functionality 2023-12-24 05:48:41 +01:00
the-real-herowl e1d5899aa5 Remove unneeded dependencies
This patches a heisenbug to be investigated later
2023-12-24 01:27:29 +01:00
the-real-herowl dd7d56a385 Merge pull request 'br_pt_translation by JoseDouglas26' (#4095) from br_pt_translation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4095
2023-12-23 20:31:49 +00:00
the-real-herowl 4bb46d7d30 Merge pull request 'New sunflower mesh (by JoseDouglas26)' (#4094) from sunflower_mesh_update into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4094
2023-12-23 20:24:45 +00:00
the-real-herowl 8071d0fbef Merge pull request 'Nerfed vexes and evokers' (#4076) from vex_evoker_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4076
2023-12-23 20:19:24 +00:00
the-real-herowl 60c0483c12 Merge pull request 'Nerfed slime and magma cube attack range' (#4075) from slime_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4075
2023-12-23 20:18:23 +00:00
cora 29d40ef553 Mix down new mob sounds to mono 2023-12-23 09:39:12 +01:00
JoseDouglas26 d59a6c6a00 mesecons_delayer pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 c20a37486e mesecons_pressureplates pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 85bc643442 mesecons_lightstone pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 907e037430 mcl_dispensers pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 7b93c65c45 mcl_droppers pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 73bcb0026f mcl_observers pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 01abafe50f mesecons_button pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 e28207f44e mesecons_walllever pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 a5370bc63d mcl_target pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 f904512e61 mcl_comparators pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 c1e3c69800 mcl_monster_eggs pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 d0697c70cc mcl_fire pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 bef3253d5c mcl_enchanting pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 ad099ed7c2 mcl_grindstone pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 a2b7549456 mcl_mangrove pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 f8ef5a15c5 mcl_death_messages pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 6c4101dc12 mcl_hoppers pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 8c0d9cc450 mcl_info pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 1f370bf1f2 hudbars pt_BR translation 2023-12-22 23:45:08 +01:00
JoseDouglas26 6bffaf56d2 mcl_dye and mcl_smithing_table translation fixes 2023-12-22 23:45:08 +01:00
JoseDouglas26 04b77db7fa mcl_books and mcl_bows pt_BR translation fixes 2023-12-22 23:45:08 +01:00
JoseDouglas26 aeeb5acc25 mcl_armor pt_BR translation correction 2023-12-22 23:45:08 +01:00
JoseDouglas26 9a8a6764d1 mcl_doors and mcl_fences pt_BR translation fixes 2023-12-22 23:45:07 +01:00
JoseDouglas26 3047568ed4 mcl_maps pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 2a8da574f0 mcl_ocean pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 00bf5f0331 mcl_smoker pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 2d5b57c60d mcl_experience pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 b476c703f1 mcl_lectern pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 8f3936792f mcl_cocoas pt_BR translation missing 2023-12-22 23:45:07 +01:00
JoseDouglas26 8816e9fc61 mcl_throwing pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 e291d9918e mcl_stonecutter pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 bd19c8fe67 mcl_mud pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 7f36116146 screwdriver pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 8afa57b914 mcl_sus_stew pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 bc186560b4 mcl_hamburger pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 ae470f8809 mcl_armor pt_BR translation missing 2023-12-22 23:45:07 +01:00
JoseDouglas26 8b1ad1c217 mcl_smithing_table pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 0638c67cf7 mcl_shields pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 3f0e77b971 mcl_bamboo pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 3e131a213f mcl_villages pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 d7c8c7a54a mcl_privs pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 fcd4a610e5 mcl_commands pt_BR translation missing 2023-12-22 23:45:07 +01:00
JoseDouglas26 cde4bc797e mcl_commands pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 cb6b4253d2 findbiome pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 6480c6923a mcl_music pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 487f78d663 mcl_hunger pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 908c46ce34 mcl_loom pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 90a758c002 mcl_lightning_rods pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 3a89d367b0 mclx_fences pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 6dac652241 mclx_core pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 4a3369205e mcl_wool pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 8b02d7b0b2 mcl_walls pt_BR translation fix 2023-12-22 23:45:07 +01:00
JoseDouglas26 184a098964 mcl_torches pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 d57fbb047d mcl_sponges pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 1c3003c85b mcl_spawn pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 188f1cdaa6 mcl_itemframes pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 e536822b4d mcl_tools pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 c6fc911c12 mcl_heads pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 cb0c67b05f mcl_fishing pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 427724ced2 mcl_ver_info pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 799462c4b4 mcl_credits pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 334ac81f58 mcl_fences pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 840381f73f mcl_fletching_table pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 21a10751d1 mcl_lanterns pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 09a063256b mcl_wip pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 9701526d16 mcl_skins pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 e2746adea8 mcl_furnaces pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 a93ce7af1f mcl_inventory pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 3684cb8d2a mcl_cherry_blossom pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 0626c3329b mcl_sculk pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 5489bf20ea mcl_beehives pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 232740b5e6 mcl_totems pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 6f7ac46f05 mcl_jukebox pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 1524f63a6d mcl_hbarmor pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 60377c56cd mcl_tt pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 b0b120dd28 mcl_walls pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 34c23bd578 mcl_tnt pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 9be815956c mcl_signs pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 2da67765a0 mcl_flowers pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 01641b5a8c mcl_flowerpots pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 9371ed5c48 mcl_spyglass pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 527577cbcc mcl_raw_ores pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 86d5e748bb mcl_craftguide pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 6cbd985974 mcl_honey pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 6f9b70a98d mcl_fireworks pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 76e941cbb6 doc_items pt_BR translation missing translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 aef093ef4e doc_items pt_BR translation correction 2023-12-22 23:45:07 +01:00
JoseDouglas26 f824f109e2 mcl_structures pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 a3ccd4d032 lightning pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 419456b835 mcl_weather pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 72a144f0b2 mcl_void_damage pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 f379a06998 mcl_raids pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 947d20ae96 mcl_mobs pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 5c06c28b0f mobs_mc pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 df02770470 mcl_minecarts pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 51dc10c9ea mcl_paintings pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 2370d155c9 mcl_falling_nodes pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 ad3ec48ec9 mcl_boats pt_BR translation 2023-12-22 23:45:07 +01:00
JoseDouglas26 beb06315ac mcl_explosions pt_BR translation 2023-12-22 23:45:07 +01:00
the-real-herowl 569dd69188 Increase sunflower height 2023-12-22 23:36:49 +01:00
the-real-herowl 92ee9c0557 Remove the wrong separate sunflower definition 2023-12-22 23:06:08 +01:00
JoseDouglas26 f63e5d3c19 fix facing west 2023-12-22 23:03:11 +01:00
JoseDouglas26 4d5d595310 changes requested in sunflower definitions 2023-12-22 22:55:09 +01:00
JoseDouglas26 f9972aef01 new lower mesh and selection box 2023-12-22 22:53:55 +01:00
JoseDouglas26 85d21fa1e9 new sunflower mesh 2023-12-22 22:53:43 +01:00
JoseDouglas26 e6a64cfc69 Sound and mining sunflower bug fixes 2023-12-22 22:53:31 +01:00
JoseDouglas26 dd5a9178d9 sunflower mapgen bug fix 2023-12-22 22:53:10 +01:00
JoseDouglas26 113f07581b new sunflower mesh 2023-12-22 22:52:50 +01:00
Eliy21 10dcdb7d6b Remove unnecessary player vector magnitude calculation 2023-12-21 15:52:26 +00:00
José M ec8f3f5530 Start the beggining of the mcl_tt spanish translation 2023-12-21 00:18:40 -06:00
José M 74ab3ffeee Add missing placeholder(s) in doc_items.pt.tr translation: '@1' 2023-12-20 23:55:39 -06:00
José M 9d62c4ca5e Fix missing placeholder(s) in mesecons_commandblock.es.tr translation: '@1' '@2' 2023-12-20 23:46:30 -06:00
José M c9d221976b Escape equals signs in translation file mcl_doc_basics.it.tr 2023-12-20 23:40:33 -06:00
José M 0d1a6d91e9 Remove an unescaped equals sign in mcl_info.fr.tr translation 2023-12-20 23:24:03 -06:00
José M 0f82c623d5 Add missing placeholder(s) in mcl_farming.fr.tr translation: '@1' 2023-12-20 23:15:12 -06:00
the-real-herowl a1d390bd4d Merge pull request 'Fix translation files syntax errors' (#4091) from megustanlosfrijoles/frijolesclone2:fix-translation-files-syntax-errors into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4091
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-21 02:05:08 +00:00
José M 325c6ab4ca Escape equals signs in translation file mcl_deepslate.pt_BR.tr 2023-12-20 19:13:30 -06:00
José M dc4c559ad9 Escape equals sign in translation 2023-12-20 19:04:46 -06:00
José M 1f52b7051a Add missing placeholder(s) in translation: '@1' 2023-12-20 18:58:15 -06:00
José M 5e28ff2d06 Delete non-empty translation in mcl_enchanting template file 2023-12-20 18:34:16 -06:00
José M d5eda7352c Remove whitespace-only translation in mcl_blast_furnace template file 2023-12-20 18:29:13 -06:00
ancientmarinerdev 5071855d00 Merge pull request 'Fix wrong argument when piston dig calls on_dignode callbacks (Credit: Cora)' (#4089) from bamboo_crash_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4089
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-20 21:28:07 +00:00
cora 4cfd4ef6ce Fix wrong argument when piston dig calls on_dignode callbacks 2023-12-20 16:54:36 +00:00
Eliy21 96fa6c251e Counteract self forward velocity when hit by players in pvp 2023-12-20 15:50:37 +00:00
Eliy21 e19de85990 Adjust the difference between sprinting & walking knockbacks for a more seemless transition 2023-12-19 17:19:09 +00:00
Eliy21 76bff2b540 Add minimum pvp knockbacks to other meele weapons 2023-12-19 16:49:48 +00:00
Eliy21 ff882707de Rework moving majority of the added velocity knockbacks into sprinting 2023-12-19 16:15:41 +00:00
Eliy21 d7ed37ef25 Remove redundant knockback limiter 2023-12-19 15:31:29 +00:00
Michieal ceada2fcec Merge pull request 'Fix translation files syntax errors' (#4061) from megustanlosfrijoles/frijolesclone2:warning-fix2 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4061
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Merged-by: michieal
2023-12-19 01:15:43 +00:00
the-real-herowl 99cc88ac42 Merge pull request 'Update spanish translations and fix syntax errors' (#4060) from megustanlosfrijoles/frijolesclone2:es-translations-syntax into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4060
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-18 23:25:48 +00:00
Michieal 56ebb5ac09 Merge pull request 'Fix the FOV issues with Bows, Sprinting and Spyglasses.' (#4045) from Fix-FOV into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4045
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-18 23:19:43 +00:00
the-real-herowl 8a5058e032 Unified and refactored FOV API code 2023-12-18 22:50:52 +00:00
the-real-herowl e312955a14 Made spyglass reset instant 2023-12-18 22:50:52 +00:00
the-real-herowl 5afd0aa255 Fixed the exclusive modifiers not being exclusive 2023-12-18 22:50:52 +00:00
Michieal 98b6ead591 Fixed a couple of errors
Removed a debug statement that was broken.
Changed `modififer` to `modifier` in a code block.
2023-12-18 22:50:52 +00:00
the-real-herowl 040ce8288e Script and documentation cleanup 2023-12-18 22:50:52 +00:00
the-real-herowl f9b192e68f Updated credits 2023-12-18 22:50:52 +00:00
the-real-herowl 08241f6ea3 Updated the api.md file 2023-12-18 22:50:52 +00:00
the-real-herowl 5bf6608483 Made bow unfocus faster 2023-12-18 22:50:52 +00:00
the-real-herowl 42ec62562d Moved sprinting into the new FOV api 2023-12-18 22:50:52 +00:00
the-real-herowl 7f5ce4e033 Fixed modifier application and removal 2023-12-18 22:50:52 +00:00
the-real-herowl 3a007e3bb1 Re-registered FOV mods using new API version 2023-12-18 22:50:52 +00:00
the-real-herowl a650f8b368 Made fovapi registration more robust 2023-12-18 22:50:52 +00:00
Michieal 580a1caa38 Reworked some of the Apply_Modifier code to help prevent errors. 2023-12-18 22:50:52 +00:00
Michieal 2f8389d3f5 Put in check to prevent Trying to Reference a Nil error in Apply_Modifier. 2023-12-18 22:50:52 +00:00
Michieal 4f3f59f4bc Put in checks to prevent repeatedly applying the same FOV modifier.
Added short circuit to remove_modifier if the modifier is not currently applied.
2023-12-18 22:50:52 +00:00
Michieal 36f661743e Set up the Bows to use the new FOV API. Bows now zoom in and clear out the zoom. 2023-12-18 22:50:52 +00:00
Michieal 0a17bbe731 Added reset for player respawning to remove FOV modifiers.
Fixed missing on_end call in remove_all_modifiers.
Added mcl_fovapi to Bows, Sprint, and Spyglass.
Set up the Spyglass to use the new FOV API.
2023-12-18 22:50:52 +00:00
Michieal 6cfb55e853 Added reset for player respawning to remove FOV modifiers.
Fixed missing on_end call in remove_all_modifiers.
Added mcl_fovapi to Bows, Sprint, and Spyglass.
2023-12-18 22:50:52 +00:00
Michieal bf41e116a1 Fleshed out the API Documentation.
Modified missing pieces of code.
2023-12-18 22:50:52 +00:00
Michieal fc80d4fb9f Initial API state. 2023-12-18 22:50:52 +00:00
Michieal 11c5d36c55 Initial Commit. 2023-12-18 22:50:52 +00:00
Eliy21 44c656502f Add a prevention in case players get stuck with the damage animation 2023-12-18 22:04:12 +00:00
Eliy21 fe90424ee4 Add pvp knockback reduction when moving towards player while attacking 2023-12-18 21:42:26 +00:00
Eliy21 14cec16c63 Increase enchanted bow knockback 2023-12-18 21:31:38 +00:00
bakawun a786b66d9e mobs:skeletons: add sounds to skeleton
and stray, fix random sound for wither skeleton
2023-12-18 11:17:25 +01:00
bakawun cc470b9d88 mobs:hoglin: fix conversion of tabs to spaces 2023-12-18 11:08:09 +01:00
bakawun ee51a500b2 mobs:piglin: use (alt) zombified piglin sounds 2023-12-18 10:57:39 +01:00
bakawun 7f823f0155 mobs:hoglin:add licence information 2023-12-18 10:38:23 +01:00
bakawun f5ba0b7981 mobs:zoglin: use hoglin sound .2 2023-12-18 10:31:08 +01:00
bakawun e202f20869 mobs:hoglin: use sound .1 for random and
reuse hurt sound for death
2023-12-18 09:58:37 +01:00
bakawun 692b101212 mobs:hoglin: add missing sounds
these were made by epCode and lincenced under
LGPL-3.0.
downloaded from
49a838e733
2023-12-18 09:51:58 +01:00
the-real-herowl 07147e9d5b Make slime+magmacube collision boxes rotate properly 2023-12-18 02:56:43 +01:00
the-real-herowl d44b00a20e Merge pull request 'Shulker improvements and homing mob projectiles' (#4000) from Bakawun/MineClone2:Shulker_shot_speed into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4000
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-18 00:54:04 +00:00
Eliy21 12109e7f44 Add player damage animation 2023-12-17 21:18:57 +00:00
Eliy21 200f7451eb Remove unnecessary invul code & add damage animation code 2023-12-17 21:15:55 +00:00
Eliy21 c39e55e2d4 Add minimum knockback to crossbow 2023-12-17 20:01:35 +00:00
Eliy21 6d7ae8ba2d Add minimum unenchanted knockback to bow 2023-12-17 19:59:18 +00:00
Eliy21 8612350fa7 Make vertical pvp knockback floatiness reduction include moving hits 2023-12-17 17:48:39 +00:00
Eliy21 0a8874ecad Make vertical pvp knockbacks less floaty 2023-12-17 16:39:04 +00:00
Eliy21 e8ee9c4463 Remove obsolete work-around code 2023-12-16 12:58:58 +00:00
Eliy21 32e91b45ae Add vertical pvp knockbacks from downward hits & reduce pvp kb on half block angled upward hits 2023-12-16 11:48:16 +00:00
Eliy21 8fbd72c142 Optimize code by calling get_enchantment function only once 2023-12-16 09:46:18 +00:00
Eliy21 cfab59d68a Rebalanced moving pvp knockbacks 2023-12-16 09:20:29 +00:00
Eliy21 33e8337bbb Finish remaining excessive vertical pvp knockback prevention adjustments when hit from below 2023-12-16 07:58:26 +00:00
Eliy21 f799596db9 Make vertical pvp knockbacks respect attack reach limit & complete excess vertical kb prevention 2023-12-15 22:56:02 +00:00
Eliy21 9b9747b3d8 Prevent excessive vertical knockbacks if hit by a player from below 2023-12-15 21:02:07 +00:00
Eliy21 c9692c6224 Fix player invulnerability not getting disabled permanently bug 2023-12-15 19:49:04 +00:00
Eliy21 cd83305f07 Make the vertical lift on pvp knockback similar to MC 2023-12-15 18:17:15 +00:00
Eliy21 d7b10d18d8 Fix not being able to give minimum knockback to players when both near and lower than them 2023-12-15 16:27:09 +00:00
Eliy21 8e2c5249f5 Fix comment on player invul code 2023-12-15 15:59:08 +00:00
Eliy21 ca556c052f Prevent pvp knockbacks when invulnerable 2023-12-15 15:52:26 +00:00
Eliy21 60367cdbe0 Revert unreliable bugfix
There are times when the continuous damage when punching players does not happen so will not fix at the moment as using other weapons does still work.
2023-12-15 15:42:49 +00:00
Eliy21 ae169b2814 Add fix to crash when moving bought villager trade item to empty sell slot bug by JoseDouglas26 (#4079)
Add fix to #4062 by JoseDouglas26 https://git.minetest.land/MineClone2/MineClone2/issues/4062#issuecomment-74045

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4079
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-12-15 03:09:48 +00:00
bakawun cee5bbc206 mobs:fix typo in homing function 2023-12-14 16:50:23 +01:00
Eliy21 6b439fd1de Add maximum pvp knockback limit & approximate enchant knockback distance to be similar to MC 2023-12-14 11:57:55 +00:00
Eliy21 bf9e487fa9 Adjust minimum pvp knockback to be closer to MC 2023-12-14 09:27:28 +00:00
Eliy21 49af5d2013 Rebalance minimum pvp knockback to account for added knockbacks when moving 2023-12-14 08:51:34 +00:00
Eliy21 ed507d8509 Remove unnecessary space in the attack reach limit on mobs code 2023-12-14 08:15:55 +00:00
Eliy21 b2507c3640 Make fire aspect enchant respect attack reach limit 2023-12-14 08:12:13 +00:00
Eliy21 85b1f5247a Add vertical lift & minimum pvp knockback 2023-12-14 07:46:16 +00:00
Eliy21 2b71462c1e Prevent knockback if player is beyond attack reach limit 2023-12-13 20:36:54 +00:00
Eliy21 b0e33793ec Fix a potential bug that could bypass attack reach limit when a stronger attack breaches the invul 2023-12-13 20:04:15 +00:00
Eliy21 96aaf89036 Readjust pvp enchant knockback to make the running knockback difference more pronounced 2023-12-13 18:49:08 +00:00
Eliy21 a8c2d4534a Nerf long pvp enchanted knockbacks especially when running 2023-12-13 17:42:42 +00:00
Eliy21 a8806fe04e Add player invulnerability & fix not continuously damaging players when holding the attack key
Player invulnerability is the same as Minecraft's Damage Immunity https://minecraft.wiki/w/Damage#Immunity

The old code for some reason only allows a few damage by holding and does not continuously damage other players after a few hits
2023-12-13 17:34:42 +00:00
Wbjitscool ebd733be82 update's the campfire's fire burning animation to make it look better (#4077)
improve the look of the campfire's flame/burning animation

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4077
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Wbjitscool <dwsda121@gmail.com>
Co-committed-by: Wbjitscool <dwsda121@gmail.com>
2023-12-13 05:22:41 +00:00
the-real-herowl a2c8d13f04 Nerfed vexes and evokers 2023-12-13 04:51:56 +01:00
the-real-herowl 610bcab0d6 Merge pull request 'Update's the stonecutter animation speed to match to the MC's one' (#4074) from stonecutter_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4074
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-13 03:14:27 +00:00
the-real-herowl ed205190e4 Nerfed slime and magma cube attack range 2023-12-13 04:10:01 +01:00
Wbjitscool 07eb70e9be Update mods/ITEMS/mcl_stonecutter/init.lua 2023-12-13 02:39:25 +00:00
the-real-herowl b3da7a473d Merge pull request 'Move deepslate ore registration within generation check' (#4070) from Zasco/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4070
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-13 02:06:25 +00:00
bakawun bc101314df mobs:shulker:use on_attack to set shoot interval
to between 1 and 6 seconds
2023-12-13 02:42:08 +01:00
the-real-herowl 69903aa4ec Fixed crashes 2023-12-13 02:42:08 +01:00
bakawun 686646b86d Shulker: align armor value with mc and set it to 0 when opened 2023-12-13 02:42:08 +01:00
bakawun 789c9a9a6d Shulker: make bullet speed match mc
speed is 5 according to https://www.gmbinder.com/share/-MelLRYIg8yCfuAqQ82g#:~:text=After%20doing%20some%20experimentation%20I,~5%20blocks%2Fsecond).
2023-12-13 02:42:08 +01:00
cora cf51c60527 Fix shulker bullets ignoring armor 2023-12-13 02:42:08 +01:00
cora 55fe71d73b Add a get_arrow_hit_func function to mcl_mobs
reason for this is that player:punch used by most mobs ignores armor
worn by player
2023-12-13 02:42:08 +01:00
cora 58bb26a7ef Make shulker bullets homing 2023-12-13 02:42:08 +01:00
cora f5079f1568 Add an option for mob arrows to be "homing" 2023-12-13 02:42:08 +01:00
Bakawun b4511fb8c7 Shulker, add missing false statement 2023-12-13 02:42:08 +01:00
Bakawun b02a3deec7 Shulker; fix attack open animation, improve peek 2023-12-13 02:42:08 +01:00
Bakawun 26cfdf0b7c Shulker: randomize shoot interval
Randomize shoot interval to between 1 and 5.5 seconds and set default shoot interval to 5.5
2023-12-13 02:42:08 +01:00
Bakawun 8d34ff2a9a Shulker: Make shulker peek periodically
Adjust walk and animation settings so the shulker peeks out randomly.
2023-12-13 02:42:08 +01:00
Bakawun e6ddc03d3c Shulker: lower shoot interval to 1 second
In this video we can see the shulkers are shooting at a rate of once per second.
https://youtube.com/shorts/8tUFaSZ4b7I?si=sszp4cnyXR4dXg9B

The wiki confirms this but mentions a range of 1 to 5.5 seconds. 
I think this range is caused by the shulker closing and stopping shots for a few seconds but no longer than the max interval of 5.5

https://minecraft.fandom.com/wiki/Shulker#:~:text=The%20shulker%20continues%20firing%20every,unaffected%20by%20Levitation%20when%20hit
2023-12-13 02:42:08 +01:00
Zasco 351e31a889 Move deepslate ore registration within generation check 2023-12-12 23:16:51 +00:00
Bakawun 5f3c901f11 Ghast: align attributes with mc
Ghast should spawn much more rarely than they currently do
I set the value to 1/4th of the original value before 72000 was set as an attempt to lower spawn rates, it actually increased them.

Align View distance, sound distance and shot interval with mc wiki.
https://minecraft.fandom.com/wiki/Ghast

Align fireball velocity with mc issue tracker
https://bugs.mojang.com/browse/MC-238286
2023-12-11 09:58:41 +01:00
the-real-herowl aff4216ccf Merge pull request 'on_attack callback fix' (#4065) from on_attack_callback into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4065
2023-12-10 23:55:47 +00:00
the-real-herowl 8b00fff4cb Remove dangling else 2023-12-11 00:54:30 +01:00
the-real-herowl cf70de0ecc Add an on_attack callback for mobs (#4064)
Added an on_attack callback that allows to execute additional custom logic after each attack.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4064
Co-authored-by: the-real-herowl <wiktor_t-i@proton.me>
Co-committed-by: the-real-herowl <wiktor_t-i@proton.me>
2023-12-10 16:10:33 +00:00
José M 6dce3b4bc4 Remove whitespace-only translation in template file 2023-12-10 01:56:19 -06:00
José M a60540c17e Remove a non empty translation in template file 2023-12-10 01:47:35 -06:00
José M 19fd075a2f Add the textdomain line in mcl_beehives.dk.tr
This will remove the warning that is shown when running Wuzzy's Minetest_Translation_tools and will contribute to the issue 3540
2023-12-10 01:16:43 -06:00
José M 1ac65305d6 Fix a typo in mcl_honey.es.tr 2023-12-10 00:13:40 -06:00
José M 8dcb62aa56 Fix a typo in mcl_honey.es.tr 2023-12-10 00:11:07 -06:00
José M 1d2a7b35d8 Update mcl_honey.es.tr 2023-12-10 00:07:17 -06:00
José M 02e7ff41d5 Update mcl_fire.es.tr and fix syntax errors 2023-12-09 23:42:32 -06:00
the-real-herowl d4797e13af Merge pull request 'release_0_85_fire_and_stone' (#4049) from release_0_85_fire_and_stone into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4049
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-12-08 23:05:13 +00:00
the-real-herowl 3caa99a409 Post-release set version 0.86.0-SNAPSHOT 2023-12-09 00:03:41 +01:00
the-real-herowl ca71e949a8 Credits update 2023-12-09 00:01:19 +01:00
the-real-herowl 9a7e39654c Minor credits update 2023-12-09 00:01:19 +01:00
the-real-herowl 333db53e7b Add release notes for 0.85 2023-12-09 00:01:19 +01:00
the-real-herowl 47f920c9df Updated release credits and set version for 0.85 2023-12-09 00:01:19 +01:00
the-real-herowl bb66f81999 Merge pull request 'Combat rebalancing' (#4036) from combat_rebalancing into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4036
2023-12-08 22:06:06 +00:00
the-real-herowl a344755894 Merge pull request 'horse: drops: remove 2nd saddle, add armor' (#4047) from Bakawun/MineClone2:horse into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4047
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-07 01:02:38 +00:00
the-real-herowl c03366aa12 Merge pull request 'Fix syntax errors and update spanish translations' (#4050) from megustanlosfrijoles/frijolesclone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4050
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-06 23:36:09 +00:00
José M bb1e572287 Update mcl_compass.es.tr and fix syntax errors 2023-12-05 18:39:29 -06:00
Eliy21 4127d120d2 Add server privs restriction to mcl_villages build tool (#4043)
<!--
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
-->

Fixes #4022

### Testing
-Make a new world, check host server and go into creative mode
-Since you're the server you have the server privs so get the mcl_villages build tool item in creative inventory and use it to see if it works
-Have someone join your server and give them the same item to use and see if they are restricted from using it

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4043
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-12-05 12:49:49 +00:00
Eliy21 86dad4693e Add warning log if players with 0 hp joined (#4051)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4051
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-12-05 08:21:37 +00:00
José M f39fe17895 Update mesecons_lightsone spanish translation
Fixed a syntaxis error at line 3 and added the missing translation for line 4
2023-12-04 22:51:50 -06:00
Eliy21 0673fcc25b Respawn dead players when they login so they don't get stuck without the death formspec (#4041)
Hopefully will prevent the dead player not respawning when logging in bug from happening

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4041
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-12-05 01:08:50 +00:00
the-real-herowl 589de76613 Fixed a code branch never being run 2023-12-05 01:59:05 +01:00
the-real-herowl 1857341b59 Fixed player knockback from arrows 2023-12-05 00:58:10 +00:00
the-real-herowl 46d9c66000 Fixed mobs executing custom on_punch with punch fail 2023-12-05 00:58:10 +00:00
the-real-herowl cca6645524 Added player damage invulnerability 2023-12-05 00:58:10 +00:00
the-real-herowl 24ffd64cad Knockback fixes 2023-12-05 00:58:10 +00:00
the-real-herowl e29654a0f6 Revert healing interval default to the lower value 2023-12-05 00:58:10 +00:00
José Muñoz 027e0e8337 Fix a typo in the spanish translation (#4039)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4039
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Co-committed-by: José Muñoz <dr.cabra@disroot.org>
2023-12-05 00:05:39 +00:00
bakawun 2ba73f832c horse: drops: remove 2nd saddle, add armor 2023-12-04 20:17:39 +01:00
chmodsayshello 4b63ff1c2a Merge pull request 'Fix "sleeping player hud" sometimes showing decimal numbers' (#4038) from player_sleeping_hudfix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4038
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-02 19:37:05 +00:00
chmodsayshello 43e7a952ac use math.ceil to get amount of needed players 2023-11-30 22:29:56 +01:00
michaljmalinowski 9be5de980e Update mods/MAPGEN/mcl_biomes/init.lua
update melon and pumpkin biomes
2023-11-28 20:26:24 +00:00
codiac 4cf865a36c Fix passive threshold in nether and end (#4030)
Fix light check for passive mobs in other dimensions. It is apparently the same in all dimensions. If a mob has it's own spawn_check function then that should be used regardless of it's type.

Fixes #4029

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4030
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: codiac <codiac@inbox.lv>
Co-committed-by: codiac <codiac@inbox.lv>
2023-11-28 02:45:18 +00:00
Eliy21 b57f6be81d Make showing advancement chat messages into a setting (#4032)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4032
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-11-28 01:37:45 +00:00
the-real-herowl cd40861b3b Merge pull request 'Add stonecutter functionality' (#3999) from stonecutter_functionality into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3999
2023-11-27 23:37:57 +00:00
the-real-herowl 19728c5a19 Merge pull request 'hopper reimplementation' (#3980) from Morik666/MineClone2:hopper into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3980
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-11-27 23:34:47 +00:00
Kostinatyn Tsiupa 1da7bb0bdc hopper reimplementation
Reimplemented hoppers and all (blast_furnace, furnace, smoker, composters, double chaets, shulker_boxes, droppers, bookshelvs and brewing_stands) connected nodes
2023-11-27 14:33:01 +02:00
bakawun 25fa21ddbd Set all mob spawn chance weights according to mc now that weights are actually taken into account 2023-11-27 10:47:55 +01:00
the-real-herowl 1044163717 Fixed the ambiguous /clear command being dangerous (#4026)
Implements #3826

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4026
Co-authored-by: the-real-herowl <wiktor_t-i@proton.me>
Co-committed-by: the-real-herowl <wiktor_t-i@proton.me>
2023-11-27 02:22:39 +00:00
ThePython10110 570ea114ec Fix weathered cut copper crafting (#4033)
Just fixing a typo.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4033
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: ThePython10110 <thepython10110@noreply.git.minetest.land>
Co-committed-by: ThePython10110 <thepython10110@noreply.git.minetest.land>
2023-11-27 02:21:48 +00:00
the-real-herowl 8fd988da11 Increased cut copper recipe output 2023-11-25 23:52:04 +00:00
the-real-herowl f1c5f0ca1c Fixed duplication bug 2023-11-25 23:52:04 +00:00
the-real-herowl b4080b6275 Credits update in mod.conf 2023-11-25 23:52:04 +00:00
the-real-herowl bb48e47488 Made stonecutter player metadata consistent 2023-11-25 23:52:04 +00:00
the-real-herowl a6025b751a Uneven crafts support
-taking part of the resulting stack now produces well-defined results
-stonecutter won't allow amount undivisible by recipe count anymore
2023-11-25 23:52:04 +00:00
the-real-herowl af2f58248f Added the ability to stonecut up to full stack 2023-11-25 23:52:04 +00:00
AFCMS e324a1a74b Make inventory use the util functions 2023-11-25 23:52:04 +00:00
AFCMS 4836418cf6 Rework Stonecutter 2023-11-25 23:52:04 +00:00
AFCMS a001f84786 Add utility functions to clean inventory lists 2023-11-25 23:52:04 +00:00
AFCMS 2128dd4c15 Add basic table ordered keys iterator 2023-11-25 23:52:04 +00:00
the-real-herowl c183da7714 Updated README 2023-11-25 23:52:04 +00:00
the-real-herowl fd17bf1a29 Removed old implementation groups 2023-11-25 23:52:04 +00:00
the-real-herowl 0c7b4d473c Copper blocks stonecutter recipes 2023-11-25 23:52:04 +00:00
the-real-herowl 6ebd3ccb7d Third batch of stonecutter recipes
-deepslate
-blackstone
-quartz bricks
2023-11-25 23:52:04 +00:00
the-real-herowl d46b9071a0 Added nether and end stonecutter recipes 2023-11-25 23:52:04 +00:00
the-real-herowl ead2e772c2 First batch of stonecutter recipes under new API
-core blocks
-stairs
-slabs
-walls
2023-11-25 23:52:04 +00:00
the-real-herowl 19cea45c17 Stonecutter fixes and improvements
-improved stonecutter API, making it more robust
-fixed a dupe bug
2023-11-25 23:52:04 +00:00
the-real-herowl b252e577ec Implement recipe registering API 2023-11-25 23:52:04 +00:00
ChrisPHP 12568a6749 use on_destruct instead of after dig node 2023-11-25 23:52:04 +00:00
ChrisPHP 559f500322 Update readme for stonecutter 2023-11-25 23:52:04 +00:00
ChrisPHP 40fb043de2 Add stage so smooth items can't be reverted 2023-11-25 23:52:04 +00:00
ChrisPHP 5dda3033a5 Prevent input from being a selectable option 2023-11-25 23:52:04 +00:00
ChrisPHP 524c9c1bcc Dupe glitch fizes and remove item label 2023-11-25 23:52:04 +00:00
ChrisPHP a9f26fb354 use item groups to determine the cuttable items 2023-11-25 23:52:04 +00:00
ChrisPHP 01d43bb33a Remove unused meta on drop items 2023-11-25 23:52:04 +00:00
ChrisPHP ca37ce5744 Remove hardcoded one element array 2023-11-25 23:52:04 +00:00
ChrisPHP 5f0ad98dae Use node group for items that can be used in the stonecutter 2023-11-25 23:52:04 +00:00
ChrisPHP 0e60231c2e Only reset output if input is empty 2023-11-25 23:52:04 +00:00
ChrisPHP 7fcc2e3be3 Minor output fixes 2023-11-25 23:52:04 +00:00
ChrisPHP 356045b3e3 Add comments and drop items when destroyed 2023-11-25 23:52:04 +00:00
ChrisPHP 07d2759ae4 Check if item is a slab or not 2023-11-25 23:52:04 +00:00
ChrisPHP 9da07af370 Check if item can be made into stairs, slabs and walls 2023-11-25 23:52:04 +00:00
ChrisPHP 47990eec2b begin adding check if item canbe cut 2023-11-25 23:52:04 +00:00
ChrisPHP 7523727521 take output from stonecutter 2023-11-25 23:52:04 +00:00
ChrisPHP 2af08c3188 clear formspec on taking input item 2023-11-25 23:52:04 +00:00
ChrisPHP 45532ebe6d Add gui to list craft recipes for some stones 2023-11-25 23:52:04 +00:00
3raven 86da47b922 French translation update (#4006)
Update french translation, add missing chain, fix typo

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4006
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Co-authored-by: 3raven <3raven@noreply.git.minetest.land>
Co-committed-by: 3raven <3raven@noreply.git.minetest.land>
2023-11-25 01:08:06 +00:00
Eliy21 7cbba73d50 Combat (mostly PvE) rebalancing (#4005)
-Added short mob invulnerability time after being hit
-Added separate shorter range for hitting mobs (as opposed to node interaction)
-Reworked mob knockback
-Slowed down natural health regeneration from saturation
-Added a setting for the saturation health regen speed

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4005
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-11-23 00:32:23 +00:00
José M 4df6f82c64 Fix spanish translation errors (#4018)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4018
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: José M <dr.cabra@disroot.org>
Co-committed-by: José M <dr.cabra@disroot.org>
2023-11-18 22:20:02 +00:00
chmodsayshello 6ee2dbe70c Add MineCraft like sleeping player hud (#4011)
This adds a sleeping hud/actionbar that'll be displayed to players currently not sleeping.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4011
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: chmodsayshello <chmodsayshello@hotmail.com>
Co-committed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-11-18 21:21:17 +00:00
the-real-herowl 613ab897b2 Merge pull request 'Fix item not dropping at tool last use' (#4009) from tool_destruction into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4009
2023-11-18 01:32:01 +00:00
the-real-herowl e53d9ec8d7 Added comments 2023-11-18 02:31:07 +01:00
Mikita Wiśniewski a764818e13 Add a new 'pumpkin' group (#4012)
Creates a new 'pumpkin' group, which combines Pumpkin, Faceless Pumkin and Jack o'Lantern under a shared category. This helps tidy up the mesecons_noteblock code a bit, and possibly other mods too.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4012
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-committed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
2023-11-14 15:35:30 +00:00
the-real-herowl 378b8f8f6c Fix item not dropping at tool last use 2023-11-13 13:35:12 +01:00
Aliaksei Urbanski 32ef89aca3 Fix minor README's imperfections (#4001)
I've prepared some minor changes for `README`s.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4001
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Aliaksei Urbanski <aliaksei.urbanski@gmail.com>
Co-committed-by: Aliaksei Urbanski <aliaksei.urbanski@gmail.com>
2023-11-11 21:01:45 +00:00
the-real-herowl accb8742dd Merge pull request 'Make golem go home. Fixes #3288' (#3929) from golem_nav into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3929
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-11-06 22:31:43 +00:00
codiac 71282e196e Move mob nav hacks to Experimental 2023-11-06 22:46:04 +01:00
codiac 89c97690c8 Add a setting to enable mod nav hacks 2023-11-06 22:01:31 +01:00
codiac 06f9486e4d Do not go home if attacking 2023-11-06 21:59:40 +01:00
codiac ae5564e658 Make golem go home. Fixes #3288 2023-11-06 21:59:40 +01:00
the-real-herowl fdf823fff6 Merge pull request 'Update trapdoor climbable behavior' (#3938) from Dehydrate6684/MineClone2:trapdoor-ladder into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3938
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-11-06 20:29:23 +00:00
Araca 52b65554d9 Do not output enchanted item if enchantment is impossible (#3998)
To Fix #3672 , I avoid displaying the output item if enchantment is not possible for various reason
* Level of added enchantment is below the one from input item
* Incompatible enchantment

Co-authored-by: Araca <>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3998
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Araca <araca.prod@gmail.com>
Co-committed-by: Araca <araca.prod@gmail.com>
2023-11-06 20:12:36 +00:00
the-real-herowl 5a069af072 Merge pull request 'Piston-breakable nodes don't fill up the push limit, items properly drop' (#3813) from seventeenthShulker/MineClone2:piston_digs_properly into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3813
2023-11-06 19:50:31 +00:00
the-real-herowl 14f73a8c55 Merge pull request 'armor trim followup' (#3974) from trim_achievement into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3974
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-11-06 19:37:56 +00:00
the-real-herowl dbab70ea38 Fixed the wayfinder 2023-11-06 20:22:46 +01:00
chmodsayshello 952a96b57d fix leggings trim textures 2023-11-05 20:35:13 +01:00
Dehydrate6684 e5a260b563
Added vines and skulk vines to ladder group 2023-11-05 14:10:58 +08:00
Dehydrate6684 9b2b8ee56e
Removed direction checks 2023-11-05 14:06:53 +08:00
seventeenthShulker 00cfca5947 Make carpet sticky again 2023-11-04 16:01:46 +00:00
seventeenthShulker c37da143da Add crying obsidian and lodestone to mvps_stoppers 2023-11-04 16:01:46 +00:00
seventeenthShulker 520fd773fb Fix random crash when piston breaks node with no player 2023-11-04 16:01:46 +00:00
seventeenthShulker 378df76e5f Prevent signs from being replaced by pushed/pulled blocks 2023-11-04 16:01:46 +00:00
seventeenthShulker 3e12b3c700 Check protection of certain nodes before push/pull
- The node directly in front of a piston (including air)

- The 'final' position of any connected nodes
2023-11-04 16:01:46 +00:00
seventeenthShulker 0637182697 Tallgrass and dead bush added to dig_by_piston 2023-11-04 16:01:46 +00:00
seventeenthShulker 0580b14310 Vertical pistons now save owner meta 2023-11-04 16:01:46 +00:00
seventeenthShulker 98cf3b7f7a Check node_replaceable after dig_by_piston
Allows tallgrass, nether vines etc to drop
2023-11-04 16:01:46 +00:00
seventeenthShulker e5829f719d All signs are mvps_stopper upon registration
All buttons are mvps_unsticky upon registration
Add some missing unmovable nodes
Bamboo trapdoor is now sticky
2023-11-04 16:01:46 +00:00
seventeenthShulker 089e3d46f1 Several more blocks comply with MC piston mechanics. 2023-11-04 16:01:46 +00:00
seventeenthShulker 5d8688dbeb Change tall flowers to `buildable_to = false` 2023-11-04 16:01:46 +00:00
seventeenthShulker 058684f17f Improve dig_node simulation and fix duplication 2023-11-04 16:01:46 +00:00
seventeenthShulker 918b8eee38 Fix unsticky defs for shulker_box_small names (some did not exist) 2023-11-04 16:01:46 +00:00
seventeenthShulker af206ed8b3 All bamboo plant tiles can be broken with pistons 2023-11-04 16:01:46 +00:00
seventeenthShulker f2eca64e42 Blocks with dig_by_piston no longer fill up the push limit
Fix for broken nodes (e.g. sugar cane) not updating and leaving floating bits

Short-term fix for minetest.dig_node not always working (checking for group dig_immediate = 3)
2023-11-04 16:01:46 +00:00
the-real-herowl 262100be24 Fixed stew/bowl duplication bug (#3995)
Fixed #3991, copied some code over from mcl_potions

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3995
Co-authored-by: the-real-herowl <wiktor_t-i@proton.me>
Co-committed-by: the-real-herowl <wiktor_t-i@proton.me>
2023-11-03 22:39:21 +00:00
Eliy21 69dc013799 Prevent multiple chestboat drivers (#3992)
Fixes #3872

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3992
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-11-03 22:09:49 +00:00
Michieal a425d359f5 WaterLoggedRootsKelpFix (#3994)
Fixes #3990

A very simple fix to Kelp and the current water logged nodes. It adds the group "waterlogged" to water logged items and then puts a check for the group in kelp growth. Made it as a group, because eventually there will be other waterlogged nodes.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3994
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Michieal <michieal@noreply.git.minetest.land>
Co-committed-by: Michieal <michieal@noreply.git.minetest.land>
2023-11-03 21:46:00 +00:00
Freeman 83d6e2a5d2 polar bear fix typo (#3846)
horrizonatal -> horizontal

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3846
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Freeman <project@gnuhacker.org>
Co-committed-by: Freeman <project@gnuhacker.org>
2023-11-03 00:06:06 +00:00
FossFanatic ce403b9245 Rename Liquid Textures (#3758)
This pull request renames the textures of water and lava to more closely follow the MineClone 2 naming convention.

The code has also been changed to now reflect these new names.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3758
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2023-11-02 23:47:26 +00:00
Eliy21 da911bd4d4 Turn non-player boat passenger sideways (#3986)
Some low hanging simple boat fixes.

Fixes #3259

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3986
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
2023-11-02 19:24:52 +00:00
the-real-herowl 8789411ab7 Merge pull request 'Add ability for shovels to turn grass paths into dirt on shift+right click' (#3932) from add-dirty-shovel-function into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3932
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-11-02 19:03:47 +00:00
the-real-herowl 5b1deedaf0 Disabled grass path making when sneaking 2023-11-02 20:00:19 +01:00
SmokeyDope fa1d8dfc47 Adjust grass path long description to inform players of new way to turn paths back to dirt. 2023-11-02 17:34:01 +00:00
SmokeyDope d2a4a6d042 add group 'path_remove_possible' to grass paths 2023-11-02 17:34:01 +00:00
SmokeyDope 5e194b33bd Adjust make_grass_path function to let shovels turn grass paths back to dirt with shift+rightclick 2023-11-02 17:34:01 +00:00
Araca 35bb569ee1 make craft guide search use local language (#3984)
Fix #3909

It is now possible to search in the crafting guide using both item id ("name", usually related to the English name) and translated item description (containing the displayed in-game name).

Co-authored-by: Araca <>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3984
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Araca <araca.prod@gmail.com>
Co-committed-by: Araca <araca.prod@gmail.com>
2023-10-31 10:00:58 +00:00
chmodsayshello 5be506830f make diamond tools upgradeable again 2023-10-25 18:04:32 +02:00
codiac 4fcd1ae541 Fix slime spawn crash (#3977)
Declare global variables before using them!

Fixes #3975

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3977
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: codiac <codiac@inbox.lv>
Co-committed-by: codiac <codiac@inbox.lv>
2023-10-23 05:32:18 +00:00
the-real-herowl f941817c39 Merge pull request 'Un-hardcode blast resistance and hardness of fences and walls' (#3943) from wood_fence_blast_resistance into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3943
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-10-22 02:24:28 +00:00
seventeenthShulker bc3bde4cf8 Forgot about blackstone 2023-10-22 02:14:17 +00:00
seventeenthShulker 8099a4bd17 Walls use `source` parameter for default hardness and blast resistance
If no `source` given, fallbacks are 2 and 6 respectively
2023-10-22 02:14:17 +00:00
seventeenthShulker e2ed1ab4a6 Fix prismarine bricks and dark variant blast res.
Should be 6 like regular prismarine
2023-10-22 02:14:17 +00:00
seventeenthShulker e43a8e267d Un-hardcode blast resistance, hardness for walls,
now only based on their material
2023-10-22 02:14:17 +00:00
seventeenthShulker 570caf47eb All wood-type and nether-type fences now match material's blast resistance 2023-10-22 02:14:17 +00:00
the-real-herowl 59f3b53a51 Merge pull request 'Use MC 1.18+ light levels to control mob spawning' (#3946) from spawn_lighting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3946
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-10-22 01:35:00 +00:00
chmodsayshello ec7e99019e add trim advancements 2023-10-21 22:25:30 +02:00
Dehydrate6684 b320d008ca
Unhardcoded nil 2023-10-18 08:04:54 +08:00
Nils Dagsson Moskopp aad231f5e4
Generate test textures with scanline order “top-bottom” 2023-10-16 21:40:51 +02:00
Nils Dagsson Moskopp 10022c93ef
Explicitly state scanline order in test texture script 2023-10-16 21:38:19 +02:00
Nils Dagsson Moskopp 01bcbbf927
Allow encoding with top-bottom scanline order 2023-10-16 21:15:40 +02:00
Nils Dagsson Moskopp 12a33e458f
Add hashbang to script to generate TGA test textures 2023-10-16 20:34:47 +02:00
Nils Dagsson Moskopp 5dcf714cd1
Partially slice 3D rendered donut along its polodial direction 2023-10-16 19:20:30 +02:00
Nils Dagsson Moskopp 0c6d9a4d85
Partially slice 3D rendered donut along its torodial direction 2023-10-16 19:16:29 +02:00
Nils Dagsson Moskopp ef65de54c0
Make 3D rendered donut appear solid 2023-10-16 19:05:56 +02:00
the-real-herowl 3d7155c1b9 Merge pull request 'Raise player eye height to 1.6 blocks.' (#3967) from Dark/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3967
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-10-16 16:41:18 +00:00
chmodsayshello e3ab94809e Merge pull request 'Fixed a crash in minetest vector code that isn't propogated to lua.' (#3966) from fix_rotate_around_axis_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3966
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-10-16 12:21:56 +00:00
Dark a66be39d9b Raise player eye height to 1.6 blocks.
This is the same as in Minecraft. The previous value of 1.5 can feel very strange for those coming from that game.
2023-10-16 00:15:12 +00:00
ancientmarinerdev 3564f6ebde Fixed a crash in minetest vector code that isn't propogated to lua. Create util for ease of use. 2023-10-15 22:03:48 +01:00
chmodsayshello f99ae93bf6 Merge pull request 'fix crash when opening a chest that has an unknow node on it' (#3964) from pepebotella/MineClone2:chest-under-unknow into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3964
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-10-15 19:21:10 +00:00
Nils Dagsson Moskopp 4d57ba62bf
Add code to generate TGA type 1 test textures 2023-10-15 20:49:11 +02:00
Nils Dagsson Moskopp 4064333b06
Adjust TGA test texture file names 2023-10-15 20:11:28 +02:00
Nils Dagsson Moskopp e87a8fc332
Add script to generate TGA test textures 2023-10-15 17:02:19 +02:00
Freeman 8d440252a4 fix crash when opening a chest that has an unknow node on it
fix #3961
2023-10-13 21:07:00 +02:00
the-real-herowl d706833f21 Merge pull request 'Wither finishing & effect fixes' (#3957) from the-real-herowl/MineClone2:wither into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3957
2023-10-11 20:46:24 +00:00
the-real-herowl c874e01cf9 Wither falling when no target found and small fixes 2023-10-11 00:54:31 +00:00
the-real-herowl 7ce82b9dcb Peaceful crash fixed 2023-10-11 00:54:31 +00:00
the-real-herowl 645072507f Wither melee attack and bug fixes 2023-10-11 00:54:31 +00:00
the-real-herowl 924a6c1c47 Settings-related fixes
-moved to the cleaner way of obtaining settings values
-disabled the anti-troll measures by default
-made the wither per-dimension limit dependent on the settings
-(anti-troll measures enabled required for wither counting and limit)
2023-10-11 00:54:31 +00:00
the-real-herowl 20b0f0748d Added some comments to the code 2023-10-11 00:54:31 +00:00
the-real-herowl d7c76e33d8 Tiny adjustments
- wither initial explosion radius moved from a magic value into a local variable
- wither initial explosion radius reduced
- wither attack_exception improved to better handle unlikely edge cases
2023-10-11 00:54:31 +00:00
the-real-herowl 966712f4ff Optimisation and cleanup
-optimised and cleaned up wither rose withering effect code
-removed unused code
2023-10-11 00:54:31 +00:00
the-real-herowl e4102e6124 Implemented wither defensive measures
Added block breaking when hit, or a safe_boom when hit and mobs_griefing
is disabled. Removed dubious anti-troll measures.
2023-10-11 00:54:31 +00:00
the-real-herowl 17c8f220e6 A few more wither fixes 2023-10-11 00:54:31 +00:00
the-real-herowl df17688b7d Great batch of improvements 2023-10-11 00:54:31 +00:00
the-real-herowl 729d8ec9e0 Another batch of wither adjustments 2023-10-11 00:54:31 +00:00
the-real-herowl c9dc12b081 Further wither adjustments 2023-10-11 00:54:31 +00:00
Nauta Turbidus a1b6819756 Withering effect and effect immunities
Added withering effect and immunities to effects.

Signed-off-by: Nauta Turbidus <88062389+nauta-turbidus@users.noreply.github.com>
2023-10-11 00:54:31 +00:00
the-real-herowl f1568483b3 Merge pull request 'Keep axolotls from attacking sheep' (#3963) from ThePython10110/MineClone2:axolotl-sheep into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3963
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-10-11 00:50:12 +00:00
ThePython10110 d7fa24ebf8 Keep axolotls from attacking sheep 2023-10-10 23:50:46 +00:00
Dehydrate6684 23468cc2dd
Used vector.offset instead of add/subtract 2023-10-10 09:39:16 +08:00
Dehydrate6684 0c48a46f7c
Updated code based on reviews 2023-10-09 13:55:08 +08:00
chmodsayshello 712a6d6c66 Merge pull request 'add 1.20 armor trims' (#3784) from armor_trims into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3784
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-10-03 21:46:00 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a620d24ec8 Fix a number of crashes involving unknown nodes, also fix fishbuckets on_place (#3914)
Fixes: #3913 #3915

~~You can reproduce the crash by placing a fish bucket on top snow above an unknown node.

I also noticed that the code always uses pointed_thing.above so I fixed that and also added a function to mcl_utils to figure out where a node should be placed (either above or below). Looks like the rest of the code could also use improvement but at least it does not crash now.~~

Cora fixed a bunch of related crashes in Mineclona so I am replacing my commit and cherry picking all her commits here.
https://codeberg.org/mineclonia/mineclonia/pulls/549

Here is the list of fixes from that PR:
- Crash when placing snow layer on unknown nodes
- Crash when snow layers on unknown nodes are flooded
- Crash when placing fishbucket on snow on top of unknown nodes
- Crash when placing chorus flower and stem on unknown
- Crash when placing mob spawners on unknown
- The fishbucket on place to actually replace buildable_to

Co-authored-by: cora <coradelamouche@gmx.ch>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3914
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Co-committed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-09-29 18:47:07 +00:00
ancientmarinerdev 178b24886f Merge pull request 'mcl_oxidation: typo in README.' (#3910) from mdk/MineClone2:typo into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3910
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-29 18:41:27 +00:00
ancientmarinerdev 8333281b4f Merge pull request 'Halved the creeper explosion timer reset radius' (#3808) from reduce-explosiontimer_reset_radius into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3808
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-29 18:36:28 +00:00
Nicu 6d3e55ce12 Reduced the creeper explosion timer reset radius from 6 to 3
This gives the player just enough time to get out of the creeper's range, to reset their explosion timer and avoid unnecessary destruction.
2023-09-29 18:35:21 +00:00
ancientmarinerdev 2c2f5595f3 Merge pull request 'Add Setting to keep respawn location set if bed is destroyed.' (#3933) from Eliy21/MineClone2:no_bed_respawn_setting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3933
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-09-29 18:29:31 +00:00
chmodsayshello 8936313fb3 proper itemslot background
redo of 904cd78d3f ; caused some issues after cherry pick, same texture
2023-09-29 16:59:45 +02:00
ancientmarinerdev c51442704c Merge pull request 'mcl_skins: link to official mcl_custom_skins' (#3954) from skins into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3954
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-28 19:43:24 +00:00
Johannes Fritz 2bd6678b08 mcl_skins: link to official mcl_custom_skins 2023-09-28 13:09:45 -05:00
Codiac e0c44244f9 Merge pull request 'Point mcl_custom_skins link to a working URL' (#3949) from Montandalar/MineClone2:fix_url_mcl_custom_skins into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3949
Reviewed-by: Codiac <codiac@noreply.git.minetest.land>
2023-09-28 10:40:03 +00:00
Codiac 5b7352a23a Merge pull request 'Fix Server crash (Issue #3939)' (#3947) from Michieal/MineClone2_For_PRs:Bamboo_Fix_PointedThing into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3947
Reviewed-by: Codiac <codiac@noreply.git.minetest.land>
2023-09-28 10:39:23 +00:00
Michieal e8c658658d Update Credits. 2023-09-26 18:59:51 +00:00
Michieal e9d994b74d Fix Campifires API to not crash the server.
Fixed the error in Campfires' On_RightClick() to not error out when called with a non-existent pointed_thing.
2023-09-26 18:57:17 +00:00
Michieal eafe6627d8 Extra checks placed in. 2023-09-26 18:35:12 +00:00
chmodsayshello 4046a68fbf Add trim snippet 2023-09-26 20:24:54 +02:00
Blockhead 882c3ef339 Point mcl_custom_skins link to a working URL 2023-09-25 19:55:36 +10:00
Nils Dagsson Moskopp bb68ceb38d
Do not encode images with illegal colormap indexes 2023-09-22 20:06:21 +02:00
codiac 95db118361 Add rules for blaze, wither skeleton, silverfish 2023-09-22 09:09:35 +10:00
codiac d2d7887e0f Handle bat and slime light checks 2023-09-21 14:53:32 +10:00
Michieal b2ebcf5d4f Readme Change
Putting my name back into the credits in the mod.
2023-09-20 06:07:13 +00:00
Michieal f57220f784 Fix Server crash (Issue ##3939)
Fixes the error of pointed_thing being nil (null) by first checking to see if it exists, and if not, exit the on_place call back.
2023-09-20 05:57:49 +00:00
codiac 7577d37b38 Clarify MC version for lighting 2023-09-20 15:56:27 +10:00
codiac bf4c7e1913 Allow non monsters spawns too 2023-09-20 09:24:51 +10:00
codiac 11e3674926 Use MC 1.18 light levels to control mob spawning 2023-09-19 11:18:40 +10:00
Nils Dagsson Moskopp 4dd3833f3b
Move encoding format heuristics from image:save() to image:encode() 2023-09-18 16:45:31 +02:00
Nils Dagsson Moskopp 3029147ed7
Add example code for rendering a 3D shape using a Z-buffer 2023-09-18 15:21:17 +02:00
Dehydrate6684 cc217d0089
Removed unnessary node definitions 2023-09-17 17:13:50 +08:00
Dehydrate6684 e6653b78ee
Added directional checks 2023-09-17 17:04:24 +08:00
Dehydrate6684 a960bf2e8e
Update trapdoor climbable behavior 2023-09-16 13:16:49 +08:00
Eliy21 2d9bffaa43 Update settingtypes.txt
Add the no bed respawn in settings
2023-09-11 19:42:04 +00:00
Eliy21 eb658a4996 Update mods/PLAYER/mcl_spawn/init.lua
Add if then condition for no bed/anchor respawn settings
2023-09-11 19:38:33 +00:00
ancientmarinerdev b4c693bb20 Merge pull request 'Campfire Updates' (#3769) from campfire_update into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3769
2023-09-04 22:20:48 +00:00
ancientmarinerdev bd46428d65 Updated credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev 9e53efbc3e Fix campfire smoke timing 2023-09-04 22:05:38 +00:00
ancientmarinerdev 6b36abfe91 Fix credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev 49e7449d7f Implement feedback and add credit 2023-09-04 22:05:38 +00:00
ancientmarinerdev 1d28a8e4ac Convert campfire particle spawning from ABM to particle spawner 2023-09-04 22:05:38 +00:00
Wbjitscool c32e88e910 Add better smoke particles 2023-09-04 22:05:38 +00:00
thunder1035 969fa98f18 Update campfire model and textures 2023-09-04 22:05:38 +00:00
PrairieWind 107420c80f Offset smoke a bit 2023-09-04 22:05:38 +00:00
PrairieWind f9afc74077 Add changes to campfires from feedback 2023-09-04 22:05:38 +00:00
PrairieWind 21f0c7750b Throw experience points after food is cooked 2023-09-04 22:05:38 +00:00
PrairieWind 04b59b2190 Campfires are unaffected by pistons 2023-09-04 22:05:38 +00:00
PrairieWind 15bb4fa4bf Players don't take burn damage when they have fire resistance potion in use, or frost walker boots
Entities seem to not burn anymore, and I am not sure why.
2023-09-04 22:05:38 +00:00
PrairieWind 4c3e521779 Fix campfire drops to work correctly with creative and silk touch 2023-09-04 22:05:38 +00:00
DinoNuggies4665 4c59b189dd changed line 82 to vector.new(), and refactored setting food wield item (wield_image doesn't matter) 2023-09-04 22:05:38 +00:00
PrairieWind 23d6c3d17b Update campfire rightclick and smothering 2023-09-04 22:05:38 +00:00
DinoNuggies4665 61f489e71f Food entities don't turn back to mutton when leaving a re-joining now 2023-09-04 22:05:38 +00:00
DinoNuggies4665 4616b6c3ec The food is now oriented the right direction when on the cooking on the campfire, and food entities are removed when the campfire is destroyed, still doesn't drop items though 2023-09-04 22:05:38 +00:00
DinoNuggies4665 d92296712c Fixed crash when standing on campfire whilst food is cooking 2023-09-04 22:05:38 +00:00
DinoNuggies4665 5b212dd3fe Made food entities local to evcery campfire, and made one food entity that works for all foods 2023-09-04 22:05:38 +00:00
PrairieWind d3095fea57 Update ignition, smothering, and campfire inventory drops
Bonus fix for grass path creation sound traveling across the entire server
2023-09-04 22:05:38 +00:00
DinoNuggies4665 177196a8d2 modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_fishing/init.lua
	modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665 13d4841097 A couple of fixes 2023-09-04 22:05:38 +00:00
DinoNuggies4665 0b7cec419a Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
DinoNuggies4665 cef6c72a71 modified: mods/ITEMS/mcl_campfires/mod.conf 2023-09-04 22:05:38 +00:00
DinoNuggies4665 aca82fcafc modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665 a7fcd62999 Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
PrairieWind d489c954f5 Campfires make big smoke
Smells like carcenogens, yum
2023-09-04 22:05:38 +00:00
PrairieWind 8b0097df71 Make campfires cook items 2023-09-04 22:05:38 +00:00
ancientmarinerdev cb407666a4 Merge pull request 'Ensure creepers work by raycast line of sight' (#3905) from raycast_creeper_sight into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3905
2023-09-03 22:14:41 +00:00
ancientmarinerdev 969a08b7be Clean up 2023-09-03 22:02:34 +00:00
ancientmarinerdev 1749712318 Change creepers line of sight check to raycast and do it from eyes to targets feet and head 2023-09-03 22:02:34 +00:00
ancientmarinerdev a648e53699 Merge pull request 'Import villager trade changes by Alessandra_Lozoya' (#3854) from Codiac/MineClone2:trades into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3854
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-02 15:44:13 +00:00
Julien Palard 878480d010
mcl_oxidation: typo in README. 2023-09-02 15:18:30 +02:00
ancientmarinerdev b0208e622b Merge pull request 'Fix cherry chest boat inv texture' (#3865) from cherry_boat into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3865
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-09-02 10:01:20 +00:00
Johannes Fritz 8c41fb53e3 Fix cherry chest boat inv texture 2023-09-02 10:00:31 +00:00
chmodsayshello 408c7f71da Merge pull request 'Update Russian translation' (#3896) from Nanashi_Mumei/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3896
Reviewed-by: rudzik8
2023-09-02 08:25:43 +00:00
Sab Pyrope 8b7a71f93e Update Russian translation. Fix 1. 2023-09-02 15:51:49 +08:00
Codiac 98e7cd6e8e Merge branch 'master' into trades 2023-09-02 04:15:42 +00:00
ancientmarinerdev 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
ancientmarinerdev 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
SmokeyDope b911f99d23 fix barrel sound code for proper max hear distance 2023-08-31 22:55:21 +00:00
ancientmarinerdev 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
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
chmodsayshello 49bd28e109 add/remove comments 2023-08-31 18:16:34 +02:00
chmodsayshello 6c107ce990 fix for enchanted items 2023-08-31 17:59:46 +02:00
chmodsayshello 7c43c15fda update loottables 2023-08-31 17:17:38 +02:00
Sab Pyrope 5b4a79a26d Update russian translation 2023-08-31 14:16:42 +08:00
chmodsayshello 291cbaf434 move armor trim license info to LEGAL.md 2023-08-28 18:48:37 +02:00
chmodsayshello fb74689f3d resolve merge conflicts 2023-08-28 16:47:31 +02:00
chmodsayshello da024bb4b8 move mcl_armor_trims to mcl_armor 2023-08-28 15:09:48 +02: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
chmodsayshello 2f8bb9726b meta based: proof of concept 2023-08-27 21:44:43 +02:00
chmodsayshello 8176e7319f update 'armor trim credits' 2023-08-27 19:42:40 +02:00
Nils Dagsson Moskopp 5bf0e79c6f
Add example code to generate TGA logo
The tiny logo is a 12×12 TGA image.
The huge logo is a 1200×1200 TGA image.
2023-08-27 15:12:47 +02:00
AFCMS 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
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 438998de6a
Remove unused files 2023-08-19 18:06:34 +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
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
chmodsayshello 6e29ae5c6c minor enhancement to texture documentation 2023-06-29 17:56:19 +00:00
ancientmarinerdev 39b614a038 Implement review feedback 2023-06-29 17:56:19 +00:00
ancientmarinerdev eded3b8dc4 Fix typo 2023-06-29 17:56:19 +00:00
ancientmarinerdev f4e84b9091 Update readme files etc. 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
ancientmarinerdev 543720d9a7 Re-organise categories 2023-06-29 17:56:19 +00:00
ancientmarinerdev 90a6fb8925 Pre-release update credits - 0.84 2023-06-29 17:56:19 +00:00
ancientmarinerdev 823f7ee5c7 Merge pull request 'Fix hopper cart crash' (#3821) from fix_cart_hopper_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3821
2023-06-28 20:35:37 +00:00
ancientmarinerdev fe501e8021 Change bug fix so that loop carries on processing other items if first one is the issue. 2023-06-28 20:19:49 +00:00
ancientmarinerdev b05fa5562c Fix crash in hopper minecarts through missing ent 2023-06-28 20:19:49 +00:00
Isaac Dennis 75a31a2106
Fix malformed line and missing part of translation 2023-06-27 21:44:43 -03:00
Isaac Dennis 86cbca1d17
Fix placeholders 2023-06-27 21:42:23 -03:00
ancientmarinerdev f335171965 Merge pull request 'Danish translations fix (Work by kbundg)' (#3823) from danish_translations_conflict into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3823
2023-06-27 21:17:48 +00:00
ancientmarinerdev 8530f4d863 Remove file without translations in so it reverts to English 2023-06-27 21:09:03 +00:00
Kristian d4e348a4bd TOM bøger 2023-06-27 21:09:03 +00:00
Kristian 590cbc0c3c Banners done 2023-06-27 21:09:03 +00:00
Kristian 6d767b7d11 Indtil banner 2023-06-27 21:09:03 +00:00
Kristian 7ba0773769 Skift til items. TOM ambolt. 2023-06-27 21:09:03 +00:00
Kristian 0f82364b3e TOM docs_items 2023-06-27 21:09:03 +00:00
Kristian 49a899170f TOM doc/doc 2023-06-27 21:09:03 +00:00
Kristian b8887b079a TOM doc/doc 2023-06-27 21:09:03 +00:00
Kristian 9c77cbc011 TOM Mobs 2023-06-27 21:09:03 +00:00
Kristian cc21b74125 Three fully translated 2023-06-27 21:09:03 +00:00
ancientmarinerdev 5c69daf5ba Merge pull request 'Add Spanish Translations' (#3817) from spanish-translations into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3817
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-06-27 20:43:40 +00:00
José Muñoz 09732acf77 Improve the translation 2023-06-27 20:39:27 +00:00
José Muñoz 008dd95f1f Add spanish translation 2023-06-27 20:39:27 +00:00
José Muñoz f6fb1d1121 Fix a typo 2023-06-27 20:39:27 +00:00
José Muñoz c61df75370 Add spanish translations 2023-06-27 20:39:27 +00:00
PrairieWind 158a5311f9 Merge pull request 'Fix gilded blackstone fortune dupe' (#3804) from gilded_blackstone_dupefix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3804
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-06-27 04:09:44 +00:00
cora d0e981e4db Fix gilded blackstone fortune dupe 2023-06-26 22:08:18 -06:00
PrairieWind 70caacd369 Merge pull request 'Cherry Blossoms' (#3749) from cherry_blossom into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3749
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-06-27 03:58:31 +00:00
ancientmarinerdev 03341ade2e Added underscore in to cherry sign registration to ensure consistent with other signs 2023-06-25 17:49:52 +01:00
ancientmarinerdev 3c4fb9abb2 Ensure dark oak has separate tt message 2023-06-25 16:37:02 +00:00
ancientmarinerdev 852c2c5710 Remove message about missing name is deprecated in mod conf files 2023-06-25 16:37:02 +00:00
ancientmarinerdev 1dfbd612be Remove warning for use of global variable and set default tt_help message 2023-06-25 16:37:02 +00:00
Wbjitscool 81569a6917 Add remaining cherry door textures 2023-06-25 16:37:02 +00:00
PrairieWind 17371ad60b Cherry blossom changes as requested 2023-06-25 16:37:02 +00:00
Nicu 36f5372fe8 OptiPNG the cherry blossom textures 2023-06-25 16:37:02 +00:00
PrairieWind 0902e137e3 Uncover wood api functions and use them in cherry and mangrove wood 2023-06-25 16:37:02 +00:00
PrairieWind 67078ba3b1 Fix most of the feedback issues in cherry blossoms 2023-06-25 16:37:02 +00:00
PrairieWind da71e7b521 Add cherry boat 2023-06-25 16:37:02 +00:00
PrairieWind 960f9adda8 Add Remaining cherry nodes, textures, and cherry particles 2023-06-25 16:37:02 +00:00
PrairieWind 74742f7fc8 Add cherry sapling to dungeon loot temporarily 2023-06-25 16:37:02 +00:00
PrairieWind c5c35ca786 Add Cherry Blossom Trees and Growth 2023-06-25 16:37:02 +00:00
PrairieWind bba440b617 Move textures out of the mcl_cherry_blossom mod 2023-06-25 16:37:02 +00:00
PrairieWind 101cde2a94 First cherry blossom commit 2023-06-25 16:37:02 +00:00
ancientmarinerdev 0f8b709677 Merge pull request 'Nerf skeleton attack' (#3811) from nerf_skellie_attack into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3811
2023-06-25 12:03:29 +00:00
ancientmarinerdev dd5d1dad29 Nerf skeleton attack 2023-06-25 11:52:02 +00:00
chmodsayshello 378b413986 Merge pull request 'OptiPNG a bunch of textures' (#3816) from optimize_textures into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3816
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-06-25 08:26:42 +00:00
ancientmarinerdev a286cb5046 Merge pull request 'Fix automated wool farm crash and elytra fly over unknown block crash' (#3809) from fix_unknown_block_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3809
2023-06-21 20:53:32 +00:00
ancientmarinerdev 8b9b4b00e5 Fix elytra crash when flying over unknown node 2023-06-21 20:47:54 +00:00
ancientmarinerdev 7d51519f4d Fix wool farm crash 2023-06-21 20:47:54 +00:00
ancientmarinerdev 088f8dec2f Fix server crash for unknown node below. 2023-06-21 20:47:54 +00:00
ancientmarinerdev 5806dd6017 Merge pull request 'Creeper should not walk to player if it does not have line of sight. Mob shouldn't look at player it does not have line of sight to.' (#3807) from line_of_sight_improvement into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3807
2023-06-21 20:22:24 +00:00
ancientmarinerdev 658f244ae4 Creeper should not walk to player if it does not have line of sight. Mob shouldn't look at player it does not have line of sight to. 2023-06-21 20:17:49 +00:00
PrairieWind ed13590bb0 OptiPNG a bunch of textures 2023-06-21 11:24:53 -06:00
ancientmarinerdev 23711950c1 Merge pull request 'Fix tab character in filename' (#3815) from fix_tab_in_file_name into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3815
2023-06-21 14:05:11 +00:00
ancientmarinerdev baf6ae65e7 Fix tab character in filename 2023-06-21 15:03:39 +01:00
chmodsayshello 9ba503f99d Merge pull request 'Updated optipng command to remove metadata' (#3806) from update-TEXTURES.md-optipng into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3806
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-06-21 10:19:57 +00:00
chmodsayshello 9d1840f4ca fix crash (no longer allow blacklisted items) 2023-06-21 12:15:41 +02:00
chmodsayshello 5cc9038169 reduce texture filesize (again) 2023-06-21 11:51:03 +02:00
chmodsayshello 460ef23b50 make upgrade_trimmed global 2023-06-21 11:49:21 +02:00
chmodsayshello 1e16647fe9 various codestyle fixes 2023-06-21 11:21:39 +02:00
chmodsayshello 16415ae577 bring back old global function 2023-06-21 10:57:50 +02:00
chmodsayshello 2665980007 add ':' to modname once 2023-06-21 10:53:41 +02:00
ancientmarinerdev 8c8b3be0f5 Merge pull request 'prevent ALL furnaces from being moved' (#3810) from fix_xp_piston_duper into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3810
2023-06-19 23:07:06 +00:00
chmodsayshello 75d6509c3e prevent ALL furnaces from being moved 2023-06-20 00:02:03 +01:00
Temak f7f8a72d08 Update russian translation (#3519)
Update russian translation by Temak

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3519
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Temak <artemkotlubai@yandex.ru>
Co-committed-by: Temak <artemkotlubai@yandex.ru>
2023-06-19 21:54:51 +00:00
Niterux 766c9efe33 Add more fishing sounds! (#3800)
Go fishing with the fishing rod, and enjoy the sounds

Co-authored-by: Niterux <parkerdec@gmail.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3800
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: Niterux <parkerp1ggypc@gmail.com>
Co-committed-by: Niterux <parkerp1ggypc@gmail.com>
2023-06-19 11:49:58 +00:00
ancientmarinerdev 52fba55910 Merge pull request 'Fix texture modifiers relying on undocumented behavior' (#3761) from appgurueu/MineClone2:fix-textures into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3761
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-06-18 17:56:58 +00:00
Nicu 358432c52a Updated optipng command to remove metadata
Added  "-strip all" to also remove all metadata from
2023-06-18 16:54:30 +00:00
ancientmarinerdev 4a17c8abc1 Merge pull request 'Fix png start warning and double slab description warning.' (#3796) from fix_png_warning_start into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3796
2023-06-18 16:09:47 +00:00
ancientmarinerdev da19aceb06 Fix double slab default description warning. Should use default unless neccessary. Why warn? 2023-06-18 16:06:35 +00:00
ancientmarinerdev 67260b16be Fix asset error warning on startup. 2023-06-18 16:06:35 +00:00
chmodsayshello 7219f70d77 Merge pull request 'Prevent slime blocks from 'connecting' to honey blocks when pushing/pulling, like in Minecraft' (#3803) from seventeenthShulker/MineClone2:independent_stickies into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3803
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-06-17 18:26:55 +00:00
chmodsayshello bb2ce9ef92 pare down a few bytes from textures 2023-06-17 20:16:36 +02:00
seventeenthShulker 758d38894d Prevent slime blocks from 'connecting' to honey blocks when pushing/pulling, like in Minecraft. 2023-06-17 16:42:06 +02:00
ancientmarinerdev 1192a46b9c Merge pull request 'Adjust hot stuff achievement to use new lava bucket texture name' (#3783) from fix_hot_stuff_achievement_icon into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3783
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-06-13 17:21:36 +00:00
SmokeyDope fd07cbdd5a update lava bucket texture name in tools/Conversion_Table.csv 2023-06-13 15:49:57 +00:00
SmokeyDope b409610537 adjust lava bucket texture name in mcl_maps/colors.json 2023-06-13 15:49:57 +00:00
SmokeyDope deb703fbc2 Adjust hot stuff achievement to use new lava bucket texture name 2023-06-13 15:49:57 +00:00
FossFanatic ac31642ec9 Door Fixes & Improvements (#3479)
This pull request fixes the issue where people had to mirror their door textures because the game used a different method to texture the doors.

Speaking of mirrored, this pull request also fixes mirrored doors and improves those greatly.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3479
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2023-06-13 15:43:52 +00:00
chmodsayshello bc29e4dd95 fix texture filename 2023-06-08 10:41:49 +02:00
chmodsayshello b76ed92aba add missing rib_boots texture 2023-06-08 10:38:30 +02:00
chmodsayshello 703f1f46fc make slot names fit 2023-06-08 10:06:26 +02:00
chmodsayshello 0b118c170e armor trims: support smithing table 2023-06-08 10:02:00 +02:00
chmodsayshello 8431ac34d0 add armor trim templates 2023-06-08 00:16:57 +02:00
ancientmarinerdev f57f73681a Merge pull request 'Drop pumpkins, melons and buttons via piston or dirt next to piston' (#3777) from pumpkin_stuff into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3777
2023-06-07 21:21:43 +00:00
chmodsayshello 049128972f armor trim: more color transparency & creative inventory removal 2023-06-07 22:49:04 +02:00
chmodsayshello 0c65d9d11a add mcl_enchanting as hard dependency 2023-06-07 22:29:59 +02:00
chmodsayshello 311beeb31c fix enchanting of trimmed armor 2023-06-07 22:27:52 +02:00
ancientmarinerdev 60c996b5ac Drop pumpkins, melons and buttons via piston or dirt next to piston 2023-06-07 20:21:05 +00:00
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
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
ancientmarinerdev 6ded4d2322 Merge pull request 'Optimise mobs' (#3720) from optimise_mobs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3720
2023-05-15 14:03:54 +00:00
ancientmarinerdev 5a059379b2 Group damage logic. Remove physics falling logic out of suspend with duplicate falling call 2023-05-15 13:54:23 +00:00
ancientmarinerdev 952a90bfde Re-organise mob_step for better clarity 2023-05-15 13:54:23 +00:00
ancientmarinerdev f326fa620f Optimise do states and env danger check 2023-05-15 13:54:23 +00:00
ancientmarinerdev 3d1fb8cf4a Clean up and optimise falling 2023-05-15 13:54:23 +00:00
ancientmarinerdev 519b237ba8 Jumping check only called once per mob_step and refactor duplicate water danger, cliff fall logic 2023-05-15 13:54:23 +00:00
ancientmarinerdev 72c3f87925 Reduce excessive mob overhead 2023-05-15 13:54:23 +00:00
ancientmarinerdev 818052dc6c Fix mob textures getting reset on shutdown/startup 2023-05-15 13:54:23 +00:00
ancientmarinerdev b3a6970370 Merge pull request 'Remove zombie pigmen and ensure zombie piglin named correctly. Add Piglin description names.' (#3718) from zombie_piglin_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3718
2023-05-14 16:15:51 +00:00
ancientmarinerdev 53637bbc19 Group attack configured so that sword piglins and piglins will also respond to aggression on other piglins. 2023-05-14 15:56:26 +00:00
ancientmarinerdev 92a8f23d22 Fix creeper name 2023-05-14 15:56:26 +00:00
ancientmarinerdev 2d89440972 Fix Piglin naming and add localisation entries 2023-05-14 15:56:26 +00:00
ancientmarinerdev 92c0809dbe Remove zombie pigman file as no longer needed 2023-05-14 15:56:26 +00:00
ancientmarinerdev 530c8ec0da Remove zombie pigmen and ensure zombie piglin named correctly. Add Piglin description names. 2023-05-14 15:56:26 +00:00
ancientmarinerdev 47e26bbfe6 Merge pull request 'Lightning rod param2 is now saved upon being struck' (#3712) from lightning_rod_param_strike into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3712
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-14 11:54:06 +00:00
PrairieWind f019f4ae45 Lightning rod param2 is now saved upon being struck 2023-05-14 11:50:27 +00:00
FossFanatic 998983445b Rename Bucket Textures (#3708)
This pull request renames buckets so that they use the `mcl_` naming convention.

I originally was going to do some renaming on a bigger scope, but decided against it for now.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3708
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2023-05-14 11:41:39 +00:00
ancientmarinerdev 0a0bb3ff9a Merge pull request 'Remove Flower Forest Beaches from Wolf biome spawn list' (#3722) from wolf_flower_biome into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3722
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-05-12 22:57:10 +00:00
PrairieWind be32ffde6b Remove Flower Forest Beaches from Wolf biome spawn list 2023-05-12 22:50:33 +00:00
PrairieWind 0364c8d2a6 Merge pull request 'Piglins no longer aggro for enchanted gold armour' (#3713) from fix_piglin_gold_aggression into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3713
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-05-12 22:30:32 +00:00
ancientmarinerdev 3aed71fb85 Piglins no longer aggro for enchanted gold armour 2023-05-12 22:21:56 +00:00
PrairieWind 8a2c90406f Merge pull request 'Fix dropped out bamboo lines from translation work' (#3717) from bamboo_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3717
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-05-12 22:16:42 +00:00
ancientmarinerdev d42260cea3 Fix dropped out bamboo lines from translation work 2023-05-11 23:49:46 +01:00
3raven 9518d47662 (french) translation enhancements (#3643)
- Add missing translation
- Fix broken translations
- Fix unacurate description
- Correct/improve/change for cohesion french translation

Translations templates have been updated,other translations must be updated.

<!--
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: 3raven <elise_declerck@laposte.net>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3643
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Co-authored-by: 3raven <3raven@noreply.git.minetest.land>
Co-committed-by: 3raven <3raven@noreply.git.minetest.land>
2023-05-11 22:39:49 +00:00
ancientmarinerdev ede98cda80 Merge pull request 'Clean up crash code and convert to new style vectors' (#3703) from cleanup_crash_code into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3703
2023-05-11 19:25:20 +00:00
ancientmarinerdev 09619a62ee Clean up is_as_cliff code and convert to new style vector part 2 2023-05-11 20:22:49 +01:00
ancientmarinerdev 31e6e38013 Clean up is_as_cliff code and convert to new style vector 2023-05-11 20:22:49 +01:00
ancientmarinerdev 8092fd573c Cleanup self.acc code and convert to new style vectors 2023-05-11 20:22:19 +01:00
ancientmarinerdev 0185609b01 Merge pull request 'Reduce network activity for elytra flying rocket particles' (#3702) from optimisations_ely into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3702
2023-05-11 17:33:47 +00:00
ancientmarinerdev 7726e576f0 Remove oopsie 2023-05-11 17:30:28 +00:00
ancientmarinerdev d920441a01 Reduce network activity for elytra flying rocket particles 2023-05-11 17:30:28 +00:00
ancientmarinerdev c62694f9e4 Merge pull request 'Hoglins attack frequency reduced now due to new attack_frequency mob setting' (#3700) from hoglin_attack_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3700
2023-05-11 17:07:55 +00:00
ancientmarinerdev 39872f8ef6 Fix hoglin reach and view_range 2023-05-11 16:33:55 +00:00
ancientmarinerdev 0787d7a988 Remove duplicate code that has been moved. 2023-05-11 16:33:55 +00:00
ancientmarinerdev 8a771ebfce Allow adjustment of attack frequency. Reduce attack frequency of Hoglins. Move on_step and do_states functionality off of the attack timer on to their own timer. 2023-05-11 16:33:55 +00:00
megustanlosfrijoles d14c074d6c Add spanish translations (#3678)
I'm working on adding more translations. I made this pull request to let everyone now I'm working on this.

So far I've completed 1 file/mod

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3678
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-10 23:12:37 +00:00
ancientmarinerdev 42c70ee622 Merge pull request 'Fix sheep wool farm crash' (#3699) from redstone_sheep_shear_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3699
2023-05-10 22:41:11 +00:00
ancientmarinerdev ff426412ef Fix sheep wool farm crash 2023-05-10 22:37:55 +00:00
ancientmarinerdev 6151507442 Merge pull request 'Beds mesecons dependency incorrectly named' (#3704) from incorrect_dependency_name into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3704
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-05-09 23:36:43 +00:00
ancientmarinerdev 3785dcda48 Beds mesecons dependency incorrectly named 2023-05-09 23:34:07 +00:00
ancientmarinerdev 1694780d3f Merge pull request 'Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with.' (#3688) from despawn_refactor into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3688
2023-05-09 23:18:27 +00:00
ancientmarinerdev ea4ea3f05e Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with. 2023-05-09 22:24:40 +00:00
ancientmarinerdev 453e90741d Merge pull request 'Fix crash when parrot sits on shoulder' (#3696) from fix_parrot_rotation_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3696
2023-05-09 22:04:09 +00:00
ancientmarinerdev 6f75932a4b Fix crash when parrot sits on shoulder 2023-05-09 21:43:54 +00:00
ancientmarinerdev 2d00e1e203 Merge pull request 'Remove slimes from mushroom islands' (#3705) from fix_mushroom_island_spawn into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3705
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-05-09 21:33:00 +00:00
ancientmarinerdev 8b45cb2672 Remove slimes from mushroom islands 2023-05-09 14:56:51 +01:00
PrairieWind 848003de85 Merge pull request 'Fix crash when creeper explodes in minecart' (#3698) from creeper_in_mc_explosion_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3698
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-05-08 16:04:31 +00:00
ancientmarinerdev be8d9122ee Fix crash when creeper explodes in minecart 2023-05-07 21:11:48 +01:00
ancientmarinerdev 5507e99582 Merge pull request 'Hostile mobs should lose aggro if they cannot see their target' (#3682) from fix_mobs_aggressive_through_blocks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3682
2023-05-06 21:54:28 +00:00
ancientmarinerdev fb9a630a5b Hostile mobs should lose aggro if they cannot see their target 2023-05-06 21:51:47 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 10459f51b1 Merge pull request 'Clean-up mcl_bamboo code' (#3662) from bamboofix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3662
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-05 18:11:16 +00:00
Mikita Wiśniewski 387b79e582 Remove useless comments 2023-05-05 07:41:50 +07:00
Mikita Wiśniewski 21694879be Clean-up mcl_bamboo code
make it less dramatic ('Bamboo Door.') and fix inventory_image inconsistency with trapdoors
2023-05-05 07:41:50 +07:00
SmokeyDope 3b64ceb5b2 add barrel sounds (#3670)
This PR Adds sounds to opening and closing barrels. The sounds are properly attributed in the 'attribution.txt' file. They are published under Creative Commons 0 (CC0) and the source for them is [here](https://freesound.org/people/quantumriver/sounds/552153/)

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3670
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: SmokeyDope <smokey@tilde.team>
Co-committed-by: SmokeyDope <smokey@tilde.team>
2023-05-04 21:48:07 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 3e768c6a6f Merge pull request 'New sweet berry textures' (#3654) from sweet-berry-texture-change into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3654
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-02 18:54:57 +00:00
SmokeyDope 1448a5e098 Add new sweet berry textures 2023-05-02 13:46:37 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8ef653fb77 Merge pull request 'Fix issue with drops turning black due to clipping into walls and floors and visually demonstrate drops merging' (#3667) from fix_clipping_mining_drops into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3667
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-01 22:00:42 +00:00
ancientmarinerdev 938ee7a832 Pick highest y and kick it up a little for visual spice and to fix occassional drop falling into floor 2023-05-01 16:53:00 -05:00
ancientmarinerdev c48510244e Before merging same stacks, move to middle to show merging occurs. 2023-05-01 16:53:00 -05:00
ancientmarinerdev 52e64a6f75 Fix issue with drops turning black due to clipping into walls and floors 2023-05-01 16:53:00 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 0568c18081 Merge pull request 'Fix crash when using a named spawn egg' (#3674) from spawn_egg_name_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3674
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-05-01 17:29:08 +00:00
cora 13df9ec46c Fix crash when using a named spawn egg 2023-04-27 21:16:19 +00:00
ancientmarinerdev 2c01240a56 Merge pull request 'Make elytra enchantable and the enchanted elytra usable' (#3637) from elytra_enchantable into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3637
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-27 20:58:12 +00:00
PrairieWind b001e4e06f Make elytra active checks use groups instead
So that modders can easily add their own varients of elytra that work
2023-04-27 20:53:49 +00:00
FlamingRCCars 1a7f9fe8ec Make elytra enchantable 2023-04-27 20:53:49 +00:00
MrRar ec5b0903be Make enchanted elytra usable 2023-04-27 20:53:49 +00:00
megustanlosfrijoles 7dc09e3ebd Add spanish translations (#3659)
I just added some translations to Spanish that were missing

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3659
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
2023-04-27 19:50:10 +00:00
ancientmarinerdev 0d80f1126c Merge pull request 'Migrate beacons back to abm' (#3631) from beacon-abm into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3631
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-27 18:09:37 +00:00
ancientmarinerdev b15482012e Implement review feedback. 2023-04-27 18:05:44 +00:00
chmodsayshello a8c989edd8 don't get all objects in radius 2023-04-27 18:05:44 +00:00
chmodsayshello 1a1473e8c0 insert missing end 2023-04-27 18:05:44 +00:00
chmodsayshello 80cde37e65 remove empty lines and unneeded code 2023-04-27 18:05:44 +00:00
chmodsayshello 181cb73e45 remove commented out code 2023-04-27 18:05:44 +00:00
chmodsayshello 198eb630e1 replace globalstep with abm 2023-04-27 18:05:44 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6c99a63419 Merge pull request 'playerbound music toggle' (#3658) from playerMusicToggle into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3658
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-04-25 18:43:47 +00:00
chmodsayshello 5db1e1876c playerbound music toggle (between 94e554aa1a and 5481f0109c) 2023-04-25 17:24:17 +02:00
ancientmarinerdev 32a60c888b Merge pull request 'solar panels: No crash when minetest.get_natural_light() return nil' (#3640) from spanels into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3640
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-04-20 13:30:26 +00:00
Johannes Fritz cdb2bc20b0 solar panels: No crash when minetest.get_natural_light() return nil 2023-04-20 12:25:45 +00:00
ancientmarinerdev becf98875f Merge pull request 'Add global cooldown for the bed quick chat feature' (#3645) from bedantispam into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3645
2023-04-19 13:35:27 +00:00
ancientmarinerdev b374301ebf Throttle applies to default or custom sleep message 2023-04-19 13:25:42 +00:00
chmodsayshello 326e805798 update translation stuff 2023-04-19 13:25:42 +00:00
chmodsayshello 65aa185ffa global 'bed button' cooldown 2023-04-19 13:25:42 +00:00
ancientmarinerdev 90b9263f03 Merge pull request 'Mapgen Performance Improvements' (#3626) from mapgen_performance_improvements into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3626
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-16 17:02:31 +00:00
ancientmarinerdev 3b1464ecc8 Tweak leaf generator numbers to catch missed jungle leaves 2023-04-16 17:50:22 +01:00
ancientmarinerdev 1015f5a569 Optimize folliage fixes code 2023-04-16 16:20:45 +00:00
ancientmarinerdev 31b65bac91 Move generator code to functions to aid in profiling 2023-04-16 16:20:45 +00:00
FossFanatic 01ac9ad685 Add old method back for foliage
This commit adds back the old `set_node` method for the foliage, since the foliage is much more difficult to work with via the VoxelManip method due to them being part of schematics that could span across mapblocks in some cases.

The old method will complement the new one by running after the VoxelManip has done its job, and fixes any foliage that the VoxelManip had missed.
2023-04-16 16:20:45 +00:00
FossFanatic d28dcb1b10 Another small change to account for mangrove leaves
This one should actually work as expected.
2023-04-16 16:20:45 +00:00
FossFanatic aac6af4c20 Small change to account for mangrove leaves 2023-04-16 16:20:45 +00:00
FossFanatic d8d83dd21c Make vines use voxelmanip colouring as well
This commit adds some code to the `set_foliage_palette` function which checks for the `param2` of the foliage node in question to see whether or not said `param2` value is `0` upon first being generated.

If it isn't, then it's safe to assume that said foliage is a vine, and therefore needs to use the other method of calculating the final `param2` value.
2023-04-16 16:20:45 +00:00
FossFanatic 76bf98b26c Use voxelmanip to set the correct param2 for nodes
Voxelmanip is now used to set the correct `param2` for the nodes which use biome colouring or, in the case of seagrass, the correct meshoption.
2023-04-16 16:20:44 +00:00
FossFanatic d53ea65da8 Remove some code
Some code has been moved to `mcl_mapgen_core` for consistency.
2023-04-16 16:20:44 +00:00
ancientmarinerdev cf174c110a Merge pull request 'release/0.83' (#3644) from release/0.83 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3644
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-04-15 11:36:52 +00:00
ancientmarinerdev 0de9685914 Post-release set version 0.84.0-SNAPSHOT 2023-04-15 12:28:27 +01:00
ancientmarinerdev 3ed3f16702 Pre-release update credits and set version 0.83.0 2023-04-15 12:25:17 +01:00
chmodsayshello 99918c192c Merge pull request 'add the ability to chat whilst being in bed' (#3634) from bedchat into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3634
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 19:00:48 +00:00
ancientmarinerdev 20638c482d Merge pull request 'Make shield block sounds not play across infinite distance' (#3629) from shield_sound_distance into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3629
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-11 17:37:54 +00:00
PrairieWind f8d338d731 Add position to shield sound 2023-04-11 17:16:57 +00:00
PrairieWind 5165730da8 Make shield block sounds not play across infinite distance 2023-04-11 17:16:57 +00:00
ancientmarinerdev d0f7d7c90d Merge pull request 'Fix French translation' (#3636) from syl/MineClone2:translationfr into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3636
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-04-11 16:53:17 +00:00
chmodsayshello 0719d6038c add missing '=' to the translation template 2023-04-09 19:53:28 +02:00
chmodsayshello bf9989beb9 add default message button 2023-04-09 19:51:55 +02:00
chmodsayshello 62c014363d 'fix' multiline comment 2023-04-09 18:50:34 +02:00
chmodsayshello 75595115a0 move rate checks to seperate function 2023-04-09 18:45:23 +02:00
chmodsayshello d9ac803f5b update translations 2023-04-09 18:37:02 +02:00
chmodsayshello 899d619624 fix translator syntax 2023-04-09 18:35:03 +02:00
chmodsayshello 145be4c830 remove debug logging 2023-04-09 18:32:52 +02:00
chmodsayshello a55cbaadd6 take 'chat_message_limit_per_10sec' into account 2023-04-09 18:32:15 +02:00
ancientmarinerdev 56175d839f Merge pull request 'Slow down the pressure plate timer' (#3627) from pplates into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3627
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-04-08 23:17:57 +00:00
ancientmarinerdev 7b748efa64 Merge branch 'master' into pplates 2023-04-08 23:11:16 +00:00
syl ac4073a259 Improve french translation 2023-04-07 17:05:06 +02:00
chmodsayshello 2366969e00 update german translation 2023-04-07 12:00:36 +02:00
chmodsayshello fca23ba47f update traslation template 2023-04-07 11:59:07 +02:00
chmodsayshello 4b1cc017a9 fix syntax 2023-04-07 11:58:27 +02:00
chmodsayshello 786aaf7a6d check for shout priv 2023-04-07 11:58:03 +02:00
ancientmarinerdev 1b4d9cfab7 Merge pull request 'Add error handling to sunlight checking to prevent crashing and improve diagnosis.' (#3624) from fix_crash_solarpanel into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3624
2023-04-06 14:13:13 +00:00
ancientmarinerdev 7fe1be2c18 Add error handling to sunlight checking to prevent crashing and improve diagnosis. 2023-04-06 13:35:38 +00:00
chmodsayshello 645e20afa4 translation updates 2023-04-05 15:45:48 +02:00
chmodsayshello a026bbd3c4 minor bed changes 2023-04-05 15:45:16 +02:00
chmodsayshello 9c8463d2e3 add basic bed-chat 2023-04-05 14:43:07 +02:00
Johannes Fritz 93bc5bb5f8 Slow down the pressure plate timer 2023-04-04 07:38:50 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 b19cc8a5e6 Merge pull request 'Ensure enchanted netherite armour is fire immune to lava etc.' (#3625) from enchanted_netherite_lava_immune into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3625
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-04-03 18:12:53 +00:00
ancientmarinerdev 6817a8535b Get item name correctly. 2023-04-03 17:50:48 +01:00
ancientmarinerdev c83574802f Ensure enchanted netherite armour is fire immune to lava etc. 2023-04-03 02:06:58 +01:00
PrairieWind 0f64fb79c5 Merge pull request 'Don't drop dug banners in creative mode' (#3623) from banners into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3623
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-04-02 22:08:46 +00:00
MrRar 87bf3aed59 Don't drop banners in creative mode 2023-04-02 21:58:34 +00:00
ancientmarinerdev 0ee31bd322 Merge pull request 'Elytra moves quicker than mapgen can cope. A bit performance hit on servers. Make this configurable.' (#3613) from ely_speed_toned_down into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3613
2023-04-02 20:36:41 +00:00
ancientmarinerdev 3e6b43ad47 Elytra moves quicker than mapgen can cope. A bit performance hit on servers. Make this configurable. 2023-04-02 20:27:02 +00:00
ancientmarinerdev ed8953dfe3 Merge pull request 'Do not run kelp lbm every time' (#3612) from lbm_run_every_time_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3612
2023-04-02 20:11:04 +00:00
ancientmarinerdev 8edffeb40d Map gen kelp should init age also 2023-04-02 20:04:32 +00:00
ancientmarinerdev 80f038da4a Do not run kelp lbm every time 2023-04-02 20:04:32 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 952c72c414 Merge pull request 'Make banners drop when the support node is dug' (#3606) from banner_node_support into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3606
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-04-02 16:29:45 +00:00
PrairieWind 088922dc33 Make sure banner drops, even if banner entity doesn't exist 2023-04-02 11:22:26 -05:00
PrairieWind a98f79763b Remove unused digger variable that I forgot 2023-04-02 11:22:26 -05:00
PrairieWind 9c83755f53 Make banners drop when support node is dug and when banner node is dug 2023-04-02 11:22:26 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 acfcb7528c Merge pull request 'Don't drop beds in creative' (#3602) from beds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3602
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-04-02 16:18:50 +00:00
Johannes Fritz 771044236f Don't drop beds in creative 2023-04-02 11:06:37 -05:00
ancientmarinerdev bfea20dd00 Merge pull request 'Mapgen optimisations' (#3607) from mapgen_optimisation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3607
2023-04-01 19:03:09 +00:00
ancientmarinerdev 0abc0ffc48 Mapgen optimisations 2023-04-01 18:53:51 +00:00
ancientmarinerdev 4205915a0b Merge pull request 'Update ruined portal loot table' (#3595) from ruined_portal_loot into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3595
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-04-01 02:27:11 +00:00
PrairieWind f7bdf7481c Update ruined portal loot table 2023-04-01 00:11:56 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6e107a77b5 Merge pull request 'Hopper minecart optimisation' (#3596) from hopper_minecart_optimisation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3596
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-31 18:43:16 +00:00
ancientmarinerdev 53923dd5fa Move on_step code to functions to help see profiling impact 2023-03-31 13:40:36 -05:00
ancientmarinerdev 59f4a62fd6 Move hopper minecarts off item entity. Do not run every on_step. Use more accurate object search location. Cut down object search distance. 2023-03-31 13:40:36 -05:00
ancientmarinerdev f8e994ae78 Create new dtime timer utility. 2023-03-31 13:40:36 -05:00
ancientmarinerdev deb393ae32 Merge pull request 'Remove mcl_player_init' (#3594) from player_init into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3594
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 18:27:08 +00:00
Johannes Fritz bef204f548 Remove mcl_player_init 2023-03-30 18:18:57 +00:00
ancientmarinerdev 80225bb8df Merge pull request 'Add texture making & optimization documentation' (#3588) from Add-texture-documentation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3588
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 02:26:06 +00:00
SmokeyDope 8a1c885faf Update optipng command to ACFMS' recommendation 2023-03-30 02:18:46 +00:00
SmokeyDope c3e37cb840 One more formatting adjust 2023-03-30 02:18:46 +00:00
SmokeyDope 4226b2a8ba Add link to optipng in textures.md and fix some formatting 2023-03-30 02:18:46 +00:00
SmokeyDope b08b6034ac Add texture making documentation 2023-03-30 02:18:46 +00:00
PrairieWind 2a3fbdead0 Merge pull request 'Make Lecterns use wooden slabs for crafting' (#3605) from lectern_slab_issues into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3605
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 02:09:48 +00:00
PrairieWind f284b1ca0e Fix minor issue with mcl_stairs.register_stair function 2023-03-30 02:03:08 +00:00
PrairieWind 2bd36b5d66 Make lecterns require wood slabs for crafting
Otherwise you can use stone slabs to craft lecterns, which doesn't make sense
2023-03-30 02:03:08 +00:00
ancientmarinerdev d5c150d46c Merge pull request 'Add slab and stair groups to crimson and warped slabs and stairs' (#3603) from crimson_slab_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3603
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-30 01:37:46 +00:00
PrairieWind 8a129fa00c Add slab and stair groups to crimson and warped slabs and stairs 2023-03-29 09:47:29 -06:00
ancientmarinerdev 12b9def9ad Merge pull request 'Fix dark day right and light night rain' (#3592) from rain_light_level_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3592
2023-03-29 02:45:39 +00:00
ancientmarinerdev 61a4595c1b Fix rain light levels so that day rain is brighter and night rain is darker 2023-03-29 02:21:16 +00:00
ancientmarinerdev 2426570871 Fix for light night rain and dark day rain issue 2023-03-29 02:21:16 +00:00
PrairieWind ce1393af0c Merge pull request 'Fixed. Add polished blackstone button and pressure plate' (#3590) from Wbjitscool/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3590
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-27 00:30:34 +00:00
Wbjitscool bfa5662421 Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt' 2023-03-27 00:24:40 +00:00
Wbjitscool 87ca144c4e Update 'mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt' 2023-03-27 00:23:53 +00:00
Wbjitscool a10235f330 Update 'mods/ITEMS/REDSTONE/mesecons_button/init.lua'
added in a Polished Blackstone Button
2023-03-27 00:07:48 +00:00
Wbjitscool e3978c4d22 Update 'mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt'
updated template.txt for buttons
2023-03-27 00:05:52 +00:00
Wbjitscool c0fa2c38bd Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua'
added polished blackstone pressure plate
2023-03-27 00:02:29 +00:00
Wbjitscool 049a4a11f4 Update 'mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt'
updated template.txt
2023-03-27 00:00:09 +00:00
PrairieWind 114e640132 Merge pull request 'Remove deprecated usages of image property in tile defs' (#3582) from dumpnodes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3582
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-26 23:06:50 +00:00
Johannes Fritz 692758bd6d Remove deprecated usages of image property in tile defs 2023-03-26 22:56:33 +00:00
ancientmarinerdev 08990207cf Merge pull request 'Fix slime and some nether mob speeds' (#3575) from nether_mob_speeds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3575
2023-03-26 15:46:37 +00:00
ancientmarinerdev 3bdc77a1aa Hoglins should only spawn in crimson forest 2023-03-26 13:03:46 +00:00
ancientmarinerdev 7f3734b6cb Ensure hoglins and piglins aren't faster than player. 2023-03-26 13:03:46 +00:00
ancientmarinerdev b7079e8b19 Fix slime and some nether mob speeds 2023-03-26 13:03:46 +00:00
ancientmarinerdev 9887958e4e Merge pull request 'Fix crash stripping unregistered block' (#3585) from fix_crash_noddef into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3585
2023-03-25 02:14:42 +00:00
ancientmarinerdev a806833e4a Fix crash stripping unregistered block 2023-03-25 02:05:30 +00:00
ancientmarinerdev 46eb4d11dc Merge pull request 'Fixing multiple crashes on the German server.' (#3587) from crashes_on_german_server into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3587
2023-03-25 02:04:40 +00:00
ancientmarinerdev 6c8113dec8 Fix crash when cannot get wear for tool 2023-03-25 01:55:52 +00:00
ancientmarinerdev b72dbf17a6 Crash for dropper failing as potentially cannot get pos. 2023-03-25 01:55:52 +00:00
ancientmarinerdev 049406162e Fix crash when skeleton tries to jock when there is no pos, maybe because pos is unloaded. 2023-03-25 01:55:52 +00:00
ancientmarinerdev 924d999ec2 Merge pull request 'Fix mcl_skins crash' (#3584) from skins into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3584
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-25 01:47:50 +00:00
Johannes Fritz a52931f986 Fix mcl_skins crash 2023-03-24 15:53:07 -05:00
ancientmarinerdev c499d20d25 Merge pull request 'Add lantern functions for adding nodes to allowed placement list' (#3567) from lanterns-add-allowed-functions into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3567
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-23 22:23:16 +00:00
SmokeyDope 47b6e54dad Add comments explaining new lantern functions 2023-03-23 22:18:04 +00:00
SmokeyDope 257e5f993b Add lantern functions for adding nodes to allowed placement list 2023-03-23 22:18:04 +00:00
ancientmarinerdev f02afca62c Merge pull request 'Remove evoker spawning in Pillager Outposts' (#3557) from remove_evokers_outpost into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3557
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-23 01:58:38 +00:00
PrairieWind 802ff3d984 Remove evoker spawning in Pillager Outposts 2023-03-23 01:53:44 +00:00
ancientmarinerdev 9367c96525 Merge pull request 'Fixing that annoying chest open and close sounds' (#3566) from sound_tweaks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3566
2023-03-23 01:34:29 +00:00
ancientmarinerdev f319a8d903 Fixing that annoying chest open 2023-03-23 01:29:05 +00:00
ancientmarinerdev 5e8bc16a0c Merge pull request 'Diminixed normalized volume levels of songs + 2 new tracks, 2 updated versions!' (#3564) from music_normalise_volumes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3564
2023-03-23 01:28:33 +00:00
ancientmarinerdev c5a15192b3 Updated with new song names in credits 2023-03-23 01:18:14 +00:00
ancientmarinerdev e41b166c1b Updated credits 2023-03-23 01:18:14 +00:00
ancientmarinerdev c393b15965 Updated music to 64kbs 2023-03-23 01:18:14 +00:00
ancientmarinerdev f5ea3894cf 2 new songs. 2 updated songs. All volums remastered to same perceived volumes. 2023-03-23 01:18:14 +00:00
ancientmarinerdev 0fbdc07402 Merge pull request 'Adjust speeds to make it less ridiculous' (#3556) from mob_speeds_overworld_tweak into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3556
2023-03-23 01:11:54 +00:00
ancientmarinerdev 41882e9e1f Adjust speeds to make it less ridiculous 2023-03-23 00:38:18 +00:00
ancientmarinerdev 15fce1130e Merge pull request 'Bundled lua with 5.7 crashes when you right click a farmer villager. math.random needs correct order' (#3576) from fix_villager_crash_with_bundle_lua into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3576
2023-03-22 04:45:20 +00:00
ancientmarinerdev 2440b73e67 Bundled lua with 5.7 crashes when you right click a farmer villager. math.random needs correct order 2023-03-22 03:55:27 +00:00
ancientmarinerdev 109bf17723 Merge pull request 'Fix warnings and global vars' (#3568) from fix_global_warnings into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3568
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-03-22 01:17:41 +00:00
ancientmarinerdev a513547958 Remove title 2023-03-21 22:20:26 +00:00
ancientmarinerdev 1c0387b898 Fix warnings and global vars 2023-03-21 22:20:26 +00:00
ancientmarinerdev 5409a382f9 Merge pull request 'Make mobs ride minecarts' (#3507) from mobs_in_minecarts into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3507
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-20 13:42:38 +00:00
ancientmarinerdev ecf72db684 Fix ooops 2023-03-20 13:37:26 +00:00
ancientmarinerdev bcd7f38fa7 Use new style vectors 2023-03-20 13:37:25 +00:00
ancientmarinerdev 3eab946889 Make death check less frequent. Load passenger in minecart at shutdown. 2023-03-20 13:37:25 +00:00
anarquimico f817fe7f72 Fix performance issues and better check for mobs death 2023-03-20 13:37:25 +00:00
anarquimico d5f01e88c4 Make mobs ride minecarts 2023-03-20 13:37:25 +00:00
ancientmarinerdev b4ea9f048b Merge pull request 'Tweak lapis distribution.' (#3562) from lapis_distribution into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3562
Reviewed-by: SmokeyDope <smokey@tilde.team>
2023-03-19 21:24:46 +00:00
ancientmarinerdev 6989e00af7 Tweak lapis distribution. 2023-03-19 18:01:39 +00:00
ancientmarinerdev 23f0c9a83e Merge pull request 'Implementing slime mapblocks!' (#3551) from slime_chunk into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3551
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-03-19 02:57:41 +00:00
ancientmarinerdev 81a258d33b Clean up and reorder code 2023-03-19 02:44:35 +00:00
ancientmarinerdev bd579314ba Remove logging and clean up 2023-03-19 02:44:35 +00:00
ancientmarinerdev e7449a65d8 Fix check_position and change spawn check to stages 2023-03-19 02:44:35 +00:00
ancientmarinerdev b8b47e55e1 Add in slime chunks 2023-03-19 02:44:35 +00:00
ancientmarinerdev 1182ce349a Merge pull request 'adjust crop hitboxes' (#3555) from Fix-potato-hitbox into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3555
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-18 22:04:07 +00:00
SmokeyDope 3f80cc8f26 Adjust beetroot hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 68a44d7824 one more carrot adjust 2023-03-18 21:59:46 +00:00
SmokeyDope ced3b4dff1 Adjust carrot hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 44711369d9 Further adjust potato hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 3839250b38 Fix potatoes stage 2 hitbox 2023-03-18 21:59:46 +00:00
ancientmarinerdev a4b4e4de69 Merge pull request 'Add sounds when using composter' (#3549) from composter-add-sounds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3549
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-18 18:35:11 +00:00
ancientmarinerdev 002a63585f Tweak volume and change reference to missing global variable 2023-03-18 18:30:03 +00:00
SmokeyDope 811f8ac516 One more indentation fix, sorry for the extra commit 2023-03-18 18:30:03 +00:00
SmokeyDope 89f2c06af2 Fix accidental extra spaces 2023-03-18 18:30:03 +00:00
SmokeyDope 20f8e18098 Add sounds when using composter 2023-03-18 18:30:03 +00:00
ancientmarinerdev 3b4fc04330 Merge pull request 'Remove unused translations' (#3539) from syl/MineClone2:unusedtranslations into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3539
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-18 18:09:37 +00:00
ancientmarinerdev d437f45f4a Merge pull request 'Sculk removed off xp_step and triggered by player and mob death [Performance]' (#3545) from sculk_performance_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3545
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-17 20:42:23 +00:00
ancientmarinerdev ef633ce617 Do not throw XP if in creative 2023-03-17 20:36:53 +00:00
ancientmarinerdev a3f23d0b35 Remove unneeded logging 2023-03-17 20:36:53 +00:00
ancientmarinerdev 2c7039fdda Clean up code 2023-03-17 20:36:53 +00:00
ancientmarinerdev c6db032674 Rework sculk to be off the xp_step and triggered by events 2023-03-17 20:36:53 +00:00
ancientmarinerdev 9f182dc63a Merge pull request 'Mob spawner crash teleport bug logging' (#3534) from over_mapgen_limit into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3534
2023-03-17 15:25:07 +00:00
ancientmarinerdev ff1b941d19 Clean and improve profiler info 2023-03-17 15:20:51 +00:00
ancientmarinerdev be269b2034 Make error handling safe in case pos is missing 2023-03-17 15:20:51 +00:00
ancientmarinerdev 97091de67f Log pos info only prior to crash 2023-03-17 15:20:51 +00:00
ancientmarinerdev ae7cfdff69 Ensure conditional doesn't mask bug crash issue 2023-03-17 15:20:50 +00:00
ancientmarinerdev 0dee7792f4 Log where map unloaded before light damage code. #3430 debugging 2023-03-17 15:20:50 +00:00
ancientmarinerdev 583d066587 Merge pull request 'clearmobs command improvement' (#3543) from clearmobs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3543
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-16 22:24:33 +00:00
Johannes Fritz 150222583a clearmobs command: nametagged/tamed is exclusive 2023-03-15 13:22:35 -05:00
Johannes Fritz a3e6f90b09 clearmobs command improvement 2023-03-15 16:25:28 +00:00
ancientmarinerdev 9697591dd6 Merge pull request 'Sky Strobe Band-aid Fix' (#3538) from temporary_snow_disablement into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3538
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-15 16:00:18 +00:00
FossFanatic ae811ed703 Disable snowy weather temporarily
This commit quickly disables the standalone snow weather for the time being, until a more permanent solution can be found.

The snowy weather should no longer occur naturally, but can still be summoned with `/weather snow` if wanted.
2023-03-15 15:54:52 +00:00
ancientmarinerdev fa0a595009 Merge pull request 'Fix verbose tool info on non-tools' (#3530) from tool_info into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3530
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-15 15:40:17 +00:00
Johannes Fritz 75dffe5059 Fix verbose tool info on non-tools 2023-03-15 15:36:48 +00:00
ancientmarinerdev 3063cc97f7 Merge pull request 'Fix syntax errors in French' (#3542) from syl/MineClone2:syntaxerrorsfr into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3542
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-15 15:25:02 +00:00
ancientmarinerdev db53e41ebd Merge pull request 'Make dye descriptions more consistent' (#3532) from grorp/MineClone2:owl into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3532
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-14 14:38:39 +00:00
ancientmarinerdev 4917ea1478 Merge pull request 'Missing punctuation in README' (#3537) from syl/MineClone2:readme into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3537
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-14 14:22:17 +00:00
syl 1d981876d9 Fix syntax errors in French 2023-03-14 11:55:07 +01:00
ancientmarinerdev 7b53b6e45f Merge pull request 'The New, Improved, Safe and More Powerful /clearmobs command' (#3528) from clearmobs_improvements into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3528
2023-03-14 02:48:26 +00:00
ancientmarinerdev 270820125d Add in a default for improved clearmobs command. 2023-03-14 02:45:33 +00:00
ancientmarinerdev fc7eb135e6 Comment out leftover logging 2023-03-14 02:45:33 +00:00
ancientmarinerdev c97fef03b9 Comment out logging, and add in the destruction 2023-03-14 02:45:33 +00:00
ancientmarinerdev 37ca0efe05 New, improved, safe clearmobs command 2023-03-14 02:45:33 +00:00
syl 8a7a8ce1bf Remove unused translations 2023-03-13 15:40:58 +01:00
syl 2d1c904368 Missing punctuation in README 2023-03-13 09:55:27 +01:00
ancientmarinerdev b49828e9cb Merge pull request 'Remove music interruptions' (#3529) from fix_music_interruptions into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3529
2023-03-12 23:13:43 +00:00
ancientmarinerdev 03d8363ed1 Ensure HP change doesn't stop music 2023-03-12 23:09:46 +00:00
ancientmarinerdev ede3123b1a Remove music interruptions 2023-03-12 23:09:46 +00:00
ancientmarinerdev 32ffa32009 Merge pull request 'Fix error handling compatibility with Minetest bundled Lua' (#3533) from fix_error_handling_compatibility into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3533
2023-03-12 22:09:12 +00:00
ancientmarinerdev 0f7efcf9c1 Fix error handling compatibility with Minetest bundled Lua 2023-03-12 21:52:35 +00:00
ancientmarinerdev 4fe4559e6d Merge pull request 'Thorns translation crash fix' (#3525) from translation_thorns_issue into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3525
2023-03-12 21:23:04 +00:00
ancientmarinerdev 4e363049e1 Firework death message incorrect order fix 2023-03-12 21:16:40 +00:00
ancientmarinerdev d5cb745def Fixed thorns death message incorrect order 2023-03-12 21:16:40 +00:00
ancientmarinerdev 639cec4989 Merge pull request 'Fix old burning storage crash and log any relevent info.' (#3522) from fix_burning_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3522
2023-03-12 21:12:34 +00:00
ancientmarinerdev 547973877a Fix old burning storage crash and log any relevent info. 2023-03-12 21:08:24 +00:00
ancientmarinerdev 994f720385 Merge pull request 'Improve French translation' (#3531) from syl/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3531
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-03-12 20:55:36 +00:00
grorp a766a6ac85 Fix a mistake in the German mcl_dye translation 2023-03-12 11:41:45 +00:00
grorp 2b0c5549f4 Update translations (9/9) 2023-03-12 11:35:56 +00:00
grorp 79996f143e Update translations (8/9) 2023-03-12 11:35:31 +00:00
grorp 166f15f5c6 Update translations (7/9) 2023-03-12 11:34:51 +00:00
grorp c706d44d55 Update translations (6/9) 2023-03-12 11:34:14 +00:00
grorp feca77c1d7 Update translations (5/9) 2023-03-12 11:33:49 +00:00
grorp 9463d12a35 Update translations (4/9) 2023-03-12 11:33:25 +00:00
grorp fa07fab325 Update translations (3/9) 2023-03-12 11:32:59 +00:00
grorp df16065617 Update translations (2/9) 2023-03-12 11:32:32 +00:00
grorp 735904ce61 Update translations (1/9) 2023-03-12 11:32:05 +00:00
grorp 49a5e28398 Make dye descriptions more consistent
The descriptions of all the dyes now end with the word "Dye". Also, they happen to match the descriptions in Minecraft now, but that wasn't my intention.
2023-03-11 08:18:14 +00:00
FossFanatic f012dbf50a Merge pull request 'Leaves Warning Removal' (#3524) from leaves_warning_removal into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3524
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-11 08:15:58 +00:00
FossFanatic d8d44fce0f Remove source of warnings for leaves
This commit changes some code so the debug log no longer gets flooded with warnings about leaves and palettes.
2023-03-11 00:30:22 +00:00
ancientmarinerdev 987760749f Merge pull request 'When mob out of range, avoid processing expensive or unneccessary things' (#3517) from improve_mob_step_performance into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3517
2023-03-11 00:16:48 +00:00
ancientmarinerdev 038d9ec014 Do not need to create new vector each time 2023-03-11 00:05:53 +00:00
ancientmarinerdev 6097dacbab Only check herd if in range 2023-03-11 00:05:53 +00:00
ancientmarinerdev 5b7132ac5e Fix duplicate call for jump check 2023-03-11 00:05:53 +00:00
ancientmarinerdev 5fc78bf6b0 Use unique name for function. Add development flag to enable crashing locally 2023-03-11 00:05:53 +00:00
ancientmarinerdev b47ef9275b Fix whoops 2023-03-11 00:05:53 +00:00
ancientmarinerdev ce6d9d561f When mob out of range, avoid processing expensive or unneccessary things 2023-03-11 00:05:53 +00:00
syl 21dbf583ee Add syl in credits 2023-03-10 23:13:06 +01:00
syl 96b2f6a01d Improve French translation 2023-03-10 22:48:46 +01:00
ancientmarinerdev 85fe29e5d3 Merge pull request 'Remove aggro for iron golem when out of range' (#3510) from iron_golem_grudge_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3510
2023-03-10 03:18:43 +00:00
ancientmarinerdev 655c130956 Remove aggro for iron golem when out of range 2023-03-10 03:03:53 +00:00
ancientmarinerdev 325de7f2cd Merge pull request 'Fix waxing duplication of shulker box' (#3527) from waxing into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3527
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-10 00:18:38 +00:00
Johannes Fritz 3c9b3497bb Fix waxing duplication of shulker box 2023-03-09 15:16:11 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8d318dfaa2 Merge pull request 'Fix Explosions Griefing Setting' (#3509) from fix_tnt_griefing_setting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3509
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-09 19:09:56 +00:00
FossFanatic 6304502173 Rename some things
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
2023-03-09 12:52:22 -06:00
FossFanatic b1a52a3243 Rename some things
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
2023-03-09 12:52:22 -06:00
FossFanatic 1a1ea29f6e Rename some things
This commit renames `tnt_griefing` to `explosions_griefing` to better reflect what this setting now does.
2023-03-09 12:52:22 -06:00
FossFanatic af8c4ded93 Try different fix for broken setting 2023-03-09 12:52:22 -06:00
FossFanatic 8b0d195906 Fix broken setting
This commit adds some lines of code which make sure that nothing gets destroyed when TNT griefing is disabled.
2023-03-09 12:52:22 -06:00
ancientmarinerdev e15d0cd5a0 Merge pull request 'Make enderman hostile towards endermites and fix it's behavior on other dimensions' (#3501) from anarquimico/MineClone2:enderman_hostile_endermite into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3501
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-08 21:47:40 +00:00
ancientmarinerdev 1a24df5073 Merge pull request 'Add in some basic modeling documentation' (#3496) from modeling_documentation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3496
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-07 16:28:54 +00:00
SmokeyDope 38b8f551d4 Note that .bmp and .tga image formats are depreciated 2023-03-07 16:16:29 +00:00
SmokeyDope c18a851dd3 Add MODELS.md 2023-03-07 16:16:29 +00:00
ancientmarinerdev 6e6aa83fd8 Merge pull request 'Adding new Exhale & Tim Unwin tracks!' (#3511) from add_new_tracks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3511
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-03-07 16:08:26 +00:00
ancientmarinerdev 695cbc54ae Adding in credits for Valley of Ghosts and Lonely Blossom 2023-03-07 15:56:24 +00:00
ancientmarinerdev 4c5b057038 Removed duplicate track 2023-03-07 15:56:24 +00:00
ancientmarinerdev 1dcdbbef79 Adding Exhale & Tim Unwin tracks into the playlists 2023-03-07 15:56:24 +00:00
ancientmarinerdev 37b42a1033 Shrink audio files with added metadata 2023-03-07 15:56:24 +00:00
ancientmarinerdev d32e968682 Add original Exhale & Tim Unwin first two tracks 2023-03-07 15:56:24 +00:00
FossFanatic 887269f6de Merge pull request 'Fix grass not growing issue' (#3516) from fix_grass_not_growing into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3516
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2023-03-07 08:45:50 +00:00
ancientmarinerdev 67ddad987d Fix grass not growing issue 2023-03-06 17:45:38 +00:00
ancientmarinerdev 25aff57076 Merge pull request 'Add Grass Palette Group' (#3481) from grass_palette_group into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3481
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-05 12:53:46 +00:00
FossFanatic 261b5dda98 Remove excessive code
This removes a piece of excessive code, which I accidentally left behind.
2023-03-05 12:45:45 +00:00
FossFanatic b80dd0294c Change the grass LBM & generator
This commit makes the grass LBM & generator look for nodes in the `grass_palette` group, instead of looking at a local list.
2023-03-05 12:45:44 +00:00
FossFanatic 260a76e5ee Add grass palette nodes in a special group & more
This commit adds any nodes which make use of a grass palette to a `grass_palette` group, to avoid having to create a list of said nodes every time.

I also added one line of code to potted ferns, in preparation for when I get to adding biome coloured potted ferns, which currently use a fixed colour instead of the biome's colour.
2023-03-05 12:45:44 +00:00
FossFanatic b4d41d1284 Prepare some things for future additions
Adds a couple of lines of code in preparation for when I try to add biome coloured potted ferns, which currently use a fixed colour instead of the biome's colour.
2023-03-05 12:45:44 +00:00
FossFanatic e82ff4781a Add grass palette nodes in a special group
This commit adds any nodes which make use of a grass palette to a `grass_palette` group, to avoid having to create a list of said nodes every time.
2023-03-05 12:45:44 +00:00
ancientmarinerdev 22e7200ea0 Merge pull request 'Expanding music choices and adding in Jester's first 4 tracks' (#3464) from music_enable_multiple_track_choice into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3464
2023-03-04 20:37:26 +00:00
ancientmarinerdev a116c67dcd Reduce size of Jester tracks 2023-03-04 20:22:04 +00:00
ancientmarinerdev 1937241a71 Fix logging 2023-03-04 20:22:04 +00:00
ancientmarinerdev 10fa91cc42 Adding the first 4 Jester trackers made for MineClone2 2023-03-04 20:22:04 +00:00
ancientmarinerdev 83ff2f1754 Enable expansion of music choices 2023-03-04 20:22:04 +00:00
PrairieWind 0e68014e23 Merge pull request 'Fix textures for item frame and glowing item frame' (#3485) from item-frame-texture-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3485
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-04 18:22:57 +00:00
SmokeyDope d4be5dd88c Add in optimized item frame and glowing item frame textures 2023-03-04 18:13:24 +00:00
SmokeyDope 256803303d remove unoptimized item frame texture 2023-03-04 18:13:24 +00:00
SmokeyDope b70d870004 remove unoptimized glowing item frame border texture 2023-03-04 18:13:24 +00:00
SmokeyDope 75fb64d6ea remove unoptimized glowing item frame texture 2023-03-04 18:13:24 +00:00
SmokeyDope f6d6a59c01 Remove "mcl_itemframes_glow_item_frame_item.png"
Duplicate image of "mcl_itemframes_glow_item_frame.png", changed code to use base frame image thus making this duplicate for inventory item unnecessary.
2023-03-04 18:13:24 +00:00
SmokeyDope 551b0c31bb Change glowing item frame inventory image to "mcl_itemframes_glow_item_frame.png"
"mcl_itemframes_glow_item_frame_border.png" "mcl_itemframes_glow_item_frame_item.png" and "mcl_itemframes_glow_item_frame" are all the same image, can save a few kilobytes by editing the glowing item frame code to just use one and removing the other two of them.
2023-03-04 18:13:24 +00:00
SmokeyDope 4939ce3e75 Add in updated glowing item frame border and glowing item frame item texture 2023-03-04 18:13:24 +00:00
SmokeyDope 108e369e0c Delete glowing item frame item texture 2023-03-04 18:13:24 +00:00
SmokeyDope 8a48729aad delete glowing item frame border texture 2023-03-04 18:13:24 +00:00
SmokeyDope f5fad2e8f5 Add in updated item frame and glowing item frame texture
New textures fill canvas completely which fixes visual bug.
2023-03-04 18:13:24 +00:00
SmokeyDope ab6abc3876 Delete old glowing item frame texture 2023-03-04 18:13:24 +00:00
SmokeyDope 1855fa2b64 Delete old item frame texture
canvas not completely filled, has some alpha transparency on borders which lead to visual bug.
2023-03-04 18:13:24 +00:00
ancientmarinerdev b4422402c9 Merge pull request 'Seagrass Param2 Fix' (#3465) from seagrass_param2_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3465
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-04 15:50:49 +00:00
FossFanatic dbbac7962d Fix the seagrass param2 and more 2023-03-04 15:42:37 +00:00
ancientmarinerdev 3ba77e408c Merge pull request 'Map Colour Fixes' (#3493) from map_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3493
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-04 13:55:46 +00:00
FossFanatic c0f52ad344 Fix maps to display coloured foliage and water 2023-03-04 13:47:51 +00:00
FossFanatic 8a408a5c7f Remove old .json file 2023-03-04 13:47:51 +00:00
ancientmarinerdev 5478c8f44f Merge pull request 'Fix spawn egg crashes in different dimensions' (#3504) from fix_spawn_eggs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3504
2023-03-04 02:19:26 +00:00
ancientmarinerdev a25cced40e Remove comment now resolved 2023-03-04 02:18:36 +00:00
ancientmarinerdev 86a85bb487 Fix spawn egg crashes in different dimensions 2023-03-04 01:38:51 +00:00
anarquimico 8c4f2fdd7b TP to dark spots only on the overworld 2023-03-03 21:55:56 -03:00
ancientmarinerdev 48fa2608ed Merge pull request 'spawn-egg-crash-fix' (#3492) from GuyLiner/MineClone2:spawn-egg-crash-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3492
2023-03-04 00:34:45 +00:00
PrairieWind cfaa6aa8c2 Merge pull request 'Disable beehive/nest drops in creative' (#3450) from beehive_drops_creative into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3450
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-03 23:11:42 +00:00
PrairieWind 2f10a8767b Beehives only go into inventory in creative when no beehive exists in the inventory 2023-03-03 23:05:18 +00:00
PrairieWind c71aec6f9d Add beehives and bee nests to inventory in creative 2023-03-03 23:05:18 +00:00
PrairieWind 493839cf11 Disable beehive/nest drops in creative 2023-03-03 23:05:18 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 4c7c1fe176 Merge pull request 'Make hoppers push items to minecarts' (#3490) from anarquimico/MineClone2:hoppers_to_minecarts into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3490
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-03-03 22:35:29 +00:00
anarquimico c37aad26c3 Make hoppers push items to minecarts 2023-03-03 16:13:49 -06:00
anarquimico a3ab67cb55 Better fix for enderman behavior 2023-03-03 10:03:26 -03:00
anarquimico 7cbeae00cc Fix enderman behaviour for other dimesions 2023-03-02 10:22:08 -03:00
anarquimico 16a4448c5f Performance improvement 2 2023-03-02 09:57:33 -03:00
anarquimico 5093f31f28 Performance improvement 2023-03-02 09:20:00 -03:00
anarquimico 8825fb9860 Removes unnecessary commentary 2023-03-02 08:32:52 -03:00
anarquimico d0022db2a5 Make enderman hostile towards endermites 2023-03-02 08:28:06 -03:00
PrairieWind 0a93d67814 Merge pull request 'Water logging mangrove roots with water bucket' (#3499) from anarquimico/MineClone2:water_logged_mangrove_roots into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3499
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-03-02 02:44:52 +00:00
anarquimico 6bdc0f032f Fixed for river_water_logged_roots 2023-03-01 19:22:27 -07:00
anarquimico 0aa3c52263 Make it work with river water 2023-03-01 19:22:27 -07:00
anarquimico f4c26fb578 Change the mangrove roots to a water logged roots after using a bucket with water on it 2023-03-01 19:22:27 -07:00
PrairieWind 85457cd3bf Merge pull request 'Create the Jockey api and use it on Skel/Spid' (#3494) from jockey_api into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3494
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-02-28 18:46:31 +00:00
epCode dc9407701e fix crash skeleton jockey code 2023-02-28 17:46:21 +00:00
epCode e48dabc8be Create the Jockey api and use it on Skel/Spid 2023-02-28 17:46:21 +00:00
PrairieWind 51c374b31f Merge pull request 'Vine Colouring Improvements' (#3480) from vine_rotation_calculation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3480
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-02-28 03:10:57 +00:00
FossFanatic a457853938 Improve code relating to vines
This commit makes the LBM and `register_on_generated` for foliage now use the better calculation for the vines.
2023-02-27 20:25:36 +00:00
FossFanatic 4659d1a0f1 Add function for colorwallmounted node rotation
This commit adds a new utility function which helps find the rotation of `colorwallmounted` nodes.
2023-02-27 20:25:36 +00:00
PrairieWind 9972b055c5 Merge pull request 'Warped Wart Fix' (#3467) from warped_wart_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3467
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
2023-02-27 17:59:16 +00:00
FossFanatic fedae4fdd0 Fixed warped wart using stripped stem side texture 2023-02-27 17:51:14 +00:00
FossFanatic 64d6fdaec5 Merge pull request 'Add missing sounds for placing and digging villager profession blocks' (#3482) from fix_profession_node_sounds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3482
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-26 17:48:00 +00:00
GuyLiner cafc16c41c Fix #3484
If a mob was not found in the spawn_dictionary or the non_spawn
dictionary and you tried to use a spawn egg to spawn that mob, the game
would crash. This commit prevents that from happening by adding a check
for mobs that don't exist, and minetest.log throws an error.
2023-02-26 11:22:21 -05:00
GuyLiner 14039290a9 Added mobs that were missing from non_spawn_specific() 2023-02-26 11:06:38 -05:00
SmokeyDope f174b733ce Add sounds to cartography table 2023-02-25 11:46:33 +00:00
SmokeyDope b4f747bd84 Add dependencies for cartography table 2023-02-25 11:44:56 +00:00
SmokeyDope 0351556a2e Add sounds to loom 2023-02-25 11:40:45 +00:00
SmokeyDope 182f9b5dc2 Add dependencies for loom 2023-02-25 11:39:38 +00:00
SmokeyDope bd4eb01a46 Add sounds to fletching table 2023-02-25 11:31:14 +00:00
SmokeyDope 5c25901433 Add dependencies for fletching table
required to get sound working
2023-02-25 11:29:55 +00:00
SmokeyDope 2d6e1c61a2 Add placement sound to lectern 2023-02-25 10:59:05 +00:00
FossFanatic d83c6fe906 Merge pull request 'Dry Biome Rain Fixes' (#3472) from dry_biome_rain_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3472
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-25 08:27:38 +00:00
FossFanatic e7c6043f06 Merge pull request 'Mintest Fix' (#3477) from api_typo_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3477
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-22 14:19:24 +00:00
FossFanatic 65b1fd163b Fix fatal typo
This typo caused the game to crash, instead of spitting out an error message as it was supposed to.
2023-02-22 13:05:18 +00:00
FossFanatic eff0a546e5 Merge pull request 'Add Biome Coloured Water' (#3461) from biome_colored_water into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3461
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-22 07:20:35 +00:00
FossFanatic 61ee14b1a6 Fix rain issues in dry biomes
This commit adds an extra check at the ABMs which prevent the rain from affecting dry biomes, even though there isn't supposed to any rain there.
2023-02-21 10:12:29 +00:00
FossFanatic 968f6ae963 Add the original palette back as an _alt version 2023-02-20 07:22:55 +00:00
FossFanatic 2e2bbf0b17 Make the water palette more diluted 2023-02-20 07:22:24 +00:00
FossFanatic 8060b02cbd Add extra check to guarantee no nil values 2023-02-19 07:49:09 +00:00
FossFanatic 693d40b6c4 Fix villages generating with incorrect water
This commit fixes an issue where villages would generate with water which wasn't of the correct biome.

The new function simply looks for water source nodes around the entire village and replaces any it finds with the same node, except with blank params so that the `on_construct` of the newly placed water source node gets called.
2023-02-18 13:51:31 +00:00
FossFanatic ecfbb1ae07 Fix waterlogged mangrove roots textures 2023-02-18 08:54:57 +00:00
FossFanatic 14e630a1e2 Fix cauldron water textures 2023-02-18 08:53:36 +00:00
FossFanatic 62afbb4509 Remove reference to removed texture 2023-02-18 08:42:21 +00:00
FossFanatic f02764bc08 Remove now unused river water source texture 2023-02-18 08:32:00 +00:00
FossFanatic aa1a928898 Remove now unused flowing river water texture 2023-02-18 08:31:36 +00:00
FossFanatic 45952a6fd6 Add greyscale water textures & water palette 2023-02-18 08:30:44 +00:00
FossFanatic 33bbeb1a4d Improve river water 2023-02-18 08:27:22 +00:00
FossFanatic d3253ecf4f Change small part of buckets code 2023-02-18 08:25:47 +00:00
FossFanatic 0abda8ff20 Add new function for water nodes 2023-02-18 08:25:08 +00:00
FossFanatic 9bb3d8311b Append stuff to the new function 2023-02-18 08:24:12 +00:00
FossFanatic 686bb38546 Add lbm and register_on_generated for water 2023-02-18 08:23:40 +00:00
FossFanatic c4f6944a03 Add water palette indexes and waterfog to the code 2023-02-18 08:22:56 +00:00
FossFanatic c1647a5cce Improve underwater sky colour code 2023-02-18 08:22:04 +00:00
FossFanatic 624c853cb3 Improve water 2023-02-18 08:21:24 +00:00
ancientmarinerdev e8641c3c20 Merge pull request 'Fix custom spawners spawning mobs regardless of light level' (#3421) from GuyLiner/MineClone2:fix-spawner into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3421
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-17 22:43:59 +00:00
GuyLiner f39cec2442 Added slime_big to non_spawn_specific instead of creating an exception for them in spawning.lua 2023-02-16 20:48:30 -05:00
GuyLiner e99a46b52d Removed comment 2023-02-16 20:48:30 -05:00
GuyLiner cd1c8bd92e Refactored logic for getting light levels for mobs
Removed mob_light_table, simplied loop, changed return values and
fixed dimension priority error in loop. Slimes also don't have a
hardcoded exception for their light levels anymore, and instead
are apart of spawn specific.
2023-02-16 20:48:28 -05:00
GuyLiner 3830171347 Adjusted mob_light_lvl for changed return value 2023-02-16 19:43:50 -05:00
GuyLiner 48b16a23b6 If player in creative mode, don't drop experience from destroyed spawners 2023-02-16 19:43:50 -05:00
GuyLiner 0a9be4b79c Added light level parameters to the mobs_mcl.setup_spawner() function, fixing #221
There is now a call to mcl_mobs:mob_light_lvl that returns a table for the name of the mob that you pass to it that contains
the light levels for that mob.
2023-02-16 19:43:50 -05:00
GuyLiner 540319d948 Added non_spawn_dictionary and function for getting mob light levels
The non_spawn_dictionary will cover all mobs that don't spawn naturally, and holds the the minimum and maximum light values for each of them.
A function has also been created that will go through both the spawn_dictionary and the non_spawn_dictionary and determine which one
a mob exists in, with the execption of slimes which cannot spawn from a custom spawner at the moment.

Mobs who don't have light levels for the world that you are currently trying to set your custom spawner in will default to their overworld values
2023-02-16 19:43:50 -05:00
GuyLiner fbb2923a0b Added mcl_mobs:non_spawn_specific function for mobs that don't naturally spawn and for mobs that don't spawn in the overworld 2023-02-16 19:43:50 -05:00
ancientmarinerdev b2e0b9b08b Merge pull request 'Mob Step error handling' (#3452) from mobs_error_handling into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3452
2023-02-16 23:34:07 +00:00
ancientmarinerdev 4d61e32021 Clean up error handling 2023-02-16 23:15:55 +00:00
ancientmarinerdev 7c602ce82c Tidy up error handling. 2023-02-16 23:15:55 +00:00
ancientmarinerdev ae92c51155 Adding error handling to the mob step function 2023-02-16 23:15:55 +00:00
ancientmarinerdev db7f4699eb Merge pull request 'Add Biome Coloured Foliage' (#3420) from biome_colored_foliage into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3420
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-16 22:35:05 +00:00
ancientmarinerdev b23fc6d23d Merge branch 'master' into biome_colored_foliage 2023-02-16 22:14:40 +00:00
FossFanatic 68e6965dd0 Remove excessive functions and change the appropriate stuff 2023-02-16 18:09:39 +00:00
FossFanatic 7d642c9929 Remove the tab before the curly bracket 2023-02-16 17:25:21 +00:00
FossFanatic 406b27852b Improve the new function somewhat 2023-02-16 07:54:00 +00:00
ancientmarinerdev d00f183456 Merge pull request 'Prevent setting fire on top of water' (#3446) from emptyshore/MineClone2:3152-fire-water into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3446
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-15 20:13:32 +00:00
emptyshore b121d0f804 Prevent placement of fire into nodes above water
This addresses the edge case where fire is set to the top of a non-water
block that represents water (such as kelp).

Note this is forbidding theoretically legitimate setups for fire over
water where fire is set to the side of a block diagonally from the
water.

Fire is still permitted next to water (so it can be set to the face of a
block diagonally from a water column).
2023-02-16 08:56:17 +13:00
FossFanatic 8f8385e4a1 Use metadata method to make player mangrove leaves 2023-02-15 18:29:56 +00:00
FossFanatic 17fc7a3256 Use metadata method to make player leaves 2023-02-15 18:29:18 +00:00
ancientmarinerdev c08153fa7f Merge pull request 'Texture-Rename-2' (#3456) from Texture-Rename-2 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3456
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-15 16:26:40 +00:00
ancientmarinerdev ba708010a2 Fix incorrect crimson texture issue 2023-02-15 16:23:08 +00:00
Michieal 6601ecf788 Basic signs texture replacement. 2023-02-15 14:52:00 +00:00
Michieal 660c85dddc Changed mcl_buckets' image use to be named properly. This fixes issue #3455 2023-02-15 14:52:00 +00:00
Michieal 2d0b4dd8f7 Finished mcl_crimson. 2023-02-15 14:52:00 +00:00
FossFanatic 10d9eb2980 Upload files to 'mods/MAPGEN/mcl_mapgen_core' 2023-02-15 12:23:58 +00:00
FossFanatic 3d9df5c797 Fix issue with vines in certain biomes
This commit removes some excessive checks which caused vines to not get a biome colour in certain biomes at certain rotations.
2023-02-15 12:20:15 +00:00
Michieal 8cc90b6714 Merge pull request 'Document hotfix release process' (#3453) from hotfix_process_document into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3453
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-02-15 08:02:37 +00:00
ancientmarinerdev db4ff13aeb Document hotfix release process 2023-02-15 00:30:01 +00:00
FossFanatic f919f73c24 Improve some code 2023-02-14 18:14:10 +00:00
FossFanatic 319beb91ce Improve vines code 2023-02-14 18:11:43 +00:00
FossFanatic bea9bbe212 Improve certain functions 2023-02-14 18:10:49 +00:00
FossFanatic 8fd40eaf46 Replace get_registered_biome_from_pos with get_palette_indexes_from_pos 2023-02-14 18:08:59 +00:00
FossFanatic fcaa2c4ce1 revert 55478f6953
revert Fix crash with mapgen v6
2023-02-14 14:22:03 +00:00
FossFanatic 55478f6953 Fix crash with mapgen v6 2023-02-14 14:01:14 +00:00
FossFanatic 57882ae56a Merge branch 'master' into biome_colored_foliage 2023-02-14 13:27:37 +00:00
FossFanatic fee4ccf096 Convert old player leaves into new system
This commit adds a couple of lines to the `mcl_mapgen_core:fix_foliage_palette_indexes"` LBM, which ensures that player leaves which were placed before this update get converted into the new player leaves.

I would have included mangrove leaves, but decided against it because of an issue where the `param2` of mangrove leaves was accidentally set to 1 (in the schematics?). This meant that if I included mangrove leaves, the LBM would have converted the natural leaves as well.

This would have made it very tedious to clean up the leaves after chopping down a mangrove tree, since these would not rot by themselves.
2023-02-14 11:20:00 +00:00
FossFanatic f653f47f26 Improve the new code somewhat 2023-02-14 08:36:49 +00:00
FossFanatic 7b7e213925 Fix mcl_util.get_registered_biome_from_pos(pos)
Adds something which was missing from the function.
2023-02-14 08:12:55 +00:00
ancientmarinerdev cf829b6481 Merge pull request 'Disable crafting white and blue dye from lily of the valley and cornflowers respectively' (#3449) from disable_lily_dye_craft into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3449
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-14 02:46:10 +00:00
PrairieWind f62546a54f Comment out crafting white and blue dye from lily of the valley and cornflowers respectively 2023-02-13 19:37:04 -07:00
ancientmarinerdev 7b6d946d7b Merge pull request 'Campfire API' (#3437) from campfire_api into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3437
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-14 02:35:34 +00:00
PrairieWind 1da272a941 Add campfires to the list of working item APIs 2023-02-14 02:25:50 +00:00
PrairieWind e3f14a3a99 Campfire API 2023-02-14 02:25:50 +00:00
ancientmarinerdev a9a61a034c Merge pull request 'Texture Conversion: Name Change Set 1 - Fixed Branch' (#3448) from fix_files_rename_branch into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3448
2023-02-14 02:09:04 +00:00
ancientmarinerdev 6f98ba5118 Fix crimson mushroom naming issue 2023-02-14 02:00:19 +00:00
ancientmarinerdev f6f812257e Fix crimson name mismatch 2023-02-14 01:50:06 +00:00
Michieal f05e976d18 changed comment. 2023-02-14 01:50:05 +00:00
Michieal 5533ec7bac fix mobs losing their textures. 2023-02-14 01:50:05 +00:00
Michieal b66e2a117f fix json reading error. 2023-02-14 01:50:05 +00:00
Michieal 09ef5fd96b optipng the textures. 2023-02-14 01:50:05 +00:00
Michieal 1e61fc3069 Fixed "mcl_crimson_mcl_crimson" issue.
Fixed colors.json stupidity.
2023-02-14 01:50:05 +00:00
Michieal ef30646788 Changed mcl_crimson - finished. 2023-02-14 01:50:02 +00:00
Michieal 70e4aaa3a7 Changed mcl_crimson part 1. 2023-02-14 01:48:11 +00:00
Michieal 8bfa55fa7a Changed Salmon, Glow Squid, Cod, Cartography Table, Awards_Axolotl, Armor_Stand_Item. Glow-Ink_sac. 2023-02-14 01:43:16 +00:00
Michieal 2ba6a60e55 Deleted unused _alt textures from mcl_crimson. 2023-02-14 01:43:16 +00:00
FossFanatic aeddb7675f Don't run LBMs at every load
This commit makes it so the LBMs don't run at every load.

This commit also adds some new `minetest.register_on_generated()` code, which should ensure that any newly generated mapblocks have the correct foliage colours.
2023-02-13 18:50:26 +00:00
FossFanatic 2ccfd89379 Add nil checks 2023-02-13 15:49:19 +00:00
FossFanatic 3a24903a01 Add nil check 2023-02-13 15:46:45 +00:00
FossFanatic abdd5e11c0 Shorten code slightly 2023-02-13 15:46:08 +00:00
FossFanatic e17fab385b Add nil checks 2023-02-13 15:44:23 +00:00
FossFanatic 17cae6896e Add back the logical code?
My gut feeling tells me that it is somehow a bad idea to have removed this.
2023-02-13 11:17:51 +00:00
FossFanatic 1c84bc6572 Put all affected grass blocks in a local
This commit puts all nodes which make use of the grass palette in a local, to make for less messy code.
2023-02-13 10:33:47 +00:00
FossFanatic 4d29fab932 Improve some trees code 2023-02-13 10:22:28 +00:00
FossFanatic a2087b19a5 Delete rogue file 2023-02-13 10:20:48 +00:00
PrairieWind 84119d8f34 Merge pull request 'Add Lily of the Valley and Cornflower Flowers' (#3438) from lily_of_the_valley into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3438
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-13 01:21:56 +00:00
PrairieWind 5da6c25ccf Fix cornflower biomes and change seed values for cornflowers and lilies of the valley 2023-02-12 23:29:02 +00:00
PrairieWind b79f74c390 Update Translation Template for flowers 2023-02-12 23:29:02 +00:00
PrairieWind 06f47a0756 Add Cornflowers
Evidently I didn't include the lily texture in the lily of the valley commit, so it is in this one. Again, lily of the valley texture by Nicu
2023-02-12 23:29:02 +00:00
PrairieWind ff79af26e4 Add Lily of the Valley Flower
Awesome Lily Texture by Nicu
2023-02-12 23:29:02 +00:00
ancientmarinerdev de56c72e15 Merge pull request 'Change kelp to use ABMs to solve performance issues' (#3417) from i_need_professional_kelp into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3417
2023-02-12 23:13:25 +00:00
ancientmarinerdev e3c8d995b5 Finish clean up# 2023-02-12 22:48:20 +00:00
ancientmarinerdev b8b45210e9 Clean up and remove old code 2023-02-12 22:48:20 +00:00
ancientmarinerdev a1f10205f6 Init age on plant so not all kelp grow to top of ocean 2023-02-12 22:48:20 +00:00
ancientmarinerdev 6f7505b6c6 Change kelp to use ABMs to solve performance issues 2023-02-12 22:48:20 +00:00
PrairieWind e323ab6e88 Merge pull request 'Make sea pickles smelt into lime dye' (#3436) from sea_pickle_dye into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3436
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-12 16:23:55 +00:00
FossFanatic c88f0047c1 Merge branch 'master' into biome_colored_foliage 2023-02-12 08:44:29 +00:00
FossFanatic 0400d9a2a5 Even further improvements to some foliage code 2023-02-12 08:28:21 +00:00
FossFanatic 3590ff6dfb Improve some LBM code 2023-02-12 08:23:19 +00:00
FossFanatic d1ceacf7ba Improve some vines code 2023-02-12 08:22:07 +00:00
FossFanatic a70a6ef13d Improve some foliage code 2023-02-12 08:21:14 +00:00
FossFanatic b4e84dadb0 Add new function
Adds the `get_registered_biome_from_pos` function, which does what the name says.
2023-02-12 07:57:04 +00:00
PrairieWind 194ff53400 Make sea pickles smelt into lime dye 2023-02-12 01:09:25 +00:00
ancientmarinerdev e7e0b082c4 Merge pull request 'Footer Annoyance Fix' (#3431) from footer_annoyance_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3431
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-12 01:00:45 +00:00
FossFanatic 18b888da8b Remove the thing above the "o" in "version" 2023-02-12 00:06:01 +00:00
ancientmarinerdev 15a15158b8 Merge pull request 'Pathfinding optimisations and villager has earlier bed time' (#3410) from villager_tweaks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3410
2023-02-11 10:48:36 +00:00
ancientmarinerdev 9445e10834 Pathfinding optimisations and villager has earlier bed time 2023-02-11 10:36:56 +00:00
ancientmarinerdev 35a75491f4 Merge pull request 'Fix hungry sheep and hyrdophobic passive mobs' (#3435) from drowning_and_hungry_mobs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3435
2023-02-11 10:26:19 +00:00
FossFanatic 81dbdaab94 Adjust palette foliage check
The excessive 128 blocks high check has been changed to now check only up to 30 blocks, since the tallest 2x2 jungle tree I seemed to get was only 29 blocks tall.

I also discovered that the search area wasn't wide enough, so sometimes the most outer leaves avoided the check. I also adjusted that.
2023-02-11 07:53:12 +00:00
ancientmarinerdev 2fd7f8c69f Fix hungry sheep and hyrdophobic passive mobs 2023-02-11 00:37:16 +00:00
ancientmarinerdev 6a34a30941 Merge pull request 'Mob spawning improvements and balancing' (#3356) from mob_cap_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3356
2023-02-10 19:09:06 +00:00
ancientmarinerdev d4c2802afb Implement review/testing feedback 2023-02-10 19:01:29 +00:00
ancientmarinerdev b2dbf48e92 Default setting fix 2023-02-10 19:01:29 +00:00
ancientmarinerdev bf50a17f2e Limit spawning of mobs outside y axis as well 2023-02-10 19:01:29 +00:00
ancientmarinerdev b817c079ba Improve balancing for early game 2023-02-10 19:01:29 +00:00
ancientmarinerdev cfa276f722 Add settings for percentage of hostile and peaceful groups spawned 2023-02-10 19:01:29 +00:00
ancientmarinerdev 86b1d8bc3e Add world gen limits to spawning to avoid things spawning past the world gen limits 2023-02-10 19:01:29 +00:00
ancientmarinerdev 9c2f43a242 Limit peaceful spawning and add configurable option 2023-02-10 19:01:29 +00:00
ancientmarinerdev 044a91e831 Change spawn cap groups to spawn_type to give water it's own spawn cap. 2023-02-10 19:01:29 +00:00
ancientmarinerdev 106979e64a Clean up 2023-02-10 19:01:29 +00:00
ancientmarinerdev 4482068211 Nerf group spawning until group spawn is based on pack size, not per spawn attempt 2023-02-10 19:01:29 +00:00
ancientmarinerdev 1dc7cab6be Add logging 2023-02-10 19:01:29 +00:00
ancientmarinerdev 634379dfe9 Retry if failing to find spawn position 2023-02-10 19:01:29 +00:00
ancientmarinerdev c2ac33ac61 Mobs now can spawn in multiple positions around you per spawning cycle 2023-02-10 19:01:29 +00:00
ancientmarinerdev b5c0830060 Restructure code and tidy 2023-02-10 19:01:29 +00:00
ancientmarinerdev c43c723e08 Clean logging etc. 2023-02-10 19:01:29 +00:00
ancientmarinerdev bd3a4ff0df Clean up 2023-02-10 19:01:28 +00:00
ancientmarinerdev 0267ad2f31 Decrease change of groups spawning for peacefuls. Refresh total mobs check on spawn. 2023-02-10 19:01:28 +00:00
ancientmarinerdev a2f9ea81cc Fix mobs debug crash 2023-02-10 19:01:28 +00:00
ancientmarinerdev 7c7f4b930c Move cap check out of spawn checks and reimplement close cap check 2023-02-10 19:01:28 +00:00
ancientmarinerdev 60529d3d5d Add in constants for spawn zones 2023-02-10 19:01:28 +00:00
ancientmarinerdev 6ea4b43249 Limit group spawn to available cap space. Total mobs check once per spawn cycle. 2023-02-10 19:01:28 +00:00
FossFanatic 1fb300ef18 Fix leaves not dropping
Due to some renaming, leaves no longer dropped from any of the `mcl_core` trees.

This has now been fixed.
2023-02-10 18:40:35 +00:00
FossFanatic b789845f62 Indentation improvements 2023-02-10 15:19:02 +00:00
FossFanatic f368fb3e43 Indentation improvements 2023-02-10 15:17:46 +00:00
FossFanatic d63ecac7cb Indentation improvements 2023-02-10 15:14:53 +00:00
FossFanatic 7fbc84971e Remove useless function
This commit removes an useless function which wasn't really needed.
2023-02-10 15:12:37 +00:00
FossFanatic 953044cc4b Mangrove propagules also grab biome colour on growth 2023-02-10 11:33:58 +00:00
FossFanatic 6744967d02 Make placed mangrove leaves always become player leaves
The same thing as with the `mcl_core` leaves.
2023-02-10 10:41:43 +00:00
FossFanatic fdb2333493 Make placed leaves always become player leaves
Any players which still have leaves in their inventory from before this update would have had those leaves rot if someone were to break any log withing 6 nodes of the leaves if they were placed. This commit adds an `after_place_node` callback which makes sure that any leaves placed by the player, become non-rotting player leaves.
2023-02-10 10:39:43 +00:00
FossFanatic 1defd03408 Make the function work self grown saplings
Saplings now also get the biome's foliage colour when grown by themselves.
2023-02-10 10:06:55 +00:00
FossFanatic d163faeb42 Use more fitting names for the newly added function
Basically renaming anything related to leaves in the new function to something more broad such as foliage, so vines aren't indirectly considered leaves. An aesthetic change, basically.
2023-02-10 08:08:28 +00:00
FossFanatic 197d3ae00b Make sapling foliage grab biome colour 2023-02-10 08:04:13 +00:00
ancientmarinerdev 6b8226dae3 Merge pull request 'Bamboo Piston Fix.' (#3424) from Bamboo_Piston_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3424
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-10 03:49:40 +00:00
Michieal f6b77aa458 reformated code. 2023-02-10 03:42:34 +00:00
Michieal 1558c852d8 Undo mesecon.register_mvps_dropper() and use abms until more research can be done. 2023-02-10 03:42:34 +00:00
Michieal 6c0525f00e Fix merge / rebase crossing massacre.
[Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation.

[Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons.

[Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes.

[Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons.
Probably not the most elegant, but hey. It works.

[Michieal] 76507025d9 Cleaned up the global function to match the current ABM.

[Michieal] dfa849e19a Merge branch 'master' into Bamboo-Piston-Dig

[Michieal] a5bdc8a166 fix bamboo mosaic recipe.

[Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps

[Michieal] f81d530912 Update init.lua to register dropper callback.
2023-02-10 03:42:34 +00:00
ancientmarinerdev 3c13ce1d6b Merge pull request 'Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index.' (#3408) from fix_dirt_dry_grass into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3408
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-10 02:50:27 +00:00
ancientmarinerdev c1d5d4280e Merge pull request 'Fixed weather not clearing after sleep' (#3414) from rain_bed_skip into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3414
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-10 02:00:23 +00:00
PrairieWind 70fb4f8a0d Fixed weather not clearing after sleep
Isnt as clean as it should be because making it clean made some very funky results
2023-02-10 01:51:28 +00:00
ancientmarinerdev 620a0af483 Merge pull request 'Fix damage desyncing entity from chest node, making it invisible' (#3385) from emptyshore/MineClone2:fix-lightning-chests into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3385
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-10 00:38:55 +00:00
ancientmarinerdev 428b1b2c12 Merge pull request 'remove "mushroom" from the names of crimson fungus and warped fungus' (#3406) from SmokeyDope/MineClone2:change_fungus_name into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3406
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-02-09 18:22:04 +00:00
FossFanatic 4ddab8bdf1 Remove the ABMs
There are likely better ways to fix any palettes that the LBMs missed.
2023-02-09 16:16:13 +00:00
FossFanatic bfe4b2fd31 Merge branch 'master' into biome_colored_foliage 2023-02-09 15:24:20 +00:00
FossFanatic cc8675602a Optimised foliage 2 2023-02-09 13:02:02 +00:00
FossFanatic aff1d5f667 Optimised foliage 1 2023-02-09 13:01:23 +00:00
FossFanatic 169019096e Change the waterlily code
Waterlilies now use a brownish grey texture with a coded hex colour.
2023-02-09 09:46:18 +00:00
FossFanatic 049db13b28 Add new waterlily texture 2023-02-09 09:40:17 +00:00
SmokeyDope dfbee5cb93 Add "mushroom" to the warped fungus and crimson fungus item descriptions for creative search 2023-02-09 03:22:17 +00:00
SmokeyDope 378af531a9 remove "mushroom" from the names of crimson fungus and warped fungus 2023-02-09 03:22:17 +00:00
ancientmarinerdev 088cda4f1c Merge pull request 'Make minecart rails unable to be broken with water & lava' (#3415) from minecart_track_water_breaking_3 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3415
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-09 02:03:47 +00:00
SmokeyDope 71671f8b5f Make minecart rails unable to be broken with lava 2023-02-09 01:53:52 +00:00
SmokeyDope c4d60e50cc Make minecart rails unable to be broken with water 2023-02-09 01:53:52 +00:00
ancientmarinerdev 9421c7ca6b Merge pull request 'Make The Footer Correct' (#3423) from beta_footer into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3423
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-09 01:22:58 +00:00
FossFanatic d9982e20d2 Make the footer more with the times 2023-02-08 19:57:00 +00:00
ancientmarinerdev 30bb1ab075 Merge pull request 'Mobs fix crash and not drop XP when dying by fire from sunlight' (#3398) from mob_death_xp_drop into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3398
2023-02-08 19:44:12 +00:00
ancientmarinerdev b834e790a7 Fix game crashes 2023-02-08 19:34:04 +00:00
ancientmarinerdev 39d4434df1 Reorder on_step calls 2023-02-08 19:34:04 +00:00
ancientmarinerdev 4b9482cb09 Mobs should not drop XP when dying by fire from sunlight 2023-02-08 19:34:04 +00:00
FossFanatic 4757e62968 Add vine texture I forgot
I forgot to add this one with the batch.
2023-02-08 16:20:42 +00:00
FossFanatic b95ebb3fca Add LBMs, ABMs, and more
This commit adds 1 new LBM (for foliage) and 2 new ABMs (one for foliage, and one for grass).

This also adds a new generator so any new maps created will have biome coloured leaves with a faster method. (Vines are excluded from this generator since I don't know yet how to get those to work with this.)
2023-02-08 16:17:33 +00:00
FossFanatic 07f332f0cd Add foliage palette indexes
This commit adds foliage palette indexes to every biome, this makes it possible for foliage to use biome colouring.
2023-02-08 16:15:04 +00:00
FossFanatic f4e8088e60 Improve mangrove leaves
This commit makes it so mangrove leaves also no longer use `param2` to see if they rot or not. The leaves also use the biome colours now.
2023-02-08 16:13:13 +00:00
FossFanatic 198375a18e Change stuff in mcl_core
Simply put, this commit changes some code so that leaves don't use `param2` to see if they rot or not, and will now use the biome colours.

This commit also makes it so vines do the same (use biome colours).
2023-02-08 16:11:38 +00:00
FossFanatic c26cddeafc Add batch 2 of the new leaf textures + foliage palette 2023-02-08 16:06:08 +00:00
FossFanatic 714d159072 Add batch 1 of the new leaf textures 2023-02-08 16:05:34 +00:00
emptyshore bdc82b76b5 Respect immortal armor group, ensuring objects are not dealt damage
Context: some objects such as chest, frame or sign entities are set to
be immortal, because they are tied to a node and should not be removed
on their own.

However since immortality wasn't respected, it would lead to odd desync
issues between nodes and accompanying entities. An example is a chest
that becomes invisible when struck by lightning or anvil.
2023-02-08 15:59:36 +13:00
ancientmarinerdev 6f67f0e095 Merge pull request 'Updated credits and contributing' (#3413) from translation_credit_anarquimico into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3413
2023-02-07 17:15:11 +00:00
ancientmarinerdev d5687716a0 Updated credits and contributing 2023-02-07 17:12:56 +00:00
ancientmarinerdev 5f0d91cf26 Merge pull request 'anarquimico_translations_1' (#3412) from anarquimico_translations_1 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3412
2023-02-07 16:53:53 +00:00
anarquimico e2de5908c7 5th ITEMS batch 2023-02-07 16:39:24 +00:00
anarquimico 439c879508 4th batch of ITEMs translation 2023-02-07 16:39:23 +00:00
anarquimico 67977b0d26 Third batch of ITEMS translation 2023-02-07 16:39:23 +00:00
anarquimico ed8c3e7d26 Second batch of ITEMS translated 2023-02-07 16:39:22 +00:00
anarquimico 7add59992f First batch of ITEMS translation 2023-02-07 16:39:22 +00:00
ancientmarinerdev d72a674097 Merge pull request 'fix_copper_blocks' (#3390) from fix_copper_blocks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3390
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-06 23:16:11 +00:00
Michieal ef4e4b1b7b Merge branch 'master' into fix_copper_blocks 2023-02-06 16:58:38 -05:00
Michieal 0e000e6491 Merge branch 'master' into fix_dirt_dry_grass 2023-02-06 16:55:14 -05:00
Michieal ec7a97ba3e Made LBM run at every load, so that it catches anything missed from previous passes. 2023-02-06 16:54:23 -05:00
PrairieWind 290680fb3d Merge pull request 'Add compostability to nether plants' (#3404) from SmokeyDope/MineClone2:nether_plants_composting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3404
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-02-06 20:20:42 +00:00
SmokeyDope 48eb934d64 Add compostability to warped wart blocks and shroomlight 2023-02-06 13:08:28 -07:00
SmokeyDope 88cf3a5900 Add compostability to nether sprouts 2023-02-06 13:08:27 -07:00
SmokeyDope 1401652015 Add compostability to warped roots and crimson roots 2023-02-06 13:08:26 -07:00
SmokeyDope cac6e15736 Add compostability to twisting vines and weeping vines 2023-02-06 13:08:24 -07:00
SmokeyDope 156d096a78 Add compostability to warped fungus and crimson fungus 2023-02-06 13:08:23 -07:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 db3483a6cb Merge pull request 'Fix mapgen issue for mcl5 to mcl2 conversion' (#3349) from fix_villages_crash_mcl5 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3349
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-02-06 19:25:49 +00:00
ancientmarinerdev ace6f8db43 Ensure index for heightmap entry is within bounds 2023-02-06 13:16:15 -06:00
ancientmarinerdev 9aeafe6053 Fix mapgen issue for mcl5 to mcl2 conversion 2023-02-06 13:16:15 -06:00
Michieal de00b7228e Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index. 2023-02-05 21:17:53 -05:00
ancientmarinerdev d454697953 Merge pull request 'More Sky Improvements' (#3391) from more_sky_improvements into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3391
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-06 01:48:38 +00:00
FossFanatic ce2011218c Make the default sunrisebg invisible 2023-02-06 01:42:10 +00:00
FossFanatic ccef2d1147 More sky improvements 2023-02-06 01:40:25 +00:00
ancientmarinerdev 5fbec2f6b5 Merge pull request 'Added conditional based on existing fire damage conditional that will apply fire damage to a' (#3405) from magma_damage_guy into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3405
2023-02-06 00:22:48 +00:00
GuyLiner 4d922d9edf Added conditional based on existing fire damage conditional that will apply fire damage to a
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
2023-02-06 00:10:52 +00:00
Michieal 46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal 08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev 7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 03:23:13 +00:00
ancientmarinerdev 58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 00:27:48 +00:00
Michieal 50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope 08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope 16a6dcb66c Completely remove selection box for warped fungus
Recommended by Michael
2023-02-02 22:45:06 +00:00
SmokeyDope 89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope 27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope 659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope 88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00
ancientmarinerdev cdc922d4ac Merge pull request 'Make fletcher buy sticks' (#3383) from mrminer/MineClone2-Fletcher-Fix:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3383
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 15:37:35 +00:00
ancientmarinerdev 060732cd66 Merge pull request 'Adjust amethyst bud growth' (#3374) from Amethyst_Bud_Growth into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3374
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 15:26:20 +00:00
Michieal ad43fbd237 Adjust amethyst bud growth speed. 2023-02-02 15:25:33 +00:00
Michieal 618313f0af Merge branch 'master' into fix_copper_blocks 2023-02-01 23:51:29 -05:00
ancientmarinerdev 31fb7faf16 Merge pull request 'feat: Rain particles move straight down, increase acceleration slightly' (#3369) from atomdmac/MineClone2:adjust-rain-velocity into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3369
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Reviewed-by: epCode <epcode@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-02 04:50:00 +00:00
Michieal a3bc3fd9b9 Removed old commented code to prevent accidental re-enabling, and put the todo into the correct spot. 2023-02-01 23:49:04 -05:00
Michieal c370f1884b Fixed the unwax copper blocks variants to be able to properly remove oxidization levels properly.
MCL_COPPER Blocks off all types (not stairs and slabs) now function properly.
2023-02-01 23:34:02 -05:00
Michieal b771f314fe Removed "scraping_copper_block" function.
Fixed the wax copper blocks variants to have the wax removed.
2023-02-01 23:24:59 -05:00
ancientmarinerdev f6a5004eab Merge pull request 'Fix wither crash on certain version of Lua.' (#3365) from fix_wither_head_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3365
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2023-02-02 02:23:27 +00:00
ancientmarinerdev 7daa79a3f8 Fix wither crash on certain version of Lua. 2023-02-02 02:22:21 +00:00
Michieal 4b0b3217e2 added in TODO 2023-02-01 19:55:23 -05:00
ancientmarinerdev e363435134 Merge pull request 'mcl_starting_chest' (#3373) from mcl_starting_chest into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3373
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-01 23:54:44 +00:00
Michieal 5b1c7f2d3a Everything *BUT* scraping works properly. 2023-02-01 18:39:13 -05:00
ancientmarinerdev 63ace64cae Merge pull request 'Underwater Darkness HUD Removal' (#3367) from water_darkness_hud_removal into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3367
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-01 22:52:08 +00:00
FossFanatic 0c0845c1bd Change the underwater detection code a bit 2023-02-01 22:50:50 +00:00
FossFanatic 24b1078b61 Make the post effect alpha the same between water source and flow 2023-02-01 22:50:50 +00:00
FossFanatic 3546d04aaa Remove water HUD code 2023-02-01 22:50:50 +00:00
FossFanatic 1abd226e07 Remove water HUD 2023-02-01 22:50:50 +00:00
ancientmarinerdev f4b1116e21 Merge pull request 'Fix V6 & Singlenode Crash' (#3386) from v6_crash_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3386
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-01 22:37:02 +00:00
FossFanatic cbb3260471 Make the palette fix LBM not run on v6 & singlenode
This fixes a crash when loading a world that doesn't have any biomes and the LBM tries to give the grassy nodes a biome colour.
2023-02-01 22:35:13 +00:00
ancientmarinerdev 855659a2a1 Merge pull request 'Fix ender chest crash + remove map hand reference' (#3387) from ender_chest into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3387
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-01 22:09:26 +00:00
Johannes Fritz 8793ed211e Fix ender chest crash + remove map hand reference 2023-02-01 09:56:12 -06:00
mrminer 01f814267e Update 'mods/ENTITIES/mobs_mc/villager.lua' 2023-01-31 21:14:23 +00:00
mrminer 8f4c69084d Make fletcher buy sticks 2023-01-31 21:12:01 +00:00
Michieal 425cf53194 fix minor bug. 2023-01-30 23:57:50 -05:00
Michieal d04f162d8f Initialize Global variable. 2023-01-30 23:53:40 -05:00
Michieal 7f84922403 fix missing skin file 2023-01-30 23:14:44 -05:00
Michieal 025f97187a Adjust for mcl_skins requirements. 2023-01-30 23:07:23 -05:00
Michieal 06effcd786 Merge branch 'master' into texture-consolidation 2023-01-30 22:57:38 -05:00
Michieal 6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
ancientmarinerdev 2ad60b06ea Merge pull request 'Set freeze and warning when mobs too close to boundary of world' (#3363) from fix_mob_past_mapgen_limits into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3363
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-31 02:29:02 +00:00
ancientmarinerdev 245ce99223 Using mcl_vars 2023-01-31 02:28:04 +00:00
ancientmarinerdev 1f107ec0c7 Tidy 2023-01-31 02:28:04 +00:00
ancientmarinerdev c209537cfe Make it a bit less chatty for logging 2023-01-31 02:28:04 +00:00
ancientmarinerdev d583ccb986 Oooops, wrong number 2023-01-31 02:28:04 +00:00
ancientmarinerdev 7d803e174c Set freeze and warning when mobs too close to boundary of world 2023-01-31 02:28:04 +00:00
Michieal 319602508d Make copper block nodes use on_place. 2023-01-30 20:13:32 -05:00
Michieal 8c703f1352 Refactored out "varient" in foavor of "variant".
Set up a basic "on_place" function.

Made _mcl_copper_waxed_variant and _mcl_copper_unwaxed_variant node parameters so that the waxing_copper_block and scraping_copper_block functions can be made generic.

Adjusted said functions to look first for the variants, and added in protection checks for the blocks
2023-01-30 18:27:53 -05:00
Michieal 95b1429922 Add mcl_util to mcl_copper's mod.conf file. 2023-01-30 16:01:09 -05:00
SmokeyDope 32b5b435c5 Make weeping vines and twisting vines break instantly
Partial revert of previous commit, they should break instantly
2023-01-30 17:09:50 +00:00
SmokeyDope a3fe41128f Make netherite ingot crafting shapeless 2023-01-30 05:38:33 +00:00
SmokeyDope 1a495dd63a Make ancient debris smeltable in a blast furnace 2023-01-30 05:03:50 +00:00
Michieal 29597af738 Fixed noted errors from Pull Request. 2023-01-29 13:12:24 -05:00
Michieal f3e840a0ff Merge branch 'master' into mcl_starting_chest 2023-01-29 13:02:03 -05:00
Adam Macumber 7dd0293616 feat: Rain particles move straight down, increase acceleration slightly 2023-01-28 11:04:58 -05:00
ancientmarinerdev 63360bcab2 Merge pull request 'Nether & End Biome Sky/Fog Colours' (#3342) from biome_skycolor_otherworlds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3342
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-26 22:49:54 +00:00
ancientmarinerdev 0b1881d1d4 Merge pull request 'Slower creative digging' (#3284) from dig_speed into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3284
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-26 22:43:38 +00:00
Johannes Fritz 8cf6269dda Fix mesh hand unknown item bug + fix fast digging disabled for simple skins 2023-01-25 12:13:53 -06:00
SmokeyDope 1f09c0a128 Make weeping vines and twisting vines break the same speed as regular vines 2023-01-25 05:47:41 +00:00
SmokeyDope fb8060c366 lower hardness of warped wart block and shroomlight block to match nether wart block 2023-01-25 04:06:59 +00:00
Johannes Fritz da7320b14c Add survival tool capabilites to all items 2023-01-24 11:38:58 -06:00
Johannes Fritz 66ff8ab8a9 Add a creative dig speed setting 2023-01-24 11:16:28 -06:00
Johannes Fritz a1cc24f8d3 Slowing creative digging 2023-01-24 11:16:28 -06:00
SmokeyDope 6f22d7daa4 Add node breaking logic to twisting vines and weeping vines
breaking twisting vines will break the ones above them, breaking weeping vines breaks the ones below them
2023-01-24 17:15:22 +00:00
SmokeyDope dc3eedac5f Add breaking sounds for warped fungus, nether sprouts, warped roots, crimson fungus, crimson roots 2023-01-24 16:24:35 +00:00
FossFanatic f3bed9f599 Move locals upward & uncomment some things (again) 2023-01-24 07:27:36 +00:00
FossFanatic f84bdbd777 Merge branch 'master' into biome_skycolor_otherworlds 2023-01-24 07:22:04 +00:00
FossFanatic 7712c45c4e Fix conflict 2023-01-24 07:21:48 +00:00
ancientmarinerdev 02ee8b757d Merge pull request 'Biome Colour Palette Fixes' (#3203) from simplified_palette_index into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3203
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-24 00:21:12 +00:00
SmokeyDope 39b6e41a62 revert hitbox size for warped fungus 2023-01-23 22:34:22 +00:00
SmokeyDope ef1f7b8e20 make blackstone, basalt, and nether gold ore mineable with a wooden pickaxe
Fixes #3287
2023-01-23 22:17:12 +00:00
PrairieWind 5c32d1c106 Merge pull request 'Fix crash when leaves don't have a registered orphan but try to rot' (#3346) from rubber_crash_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3346
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-01-23 22:02:24 +00:00
SmokeyDope 70b56d7126 Fix hitbox size for Warped Fungus 2023-01-23 21:30:32 +00:00
ancientmarinerdev c4ea504123 Fix crash when leaves don't have a registered orphan but try to rot 2023-01-23 20:58:05 +00:00
ancientmarinerdev 6d60fb4160 Merge pull request 'Add some mob object checks to avoid crashing' (#3324) from fix_ghast_kill_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3324
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-23 20:19:34 +00:00
ancientmarinerdev e4f26a4688 Fix self object checks for check suspend 2023-01-23 20:10:28 +00:00
ancientmarinerdev af86e73280 Fix self object reference in player_in_active_range 2023-01-23 20:10:28 +00:00
ancientmarinerdev 32be8f9602 Fix more self object references in falling 2023-01-23 20:10:28 +00:00
ancientmarinerdev 15560d969c Change order of mob step 2023-01-23 20:10:28 +00:00
ancientmarinerdev 6bbf3af97b Remove log line 2023-01-23 20:10:28 +00:00
ancientmarinerdev 84317afc93 Review feedback implemented and planned changes 2023-01-23 20:10:28 +00:00
ancientmarinerdev 2cd6629ae1 Add some mob object checks to avoid crashing 2023-01-23 20:10:28 +00:00
SmokeyDope f971283798 Add placement sounds to twisting vines and weeping vines 2023-01-23 16:55:18 +00:00
FossFanatic 9afdd09d9d Fix wrong init accident
I accidentally put the `init.lua` of `mcl_biomes` instead of `mcl_mapgen_core` in my previous commit. This fixes that.
2023-01-23 10:25:48 +00:00
SmokeyDope 62bb7a85eb Add sounds to weeping vines and twisting vines, updated warped wart block and shroomlight sounds 2023-01-23 02:04:58 +00:00
SmokeyDope 42eb541eaa Add sound to warped wart block and shroomlight block 2023-01-23 01:28:55 +00:00
SmokeyDope 9e8ed7efc3 make hoes effective and swords slightly effective on nether wart blocks 2023-01-23 00:11:56 +00:00
SmokeyDope 36231241ba make hoes effective on warped wart blocks and shroomlight blocks 2023-01-23 00:06:46 +00:00
ancientmarinerdev 9a276489d1 Merge pull request 'Fix assist death messages rarely showing up' (#3265) from CyberMango/MineClone2:dev/mango/assist_death_messages_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3265
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-22 23:31:58 +00:00
CyberMango e2cbd4267c Added back sweet berries death messages. 2023-01-22 22:59:28 +02:00
CyberMango 4ec506b534 Turned a global constant into local. 2023-01-22 22:59:28 +02:00
CyberMango 06435e0f4c Mixed 2 conditions into 1. 2023-01-22 22:59:28 +02:00
CyberMango a1d98c080f Now only allowing players and lua entities to do assist kills. 2023-01-22 22:59:28 +02:00
CyberMango 96cd2657db Cleanup and removed debug prints. 2023-01-22 22:59:23 +02:00
CyberMango cd63f32cdd Fixed and optimized assist death messages.
Still left many log messages, a longer timeout and some unclean parts.
2023-01-22 22:58:46 +02:00
FossFanatic 2d81d153bd Unsimplify the LBM 2023-01-22 18:02:31 +00:00
FossFanatic dc7a46df4e Simplify the LBM even more 2023-01-22 17:46:17 +00:00
FossFanatic ad25b0bc4b Make set palette safer 2023-01-22 16:51:40 +00:00
FossFanatic b77260253a Make grass palette fix LBM more efficient 2023-01-22 15:59:10 +00:00
ancientmarinerdev ad9beebc70 Merge pull request 'Extra Breaking Animation Frame' (#3343) from extra_break_animation_frame into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3343
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-01-22 15:07:25 +00:00
FossFanatic b6951d00b9 Add an extra frame to the breaking animation 2023-01-22 15:06:51 +00:00
ancientmarinerdev 86e480aad0 Merge pull request 'Make sweet berries' velocity checks for damage conditions use absolute values.' (#3308) from CyberMango/MineClone2:dev/mango/make_berries_velocity_check_absolute into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3308
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-22 00:56:48 +00:00
ancientmarinerdev ce7d493890 Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-22 00:45:53 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 995679d7ae Merge pull request 'Fix most deaths not producing a death message.' (#3332) from CyberMango/MineClone2:dev/mango/fix_mt_deaths_messages into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3332
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-20 22:32:22 +00:00
CyberMango c57f797226 Make the velocity checks absolute.
Now sweet berries will cause damage in all directions.
2023-01-20 19:15:55 +02:00
CyberMango 78f32d2dd4 Removed the approved field from death reasons.
This created a strange bug that only death reasons created by
mcl_utils.deal_damage were "approved" so only they triggered running the
death callbacks, so only they triggered printing a death message.
Therefore most deaths did not produce a death message.
2023-01-20 19:15:21 +02:00
FossFanatic a1ad84370c Move locals upward & uncomment some things
Some locals relating to the biome sky colours and fog colours have been moved upward since there otherwise were some issues.

The sky colours and fog colours of the Nether & End biomes have also been uncommented.
2023-01-20 15:44:03 +00:00
FossFanatic f6a3fe2128 Make Nether & End use biome sky- or fog colours 2023-01-20 15:41:44 +00:00
ancientmarinerdev 1c65e0ad68 Merge pull request 'Add how to play notes' (#3341) from add_download_notes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3341
2023-01-20 15:15:51 +00:00
ancientmarinerdev 6900748429 Add how to play notes 2023-01-20 15:14:45 +00:00
ancientmarinerdev f09b723885 Merge pull request 'Release 0.82' (#3337) from release_0_82_0 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3337
2023-01-20 14:43:45 +00:00
ancientmarinerdev efd3420d52 Post-release set version 0.82.0-SNAPSHOT 2023-01-19 23:34:04 +00:00
ancientmarinerdev 62be5a06f6 Update release notes 2023-01-19 22:22:48 +00:00
ancientmarinerdev 683799aea5 Update release steps 2023-01-19 21:54:01 +00:00
ancientmarinerdev 383cbf96a6 Pre-release set version 0.82.0 2023-01-19 21:51:16 +00:00
ancientmarinerdev a7632e767d Run credits update script for release 0.82 2023-01-19 21:09:42 +00:00
ancientmarinerdev 99d09c76ae Merge pull request 'mcl_bamboo2_cleanup' (#3327) from mcl_bamboo2_cleanup into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3327
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-19 21:01:08 +00:00
ancientmarinerdev c7ebe1b8cd Updated Bamboo textures by Nicu. Updated credits as per request from Michieal 2023-01-19 20:51:49 +00:00
ancientmarinerdev 5c464f1c1d Merge pull request 'Grass Footstep Sound Fix' (#3312) from grass_sound_revert into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3312
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-19 13:02:38 +00:00
ancientmarinerdev 87e6842c00 Merge pull request 'Update credits' (#3334) from release_0_82_credits into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3334
2023-01-19 01:36:13 +00:00
Michieal b258ccffdc Merge Master into mcl_bamboo_cleanup 2023-01-18 20:29:40 -05:00
ancientmarinerdev 83b0807218 Update credits 2023-01-19 00:04:16 +00:00
Michieal a00ef4500d Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-18 18:40:23 -05:00
PrairieWind c49aef3251 Merge pull request 'Disable zombie siege raid until we stop zombies pathing through door' (#3329) from disable_zombie_siege into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3329
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-01-18 20:51:04 +00:00
ancientmarinerdev f3ba32d739 Disable zombie siege raid until we stop zombies pathing through door 2023-01-18 19:47:45 +00:00
Michieal ed03cb470d Change Bamboo Trapdoor to be Boring. 2023-01-17 22:12:57 -05:00
FossFanatic 9746dbc376 Make the LBM run at every load again
After testing this out, it seems that the LBM only works consistenly when it runs at every load.
2023-01-17 16:04:12 +00:00
FossFanatic d89a7e0326 Rename _mcl_palette_index back to _mcl_grass_palette_index 2023-01-17 12:55:40 +00:00
FossFanatic 5fd5cc9f1c Merge branch 'master' into simplified_palette_index 2023-01-17 12:53:09 +00:00
FossFanatic c75ec6916c Conflict fix attempt 2 2023-01-17 12:52:50 +00:00
FossFanatic 4b6b4d8398 revert 26e032687a
revert Fix conflict with most recent master
2023-01-17 12:49:43 +00:00
FossFanatic 513d148eaf Merge branch 'master' into grass_sound_revert 2023-01-17 12:44:16 +00:00
FossFanatic 26e032687a Fix conflict with most recent master 2023-01-17 12:39:15 +00:00
Michieal b99487b6ab Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-16 20:19:03 -05:00
ancientmarinerdev 8adc1d48b2 Merge pull request 'Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds.' (#3328) from beetroot_fortune_hotfix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3328
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-17 00:59:25 +00:00
Michieal ac30e25065 Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds. 2023-01-16 19:40:07 -05:00
Michieal 0931af21c8 Remove most oak trees from Bamboo biomes. 2023-01-16 18:34:48 -05:00
Michieal 77a8ca689f Give textures more definition. 2023-01-16 18:16:26 -05:00
ancientmarinerdev 30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-16 20:22:09 +00:00
Michieal 55bb9800f4 removed errant logging line. 2023-01-16 15:07:57 -05:00
Michieal b805ae9926 Adjust bamboo growth rates to be close to the MC wiki. 2023-01-16 15:01:38 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 90c74f4a6a Merge pull request 'Fix undeclared global variable in mcl_buckets' (#3314) from buckets_warning into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3314
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-16 19:02:34 +00:00
Johannes Fritz 6e6c11cde2 Fix undeclared global variable in mcl_buckets 2023-01-16 12:56:59 -06:00
Michieal d48b3dcaee Starting Inventory fix #4 Optimized and remove chatcommand. 2023-01-16 02:12:39 -05:00
Michieal 88493091b6 Starting Inventory fix #3. turn off debugging in code.
Ready for testing.
2023-01-16 01:58:27 -05:00
Michieal d68667beb9 Starting Inventory fix #2. add in chat command, /give_starting_inventory. add in debug code. 2023-01-16 01:53:35 -05:00
Michieal 181628e539 Starting Inventory fix #2 2023-01-16 00:51:23 -05:00
Michieal c57a757510 Starting Inventory fix #1/ 2023-01-16 00:21:15 -05:00
Michieal 26f3275b7c renamed to mcl_starting_inventory... continued. Fixed the setting in settingtypes.txt 2023-01-15 21:23:49 -05:00
Michieal 45b4b4a458 renamed to mcl_starting_inventory as that is what it is. 2023-01-15 21:21:26 -05:00
Michieal 5424ca8c2b Created Starting Chest that is given to players.
Based on the "give_initial_stuff" mod.
2023-01-15 20:39:51 -05:00
ancientmarinerdev 8feefcdd7b Merge pull request 'Give longer to breed mobs. 1.5s is not enough' (#3298) from extend_breeding_time into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3298
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-16 00:01:40 +00:00
ancientmarinerdev 9b28baaad6 Give longer to breed mobs. 1.5s is not enough 2023-01-16 00:00:28 +00:00
PrairieWind 60a1a364dc Merge pull request 'Fix animals jumping way too high upon growing up' (#3316) from growth_jump_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3316
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-15 23:43:07 +00:00
b3nderman f9b021e4c6 Fix animals jumping way too high upon growing up 2023-01-15 22:47:05 +00:00
ancientmarinerdev 65fb911e5f Merge pull request 'Fix geode crash' (#3304) from fix_geode_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3304
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-15 22:28:38 +00:00
ancientmarinerdev 38732e801d Fix geode crash 2023-01-15 22:27:02 +00:00
ancientmarinerdev 5ad2a990d4 Merge pull request 'Allow blaze spawners to be deactivated' (#3315) from fix_blaze_spawner_disable into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3315
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-15 22:24:59 +00:00
ancientmarinerdev 8f6c932e88 Allow blaze spawners to be deactivated 2023-01-15 22:22:14 +00:00
Michieal e9c202ae45 Added Bamboo Biomes to spawning.lua. 2023-01-15 15:30:34 -05:00
Michieal d6ee21d192 Merge branch 'master' into mcl_bamboo_too 2023-01-15 15:27:30 -05:00
PrairieWind 876fc2fb50 Merge pull request 'Fix tamed ocelot textures not being set correctly' (#3317) from tamed_cat_texture_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3317
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-15 19:41:51 +00:00
Michieal 0c61035df0 Missing files from the optipng commit. (not exactly sure what happened.) 2023-01-15 14:30:12 -05:00
b3nderman a7fac7c550 Fix tamed ocelot textures not being set correctly 2023-01-15 16:57:47 +00:00
ancientmarinerdev 93c9fdfaae Merge pull request 'Light Blocks' (#3078) from light-blocks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3078
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-15 15:37:10 +00:00
AFCMS 3027965314 Add comment 2023-01-15 15:32:42 +00:00
AFCMS e9c9f151de Let user dig light blocks when wielding a light block 2023-01-15 15:32:42 +00:00
AFCMS fb8262bf57 Make light blocks `buildable_to` 2023-01-15 15:32:42 +00:00
AFCMS 726358da4b Rename callbacks parameters to match Minetest documentation 2023-01-15 15:32:42 +00:00
AFCMS 515204d296 Update translation template and add french translation 2023-01-15 15:32:42 +00:00
AFCMS eb5f5678d6 Fix typo in barrier help text 2023-01-15 15:32:42 +00:00
AFCMS 33e2b79b2b Make nearby light blocks spawn particles when player wield one 2023-01-15 15:32:42 +00:00
AFCMS 7c497d9604 Remove config file 2023-01-15 15:32:42 +00:00
AFCMS 7c20896d5e Make light blocks not walkable 2023-01-15 15:32:42 +00:00
AFCMS cd70dd5b88 Spawn particle then placing light blocks 2023-01-15 15:32:42 +00:00
AFCMS 302970d220 Basic light blocks 2023-01-15 15:32:42 +00:00
AFCMS 79876635af Use `mcl_util.call_on_rightclick` in `on_place` callback for barrier block 2023-01-15 15:32:42 +00:00
AFCMS b9238b4069 Use new vectors 2023-01-15 15:32:42 +00:00
AFCMS bf25fca47d Remove support for `use_texture_alpha` bool values (mt 5.3) 2023-01-15 15:32:42 +00:00
AFCMS 92261e5fb5 Remove `stack_max` fields duplicated with default value 2023-01-15 15:32:42 +00:00
AFCMS 1e31e383d4 Fix invalid function signature for `on_place` callbacks + handling of possible nil value 2023-01-15 15:32:42 +00:00
AFCMS 4457432d32 Format file 2023-01-15 15:32:42 +00:00
ancientmarinerdev fa96f9d593 Merge pull request 'Music Hyphenation & Concision' (#3311) from music_hyphenation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3311
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-14 22:00:15 +00:00
FossFanatic fbb4cf084f Revert grass footstep sound
This reverts the grass footstep sounds back to the one before the recent sound update by grorp.
2023-01-14 15:22:19 +00:00
FossFanatic 60b19b31ab Add hyphenation
This also adds hyphenation to `In-game`.
2023-01-14 10:21:35 +00:00
FossFanatic 871c4f24c2 Change some language stuff
This adds correct hyphenation and also makes things more concise.
2023-01-14 10:20:30 +00:00
FossFanatic 18c0e1f050 Change the indexes back to the older ones 2023-01-14 10:05:00 +00:00
FossFanatic fb8e41047d Use older palette PNG file 2023-01-14 10:00:42 +00:00
FossFanatic 2bd5e6a84f Delete text file 2023-01-14 10:00:19 +00:00
FossFanatic 23a13f14e0 Merge branch 'master' into simplified_palette_index 2023-01-14 09:51:47 +00:00
gldrk 5412206743 Make iron golem protect villagers 2023-01-14 01:37:32 +03:00
gldrk 30521a8b2f Make iron golem defend itself from players 2023-01-14 01:34:28 +03:00
gldrk 1536338199 Allow passive mobs to have protectors 2023-01-14 01:32:42 +03:00
gldrk 3697ef8069 Fix summoning friends for mobs 2023-01-14 01:28:35 +03:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 dd15092052 Merge pull request 'Give an option for players to disable the in game music' (#3299) from music_settings_switch into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3299
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-13 21:31:20 +00:00
ancientmarinerdev ce485e89cd In game music review feedback fix 2023-01-13 15:04:40 -06:00
ancientmarinerdev 09a7348256 Give an option for players to disable the in game music 2023-01-13 15:04:40 -06:00
FossFanatic a500528613 Make the LBM run only once
Since some people complained about the LBM running at every load, I changed it so it only runs once instead. It shouldn't even need to run more than once anyways, unless somebody could prove the contrary.
2023-01-13 17:58:51 +00:00
FossFanatic 292e7129f2 Merge branch 'master' into simplified_palette_index 2023-01-13 17:50:39 +00:00
Michieal 3091e85b1c Optipng textures. 2023-01-12 22:17:26 -05:00
Michieal da277f9dc7 fixed missed line. 2023-01-12 22:16:02 -05:00
Michieal 27a487195a Merge branch 'master' into mcl_bamboo_too 2023-01-12 22:14:58 -05:00
Michieal 2fdc8cbdd4 Changed Bamboo Sign's inventory & wield image to match the placed sign.
Reduced the number of images that trapdoors need to work.
2023-01-12 22:12:05 -05:00
Michieal 0079cf807e Changed Bamboo Signs to use custom image. 2023-01-12 21:06:25 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 899cfd5157 Merge pull request 'Added protection violation checker functions.' (#3274) from CyberMango/MineClone2:dev/mango/generic_protection_violation_functions into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3274
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-12 21:03:26 +00:00
CyberMango 64a7f76d5b Replaced positions check with an area check.
This one is using the minetest.is_area_protected so it should work
faster. It also doesnt require the user to manually add all the points
that should be checked so its nicer to use.
2023-01-12 21:22:36 +02:00
CyberMango b0d9eed3e1 Removed specific functions and added usage examples.
The specific functions didnt end up adding much simplicity, but did add
some degree of confusion.
2023-01-12 20:04:44 +02:00
CyberMango 685a7ff256 Added a function for a single position and better naming.
Now the functions are named with "position" instead of "node" to better
reflect what they do and what args they expect.

Also added a function for cehcking just a single position since thats
the most common use case, so it saves a small performance overhead.
2023-01-12 20:04:44 +02:00
CyberMango 949a2b787e Added protection violation checker functions.
1 completley generic and 3 more that use it for more specific cases -
  placing a node, modifying a node and planting over a node.
2023-01-12 20:04:44 +02:00
FossFanatic 8849b2e98f Merge branch 'master' into simplified_palette_index 2023-01-12 15:32:46 +00:00
Michieal 9e76cd963d Adjust bamboo sign color 2023-01-12 03:51:42 -05:00
Michieal 522a7577de Fix Bamboo nodes showing up in creative inventory.
Fix lava bamboo node placement.
2023-01-12 03:47:13 -05:00
Michieal 7912239562 Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too
# Conflicts:
#	mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank_mosaic.png
2023-01-12 03:30:01 -05:00
Michieal 396fedd8e7 temp commit - brownish, rather than yellow, colored palette for bamboo things. 2023-01-12 03:29:49 -05:00
Michieal f81eec6fff temp commit - brownish, rather than yellow, colored palette for bamboo things. 2023-01-12 03:28:29 -05:00
Michieal d2625d3ace Fix water node placement, and lava node placement. (Yes, nether lava too!) 2023-01-12 03:27:17 -05:00
Michieal a04d946879 Updated Licensing for additional images. 2023-01-11 21:50:34 -05:00
ancientmarinerdev 482a6071f5 Merge pull request 'Beetroot Seed fix' (#3294) from beetroot_seed_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3294
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-11 22:27:58 +00:00
Michieal 6993559330 Updated relevant Credits for Bamboo and recent work. 2023-01-11 07:26:01 -05:00
Michieal b572363b8e temp commit. recolor scaffolds. 2023-01-11 07:16:41 -05:00
Michieal 00408b998c Fix -- Bamboo grow, bamboo place to be correct. 2023-01-11 07:16:12 -05:00
Michieal e7c238c17e Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too
# Conflicts:
#	mods/ITEMS/mcl_bamboo/bamboo_base.lua
2023-01-11 02:32:28 -05:00
Michieal 1de806f6f8 Put height into placed, base, bamboo stalk nodes so that height checks work properly.
Fix placing bamboo on top of other bamboo nodes, when it would go above the decided height. It now stops just before the endcap node placement.

Fixed Errant log message.
Fixed itemstack removal while in creative mode.
2023-01-11 02:31:36 -05:00
Michieal b07e6fccdc Put height into placed, base, bamboo stalk nodes so that height checks work properly.
Fix placing bamboo on top of other bamboo nodes, when it would go above the decided height. It now stops just before the endcap node placement.
2023-01-11 02:22:30 -05:00
Michieal 04efa74115 Prevent growing "around" things in the way. 2023-01-11 02:19:19 -05:00
Michieal 2e8f56d098 Merge branch 'master' into mcl_bamboo_too 2023-01-10 22:29:28 -05:00
Michieal ff7299a444 Fix beetroot seeds not dropping.
Changed drop rate to 1-4.

Added in Fortune drops too. (Per the minecraft wiki.)
2023-01-10 21:38:42 -05:00
Michieal aad2d114f9 temp commit. recolor of the planks and scaffolds. 2023-01-10 20:49:38 -05:00
ancientmarinerdev 2ed3c1c480 Merge pull request 'Mob Fixes' (#3242) from mob_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3242
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-11 01:11:07 +00:00
ancientmarinerdev 111c885417 Added burger alias 2023-01-11 01:07:18 +00:00
ancientmarinerdev 8e1f00d428 Villager breeding is now unburgered. Burger now needs right click to initiate follow. 2023-01-11 01:07:18 +00:00
ancientmarinerdev 4fd4425aae Improved mob debug 2023-01-11 01:07:18 +00:00
ancientmarinerdev ac4cd2c325 Improve performance for head swivel check 2023-01-11 01:07:18 +00:00
ancientmarinerdev 01c8009c6a Tidy on_step function 2023-01-11 01:07:18 +00:00
ancientmarinerdev ef90820f67 Fix farm animals so they don't get into combat state 2023-01-11 01:07:18 +00:00
ancientmarinerdev d6d11b9526 Zombie villagers cannot despawn during curing process 2023-01-11 01:07:17 +00:00
ancientmarinerdev b0264b2736 Endermen now despawn when not holding a block. 2023-01-11 01:07:17 +00:00
Michieal c12f2cc565 Fix placement of bamboo endcap 2023-01-10 19:23:40 -05:00
Michieal 9f94f12127 Fix placement of bamboo onto bamboo nodes going higher than max height. 2023-01-10 18:48:50 -05:00
Michieal 784f3ec226 Made plank textures more dried bamboo looking. 2023-01-10 16:40:18 -05:00
Michieal 44a769397d Fix bamboo mosaic using wrong texture.
Fix error.
2023-01-10 15:36:17 -05:00
PrairieWind b3da85be64 Merge pull request 'mcl_music_without_menu_music' (#3291) from mcl_music_without_menu_music into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3291
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-01-10 19:15:22 +00:00
ancientmarinerdev 3ed32abc4e Add credit for nether music 2023-01-10 19:05:56 +00:00
kay27 9db6050638 Fix music interruption 2023-01-10 19:05:56 +00:00
kay27 7ceb953a56 Add different music for different dimensions 2023-01-10 19:05:56 +00:00
kay27 1894d8c5f0 Fix mcl_music: play to all players, play every day, overworld only 2023-01-10 19:05:56 +00:00
kay27 419d61edde Add trivial mcl_music mod and a piano track by diminixed 2023-01-10 19:05:55 +00:00
PrairieWind 9820309762 Merge pull request 'mcl_crimson_update' (#3289) from mcl_crimson_update into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3289
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2023-01-10 18:17:39 +00:00
Michieal 726eba7ed8 Make bamboo fence/gate less yellow. It's bamboo, not corn XD 2023-01-10 04:42:31 -05:00
Michieal f46581905a Added veins to the Hyphae log sides. 2023-01-10 04:30:29 -05:00
Michieal 4f6de581dd fixed the warped fungus mushroom texture.
fixed the warped fungus selection box.
2023-01-10 04:29:47 -05:00
Michieal eb8f7360a2 Merge branch 'master' into mcl_bamboo_too 2023-01-09 18:56:05 -05:00
ancientmarinerdev db62631540 Merge pull request 'mcl_lectern' (#3282) from mcl_lectern into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3282
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-09 22:33:31 +00:00
ancientmarinerdev fb30564827 Ooooooh, lecterns. My favourite. 2023-01-09 22:32:14 +00:00
Michieal 8c355db3ce Made Lecterns solid. 2023-01-09 22:32:14 +00:00
Michieal eae08f3010 Finished Lecterns.
Added in License.txt.
2023-01-09 22:32:14 +00:00
Michieal 4701c4d6e7 Built basic lectern model, texture, and node definition.
Created crafting recipe.

Marked Lecterns as WIP.

Started defining placement.

Added in README.txt.
2023-01-09 22:32:14 +00:00
Michieal 8df0b2a48e Made changes to the MapGen definitions because with the new grow code, bamboo creates its own height, and therefore places its own top. And, having multiple tops looks funny. 2023-01-09 16:31:02 -05:00
ancientmarinerdev 66f368531d Merge pull request 'Fix Country Lode HUD Issue' (#3268) from advancement_bug_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3268
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-09 21:17:41 +00:00
PrairieWind 7cb5c55d68 Update Translation Files
Fixes the translation error for other languages
2023-01-09 13:36:36 -07:00
Michieal 34faca3f2c Added in License.txt
Made the end cap node wave in the wind.
2023-01-08 23:08:12 -05:00
Michieal d5dda679eb fix vestigial variable names to not be so obtuse. 2023-01-07 16:45:36 -05:00
Michieal c65bbcd5a5 fixed missed spot for licensing. 2023-01-07 16:14:33 -05:00
Michieal 533f59bf27 Merge branch 'master' into mcl_bamboo_too 2023-01-06 18:08:33 -05:00
Michieal 3074c15d14 clear up comment confusion.
Factored out hard coded names for variable names.

removed "minecraft" from README.md.
2023-01-06 18:07:30 -05:00
Michieal 132178b8c7 clear up comment confusion. 2023-01-06 17:46:54 -05:00
Michieal ede21a8627 revert f92ea77849
revert accidental second commit.

Mega commit. lol.

Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
2023-01-06 22:43:41 +00:00
Michieal 82fae13b47 Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too 2023-01-06 17:41:57 -05:00
Michieal f92ea77849 Mega commit. lol.
Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
2023-01-06 17:41:01 -05:00
Michieal 7ebf9b7ab8 Mega commit. lol.
Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
2023-01-06 17:40:35 -05:00
Michieal 07a56165ed update optional depends. 2023-01-06 20:23:59 +00:00
Michieal ee0b355f51 Fix licensing. 2023-01-06 20:21:08 +00:00
PrairieWind 6fd799ac42 Fix Country Lode HUD Issue
Fixed the error that was thrown when the advancement is unlocked and also fixed the popup HUD so the advancement title fits correctly
2023-01-06 16:35:59 +00:00
ancientmarinerdev 01bb753549 Merge pull request 'Refactor mob_step and do_states' (#3231) from mob_tweaks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3231
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-06 14:10:39 +00:00
ancientmarinerdev 59694ebc7c Fix merge conflict 2023-01-06 13:52:03 +00:00
Michieal cc24144bc6 Fixed collision and selection box for endcap nodes.
fixed typo in debug message.
2023-01-06 01:22:18 -05:00
Michieal e1cd16c971 Adjusted growth interval.
tested and fixed bamboo growth function.

Add debug code across growth function and scaffold place.

disabled debug for commit. removed finished todos.
2023-01-06 00:41:26 -05:00
ancientmarinerdev 00c4ecf643 Merge pull request 'Villagers and pathfinding improvements' (#3083) from village_town_bell_pathfix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3083
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-06 02:59:48 +00:00
ancientmarinerdev e4db91d35c Fix crash bug 2023-01-06 02:59:02 +00:00
ancientmarinerdev 2527479401 Clean up on isle 5, please 2023-01-06 02:59:02 +00:00
ancientmarinerdev 85f7bbdb80 Optimisation. Don't even prepare to path if not ready to path 2023-01-06 02:59:02 +00:00
ancientmarinerdev 465a919f6b Villager will now reclaim job during the day even when it isn't work time 2023-01-06 02:59:02 +00:00
ancientmarinerdev 325a666c62 Added pathfinder constants to make it easier to tweak 2023-01-06 02:59:02 +00:00
ancientmarinerdev e9b54e85c2 Pathfinding clean up 2023-01-06 02:59:02 +00:00
ancientmarinerdev 4324fe2489 Villager will now path from one house to another in search of available job or bed 2023-01-06 02:59:02 +00:00
ancientmarinerdev d6804bf4b7 Fix distance to target issue, and refactor pathing actions 2023-01-06 02:59:02 +00:00
ancientmarinerdev 87f04bdd9f Prevent attempting to path through 2 doors until code supports it. Clean up also. 2023-01-06 02:59:02 +00:00
ancientmarinerdev e3307d647b Fix pathing to bell that is sat on the ground 2023-01-06 02:59:02 +00:00
ancientmarinerdev 29cd73cb84 Pathfinding through door should also check door closest to position so villager can leave current house 2023-01-06 02:59:02 +00:00
ancientmarinerdev 5c0a763b83 Optimisation - Only check for town bell if ready to path 2023-01-06 02:59:02 +00:00
ancientmarinerdev 9b1ceebf0d Villagers will now pathfind to town bell that isn't on the ground 2023-01-06 02:59:02 +00:00
Michieal ed64e7f733 Reverted scaffolding (WIP) for final push. Making an issue for it's continued work. Left wip in, but commented and future featured out. Will test changes forthwith.
Adjusted bamboo base code (randomize which one to use.) to do less math and accomplish the same thing.
2023-01-05 20:27:52 -05:00
ancientmarinerdev 856a60bcc2 Merge pull request 'Fix a few issues with sweet berries.' (#3187) from CyberMango/MineClone2:bug/mango/sweet_berry_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3187
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-06 00:09:41 +00:00
Michieal 08f9c0074a REVERT: Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions. 2023-01-05 18:31:21 -05:00
FossFanatic 09db6017c3 Merge branch 'master' into simplified_palette_index 2023-01-05 10:06:11 +00:00
Michieal c4969c13cd trying to fix redundancy error... 2023-01-05 00:30:18 -05:00
Michieal f70176da34 Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions. 2023-01-04 23:56:51 -05:00
Michieal e314addeb3 Merge branch 'master' into mcl_bamboo_too
# Conflicts:
#	mods/ITEMS/mcl_dye/init.lua
2023-01-04 23:10:54 -05:00
Michieal df8fc65e1e temp commit. 2023-01-04 23:03:08 -05:00
Michieal 687887fe27 Incorporate applying bonemeal to Bamboo stalks. 2023-01-04 22:49:17 -05:00
Michieal 65aa956d9c Add alias for scaffolding.
Rework grow_bamboo to handle random heights, and to handle bonemeal.

 Remove "bamboo_node" in favor of is_bamboo()
2023-01-04 22:43:05 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ddd004c0f0 Merge pull request 'Fix incorrect foundation size for belltower' (#3147) from village_tweaks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3147
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-01-04 21:45:47 +00:00
ancientmarinerdev 609ef220ad Village building and paths should not spawn on top of snowy trees 2023-01-04 15:14:40 -06:00
ancientmarinerdev 32a7eb4087 Fix incorrect foundation size for belltower 2023-01-04 15:14:37 -06:00
CyberMango 5e969ba928 Added sweet berries death messages. 2023-01-04 23:04:19 +02:00
CyberMango 17e02aec3c Applying bone meal on a stage 3 sweet berry no longer grows it.
It now ignores the bone meal and harvests the sweet berry as normal.
2023-01-04 23:04:19 +02:00
CyberMango fb28e192e6 Bone meal applied on sweet berries only grows them by 1 stage now.
The interface of the grow plant is a bit confusing since even with
stages set to 0 the plant grows by 1 stage (if other conditions such as
light are met). Therefore changing it to 0 makes the plant grow by 1.
2023-01-04 23:04:19 +02:00
CyberMango 0f569fdbaa Bone meal on sweet berries in creative mode is no longer wasted and
minor fixes.

removed an unnecessary -- in a comment.
Removed a redundant concatination.
2023-01-04 23:04:19 +02:00
CyberMango 8a7fcfde82 Fixed sweet berries bugs.
Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
2023-01-04 23:04:19 +02:00
CyberMango fb51067c78 Created a shared function for planting a seed that can also be consumed. 2023-01-04 23:04:19 +02:00
Michieal 8dd4a2611e Added alias for scaffolding. 2023-01-04 14:25:31 -05:00
Michieal f86ee99abf Further cleaned up bamboo base code.
Fixed some errors in Scaffolding, Commented out the in progress section.
2023-01-04 11:28:09 -05:00
FossFanatic 6cf1fa7b81 Merge branch 'master' into simplified_palette_index 2023-01-04 15:02:56 +00:00
ancientmarinerdev 7ea41a2f21 Merge pull request 'Fix baby zombies going through 1 node high space' (#3241) from short_baby_zombies into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3241
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-04 14:56:26 +00:00
FossFanatic 39bcf2f961 Merge branch 'master' into simplified_palette_index 2023-01-04 14:01:58 +00:00
Johannes Fritz 0b1916b807 Fix baby zombies going through 1 node high space 2023-01-04 07:52:48 -06:00
Michieal d1a017f6b2 optimized out some for loops, cleaned up code for bamboo placement.
tested the changes.
2023-01-03 18:40:40 -05:00
Michieal 50e50e2904 Continued some optimizations of code in bamboo.on_place.
Begun work on scaffolding.
2023-01-03 15:57:58 -05:00
Michieal 966c914a8e Updated .gitignore to exclude *.xcf (gimp) files. 2023-01-03 15:39:23 -05:00
Michieal 9351f72c15 Updated Bamboo translations template.txt 2023-01-03 15:38:34 -05:00
Michieal ef7fb0d2e3 Cleaned up the code. Fixed side placement of bamboo against bamboo.
Dinked with the random number generator some more.

Condensed some more of the code duplication (WIP).

Added in MCL_Log function.

Finally settled on a decent looking Bamboo top.
2023-01-03 01:38:12 -05:00
Michieal 5ef7d9f7a0 Added in Bamboo_Plank variable.
Dinked with the random number generator some.

Moved Bamboo Mosaic from base to items.

condensed some of the code duplication (WIP).

started to add in checks to prevent bamboo from being placed against itself horizontally.

Fixed a couple of naming issues.
2023-01-02 22:36:09 -05:00
ancientmarinerdev 0fca1ce469 Merge pull request 'Fix crash for sky colour if cannot find biome' (#3239) from fix_colour_crash_risk into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3239
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-01-03 01:02:19 +00:00
Michieal 388632cd46 Fixed BROKEN skycolor 2023-01-02 19:36:01 -05:00
Michieal dd4a0a4172 Fixed mcl_fishing depending on mcl_bamboo. 2023-01-02 19:24:56 -05:00
ancientmarinerdev df6d1c026a Fix crash for sky colour if cannot find biome 2023-01-02 21:48:58 +00:00
Michieal d586b3fecc Tracked down missing node type placement issues, and fixed them.
Now with Chicken Cherry Cola!
2023-01-02 03:54:26 -05:00
Michieal a7a0c4791a Many bug fixes, Adjusted randomizing code.
And, Now with Lime-Cherry Kool-aid!! Yum!
2023-01-02 02:19:33 -05:00
Michieal 23b62c296a Fix code caching errors, and remove unused variables from init. 2023-01-01 23:07:20 -05:00
ancientmarinerdev f8ae702ce4 Function name consistency 2023-01-02 00:58:23 +00:00
ancientmarinerdev 5faf060122 Fix crash and remove unused duplicate variables 2023-01-02 00:54:08 +00:00
ancientmarinerdev 8c648d1fc3 Refactor mob_step and do_states 2023-01-02 00:00:40 +00:00
ancientmarinerdev 46052e5b7e Merge pull request 'Add templates for issues and pull requests' (#3220) from gitea_templates into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3220
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-01 19:04:12 +00:00
iliekprogrammar 6430fcf103 Clarify *missing feature request* template 2023-01-01 19:03:34 +00:00
iliekprogrammar 7376b08c61 Better headers. More distinct *missing feature* template 2023-01-01 19:03:34 +00:00
iliekprogrammar 2e28a3386b Revert "Add "Testing/Review needed" tag to pull request templates"
This reverts commit 45656d8b747eac6400b2752fe2de603308ca69ef.
2023-01-01 19:03:34 +00:00
iliekprogrammar 98dac6dcd7 Add "Testing/Review needed" tag to pull request templates 2023-01-01 19:03:34 +00:00
iliekprogrammar 3026808a71 Add templates for issues and pull requests 2023-01-01 19:03:34 +00:00
test1 7c7521ff15 Merge pull request 'Update readme' (#3223) from updated_readme into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3223
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2022-12-31 13:23:03 +00:00
test1 50d8e95c16 Update readme 2022-12-31 13:16:52 +00:00
iliekprogrammar fc74bd5cfe Merge pull request 'fix-cocoa-place' (#3221) from fix-cocoa-place into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3221
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-31 10:49:57 +00:00
kabou 2a37d38f6c Reformat cocoa pod node definition groups. 2022-12-31 11:18:04 +01:00
kabou 89821a8329 Rename cocoa pod placement function.
* Rename cocoa pod placement function to match the `on_place` call in
  the cocoa pods item definition.
* Make the function local, there are no callers outside of mcl_cocoas.
2022-12-31 10:41:39 +01:00
iliekprogrammar 3249c13752 Merge pull request '`mcl_meshhand` fixes' (#2939) from mcl-meshhand-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2939
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:50:46 +00:00
iliekprogrammar 2ea72ccda8 Merge branch 'master' into mcl-meshhand-fixes 2022-12-30 18:47:55 +00:00
iliekprogrammar 5237eca31e Merge pull request '`mcl_item_entity` fixes' (#2936) from mcl-item-entity-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2936
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:39:34 +00:00
iliekprogrammar c2ba70a601 Merge branch 'master' into mcl-item-entity-fixes 2022-12-30 18:34:41 +00:00
iliekprogrammar 723fe9c532 Merge pull request 'mcl_init fixes' (#2862) from mcl-init-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2862
Reviewed-by: iliekprogrammar <iliekprogrammar@gmail.com>
2022-12-30 18:18:21 +00:00
iliekprogrammar 661afed46c Merge branch 'master' into mcl-init-fixes 2022-12-30 18:11:08 +00:00
FossFanatic 3d2955c394 Merge branch 'master' into simplified_palette_index 2022-12-30 10:36:35 +00:00
Michieal 87327abfb9 Restructure Commit.
Recipes are in recipes.lua
Bamboo Basic nodes are in bamboo_base.lua
Bamboo items are in bamboo_items.lua
Bamboo api / globals are in globals.lua.
2022-12-29 13:16:48 -05:00
Michieal 34263c2ef3 Change bamboo back to Axey, instead of swordy. 2022-12-29 12:28:42 -05:00
Michieal 38c6969292 Fix mod.conf in mcl_fishing
Fix bamboo nodes on_destruct to handle the alt nodes too.
clean up ToDos
2022-12-29 11:31:13 -05:00
FossFanatic 54548ecfdf Merge branch 'master' into simplified_palette_index 2022-12-29 14:51:17 +00:00
FossFanatic 5ec7b8ed89 Add LBM to fix grass palette indexes
Adds a LBM which basically fixes the grass palette indexes of the nodes from older worlds. I have also added some more nodes to `block_fixes`.
2022-12-29 14:18:37 +00:00
FossFanatic 137179ac8e revert 3afb42b2f7
revert Add a LBM to fix grass palette indexes on older worlds
2022-12-29 14:13:50 +00:00
FossFanatic 3afb42b2f7 Add a LBM to fix grass palette indexes on older worlds 2022-12-29 14:12:00 +00:00
Michieal 1d0968f4f5 Fix bamboo nodes on_destruct to handle the alt nodes too.
clean up ToDos
2022-12-29 01:38:10 -05:00
Michieal 0f9d263e02 Add Bamboo to the Fishing Junk table.
Update the mod.conf to be aware of mcl_bamboo.
2022-12-29 01:29:25 -05:00
Michieal 26c1be3722 Fix bamboo node to be Swordy.
Added in secondary bamboo node types.
Changed the grow_bamboo function to make use of new alt nodes, and removed unneccessary "force" parameter.
2022-12-29 01:03:25 -05:00
Michieal acc2be7253 Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too 2022-12-28 18:21:39 -05:00
Michieal 3015bfb8c4 Merge branch 'master' into mcl_bamboo_too 2022-12-28 23:16:01 +00:00
Michieal 28cb06421d Merge branch 'master' into mcl_bamboo_too 2022-12-28 18:13:51 -05:00
Michieal 731468cf5a Did a bit of code restructuring.
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
2022-12-28 18:10:12 -05:00
Michieal ff7693937a Did a bit of code restructuring.
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
2022-12-28 15:29:06 -05:00
FossFanatic c1cde073c8 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:34:24 +00:00
Michieal 76669e1f3c Moved bamboo grow code to its own function, and made that function global so that it can be called outside of mcl_bamboo. 2022-12-28 14:34:14 -05:00
FossFanatic ef15477e37 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:33:26 +00:00
FossFanatic a0c5a04d26 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:32:42 +00:00
FossFanatic 18e932997d Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:31:11 +00:00
FossFanatic 1f601c68c5 Make snowy grass blocks have a palette index
This fixes the issue where snowy grass blocks always have the same coloured grass underneath them.
2022-12-28 17:02:58 +00:00
FossFanatic 9cf6c9ed5e Change swamp and mangrove grass palette index
Changes the grass palette index of the swamp and mangrove to use the swampier variant of the swamp colours.
2022-12-28 16:10:02 +00:00
FossFanatic 9f9cc3a629 Change grass block inventory colour
According to the wiki, the hex code of the grass block when held or in the inventory is #7CBD6B.
2022-12-27 21:19:33 +00:00
FossFanatic ac90350257 Change palette indexes to fit the new palette 2022-12-27 20:57:58 +00:00
FossFanatic a6841fe38b Simplify palette and add helpful text file 2022-12-27 20:55:24 +00:00
Michieal 6f05992c8b Fix Licensing.
Removed Make_Stairs check.
Made unified protection check.
Began work on the second half of scaffolding.
Removed comments that was no longer needed.
2022-12-25 07:30:31 -05:00
Michieal c55332bf42 Change mod.conf and readme's depends.
Optipng images, after adding in bamboo top image.
Try out a plantlike style top node for bamboo stalks.
Make Bamboo drop 1-2 bamboo.
Fix Bamboo top drops.
2022-12-24 00:57:44 -05:00
Michieal 42f8fbf9b8 Added in Fuel Recipes for bamboo slabs / stairs; including mosaics.
Finished Bamboo Mosaic nodes.
2022-12-23 17:27:01 -05:00
Michieal b0978d275d Abstracted variables in bamboo abm.
Fix Base scaffolding in Creative mode.
Fixed Lua Warnings.
2022-12-22 16:08:05 -05:00
Michieal 2b11b5c17a Added full node names for bamboo on_place.
Added in bamboo top destruct.
Removed mapgen.lua.
2022-12-21 22:23:46 -05:00
Michieal 9445b02dcc MapGen update. Adjusted decorations. 2022-12-21 20:57:34 -05:00
Michieal e0d48400a7 Fix the removal of bamboo extras. 2022-12-21 16:16:53 -05:00
Michieal 742a625c42 Added in aliasing for scaffolding, to prevent breakage for players using the "mcl_scaffolding" mod. 2022-12-21 15:55:50 -05:00
Michieal 95d3f9be07 Make Lantern API callable from outside of mcl_lanterns 2022-12-21 12:34:47 -05:00
Michieal 16d94a88db moved extras to the proper location 2022-12-21 12:32:09 -05:00
Michieal b14f055154 Merge branch 'master' into mcl_bamboo_too
# Conflicts:
#	mods/ITEMS/mcl_bamboo/init.lua
2022-12-20 23:19:29 -05:00
Michieal 773c760727 Added Bamboo Mosaic.
Added Tiki Lamp (extras) - Requires mcl_lanterns to be fixed to allow API to be called from other mods.
Moved Side Scaffolding to bambootoo.lua
2022-12-14 23:02:08 -05:00
AFCMS 96e83e866c
Make `mcl_item_entity` API public 2022-11-15 21:48:58 +01:00
AFCMS 3bb86fd436
Fix warnings + add type annotations
- fix wrong usage of `mcl_enchanting.get_enchantments`
- use new vectors everywhere
- simplify code
- make code lines less long
2022-11-15 21:48:57 +01:00
AFCMS 4acee8e64e
Fixes to `mcl_meshhand`
- fix actual crash when placing hand in world (undefined function)
- remove node fields redundant with default values
- remove support for `use_texture_alpha_string_modes`
- type annotation
- more explicit functions
2022-11-13 21:54:59 +01:00
AFCMS bacec2c7e6
Make 2 last params of `mcl_vars.get_node` optional 2022-10-25 11:01:44 +02:00
AFCMS a3d459f020
Refactor `mcl_init`
- use new vectors
- make code less confuse
- type annotations
2022-10-25 11:01:44 +02:00
Nils Dagsson Moskopp e9862f5f24
Add example code for node colormap generation 2022-07-31 00:24:34 +02:00
Nils Dagsson Moskopp 685bdcb379
Allow encoding with B8G8R8A8 colormap 2022-05-19 18:26:41 +02:00
Nils Dagsson Moskopp 7446a275b5
Remove author from mod.conf
ContentDB sets this field automatically
2022-05-16 22:18:01 +02:00
Nils Dagsson Moskopp 83348bf3ac
Document use cases, image type support, plans 2022-05-16 20:34:33 +02:00
Nils Dagsson Moskopp 45e405982a
Allow encoding with A1R5G5B5 colormap 2022-05-16 18:48:18 +02:00
Nils Dagsson Moskopp e83894fcfa
Treat empty colormap as no colormap 2022-05-16 17:56:53 +02:00
Nils Dagsson Moskopp 9f9b78eed9
Allow color-mapped encoding for RGB images 2022-05-16 17:28:16 +02:00
Nils Dagsson Moskopp ed061e68ff
Allow RLE encoding for RGBA images 2022-05-16 13:16:23 +02:00
Nils Dagsson Moskopp 1f9c446a98
Assert that pixel data is encoded 2022-05-16 03:21:52 +02:00
Nils Dagsson Moskopp 7b94fc026d
Allow to specify color format 2022-05-16 02:48:51 +02:00
Nils Dagsson Moskopp fa23775bf9
Measure pixel_depth in bits everywhere 2022-05-16 01:54:21 +02:00
Nils Dagsson Moskopp 36ee45ebe3
Add RGBA support (only RAW encoding) 2022-05-16 01:39:33 +02:00
Nils Dagsson Moskopp 2112637faf
Use HSP for RGB-to-BW8 conversion 2022-05-15 19:58:19 +02:00
Nils Dagsson Moskopp 5b79bc6fb7
Set default encoding to R8G8B8 RAW
This the most trivial RGB encoding the encoder supports. Setting
it prevents a crash related to BW8 only supporting RAW encoding.
2022-05-15 19:31:24 +02:00
Nils Dagsson Moskopp 759b0a188f
Allow saving R8G8B8 images as BW8 2022-05-15 19:23:26 +02:00
Nils Dagsson Moskopp 376b6404b2
Allow RAW or RLE encoding for true-color images 2022-05-15 15:56:18 +02:00
Nils Dagsson Moskopp 9bd1702d60
Encode image only when saving it to a file 2022-05-15 14:58:12 +02:00
Nils Dagsson Moskopp 5640e19c94
Add fractal example 2022-05-15 03:10:53 +02:00
Nils Dagsson Moskopp 25b7b30945
Allow encoding grayscale images as BW8 2022-05-14 22:41:52 +02:00
Nils Dagsson Moskopp 9af0719df8
Allow encoding RGB images as B8G8R8 2022-05-14 21:56:42 +02:00
Nils Dagsson Moskopp 1b48c3f539
Use raw packets in RLE compression in tga_encoder 2022-05-14 21:52:08 +02:00
Nils Dagsson Moskopp 13552f16f2
Reduce TGA filesize by 25% by using 16-bit colors 2022-05-14 21:52:07 +02:00
Nils Dagsson Moskopp 4f6ea5d035
Add credits to README 2022-05-14 21:52:07 +02:00
Nils Dagsson Moskopp c00b0d50c6
Add usage examples 2022-05-14 21:52:00 +02:00
Nils Dagsson Moskopp adb8e45d67
Fix TGA file writing on Windows
Before this patch, the tga_encoder mod would write corrupted TGA files
on Windows: Bytes that looked like newlines were replaced by a carriage
return and a newline.
2022-05-14 20:21:59 +02:00
Nils Dagsson Moskopp 3f60b5baa6
Speed up TGA encoding by creating fewer strings 2022-05-14 20:21:58 +02:00
Nils Dagsson Moskopp 52e5c955f0
Use RLE compression in tga_encoder 2022-05-14 20:21:58 +02:00
Elias Fleckenstein b88579b52e
Add updated tga_encoder 2022-05-14 20:21:58 +02:00
Elias Fleckenstein eaa4dc99d7
Initial import 2022-05-14 20:21:52 +02:00
4922 changed files with 51838 additions and 15305 deletions

View File

@ -4,7 +4,7 @@ root = true
end_of_line = lf
[*.lua]
charset = utf8
charset = utf-8
indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = true

View File

@ -0,0 +1,36 @@
---
name: "Bug report"
about: "File a bug report"
labels:
- unconfirmed
- bug
---
<!--
Thanks for taking the time to fill out this bug report!
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
By submitting this issue, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->
<!--
What version of MineClone2 are you using? We do not provide support for outdated versions of MineClone2.
Current latest version is listed here, at the top:
https://git.minetest.land/MineClone2/MineClone2/tags
-->
MineClone2 version:
### What happened?
Report about the bug! Please send large log snippets as an attachement file.
### What should happen:
Tell us what should happen!
### Steps to reproduce
Tell us how we can reproduce the bug!

View File

@ -0,0 +1,26 @@
---
name: "Feature request"
about: "File a feature request not in Minecraft"
labels:
- "non-Minecraft feature"
- "needs discussion"
---
<!--
Got a new non-Minecraft feature request? Explain to us why we should consider your idea.
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
By submitting this issue, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->
### Feature
Tell us about your requested feature not in Minecraft!
### Why
Tell us why should we implement it!

View File

@ -0,0 +1,25 @@
---
name: "Missing Feature request"
about: "File a missing feature request in Minecraft but not in MineClone2"
labels:
- "missing feature"
---
<!--
Thanks for taking the time to fill out this missing feature request!
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
By submitting this issue, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->
### Current feature in Minecraft
Tell us about the feature currently in Minecraft! What is it like on Minecraft?
### Current feature in MineClone2
Tell us about the feature currently in MineClone2! What is different?

View File

@ -0,0 +1,20 @@
---
name: "Pull request"
about: "Submit a pull request"
labels:
---
<!--
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!

4
.gitignore vendored
View File

@ -4,3 +4,7 @@
*.blend2
*.blend3
/.idea/
*.xcf
.Rproj.user
prompt.txt
__pycache__

View File

@ -1,10 +1,12 @@
---@diagnostic disable
unused_args = false
allow_defined_top = true
max_line_length = false
redefined = false
globals = {
"minetest", "core",
"minetest", "core",
}
read_globals = {
@ -40,16 +42,16 @@ read_globals = {
"factorial"
}
},
------
--MODS
------
------
--MODS
------
--GENERAL
"default",
--GENERAL
"default",
--ENTITIES
"cmi",
--ENTITIES
"cmi",
--HUD
"sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus",
}
--HUD
"sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus",
}

22
.luarc.json Normal file
View File

@ -0,0 +1,22 @@
{
"runtime.version": "LuaJIT",
"diagnostics": { "disable": ["lowercase-global"] },
"diagnostics.globals": [
"minetest",
"dump",
"dump2",
"Raycast",
"Settings",
"PseudoRandom",
"PerlinNoise",
"VoxelManip",
"SecureRandom",
"VoxelArea",
"PerlinNoiseMap",
"PcgRandom",
"ItemStack",
"AreaStore",
"vector"
],
"workspace.ignoreDir": [".luacheckrc"]
}

1
API.md
View File

@ -41,6 +41,7 @@ A lot of things are possible by using one of the APIs in the mods. Note that not
* Beds: `ITEMS/mcl_beds`
* Buckets: `ITEMS/mcl_buckets`
* Dispenser support: `ITEMS/REDSTONE/mcl_dispensers`
* Campfires: `ITEMS/mcl_campfires`
### Mobs
* Mobs: `ENTITIES/mcl_mobs`

View File

@ -2,17 +2,16 @@
So you want to contribute to MineClone2?
Wow, thank you! :-)
MineClone2 is maintained by Nicu and Cora. If you have any
problems or questions, contact us (See Links section below).
MineClone2 is maintained by AncientMariner and Nicu. If you have any
problems or questions, contact us on Discord/Matrix (See Links section below).
You can help with MineClone2's development in many different ways,
whether you're a programmer or not.
## MineClone2's development target is to...
- Crucially, create a stable, moddable, free/libre clone of Minecraft
based on the Minetest engine with polished features, usable in both
singleplayer and multiplayer. Currently, a lot of Minecraft features
are already implemented.
- Create a stable, peformant, moddable, free/libre game based on Minecraft
using the Minetest engine, usable in both singleplayer and multiplayer.
- Currently, a lot of features are already implemented.
Polishing existing features is always welcome.
## Links
@ -76,7 +75,7 @@ in singleplayer, post a screenshot of the message that Minetest showed
when the crash happened (or copy the message into your issue). If you
are a server admin, you can find error messages in the log file of the
server.
* Tell us which MineClone2 and Minetest versions you are using.
* Tell us which MineClone2 and Minetest versions you are using (from Minetest 5.7 type /ver, for previous versions, check the game.conf or README.md file).
* Tell us how to reproduce the problem: What you were doing to trigger
the bug, e.g. before the crash happened or what causes the faulty
behavior.
@ -120,11 +119,11 @@ It's also a good idea to join the Discord server
(or alternatively IRC or Matrix).
#### Textures
For textures we use the Pixel Perfection texture pack. For older Minecraft
features that is mostly enough but a lot of the newer textures in it are
copies or slight modifications of the original MC textures so great caution
needs to be taken when using any textures coming from Minecraft texture
packs.
For textures we prefer original art, but in the absence of that will accept
Pixel Perfection texture pack contributions. Be warned many of the newer
textures in it are copies or slight modifications of the original MC textures
so great caution needs to be taken when using any textures coming from
Minecraft texture packs.
If you want to make such contributions, join our Discord server. Demands
for textures will be communicated there.
@ -135,7 +134,10 @@ resource pack or minetest_game. Unfortunately, MineClone2 does not play
a sound in every situation you would get one in Minecraft. Any help with
sounds is greatly appreciated, however if you add new sounds you should
probably work together with a programmer, to write the code to actually
play these sounds in game.
play these sounds in game. All sounds should be released under an open
source license with clear information on the source, licencing and any
changes made by the contributor. Use the README files in the mod to
communicate this information.
#### 3D Models
Most of the 3D Models in MineClone2 come from
@ -145,9 +147,9 @@ Blender on demand. Many of the models have to be patched, some new
animations have to be added etc.
#### Crediting
Asset contributions will be credited in their own respective sections in
CREDITS.md. If you have commited the results yourself, you will also be
credited in the Contributors section.
Asset contributions will be credited in their mods and their own respective
sections in CREDITS.md. If you have commited the results yourself, you will
also be credited in the Contributors section.
### Contributing Translations
@ -182,7 +184,12 @@ information about the game's performance and let us know places to
investigate optimization issues. This way we can make the game faster.
#### Using Minetest's profiler
Minetest has a built in profiler. Simply set `profiler.load = true` in
We frequently will use profiling to optimise our code. We recommend use of
the JIT profiler (RIP Jude) to fully understand performance impact:
https://content.minetest.net/packages/jwmhjwmh/jitprofiler/
Minetest also has a built in profiler. Simply set `profiler.load = true` in
your configuration file and restart the server. After running the server
for some time, just run `/profiler save` in chat - then you will find a
file in the world directory containing the results. Open a new issue and
@ -213,10 +220,14 @@ they have made their donation Incognito).
* Fork the repository (in case you have not already)
* Do your change in a new branch
* Create a pull request to get your changes merged into master
* Keep your pull request up to date by regularly merging upstream. It is
imperative that conflicts are resolved prior to merging the pull
* It is important that conflicts are resolved prior to merging the pull
request.
* After the pull request got merged, you can delete the branch
* We update our branches via rebasing. Please avoid merging master into
your branch unless it's the only way you can resolve a conflict. We can
rebase branches from the GUI if the user has not merged master into the
branch.
* After the pull request got merged, you can delete the branch if the
merger hasn't done this already.
### Discuss first
If you feel like a problem needs to fixed or you want to make a new
@ -240,7 +251,7 @@ work causes problems, we ask you fix the issues as soon as possible.
### Changing Gameplay
Pull Requests that change gameplay have to be properly researched and
need to state their sources. These PRs also need Fleckenstein's approval
need to state their sources. These PRs also need the maintainer's approval
before they are merged.
You can use these sources:
@ -262,9 +273,7 @@ excessive git bureaucracy commits in master)
* Submodules should only be used if a) upstream is highly reliable and
b) it is 100% certain that no mcl2 specific changes to the code will be
needed (this has never been the case before, hence mcl2 is submodule free so far)
* Commit messages should be descriptive and never contain mcl2 specific
issueids - there are other projects who might use commits from mcl2 and
it will confuse their issue trackers.
* Commit messages should be descriptive
* Try to group your submissions best as you can:
* Try to keep your PRs small: In some cases things reasonably be can't
split up but in general multiple small PRs are better than a big one.
@ -348,18 +357,24 @@ end
### Developer status
Active and trusted contributors are often granted write access to the
MineClone2 repository.
MineClone2 repository as a contributor. Those that have demonstrated the right
technical skills and behaviours may be granted developer access. These are the
most trusted contributors who will contribute to ensure coding standards and
processes are followed.
#### Developer responsibilities
- If you have developer privileges you can just open a new branch in the
mcl2 repository (which is preferred). From that you create a pull request.
- If you have developer/contributor privileges you can just open a new branch
in the mcl2 repository (which is preferred). From that you create a pull request.
This way other people can review your changes and make sure they work
before they get merged.
- If you do not (yet) have developer privs you do your work on a branch
on your private repository e.g. using the "fork" function on mesehub.
- Any developer is welcome to review, test and merge PRs. A PR needs
at least one approval (by someone else than the author) but the maintainers
are usually relatively quick to react to new submissions.
- Any developer is welcome to review, test and approve PRs. A maintainer may prefer
to merge the PR especially if it is in a similar area to what has been worked on
and could result in merge conflicts for a larger older branch, or needs
art/licencing reviewing. A PR needs at least one approval (by someone else other
than the author).
- The maintainers are usually relatively quick to react to new submissions.
### Maintainer status
Maintainers carry the main responsibility for the project.
@ -375,7 +390,7 @@ merged.
- Resolving conflicts and problems within the community
#### Current maintainers
* Cora - responsible for gameplay review, publishing releases,
* AncientMariner - responsible for gameplay review, publishing releases,
technical guidelines
* Nicu - responsible for community related issues

View File

@ -6,38 +6,44 @@
## Creator of MineClone2
* Wuzzy
## Maintainers
* AncientMariner
* Nicu
* Herowl
## Previous Maintainers
* Fleckenstein
* jordan4ibanez
* cora
* Nicu
## Developers
* bzoss
* AFCMS
* epCode
* ryvnf
* iliekprogrammar
* MysticTempest
* Rootyjr
* aligator
* Code-Sploit
* NO11
* kabou
* rudzik8
* chmodsayshello
* PrairieWind
* RandomLegoBrick
* SumianVoice
* MrRar
* talamh
* Faerraven
* FossFanatic
* SmokeyDope
* Faerraven / Michieal
* Codiac
## Past Developers
* jordan4ibanez
* iliekprogrammar
* kabou
* kay27
* MysticTempest
* NO11
* SumianVoice
* PrairieWind
## Contributors
* RandomLegoBrick
* rudzik8
* Code-Sploit
* aligator
* Rootyjr
* ryvnf
* bzoss
* talamh
* Laurent Rocher
* HimbeerserverDE
* TechDudie
@ -66,6 +72,10 @@
* Marcin Serwin
* erlehmann
* E
* n_to
* debiankaios
* Gustavo6046 / wallabra
* CableGuy67
* Benjamin Schötz
* Doloment
* Sydney Gems
@ -80,15 +90,12 @@
* aldum
* Dieter44
* Pepebotella
* MrRar
* Lazerbeak12345
* mrminer
* Thunder1035
* opfromthestart
* snowyu
* FaceDeer
* Faerraven / Michieal
* FossFanatic
* Herbert West
* GuyLiner
* 3raven
@ -96,25 +103,39 @@
* TheOnlyJoeEnderman
* Ranko Saotome
* Gregor Parzefall
* Wbjitscool
* b3nderman
* CyberMango
* gldrk
* atomdmac
* emptyshore
* FlamingRCCars
* uqers
* Niterux
* appgurueu
* seventeenthShulker
* DinoNuggies4665
* basxto
* Morik666
* Eliy21
* mdk
* Alessandra Lozoya
* VanicGame
* ThePython10110
* Araca
* Montandalar
* mim
* Dark
* Bakawun
* JoseDouglas26
* Zasco
## MineClone5
* kay27
* Debiankaios
* epCode
* NO11
* j45
* chmodsayshello
* 3raven
* PrairieWind
* Gustavo6046 / wallabra
* CableGuy67
* MrRar
## Mineclonia
* erlehmann
* Li0n
* E
* n_to
## Music
* Jordach for the jukebox music compilation from Big Freaking Dig
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
## Original Mod Authors
* Wuzzy
@ -146,12 +167,20 @@
* 4Evergreen4
* jordan4ibanez
* paramat
* debian044 / debian44
* chmodsayshello
* cora
* Faerraven / Michieal
* PrairieWind
* ChrisPHP
## 3D Models
* 22i
* tobyplowy
* epCode
* Faerraven / Michieal
* SumianVoice
* thunder1035
## Textures
* XSSheep
@ -166,6 +195,13 @@
* RandomLegoBrick
* cora
* Faerraven / Michieal
* Nicu
* Exhale
* Aeonix_Aeon
* Wbjitscool
* SmokeyDope
* thunder1035
* Herowl
## Translations
* Wuzzy
@ -180,14 +216,22 @@
* snowyu
* 3raven
* SakuraRiu
* anarquimico
* syl
* Temak
* megustanlosfrijoles
* kbundg
* Isaac Dennis
* ADLON
* Sab Pyrope
* JoseDouglas26
## Funders
* 40W
* bauknecht
* Cora
## Special thanks
* celeron55 for creating Minetest
* Jordach for the jukebox music compilation from Big Freaking Dig
* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
* The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
* Notch and Jeb for being the major forces behind Minecraft
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/

View File

@ -170,16 +170,8 @@ These groups are used mostly for informational purposes
* `ammo_bow=1`: Item is used as ammo for bows
* `non_combat_armor=1`: Item can be equipped as armor, but is not made for combat (e.g. zombie head, pumpkin)
* `container`: Node is a container which physically stores items within and has at least 1 inventory
* `container=2`: Has one inventory with list name `"main"`. Items can be placed and taken freely
* `container=3`: Same as `container=2`, but shulker boxes can not be inserted
* `container=4`: Furnace-like, has lists `"src"`, `"fuel"` and `"dst"`.
It is expected that this also reacts on `on_timer`;
the node timer must be started from other mods when they add into `"src"` or `"fuel"`
* `container=5`: Left part of a 2-part horizontal connected container. Both parts have a `"main"` inventory
list. Both inventories are considered to belong together. This is used for large chests.
* `container=6`: Same as above, but for the right part.
* `container=7`: Has inventory list "`main`", no movement allowed
* `container=1`: Other/unspecified container type
* `container=1`: Container type, which does not allow hoppers to transfer items
* `container=2`: Items can be placed and taken freely. Can have inventory with list name `"main"` or define `_mcl_hoppers_on_try_pull`, `_mcl_hoppers_on_try_push`, `_mcl_hoppers_on_after_pull`, `_mcl_hoppers_on_after_push` to play along hoppers nicely.
* `spawn_egg=1`: Spawn egg
* `pressure_plate=1`: Pressure plate (off)

21
HOW_TO_PLAY.md Normal file
View File

@ -0,0 +1,21 @@
Survive, farm, build, explore, play with friends, and do much more. Inspired by a well known block game, pushing beyond.
How to play:
#### Download Minetest
- Navigate to https://www.minetest.net/ to download the client.
- Once installed, open and select the "Content" tab
#### Install MineClone2 from ContentDB
- Click "Browse Online Content" and filter by Games (select "Games" from the dropdown box)
- Find "MineClone2" (should be first on the list or on the first page)
- Click the [+] button next to MineClone2 and wait for download to finish
- Click "Back to Main Menu"
#### Create new world and play
- Click "Start Game" tab
- At the bottom click the MineClone2 icon (the 2 dirt with grass blocks)
- Click "New", give your world a name
- You can leave seed blank or put in a word of your choice
- Select your new world
- Click "Play Game" and enjoy!

View File

@ -5,7 +5,7 @@ Copying is an act of love. Please copy and share! <3
Here's the detailed legalese for those who need it:
## License of source code
MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
MineClone 2 (by Lizzy Fleckenstein, Wuzzy, davedevils and countless others)
is an imitation of Minecraft.
MineClone 2 is free software: you can redistribute it and/or modify
@ -38,11 +38,15 @@ No non-free licenses are used anywhere.
The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
from scratch.
The glazed terracotta textures have been created by (MysticTempest)[https://github.com/MysticTempest].
The glazed terracotta textures have been created by [MysticTempest](https://github.com/MysticTempest).
Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
Armor trim models were created by Aeonix_Aeon
Source: <https://www.curseforge.com/minecraft/texture-packs/ozocraft-remix>
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
All other files, unless mentioned otherwise, fall under:
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)

75
MODELS.md Normal file
View File

@ -0,0 +1,75 @@
# Models in Minetest/Mineclone2
Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2.
## Minetest Wiki
For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender)
## Recommended software
### Blender
Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine.
Download blender [Here](https://www.blender.org/download/)
### .b3d addon for blender
Blitz 3D (.b3d) Is one of the main animated model formats used for entities in the minetest engine. It cannot be imported to blender without a plugin called "Import-Export:Bitz 3D format (.b3d)".
The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786)
## Types of model formats
### Animated, skinned models
* Blitz 3D files (.b3d)
* Microsoft DirectX (.x) (binary & text, compression is not supported)
### Static meshes
* Wavefront OBJ (.obj)
Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
Note: Do not use .b3d and .x files for static meshes at the moment, Minetest currently spawns animated mesh scene nodes for these, which may result in reduced performance.
### Supported texture formats
* .png
* .jpg
* .bmp (depreciated, please use .png or .jpg)
* .tga (depreciated, please use .png or .jpg)
Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore.
## Pros & Cons of .b3d vs .x
### B3D
* [+] Binary format means a small size
* [-] Difficult to postprocess after exporting
* [-] Difficult to debug problems
### X (text version)
* [+] Can be parsed easily with lua scripts
* [+] Can be easily generated by scripts
* [+] Easy to debug issues (you can just read it)
* [+] Can be optimized by quantizing some data
* [-] Blender exporter is kinda buggy and inefficient
* [-] Probably still bigger than an equivalent .b3d
Note: Avoid using the binary X format! It's actually just a tokenized version of the ASCII representation, and may actually be less efficient than a sufficiently optimized text .x file!

View File

@ -2,8 +2,6 @@
An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
Developed by many people. Not developed or endorsed by Mojang AB.
Version: 0.82 (in development)
### Gameplay
You start in a randomly-generated world made entirely of cubes. You can explore
the world and dig and build almost every block in the world to create new
@ -29,7 +27,7 @@ Or you can play in “creative mode” in which you can build almost anything in
## How to play (quick start)
### Getting started
* **Punch a tree** trunk until it breaks and collect wood
* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu and craft 4 wood planks
* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu) and craft 4 wood planks
* Place the 4 wood planks in a 2×2 shape in the crafting grid to **make a crafting table**
* **Rightclick the crafting table** for a 3×3 crafting grid to craft more complex things
* Use the **crafting guide** (book icon) to learn all the possible crafting recipes
@ -39,15 +37,15 @@ Or you can play in “creative mode” in which you can build almost anything in
### Farming
* Find seeds
* Craft hoe
* Rightclick dirt or similar block with hoe to create farmland
* Craft a hoe
* Rightclick dirt or a similar block with a hoe to create farmland
* Place seeds on farmland and watch them grow
* Collect plant when fully grown
* Collect plants when fully grown
* If near water, farmland becomes wet and speeds up growth
### Furnace
* Craft furnace
* Furnace allows you to obtain more items
* Craft a furnace
* The furnace allows you to obtain more items
* Upper slot must contain a smeltable item (example: iron ore)
* Lower slot must contain a fuel item (example: coal)
* See tooltips in crafting guide to learn about fuels and smeltable items
@ -80,35 +78,33 @@ The MineClone2 repository is hosted at Mesehub. To contribute or report issues,
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
* Discord: <https://discord.gg/xE4z8EEpDC>
* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
* IRC: <https://web.libera.chat/#mineclone2>
* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
* Reddit: <https://www.reddit.com/r/MineClone2/>
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
* OpenCollective: <https://opencollective.com/mineclone2>
* Mastodon: <https://fosstodon.org/@MineClone2>
* Lemmy: <https://lemmy.world/c/mineclone2>
* Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
* Reddit: <https://www.reddit.com/r/MineClone2/>
* IRC (barely used): <https://web.libera.chat/#mineclone2>
## Target
- Crucially, create a stable, moddable, free/libre clone of Minecraft
based on the Minetest engine with polished features, usable in both
- Create a stable, moddable, free/libre game based on Minecraft
on the Minetest engine with polished features, usable in both
singleplayer and multiplayer. Currently, a lot of **Minecraft Java
Edition** features are already implemented and polishing existing
features are prioritized over new feature requests.
- With lessened priority yet strictly, implement features targetting
- Implement features targetting
**Current Minecraft versions + OptiFine** (OptiFine only as far as supported
by the Minetest Engine). This means features in parity with the listed
Minecraft experiences are prioritized over those that don't fulfill this
scope.
- Optionally, create a performant experience that will run relatively
well on really low spec computers. Unfortunately, due to Minecraft's
mechanisms and Minetest engine's limitations along with a very small
playerbase on low spec computers, optimizations are hard to investigate.
by the Minetest Engine).
- Create a performant experience that will run relatively
well on really low spec computers.
## Completion status
This game is currently in **beta** stage.
It is playable, but not yet feature-complete.
Backwards-compability is not entirely guaranteed, updating your world might cause small bugs.
If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable. The testing branch often features some experimental PRs and should be considered less stable.
If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable.
The following main features are available:
@ -158,7 +154,7 @@ The following features are incomplete:
* Some monsters and animals
* Redstone-related things
* Special minecarts
* Some special minecarts (hopper and chest minecarts work)
* A couple of non-trivial blocks and items
Bonus features (not found in Minecraft):
@ -166,7 +162,7 @@ Bonus features (not found in Minecraft):
* Built-in crafting guide which shows you crafting and smelting recipes
* In-game help system containing extensive help about gameplay basics, blocks, items and more
* Temporary crafting recipes. They only exist to make some otherwise unaccessible items available when you're not in creative mode. These recipes will be removed as development goes on an more features become available
* Saplings in chests in mapgen v6
* Saplings in chests in [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
* Fully moddable (thanks to Minetest's powerful Lua API)
* New blocks and items:
* Lookup tool, shows you the help for whatever it touches

View File

@ -1,48 +1,45 @@
# MineClone2
Un jeu non-officiel similaire à Minecraft pour Minetest. Forké depuis Mineclone par davedevils. Développé par de nombreuses personnes. Ni développé ou supporté par Mojang AB.
Version: 0.79 (en dévelopment)
Un jeu non-officiel similaire à Minecraft pour Minetest. Forké depuis Mineclone par davedevils. Développé par de nombreuses personnes. Pas développé ni supporté par Mojang AB.
### Gameplay
Vous atterissez dans un monde fait entièrement de cubes et généré aléatoirement. Vous pouvez explorer le monde, miner et construire presque n'importe quel bloc pour créer de nouvelles structures. Vous pouvez choisir de jouer en "mode survie" dans lequel vous devez combattre des monstres et la faim et progresser lentement dans différents aspects du jeu, comme l'extraction de minerai, l'agriculture, la construction de machines et ainsi de suite. Ou alors vous pouvez jouer en "mode créatif" où vous pouvez construire à peu près n'importe quoi instantanément.
### Résumé du Gameplay
* Jeu de type bac-à-sable, sans objetifs
* Survie : combattre des monstres hostiles et la faim
* Creuser pour du minerai et d'autres trésors
* Magie : gagner de l'expérience et enchanter les outils
* Utiliser les blocs ramassés pour construire de magnifiques bâtiments, votre imagination est la limite
* Ramasser des fleurs (et d'autres sources de teinture) et colorez votre monde
* Survie : combattez des monstres hostiles et la faim
* Creusez pour du minerai et d'autres trésors
* Magie : gagnez de l'expérience et enchantez les outils
* Utilisez les blocs ramassés pour construire de magnifiques bâtiments, votre imagination est la seule limite
* Ramassez des fleurs (et d'autres sources de teinture) et colorez votre monde
* Trouvez des graines et commencez à cultiver
* Trouvez ou fabriquez des centaines d'objets
* Construisez un réseau ferroviaire complexe et amusez vous avec les wagonnets
* Construisez un réseau ferroviaire complexe et amusez-vous avec les wagonnets
* En mode créatif vous pouvez construire presque n'importe quoi gratuitement et sans limite
## Comment jouer (démarrer rapidement)
### Commencer
* **Frappez un arbre** jusqu'à ce qu'il casse et donne du bois
* Placez le **bois dans la grille 2x2** (la "grille de fabrication" de votre menu d'inventaire) et fabriquez 4 planches de bois
* Placer les 4 planches de bois dans la grille 2x2 et **fabriquez une table d'artisanat**
* **Cliquez droit la table d'artisanat** (icone livre) pour apprendre toutes les recettes possibles
* Placer les 4 planches de bois dans la grille 2x2 et **fabriquez un établi**
* **Faites un clic droit sur l'établi** (icone livre) pour apprendre toutes les recettes possibles
* **Fabriquez une pioche de bois** pour miner la pierre
* Différents outils minent différentes sortes de blocs. Essayez les !
* Continuez à jouer comme vous voulez. Amusez vous !
* Différents outils minent différentes sortes de blocs. Essayez-les !
* Continuez à jouer comme vous voulez. Amusez-vous !
### Agriculture
* Trouvez des graines
* Fabriquez une houe
* Cliquez droit la terre ou des blocs similaires avec la houe pour créer des terres agricoles
* Faites un clic droit sur la terre ou des blocs similaires avec la houe pour créer des terres agricoles
* Placer des graines sur des terres agricoles et regardez les pousser
* Récoltez les plantes une fois matûres
* Les terres agricoles proche de l'eau deviennent humides et accélèrent la croissance
### Four
* Fabriquer un Four
* Fabriquez un four
* Le four permet d'obtenir plus d'objets
* L'emplacement du haut doit contienir un objet fondable (par ex : minerai de fer)
* L'emplacement du bas doit contienir un objet combustible (par ex : charbon)
* L'emplacement du haut doit contenir un objet fondable (par ex : minerai de fer)
* L'emplacement du bas doit contenir un objet combustible (par ex : charbon)
* Voir le guide d'artisanat pour en apprendre plus sur les objets fondables et combustibles
### Aide supplémentaire
@ -62,43 +59,43 @@ Il n'y a pas de support de MineClone2 dans les versions développement de Minete
Pour installer MineClone2 (si ce n'est pas déjà fait), déplacez ce dossier dans le dossier “games” de Minetest. Consultez l'aide de Minetest pour en apprendre plus.
## Liens utiles
Le dépôt de MineClone2 est hébergé sur Mesehub. Pour contribuer ou rapporter des problèmes, aller là-bas.
Le dépôt de MineClone2 est hébergé sur Mesehub. Pour contribuer ou signaler des problèmes, allez là-bas.
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
* Discord: <https://discord.gg/xE4z8EEpDC>
* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
* IRC: <https://web.libera.chat/#mineclone2>
* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
* Reddit: <https://www.reddit.com/r/MineClone2/>
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
* OpenCollective: <https://opencollective.com/mineclone2>
* Mesehub : <https://git.minetest.land/MineClone2/MineClone2>
* Discord : <https://discord.gg/xE4z8EEpDC>
* YouTube : <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
* IRC : <https://web.libera.chat/#mineclone2>
* Matrix : <https://app.element.io/#/room/#mc2:matrix.org>
* Reddit : <https://www.reddit.com/r/MineClone2/>
* Forums Minetest : <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
* ContentDB : <https://content.minetest.net/packages/wuzzy/mineclone2/>
* OpenCollective : <https://opencollective.com/mineclone2>
## Objectif
* Créer un clone stable, moddable, libre et gratuit basé sur le moteur de jeu Minetest avec des fonctionalités abouties, utilisable à la fois en mode solo et multijoueur. Actuellement, beaucoup des fonctionalités de **Minecraft Java Edition** sont déjà implémentées et leur amélioration est prioritaire sur les nouvelles demandes.
* Avec une priorité moindre, implémenter les fonctionalités des versions **Minecraft + OptiFine** (OtiFine autant que supporté par le moteur Minetest). Cela signifie que les fonctionalités présentes dans les versions listées sont priorisées.
* Dans l'idéal, créer une expérience performante qui tourne bien sur des ordinateurs à basse performance. Malheureusement, en raison des mécanismes de Minecraft et des limitations du moteur Minetest ainsi que de la petite taille de la communauté de joueurs sur des ordinateurs à basse performances, les optimisations sont difficiles à explorer.
* Essentiellement, créer un clone de Minecraft stable, moddable, libre et gratuit basé sur le moteur de jeu Minetest avec des fonctionnalités abouties, utilisable à la fois en mode solo et multijoueur. Actuellement, beaucoup des fonctionnalités de **Minecraft Java Edition** sont déjà implémentées et leur amélioration est prioritaire sur les nouvelles demandes.
* Avec une priorité moindre, implémenter les fonctionnalités des versions **Minecraft + OptiFine** (OptiFine autant que supporté par le moteur Minetest). Cela signifie que les fonctionnalités présentes dans les versions listées sont priorisées.
* Dans l'idéal, créer une expérience performante qui tourne bien sur des ordinateurs à basse performance. Malheureusement, en raison des mécanismes de Minecraft et des limitations du moteur Minetest ainsi que de la petite taille de la communauté de joueurs sur des ordinateurs à basses performances, les optimisations sont difficiles à explorer.
## Statut de complétion
Ce jeu est actuellement au stade **beta**.
Il est jouable mais incomplet en fonctionalités.
Il est jouable mais incomplet en fonctionnalités.
La rétro-compatibilité n'est pas entièrement garantie, mettre votre monde à jour peut causer de petits bugs.
Si vous voulez utiliser la version de développement de MineClone2 en production, la branche master est habituellement relativement stable. Les branches de test fusionnent souvent des pull requests expérimentales et doivent être considérées comme moins stable.
Les principales fonctionalités suivantes sont disponibles :
Les principales fonctionnalités suivantes sont disponibles :
* Outils, armes
* Armure
* Système de fabrication : grille 2x2, table d'artisanat (grille 3x3), four, incluant un guide de fabrication
* Coffres, grands coffres, coffre ender, boite de shulker
* Système de fabrication : grille 2x2, établi (grille 3x3), four, incluant un guide de fabrication
* Coffres, grands coffres, coffre ender, boites de Shulker
* Fours, entonnoirs
* Faim
* La plupart des monstres et animaux
* Tout les minerais de Minecraft
* Tous les minerais de Minecraft
* La plupart des blocs de l'overworld
* Eau et lave
* Météo
* 28 biomes + 5 biomes du nether
* 28 biomes + 5 biomes du Nether
* Le Nether, monde souterrain brûlant dans une autre dimension
* Circuits Redstone (partiel)
* Effets de Statut (partiel)
@ -107,10 +104,10 @@ Les principales fonctionalités suivantes sont disponibles :
* Brassage, potions, flèches trempées (partiel)
* Bâteaux
* Feu
* Blocs de construction : escaliers, dalles, portes, trappes, barrière, portillon, muret
* Blocs de construction : escaliers, dalles, portes, trappes, barrières, portillons, murets
* Horloge
* Boussole
* Eponge
* Éponge
* Bloc de slime
* Petites plantes et pousses
* Teintures
@ -118,26 +115,30 @@ Les principales fonctionalités suivantes sont disponibles :
* Blocs de décoration : verre, verre teinté, vitres, barres de fer, terre cuites (et couleurs), têtes et plus
* Cadres d'objets
* Juke-boxes
* Lits
* Menu d'inventaire
* Inventaire créatif
* Agriculture
* Livres pour écrire
* Commandes
* Villages
* L'End
* et plus !
Les fonctionalités suivantes sont incomplètes :
Les fonctionnalités suivantes sont incomplètes :
* certains monstres et animaux
* certains composants de Redstone
* Certains monstres et animaux
* Certains composants de Redstone
* Wagonnets spéciaux
* quelques blocs et objets non-triviaux
* Quelques blocs et objets non-triviaux
Fonctionalités bonus (absentes de Minecraft) :
Fonctionnalités bonus (absentes de Minecraft) :
* Guide d'artisanat intégré au jeu qui montre les recettes d'artisanat et de cuisson
* Système d'aide intégré au jeu contenant des informations à propos des techniques de base, blocs, objets et plus
* Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionalités.
* Pousses dans les coffres en mapgen v6
* Entièrement moddable (grâce la puissante API lua de Minetest)
* Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionnalités.
* Pousses dans les coffres en [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
* Entièrement moddable (grâce la puissante API Lua de Minetest)
* Nouveaux blocs et objets :
* Outil de recherche, montre l'aide de ce qu'il touche
* Plus de dalles et d'escaliers
@ -149,22 +150,24 @@ Fonctionalités bonus (absentes de Minecraft) :
* Avant-poste du Nether (Forteresse)
Différences techniques avec Minecraft :
* Limite en hauteur de 31000 blocs (bien plus grand que Minecraft)
* Taille horizontale du monde 62000×62000 blocs (bien plus petit que Minecraft mais toujours très grand)
* Toujours assez incomplet et buggé
* Des blocs, objets, ennemis et fonctionalités manquent
* Des blocs, objets, ennemis et fonctionnalités manquent
* Quelques objets ont des noms légèrement différents pour être plus faciles à distinguer
* Des musiques différentes pour le juke-boxe
* Des textures différentes (Pixel Perfection)
* Des sons différents (sources diverses)
* Un moteur de jeu différent (Minetest)
* Des bonus cachés différents
...et enfin MineClone2 est un logiciel libre !
## Autres fichiers readme
* `LICENSE.txt`: Le texte de la license GPLv3
* `CONTRIBUTING.md`: Information pour ceux qui veulent contribuer
* `API.md`: Pour les modders Minetest qui veulent modder ce jeu
* `LEGAL.md`: Information légale
* `CREDITS.md`: Liste des contributeurs
* `LICENSE.txt` : Le texte de la licence GPLv3
* `CONTRIBUTING.md` : Information pour ceux qui veulent contribuer
* `API.md` : Pour les modders Minetest qui veulent modder ce jeu
* `LEGAL.md` : Information légale
* `CREDITS.md` : Liste de toutes les personnes qui ont contribué

193
README_locale/README.ru.md Normal file
View File

@ -0,0 +1,193 @@
# MineClone2
Неофициальная игра в стиле Minecraft для Minetest. Форк MineClone от davedevils.
Разработана многими людьми. Не разработана и не одобрена Mojang AB.
### Игровой процесс
Вы начинаете в случайно сгенерированном мире созданном целиком из кубов. Вы можете
исследовать мир, выкопать и поставить почти каждый блок в мире, чтобы создавать новые
структуры. Вы можете играть в “режиме выживания” в котором вам придется бороться с
монстрами и голодом за выживание и медленно проходить через различные аспекты игры,
такие как копание, фермерство, постройка механизмов и так далее. Или вы можете играть
в “творческом режиме” в котором вы сразу можете строить что угодно.
#### Итоги геймплея
* Геймплей в стиле песочницы, без целей
* Выживайте: сражайтесь с враждебными монстрами и голодом
* Добывайте руды и прочие ценные предметы
* Магия: получайте опыт и зачаруйте ваше снаряжение
* Создавайте из собранных блоков величественные постройки ограниченные только воображением
* Собирайте цветы и другие красители, чтобы раскрасить ваш мир
* Найдите семена и заведите ферму
* Найдите или создайте один из сотен предметов
* Проложите рельсы и повеселитесь с вагонетками
* Постройте сложные механизмы со схемами из редстоуна
* В творческом режиме вы можете свободно строить всё без лимитов
## Как играть (быстрый старт)
### Начнем
* **Бейте по стволу дерева** пока оно не сломается и соберите древесину
* Поставьте **древесину в сетку 2×2** (“сетка крафта” в вашем инвентаре) и скрафтите 4 доски
* Разложите 4 доски в форме 2×2 в сетке крафта, чтобы **сделать верстак**
* **Правым кликом по верстаку**, чтобы открыть сетку крафта 3×3 для более сложных предметов
* Используйте **книгу рецептов** (иконка книги), чтобы узнать все возможные рецепты крафтов
* **Скрафтите деревянную кирку**, чтобы вы могли копать камень
* Разные инструменты добывают разные виды блоков. Опробуйте их все!
* Продолжайте играть как пожелаете. Повеселитесь!
### Фермерство
* Найдите семена
* Скрафтите мотыгу
* Правой кнопкой мотыгой по земле или похожему блоку, чтобы создать грядку
* Посадите семена на грядку и ждите пока они вырастут
* Соберите растение когда оно полностью созреет
* Рядом с водой грядка становится влажной и растения растут быстрее
### Переплавка
* Скрафтите печь
* Печь позволит вам получить больше предметов
* Верхний слот должен содержать переплавляемый предмет (например: железную руду)
* Нижний слот должен содержать топливо (например: уголь)
* Смотрите книгу рецептов, чтобы узнать о других переплавляемых предметах и топливе
### Дополнительная помощь
Больше информации о геймплее, блоках, предметах и многое другое можно найти во
внутриигровой справке. Вы можете перейти в неё через ваш инвентарь.
### Особые предметы
Следующие предметы интересны для творческого режима и для строителей приключенческих
карт. Их нельзя получить в игре или через творческий инвентарь.
* Барьер: `mcl_core:barrier`
Используйте чат-команду `/giveme`, чтобы получить их.
Смотрите справку для дальнейшей информации.
## Установка
Эта игра требует [Minetest](http://minetest.net) для запуска (версия 5.4.1 или
выше). Вам нужно сперва установить Minetest. Только стабильные версии поддерживаются
официально. Не поддерживается запуск MineClone2 на разрабатываемых версиях Minetest.
Чтобы установить MineClone2 (если вы этого еще не сделали), переместите эту папку в
“games” в папке данных Minetest. Смотрите справку Minetest, чтобы узнать больше.
## Полезные ссылки
Репозиторий MineClone2 хранится на Mesehub. Зайдите туда, чтобы оставить запрос или
поучаствовать в разработке.
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
* Discord: <https://discord.gg/xE4z8EEpDC>
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
* OpenCollective: <https://opencollective.com/mineclone2>
* Mastodon: <https://fosstodon.org/@MineClone2>
* Lemmy: <https://lemmy.world/c/mineclone2>
* Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
* Форум Minetest: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
* Reddit: <https://www.reddit.com/r/MineClone2/>
* IRC (едва используется): <https://web.libera.chat/#mineclone2>
## Цели
- Создать стабильную, модифицируемую, бесплатную и свободную игру основанную на
Minecraft на движке Minetest с проработанными возможностями для одиночной игры и
для мультиплеера. На данный момент множество возможностей **Minecraft Java
Edition** уже реализовано и доработка имеющегося контента в приоритете над
добавлением нового.
- Реализовать возможности на уровне **текущей версии Minecraft + OptiFine** (OptiFine
настолько, насколько это поддерживается движком Minetest).
- Добиться производительности для запуска на действительно слабых компьютерах.
## Готовность
Игра сейчас на стадии **бета**. Она играбельна, но еще не имеет всех возможностей.
Обратная совместимость целиком не гарантируется, обновление вашего мира может повлечь
за собой небольшие ошибки. Если вы хотите использовать разрабатываемую версию
Mineclone2, то ветка master обычно относительно стабильна.
Следущие возможности уже доступны:
* Инструменты, оружие, броня
* Система крафта: сетка 2×2, верстак (сетка 3×3) и книга рецептов
* Сундуки, большие сундуки, эндер-сундуки, ящики шалкера
* Печи и воронки
* Система голода
* Большинство монстров и животных
* Все руды из Minecraft
* Большинство блоков из Верхнего мира
* Вода и лава
* Погода
* 28 биомов + 5 биомов в Незере
* Незер, пылающий подземный мир в другом измерении
* Схемы из редстоуна (частично)
* Вагонетки (частично)
* Статусные эффекты (частично)
* Опыт
* Зачарование
* Зельеварение, зелья, смоченные стрелы (частично)
* Лодки
* Огонь
* Строительные блоки: ступени, плиты, двери, люки, заборы, калитки, стены
* Часы
* Компас
* Губки
* Блоки слизи
* Растения и саженцы
* Красители
* Флаги
* Декоративные блоки: стекло, окрашенное стекло, стеклянные панели, железные решетки, цветная керамика, головы и многое другое
* Рамки для предметов
* Прогрыватели
* Кровати
* Меню инвентаря
* Творческий инвентарь
* Фермерство
* Книги с пером
* Команды
* Деревни
* Измерение Края
* И многое другое!
Следующие возможности еще не завершены:
* Некоторые монстры и животные
* Предметы связанные с редстоуном
* Некоторые вагонетки (с сундуком и с воронкой уже работают)
* Пара нетривиальных блоков и предметов
Бонусные возможности (нет в Minecraft-е):
* Встроенный гайд для крафта покажет вам рецепты крафта и переплавки
* Внутриигровая справка содержит всестороннюю информацию об основах игры, блоках, предметах и прочее
* Временные рецепты крафта. Они существуют, чтобы получить доступ к ранее недоступным предметам вне творческого режима. Они будут удалены как только разработка позволит им стать доступными
* Саженцы в сундуках в [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
* Полностью модифицируема (благодаря мощному Lua API в Minetest)
* Новые блоки и предметы:
* Инструмент просмотра покажет справку о том чего коснется
* Больше ступеней и плит
* Калитки и заборы из адских кирпичей
* Замены структур - малые верии структур из Minecraft пока большие структуры не будут сделаны:
* Лесная хижина (Особняк)
* Форт Незера (Крепости)
Технические отличия от Minecraft:
* Лимит высоты - 31000 блоков (намного больше чем в Minecraft)
* Горизонтальный размер мира - 62000×62000 блоков (намного меньше чем в Minecraft, но всё еще очень большой)
* Всё еще не завершен и содержит много багов
* Недостающие блоки, предметы, мобы
* Некоторые предметы с другими названиями, чтобы лучше их различать
* Другая музыка для проигрывателей
* Другие текстуры (Pixel Perfection)
* Другие звуки (разные источники)
* Другой движок (Minetest)
* Другие пасхалки
… и наконец, MineClone2 это свободное программное обеспечение!
## Другие readme файлы
* `LICENSE.txt`: текст лицензии GPLv3
* `CONTRIBUTING.md`: информация для тех кто хочет поучаствовать в разработке
* `API.md`: для моддеров Minetest кто хочет изменить эту игру
* `LEGAL.md`: юридическая информация
* `CREDITS.md`: список участников проекта

View File

@ -1,19 +1,89 @@
#File to document release steps with a view to evolving into a script
### Standard Release
#Update CREDITS.md
#Update version in README.md (soon to be game.conf from of 0.82.0)
# File to document release steps with a view to evolving into a script
# Update CREDITS.md
# Update version in game.conf
```
lua tools/generate_ingame_credits.lua
git add CREDITS.md
git add mods/HUD/mcl_credits/people.lua
git add game.conf
git add README.md
# To uncomment when applicable
#git add game.conf
#git add RELEASE.md
git commit -m "Pre-release update credits and set version 0.81.1"
git commit -m "Pre-release update credits and set version 0.83.0"
git tag 0.81.1
git tag 0.83.0
git push origin 0.81.1
git push origin 0.83.0
```
# Update version in game.conf to the next version with -SNAPSHOT suffix
`git commit -m "Post-release set version 0.84.0-SNAPSHOT"`
### Hotfix Release
##### Prepare release branch
When hotfixing, you should never release new features. Any new code increases risk of new bugs which has additional testing/release concerns.
To mitigate this, you just release the last release, and the relevant bug fix. For this, we do the following:
* Create release branch from the last release tag, push it:
```
git checkout -b release/0.82.1 0.82.0
git push origin release/0.82.1
```
##### Prepare feature branch and fix
* Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
`git checkout -b hotfix_bug_1_branch`
* Fix crash/serious bug and commit
* Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
##### Update version and tag the release
* After all fixes are in release branch, pull it locally (best to avoid a merge conflict as feature branch will need to be merged into master also, which already changed version):
* Update version in game.conf to hotfix version and commit it. Example: version=0.82.1
* Tag it, push tag and branch:
```
git tag 0.82.1
git push origin 0.82.1
git push origin release/0.82.1
```
Note: If you have to do more than 1 hotfix release, can do it on the same release branch.
### Release via ContentDB
* Go to MineClone2 page (https://content.minetest.net/packages/Wuzzy/mineclone2/)
* Click +Release
* Enter the release tag number in the title and Git reference box. For example (without quotes): "0.82.1"
* In the minimum minetest version, put the oldest supported version (as of 14/02/2023 it is 5.5), leave the Maximum minetest version blank
* Click save. Release is now live.
##### Inform people
* Upload video to YouTube
* Add a comment to the forum post with the release number and change log. Maintainer will update main post with code link.
* Add a Discord announcement post and @everyone with link to video, forum post and release notes.
* Share the news on reddit + Lemmy. Good subs to share with:
* r/linux_gaming
* r/opensourcegames
* r/opensource
* r/freesoftware
* r/linuxmasterrace
* r/MineClone2

57
TEXTURES.md Normal file
View File

@ -0,0 +1,57 @@
# Making Textures In Mineclone2
Textures are a crucial asset for all items, nodes, and models in mineclone2. This document is for artist who would like to make and modify textures for mineclone2. While no means comprehensive, this document contains the basic important information for beginners to get started with texture curation and optimization.
## Minetest Wiki
For more detailed information on creating and modifing texture packs for Minetest/Mineclone2, please visit the Minetest wiki's page on creating a texture pack. Click [here](https://wiki.minetest.net/Creating_texture_packs) to view the wiki page on creating texture packs.
## GIMP Tutorials Pixel Art Guide
GIMP Tutorials has an excellent guide to making pixel art in GIMP. If you would like further clarification as well as screenshots for what we are about to cover, it is an excellent resource to turn to. Click [here](https://thegimptutorials.com/how-to-make-pixel-art/) to view the guide
## Recommended Software
### GIMP
GIMP (GNU Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine.
Download GIMP [here](http://gimp.org/)
# Getting Started
## Creating a new file
the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing "New".
Choose width of 16 and height of 16 for the image size. While higher resolution textures are possible, The default size is 16x16. It is recommended you use this size as well, as it is universally supported on all systems.
## Zoom In
Next, you'll want to zoom in as the canvas is very small at the default zoom level. To do this either use CTRL + mousewheel, +/-, or navigate to the View menu > zoom > zoom in
## Configure Grid
Now, we'll want to turn on the grid. Open the edit menu and enable the 'show grid' option.
The default grid size is 10 pixels, we want to change it to a 1 pixel grid. Go to the Image menu and choose 'configure grid.
In the Spacing section, change both the Horizontal and Vertical pixel settings to 1.00 then click ok and the grid will update.
## Pencil Tool & Color Picking
The most useful brush type for pixel art is the Pencil tool. Its nested under the paintbrush tool in the toolbox, or you can use the keyboard shortcut 'N'.
Once the pencil tool is selected, navigate to the sliders on the left side of the canvas and change brush size to 1 pixel.
Now choose a color! You can do this by clicking on the two colored squares under the toolbox. The Color Picker tool is also a good option if you already have a reference image for color palette.
## How to export optimally
Once you have finished up a texture and are ready to export it, navigate to the file menu > export as... and make sure the file name extention is .png
After clicking 'Export', a menu will appear with a bunch of options checked. Make sure to uncheck all of these options!!! This will drastically reduce the file size from multiple kilobytes to a couple of hundred bytes. Finally click 'Export' one more time.
### Further optimization with OptiPNG
For those running a GNU/linux distribution, you most likely have the 'optipng' command available to you. If it does not come with your system by default, the software homepage can be found [here](https://optipng.sourceforge.net/) where you can download and install from source.
First, Open up the terminal in the directory where your exported texture is located (or navigate to the directory with the 'cd your/directory/path/to/textures'), then run this command
```
optipng -o7 -zm1-9 -nc -clobber -strip all *.png
```
This will further optimize all the textures in the directory.
NOTE: If you would like to further edit a texture that has been optipng'd in GIMP, you must manually set the color palette back to RBG after opening. Navigate to Image menu > Mode > select RGB

View File

@ -1 +1 @@
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.12. This is a work in progress! Expect bugs!
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more.

View File

@ -1,4 +1,4 @@
title = MineClone 2
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
disallowed_mapgens = v6
version=MCL2-0.82-indev
version=0.87.0-SNAPSHOT

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -204,7 +204,7 @@ end
-- Checks if the given node would drop its useful drop if dug by a given tool.
-- Returns true if it will yield its useful drop, false otherwise.
function mcl_autogroup.can_harvest(nodename, toolname)
function mcl_autogroup.can_harvest(nodename, toolname, player)
local ndef = minetest.registered_nodes[nodename]
if not ndef then
@ -215,6 +215,10 @@ function mcl_autogroup.can_harvest(nodename, toolname)
return true
end
if minetest.get_item_group(nodename, "dig_immediate_piston") >= 1 then
return true
end
-- Check if it can be dug by tool
local tdef = minetest.registered_tools[toolname]
if tdef and tdef._mcl_diggroups then
@ -228,7 +232,9 @@ function mcl_autogroup.can_harvest(nodename, toolname)
end
-- Check if it can be dug by hand
local tdef = minetest.registered_tools[""]
if not player or not player:is_player() then return false end
local name = player:get_inventory():get_stack("hand", 1):get_name()
local tdef = minetest.registered_items[name]
if tdef then
for g, gdef in pairs(tdef._mcl_diggroups) do
if ndef.groups[g] then
@ -260,7 +266,7 @@ local function get_tool_capabilities(tdef)
-- If the damage group and punch interval from hand is not included,
-- then the user will not be able to attack with the tool.
local hand_toolcaps = minetest.registered_tools[""].tool_capabilities
local hand_toolcaps = mcl_meshhand.survival_hand_tool_caps
return {
full_punch_interval = hand_toolcaps.full_punch_interval,
damage_groups = hand_toolcaps.damage_groups
@ -280,7 +286,7 @@ end
-- would have to add _mcl_autogroup as a dependency which would break the mod
-- loading order.
function mcl_autogroup.get_groupcaps(toolname, efficiency)
local tdef = minetest.registered_tools[toolname]
local tdef = minetest.registered_items[toolname]
local groupcaps = table.copy(get_tool_capabilities(tdef).groupcaps or {})
add_groupcaps(toolname, groupcaps, tdef._mcl_diggroups, efficiency)
return groupcaps
@ -298,6 +304,10 @@ end
-- loading order.
function mcl_autogroup.get_wear(toolname, diggroup)
local tdef = minetest.registered_tools[toolname]
if not tdef then
minetest.log("warning", "Adding wear for tool: " .. tostring(toolname) .. " failed with diggroup: " .. tostring(diggroup))
return nil
end
local uses = tdef._mcl_diggroups[diggroup].uses
return math.ceil(65535 / uses)
end
@ -350,7 +360,7 @@ local function overwrite()
end
end
for tname, tdef in pairs(minetest.registered_tools) do
for tname, tdef in pairs(minetest.registered_items) do
-- Assign groupcaps for digging the registered digging groups
-- depending on the _mcl_diggroups in the tool definition
if tdef._mcl_diggroups then

View File

@ -31,6 +31,7 @@ local known_controls = {
aux1 = true,
down = true,
up = true,
zoom = true,
}
minetest.register_on_joinplayer(function(player)

View File

@ -1,10 +1,11 @@
# mcl_autogroup
This mod emulate digging times from mc.
## mcl_autogroup.can_harvest(nodename, toolname)
Return true if <nodename> can be dig with <toolname>.
## mcl_autogroup.can_harvest(nodename, toolname, player)
Return true if <nodename> can be dig with <toolname> by <player>.
* nodename: string, valid nodename
* toolname: (optional) string, valid toolname
* player: (optinal) ObjectRef, valid player
## mcl_autogroup.get_groupcaps(toolname, efficiency)
This function is used to calculate diggroups for tools.

View File

@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason)
end
function mcl_damage.from_mt(mt_reason)
if mt_reason._mcl_chached_reason then
return mt_reason._mcl_chached_reason
if mt_reason._mcl_cached_reason then
return mt_reason._mcl_cached_reason
end
local mcl_reason
@ -155,7 +155,6 @@ end, true)
minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
if not damage_enabled then return 0 end
if player:get_hp() > 0 then
mt_reason.approved = true
if hp_change < 0 then
mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason))
end
@ -163,9 +162,7 @@ minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
end, false)
minetest.register_on_dieplayer(function(player, mt_reason)
if mt_reason.approved then
mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
end
mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
minetest.log("action","Player "..player:get_player_name().." died at "..minetest.pos_to_string(vector.round(player:get_pos())))
end)

View File

@ -13,6 +13,7 @@ under the LGPLv2.1 license.
mcl_explosions = {}
local mod_fire = minetest.get_modpath("mcl_fire")
local explosions_griefing = minetest.settings:get_bool("mcl_explosions_griefing", true)
--local CONTENT_FIRE = minetest.get_content_id("mcl_fire:fire")
local math = math
@ -191,7 +192,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
local grief_protected = info.grief_protected
-- Trace rays for environment destruction
if info.griefing then
if info.griefing and explosions_griefing then
for i = 1, #raydirs do
local rpos_x = pos.x
local rpos_y = pos.y
@ -351,6 +352,23 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
end
end
end
-- Punch End Crystals to make them explode
if ent and ent.name == "mcl_end:crystal" then
if direct then
local puncher = direct:get_luaentity()
if puncher and puncher.name == "mcl_end:crystal" then
ent.object:punch(direct, 1.0, { -- End Crystal nearby, trigger it.
full_punch_interval = 1.0,
damage_groups = {fleshy = 1},
}, nil, nil)
else
ent.object:remove() -- Direct Exists, but it is not an end crystal, remove crystal.
end
else
ent.object:remove() -- Node exploded the end crystal, remove it.
end
end
end
local airs, fires = {}, {}

View File

@ -0,0 +1,2 @@
# textdomain:mcl_explosions
@1 was caught in an explosion.=@1 est mort dans une explosion

View File

@ -0,0 +1,2 @@
# textdomain:mcl_explosions
@1 was caught in an explosion.=@1 z-es mòrt dins una explosion

View File

@ -0,0 +1,2 @@
# textdomain:mcl_explosions
@1 was caught in an explosion.=@1 foi pego(a) em uma explosão.

View File

@ -0,0 +1,2 @@
# textdomain:mcl_explosions
@1 was caught in an explosion.=@1 попал(а) под взрыв.

View File

@ -0,0 +1,2 @@
# textdomain:mcl_explosions
@1 was caught in an explosion.=

View File

@ -3,26 +3,26 @@ mcl_vars = {}
mcl_vars.redstone_tick = 0.1
--- GUI / inventory menu settings
-- GUI / inventory menu settings
mcl_vars.gui_slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]"
-- nonbg is added as formspec prepend in mcl_formspec_prepend
mcl_vars.gui_nonbg = mcl_vars.gui_slots ..
"style_type[image_button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]"..
"style_type[button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]"..
"style_type[field;textcolor=#323232]"..
"style_type[label;textcolor=#323232]"..
"style_type[textarea;textcolor=#323232]"..
"style_type[checkbox;textcolor=#323232]"
mcl_vars.gui_nonbg = table.concat({
mcl_vars.gui_slots,
"style_type[image_button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]",
"style_type[button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]",
"style_type[field;textcolor=#323232]",
"style_type[label;textcolor=#323232]",
"style_type[textarea;textcolor=#323232]",
"style_type[checkbox;textcolor=#323232]",
})
-- Background stuff must be manually added by mods (no formspec prepend)
mcl_vars.gui_bg_color = "bgcolor[#00000000]"
mcl_vars.gui_bg_img = "background9[1,1;1,1;mcl_base_textures_background9.png;true;7]"
-- Legacy
mcl_vars.inventory_header = ""
-- Tool wield size
mcl_vars.tool_wield_scale = { x = 1.8, y = 1.8, z = 1 }
mcl_vars.tool_wield_scale = vector.new(1.8, 1.8, 1)
-- Mapgen variables
local mg_name = minetest.get_mapgen_setting("mg_name")
@ -35,55 +35,71 @@ mcl_vars.chunksize = math.max(1, tonumber(minetest.get_mapgen_setting("chunksize
mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
-- Central chunk is offset from 0,0,0 coordinates by 32 nodes (2 blocks)
-- See more in https://git.minetest.land/MineClone2/MineClone2/wiki/World-structure%3A-positions%2C-boundaries%2C-blocks%2C-chunks%2C-dimensions%2C-barriers-and-the-void
local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
mcl_vars.chunk_size_in_nodes = mcl_vars.chunksize * mcl_vars.MAP_BLOCKSIZE
local central_chunk_min_pos = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
local central_chunk_max_pos = central_chunk_min_pos + mcl_vars.chunk_size_in_nodes - 1
local ccfmin = central_chunk_min_pos - mcl_vars.MAP_BLOCKSIZE -- Fullminp/fullmaxp of central chunk, in nodes
local ccfmax = central_chunk_max_pos + mcl_vars.MAP_BLOCKSIZE
local mapgen_limit_b = math.floor(math.min(mcl_vars.mapgen_limit, mcl_vars.MAX_MAP_GENERATION_LIMIT) / mcl_vars.MAP_BLOCKSIZE)
local mapgen_limit_b = math.floor(math.min(mcl_vars.mapgen_limit, mcl_vars.MAX_MAP_GENERATION_LIMIT) /
mcl_vars.MAP_BLOCKSIZE)
local mapgen_limit_min = -mapgen_limit_b * mcl_vars.MAP_BLOCKSIZE
local mapgen_limit_max = (mapgen_limit_b + 1) * mcl_vars.MAP_BLOCKSIZE - 1
local numcmin = math.max(math.floor((ccfmin - mapgen_limit_min) / mcl_vars.chunk_size_in_nodes), 0) -- Number of complete chunks from central chunk
local numcmax = math.max(math.floor((mapgen_limit_max - ccfmax) / mcl_vars.chunk_size_in_nodes), 0) -- fullminp/fullmaxp to effective mapgen limits.
mcl_vars.mapgen_edge_min = central_chunk_min_pos - numcmin * mcl_vars.chunk_size_in_nodes
mcl_vars.mapgen_edge_max = central_chunk_max_pos + numcmax * mcl_vars.chunk_size_in_nodes
---@param x integer
---@return integer
local function coordinate_to_block(x)
return math.floor(x / mcl_vars.MAP_BLOCKSIZE)
end
---@param x integer
---@return integer
local function coordinate_to_chunk(x)
return math.floor((coordinate_to_block(x) - central_chunk_offset) / mcl_vars.chunksize)
end
---@param pos Vector
---@return Vector
function mcl_vars.pos_to_block(pos)
return {
x = coordinate_to_block(pos.x),
y = coordinate_to_block(pos.y),
z = coordinate_to_block(pos.z)
}
return vector.new(
coordinate_to_block(pos.x),
coordinate_to_block(pos.y),
coordinate_to_block(pos.z)
)
end
---@param pos Vector
---@return Vector
function mcl_vars.pos_to_chunk(pos)
return {
x = coordinate_to_chunk(pos.x),
y = coordinate_to_chunk(pos.y),
z = coordinate_to_chunk(pos.z)
}
return vector.new(
coordinate_to_chunk(pos.x),
coordinate_to_chunk(pos.y),
coordinate_to_chunk(pos.z)
)
end
local k_positive = math.ceil(mcl_vars.MAX_MAP_GENERATION_LIMIT / mcl_vars.chunk_size_in_nodes)
local k_positive_z = k_positive * 2
local k_positive_y = k_positive_z * k_positive_z
---@param pos Vector
---@return integer
function mcl_vars.get_chunk_number(pos) -- unsigned int
local c = mcl_vars.pos_to_chunk(pos)
return
(c.y + k_positive) * k_positive_y +
return (c.y + k_positive) * k_positive_y +
(c.z + k_positive) * k_positive_z +
c.x + k_positive
c.x + k_positive
end
if not superflat and not singlenode then
@ -117,11 +133,8 @@ elseif singlenode then
mcl_vars.mg_bedrock_is_rough = false
else
-- Classic superflat
local ground = minetest.get_mapgen_setting("mgflat_ground_level")
ground = tonumber(ground)
if not ground then
ground = 8
end
local ground = tonumber(minetest.get_mapgen_setting("mgflat_ground_level")) or 8
mcl_vars.mg_overworld_min = ground - 3
mcl_vars.mg_overworld_max_official = mcl_vars.mg_overworld_min + minecraft_height_limit
mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
@ -181,14 +194,16 @@ minetest.craftitemdef_default.stack_max = 64
math.randomseed(os.time())
local chunks = {} -- intervals of chunks generated
---@param pos Vector
function mcl_vars.add_chunk(pos)
local n = mcl_vars.get_chunk_number(pos) -- unsigned int
local prev
for i, d in pairs(chunks) do
if n <= d[2] then -- we've found it
if (n == d[2]) or (n >= d[1]) then return end -- already here
if n == d[1]-1 then -- right before:
if prev and (prev[2] == n-1) then
if n == d[1] - 1 then -- right before:
if prev and (prev[2] == n - 1) then
prev[2] = d[2]
table.remove(chunks, i)
return
@ -196,17 +211,20 @@ function mcl_vars.add_chunk(pos)
d[1] = n
return
end
if prev and (prev[2] == n-1) then --join to previous
if prev and (prev[2] == n - 1) then --join to previous
prev[2] = n
return
end
table.insert(chunks, i, {n, n}) -- insert new interval before i
table.insert(chunks, i, { n, n }) -- insert new interval before i
return
end
prev = d
end
chunks[#chunks+1] = {n, n}
chunks[#chunks + 1] = { n, n }
end
---@param pos Vector
---@return boolean
function mcl_vars.is_generated(pos)
local n = mcl_vars.get_chunk_number(pos) -- unsigned int
for i, d in pairs(chunks) do
@ -217,47 +235,46 @@ function mcl_vars.is_generated(pos)
return false
end
-- "Trivial" (actually NOT) function to just read the node and some stuff to not just return "ignore", like mt 5.4 does.
-- p: Position, if it's wrong, {name="error"} node will return.
-- force: optional (default: false) - Do the maximum to still read the node within us_timeout.
-- us_timeout: optional (default: 244 = 0.000244 s = 1/80/80/80), set it at least to 3000000 to let mapgen to finish its job.
--
-- returns node definition, eg. {name="air"}. Unfortunately still can return {name="ignore"}.
function mcl_vars.get_node(p, force, us_timeout)
---"Trivial" (actually NOT) function to just read the node and some stuff to not just return "ignore", like mt 5.4 does.
---@param pos Vector Position, if it's wrong, `{name="error"}` node will return.
---@param force? boolean Optional (default: `false`), Do the maximum to still read the node within us_timeout.
---@param us_timeout? number Optional (default: `244 = 0.000244 s = 1/80/80/80`), set it at least to `3000000` to let mapgen to finish its job
---@return node # Node definition, eg. `{name="air"}`. Unfortunately still can return `{name="ignore"}`.
---@nodiscard
function mcl_vars.get_node(pos, force, us_timeout)
-- check initial circumstances
if not p or not p.x or not p.y or not p.z then return {name="error"} end
if not pos or not pos.x or not pos.y or not pos.z then return { name = "error" } end
-- try common way
local node = minetest.get_node(p)
local node = minetest.get_node(pos)
if node.name ~= "ignore" then
return node
end
-- copy table to get sure it won't changed by other threads
local pos = {x=p.x,y=p.y,z=p.z}
-- copy vector to get sure it won't changed by other threads
local pos_copy = vector.copy(pos)
-- try LVM
minetest.get_voxel_manip():read_from_map(pos, pos)
node = minetest.get_node(pos)
minetest.get_voxel_manip():read_from_map(pos_copy, pos_copy)
node = minetest.get_node(pos_copy)
if node.name ~= "ignore" or not force then
return node
end
-- all ways failed - need to emerge (or forceload if generated)
local us_timeout = us_timeout or 244
if mcl_vars.is_generated(pos) then
if mcl_vars.is_generated(pos_copy) then
minetest.chat_send_all("IMPOSSIBLE! Please report this to MCL2 issue tracker!")
minetest.forceload_block(pos)
minetest.forceload_block(pos_copy)
else
minetest.emerge_area(pos, pos)
minetest.emerge_area(pos_copy, pos_copy)
end
local t = minetest.get_us_time()
node = minetest.get_node(pos)
node = minetest.get_node(pos_copy)
while (not node or node.name == "ignore") and (minetest.get_us_time() - t < us_timeout) do
node = minetest.get_node(pos)
while (not node or node.name == "ignore") and (minetest.get_us_time() - t < (us_timeout or 244)) do
node = minetest.get_node(pos_copy)
end
return node

View File

@ -0,0 +1,14 @@
# Oxidization API for MineClone 2
This mods adds the oxidization api, so that modders can easily use the same features that copper uses.
## API
To take advantage of the actual oxidization, put `oxidizable = 1` into the list of groups for the oxidizable node.
You would also need to put `_mcl_oxidized_variant = itemstring of node this node will oxidize into` into the node definition.
For example, a copper block oxidizes into exposed copper, so the defintion would be `_mcl_oxidized_variant = "mcl_copper:block_exposed"`.
To utilize the ability to wax the block for protection from oxidization, put `mcl_waxed_variant = item string of waxed variant of node` into the node definition table.
For example, Copper Blocks have the definition arguement of `_mcl_waxed_variant = "mcl_copper:waxed_block"`.
For waxed nodes, scraping is easy. Start by putting `waxed = 1` into the list of groups of the waxed node.
Next put `_mcl_stripped_variant = item string of the unwaxed variant of the node` into the defintion table.
Waxed Copper Blocks can be scrapped into normal Copper Blocks because of the definition `_mcl_stripped_variant = "mcl_copper:block"`.

View File

@ -0,0 +1,12 @@
minetest.register_abm({
label = "Oxidatize Nodes",
nodenames = { "group:oxidizable" },
interval = 500,
chance = 3,
action = function(pos, node)
local def = minetest.registered_nodes[node.name]
if def and def._mcl_oxidized_variant then
minetest.set_node(pos, { name = def._mcl_oxidized_variant, param2 = node.param2 })
end
end,
})

View File

@ -0,0 +1,4 @@
name = mcl_oxidation
title = Oxidation API for MineClone 2
author = PrairieWind, N011, Michael
description = API to allow oxidizing different nodes.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

View File

@ -39,8 +39,8 @@ Metal sounds:
default_place_node_metal.*.ogg - Ogrebane - CC0
- http://opengameart.org/content/wood-and-metal-sound-effects-volume-2
original by anonymous (CC0 1.0), mastering by iliekprogrammar (CC0 1.0):
https://freesound.org/people/deleted_user_2104797/sounds/166313/
AGFX (CC BY 3.0):
https://www.freesound.org/people/AGFX/packs/1253/
default_water_footstep.*.ogg
blukotek (CC0 1.0):

View File

@ -166,7 +166,7 @@ end
function mcl_sounds.node_sound_water_defaults(table)
table = table or {}
table.footstep = table.footstep or
{name = "default_water_footstep", gain = 0.05}
{name = "default_water_footstep", gain = 0.2}
table.place = table.place or
{name = "mcl_sounds_place_node_water", gain = 1.0}
table.dug = table.dug or

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

View File

@ -1,4 +1,87 @@
# tga_encoder
A TGA Encoder written in Lua without the use of external Libraries.
Created by fleckenstein for MineClone2, then improved by erlehmann.
May be used as a Minetest mod.
See `examples.lua` for example code and usage hints.
## Use Cases for `tga_encoder`
### Encoding Textures for Editing
TGA images of types 1/2/3 consist of header data followed by a pixel array.
This makes it trivial to parse TGA files and even edit pixels in-place.
No checksums need to be updated on any kind of in-place texture editing.
**Tip**: When storing an editable image in item meta, use zlib compression.
### Legacy Minetest Texture Encoding
Minetest 5.4 did not include `minetest.encode_png()` (or any equvivalent).
Since `tga_encoder` is written in pure Lua, it does not need engine support.
**Tip:** Look at `examples.lua` and the Minetest mod `mcl_maps` for guidance.
### Advanced Texture Format Control
The function `minetest.encode_png()` always encodes images as 32bpp RGBA.
`tga_encoder` allows saving images as grayscale, 16bpp RGBA and 24bpp RGB.
For generating maps from terrain, color-mapped formats can be more useful.
### Encoding Very Small Textures
Images of size 8×8 or below are often smaller than an equivalent PNG file.
Note that on many filesystems files use at least 4096 bytes (i.e. 64×64).
Therefore, saving bytes on files up to a few 100 bytes is often useless.
### Encoding Reference Textures
TGA is a simple format, which makes it easy to create reference textures.
Using a hex editor, one can trivially see how all the pixels are stored.
## Supported Image Types
For all types, images are encoded in a fast single pass (i.e. append-only).
### Color-Mapped Images (Type 1)
These images contain a palette, followed by pixel data.
* `A1R5G5B5` (8bpp RGB)
* `B8G8R8` (8bpp RGB)
* `B8G8R8A8` (8bpp RGBA)
### True-Color Images (Type 2)
These images contain uncompressed RGB(A) pixel data.
* `A1R5G5B5` (16bpp RGBA)
* `B8G8R8` (24bpp RGB)
* `B8G8R8A8` (32bpp RGBA)
### Grayscale Images (Type 3)
* `Y8` (8bpp grayscale)
### Run-Length Encoded (RLE), True-Color Images (Type 10)
These images contain compressed RGB(A) pixel data.
* `A1R5G5B5` (16bpp RGBA)
* `B8G8R8` (24bpp RGB)
* `B8G8R8A8` (32bpp RGBA)
## TODO
* Actually support `R8G8B8A8` input for `A1R5G5B5` output
* Add both zoomable and explorable maps to `mcl_maps`.

View File

@ -0,0 +1,32 @@
dofile("init.lua")
-- This generates images necessary to colorize 16 Minetest nodes in 4096 colors.
-- It serves as a demonstration of what you can achieve using colormapped nodes.
-- It is be useful for grass or beam or glass nodes that need to blend smoothly.
-- Sample depth rescaling is done according to the algorithm presented in:
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
local max_sample_in = math.pow(2, 4) - 1
local max_sample_out = math.pow(2, 8) - 1
for r = 0,15 do
local pixels = {}
for g = 0,15 do
if nil == pixels[g + 1] then
pixels[g + 1] = {}
end
for b = 0,15 do
local color = {
math.floor((r * max_sample_out / max_sample_in) + 0.5),
math.floor((g * max_sample_out / max_sample_in) + 0.5),
math.floor((b * max_sample_out / max_sample_in) + 0.5),
}
pixels[g + 1][b + 1] = color
end
end
local filename = "colormap_" .. tostring(r) .. ".tga"
tga_encoder.image(pixels):save(
filename,
{ color_format="A1R5G5B5" } -- waste less bits
)
end

View File

@ -0,0 +1,105 @@
#!/usr/bin/env lua5.1
-- -*- coding: utf-8 -*-
-- 3D “donut” shape rendering using floating-point math
-- see <https://www.a1k0n.net/2011/07/20/donut-math.html>
-- cargo-culted by erle 2023-09-18
local theta_spacing = 0.01 -- 0.07
local phi_spacing = 0.002 -- 0.02
local R1 = 1
local R2 = 2
local K2 = 5
local screen_height = 256
local screen_width = 256
local K1 = screen_width * K2 * 3 / ( 8 * ( R1 + R2 ) )
local output = {}
local zbuffer = {}
local grey = { 120, 120, 120 }
local gray = { 136, 136, 136 }
for y = 1,screen_height,1 do
output[y] = {}
zbuffer[y] = {}
for x = 1,screen_width,1 do
local hori = math.floor( ( (y - 1) / 32 ) % 2 )
local vert = math.floor( ( (x - 1) / 32 ) % 2 )
output[y][x] = hori ~= vert and grey or gray
zbuffer[y][x] = 0
end
end
function render_frame(A, B)
-- precompute sines and cosines of A and B
local cosA = math.cos(A)
local sinA = math.sin(A)
local cosB = math.cos(B)
local sinB = math.sin(B)
-- theta goas around the cross-sectional circle of a torus
local theta = 0
while theta <= 2*math.pi do
if ( theta < 2*math.pi * 1/8 ) or ( theta > 2*math.pi * 7/8 ) then
theta = theta + (theta_spacing * 16)
else
theta = theta + theta_spacing
end
-- precompute sines and cosines of theta
local costheta = math.cos(theta)
local sintheta = math.sin(theta)
-- phi goes around the center of revolution of a torus
local phi = 0
while phi <= 2*math.pi do
if ( phi > 2*math.pi * 3/8 ) and ( phi < 2*math.pi * 5/8 ) then
phi = phi + (phi_spacing * 128)
else
phi = phi + phi_spacing
end
-- precompute sines and cosines of phi
local cosphi = math.cos(phi)
local sinphi = math.sin(phi)
-- 2D (x, y) coordinates of the circle, before revolving
local circlex = R2 + R1*costheta
local circley = R1*sintheta
-- 3D (x, y, z) coordinates after rotation
local x = circlex*(cosB*cosphi + sinA*sinB*sinphi) - circley*cosA*sinB
local y = circlex*(sinB*cosphi - sinA*cosB*sinphi) + circley*cosA*cosB
local z = K2 + cosA*circlex*sinphi + circley*sinA
local ooz = 1/z
-- x and y projection
local xp = math.floor(screen_width/2 + K1*ooz*x)
local yp = math.floor(screen_height/2 + K1*ooz*y)
-- calculate luminance
local L = cosphi*costheta*sinB - cosA*costheta*sinphi - sinA*sintheta + cosB*( cosA*sintheta - costheta*sinA*sinphi )
-- if (L > 0) then
if (true) then
if (ooz > zbuffer[yp][xp]) then
zbuffer[yp][xp] = ooz
local luminance = math.max( math.ceil( L * 180 ), 0 )
-- luminance is now in the range 0 to 255
r = math.ceil( (luminance + xp) / 2 )
g = math.ceil( (luminance + yp) / 2 )
b = math.ceil( (luminance + xp + yp) / 3 )
output[yp][xp] = { r, g, b }
end
end
end
end
end
dofile('init.lua')
render_frame(-0.7, 0.7)
tga_encoder.image(output):save("donut.tga")

View File

@ -0,0 +1,181 @@
dofile("init.lua")
-- encode a bitmap
local _ = { 0, 0, 0 }
local R = { 255, 127, 127 }
local pixels = {
{ _, _, _, _, _, _, _ },
{ _, _, _, R, _, _, _ },
{ _, _, R, R, R, _, _ },
{ _, R, R, R, R, R, _ },
{ _, R, R, R, R, R, _ },
{ _, _, R, _, R, _, _ },
{ _, _, _, _, _, _, _ },
}
tga_encoder.image(pixels):save("bitmap_small.tga")
-- test that image can be encoded
local bitmap_small_0 = tga_encoder.image(pixels)
bitmap_small_0:encode()
assert(191 == #bitmap_small_0.data)
-- test that imbage can be encoded with parameters
local bitmap_small_1 = tga_encoder.image(pixels)
bitmap_small_1:encode(
{
colormap = {},
color_format = "B8G8R8",
compression = "RAW",
}
)
assert(191 == #bitmap_small_1.data)
-- change a single pixel, then rescale the bitmap
local pixels_orig = pixels
pixels_orig[4][4] = { 255, 255, 255 }
local pixels = {}
for x = 1,56,1 do
local x_orig = math.ceil(x/8)
for z = 1,56,1 do
local z_orig = math.ceil(z/8)
local color = pixels_orig[z_orig][x_orig]
pixels[z] = pixels[z] or {}
pixels[z][x] = color
end
end
tga_encoder.image(pixels):save("bitmap_large.tga")
-- note that the uncompressed grayscale TGA file written in this
-- example is 80 bytes but an optimized PNG file is 81 bytes …
local pixels = {}
for x = 1,6,1 do -- left to right
for z = 1,6,1 do -- bottom to top
local color = { math.min(x * z * 4 - 1, 255) }
pixels[z] = pixels[z] or {}
pixels[z][x] = color
end
end
tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {color_format="Y8", compression="RAW"})
local pixels = {}
for x = 1,16,1 do -- left to right
for z = 1,16,1 do -- bottom to top
local r = math.min(x * 32 - 1, 255)
local g = math.min(z * 32 - 1, 255)
local b = 0
-- blue rectangle in top right corner
if x > 8 and z > 8 then
r = 0
g = 0
b = math.min(z * 16 - 1, 255)
end
local color = { r, g, b }
pixels[z] = pixels[z] or {}
pixels[z][x] = color
end
end
local gradients = tga_encoder.image(pixels)
gradients:save("gradients_8bpp_raw.tga", {color_format="Y8", compression="RAW"})
gradients:save("gradients_16bpp_raw.tga", {color_format="A1R5G5B5", compression="RAW"})
gradients:save("gradients_16bpp_rle.tga", {color_format="A1R5G5B5", compression="RLE"})
gradients:save("gradients_24bpp_raw.tga", {color_format="B8G8R8", compression="RAW"})
gradients:save("gradients_24bpp_rle.tga", {color_format="B8G8R8", compression="RLE"})
for x = 1,16,1 do -- left to right
for z = 1,16,1 do -- bottom to top
local color = pixels[z][x]
color[#color+1] = ((x * x) + (z * z)) % 256
pixels[z][x] = color
end
end
gradients:save("gradients_32bpp_raw.tga", {color_format="B8G8R8A8", compression="RAW"})
-- the RLE-compressed file is larger than just dumping pixels because
-- the gradients in this picture can not be compressed well using RLE
gradients:save("gradients_32bpp_rle.tga", {color_format="B8G8R8A8", compression="RLE"})
local pixels = {}
for x = 1,512,1 do -- left to right
for z = 1,512,1 do -- bottom to top
local oz = (z - 256) / 256 + 0.75
local ox = (x - 256) / 256
local px, pz, i = 0, 0, 0
while (px * px) + (pz * pz) <= 4 and i < 128 do
px = (px * px) - (pz * pz) + oz
pz = (2 * px * pz) + ox
i = i + 1
end
local color = {
math.max(0, math.min(255, math.floor(px * 64))),
math.max(0, math.min(255, math.floor(pz * 64))),
math.max(0, math.min(255, math.floor(i))),
}
pixels[z] = pixels[z] or {}
pixels[z][x] = color
end
end
tga_encoder.image(pixels):save("fractal_8bpp.tga", {color_format="Y8"})
tga_encoder.image(pixels):save("fractal_16bpp.tga", {color_format="A1R5G5B5"})
tga_encoder.image(pixels):save("fractal_24bpp.tga", {color_format="B8G8R8"})
-- encode a colormapped bitmap
local K = { 0 }
local B = { 1 }
local R = { 2 }
local G = { 3 }
local W = { 4 }
local colormap = {
{ 1, 2, 3 }, -- K
{ 0, 0, 255 }, -- B
{ 255, 0, 0 }, -- R
{ 0, 255, 0 }, -- G
{ 253, 254, 255 }, -- W
}
local pixels = {
{ W, K, W, K, W, K, W },
{ R, G, B, R, G, B, K },
{ K, W, K, W, K, W, K },
{ G, B, R, G, B, R, W },
{ W, W, W, K, K, K, W },
{ B, R, G, B, R, G, K },
{ B, R, G, B, R, G, W },
}
-- note that the uncompressed colormapped TGA file written in this
-- example is 108 bytes but an optimized PNG file is 121 bytes …
tga_encoder.image(pixels):save("colormapped_B8G8R8.tga", {colormap=colormap})
-- encoding as A1R5G5B5 saves 1 byte per palette entry → 103 bytes
tga_encoder.image(pixels):save("colormapped_A1R5G5B5.tga", {colormap=colormap, color_format="A1R5G5B5"})
-- encode a colormapped bitmap with transparency
local _ = { 0 }
local K = { 1 }
local W = { 2 }
local colormap = {
{ 0, 0, 0, 0 },
{ 0, 0, 0, 255 },
{ 255, 255, 255, 255 },
}
local pixels = {
{ _, K, K, K, K, K, _ },
{ _, K, W, W, W, K, _ },
{ K, K, W, W, W, K, K },
{ K, W, W, W, W, W, K },
{ _, K, W, W, W, K, _ },
{ _, _, K, W, K, _, _ },
{ _, _, _, K, _, _, _ },
}
tga_encoder.image(pixels):save("colormapped_B8G8R8A8.tga", {colormap=colormap})
-- encoding a colormapped image with illegal colormap indexes should error out
local colormap = {
{ 0, 0, 0, 0 },
{ 0, 0, 0, 255 },
}
local status, message = pcall(
function ()
tga_encoder.image(pixels):encode({colormap=colormap})
end
)
assert(
false == status and
"init.lua:36: colormap index 2 not in colormap of size 2" == message
)

View File

@ -9,60 +9,566 @@ local image = setmetatable({}, {
})
function image:constructor(pixels)
self.data = ""
self.pixels = pixels
self.width = #pixels[1]
self.height = #pixels
self:encode()
end
function image:encode_colormap_spec()
self.data = self.data
.. string.char(0, 0) -- first entry index
.. string.char(0, 0) -- number of entries
.. string.char(0) -- bits per pixel
local pixel_depth_by_color_format = {
["Y8"] = 8,
["A1R5G5B5"] = 16,
["B8G8R8"] = 24,
["B8G8R8A8"] = 32,
}
function image:encode_colormap_spec(properties)
local colormap = properties.colormap
local colormap_pixel_depth = 0
if 0 ~= #colormap then
colormap_pixel_depth = pixel_depth_by_color_format[
properties.color_format
]
-- ensure that each pixel references a legal colormap entry
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
local colormap_index = pixel[1]
if colormap_index >= #colormap then
error(
"colormap index " .. colormap_index ..
" not in colormap of size " .. #colormap
)
end
end
end
end
local colormap_spec =
string.char(0, 0) .. -- first entry index
string.char(#colormap % 256, math.floor(#colormap / 256)) .. -- number of entries
string.char(colormap_pixel_depth) -- bits per pixel
self.data = self.data .. colormap_spec
end
function image:encode_image_spec()
self.data = self.data
.. string.char(0, 0) -- X-origin
.. string.char(0, 0) -- Y-origin
.. string.char(self.width % 256, math.floor(self.width / 256)) -- width
.. string.char(self.height % 256, math.floor(self.height / 256)) -- height
.. string.char(24) -- pixel depth (RGB = 3 bytes = 24 bits)
.. string.char(0) -- image descriptor
function image:encode_image_spec(properties)
local color_format = properties.color_format
assert(
"Y8" == color_format or -- (8 bit grayscale = 1 byte = 8 bits)
"A1R5G5B5" == color_format or -- (A1R5G5B5 = 2 bytes = 16 bits)
"B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits)
"B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits)
)
local scanline_order = properties.scanline_order
assert (
"bottom-top" == scanline_order or
"top-bottom" == scanline_order
)
local pixel_depth
if 0 ~= #properties.colormap then
pixel_depth = self.pixel_depth
else
pixel_depth = pixel_depth_by_color_format[color_format]
end
assert( nil ~= pixel_depth)
-- the origin is the bottom left corner of the image (always)
local x_origin_lo = 0
local x_origin_hi = 0
local y_origin_lo = 0
local y_origin_hi = 0
local image_descriptor = 0 -- equal to bottom-top scanline order
local width_lo = self.width % 256
local width_hi = math.floor(self.width / 256)
local height_lo = self.height % 256
local height_hi = math.floor(self.height / 256)
if "top-bottom" == scanline_order then
image_descriptor = 32
y_origin_lo = height_lo
y_origin_hi = height_hi
end
self.data = self.data .. string.char (
x_origin_lo, x_origin_hi,
y_origin_lo, y_origin_hi,
width_lo, width_hi,
height_lo, height_hi,
pixel_depth,
image_descriptor
)
end
function image:encode_header()
function image:encode_colormap(properties)
local colormap = properties.colormap
if 0 == #colormap then
return
end
local color_format = properties.color_format
assert (
"A1R5G5B5" == color_format or
"B8G8R8" == color_format or
"B8G8R8A8" == color_format
)
local colors = {}
if "A1R5G5B5" == color_format then
-- Sample depth rescaling is done according to the algorithm presented in:
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
local max_sample_in = math.pow(2, 8) - 1
local max_sample_out = math.pow(2, 5) - 1
for i = 1,#colormap,1 do
local color = colormap[i]
local colorword = 32768 +
((math.floor((color[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) +
((math.floor((color[2] * max_sample_out / max_sample_in) + 0.5)) * 32) +
((math.floor((color[3] * max_sample_out / max_sample_in) + 0.5)) * 1)
local color_bytes = string.char(
colorword % 256,
math.floor(colorword / 256)
)
colors[#colors + 1] = color_bytes
end
elseif "B8G8R8" == color_format then
for i = 1,#colormap,1 do
local color = colormap[i]
local color_bytes = string.char(
color[3], -- B
color[2], -- G
color[1] -- R
)
colors[#colors + 1] = color_bytes
end
elseif "B8G8R8A8" == color_format then
for i = 1,#colormap,1 do
local color = colormap[i]
local color_bytes = string.char(
color[3], -- B
color[2], -- G
color[1], -- R
color[4] -- A
)
colors[#colors + 1] = color_bytes
end
end
assert( 0 ~= #colors )
self.data = self.data .. table.concat(colors)
end
function image:encode_header(properties)
local color_format = properties.color_format
local colormap = properties.colormap
local compression = properties.compression
local colormap_type
local image_type
if "Y8" == color_format and "RAW" == compression then
colormap_type = 0
image_type = 3 -- grayscale
elseif (
"A1R5G5B5" == color_format or
"B8G8R8" == color_format or
"B8G8R8A8" == color_format
) then
if "RAW" == compression then
if 0 ~= #colormap then
colormap_type = 1
image_type = 1 -- colormapped RGB(A)
else
colormap_type = 0
image_type = 2 -- RAW RGB(A)
end
elseif "RLE" == compression then
colormap_type = 0
image_type = 10 -- RLE RGB
end
end
assert( nil ~= colormap_type )
assert( nil ~= image_type )
self.data = self.data
.. string.char(0) -- image id
.. string.char(0) -- color map type
.. string.char(10) -- image type (RLE RGB = 10)
self:encode_colormap_spec() -- color map specification
self:encode_image_spec() -- image specification
.. string.char(colormap_type)
.. string.char(image_type)
self:encode_colormap_spec(properties) -- color map specification
self:encode_image_spec(properties) -- image specification
self:encode_colormap(properties)
end
function image:encode_data()
local current_pixel = ''
local previous_pixel = ''
local count = 1
local packets = {}
local rle_packet = ''
function image:encode_data(properties)
local color_format = properties.color_format
local colormap = properties.colormap
local compression = properties.compression
local data_length_before = #self.data
if "Y8" == color_format and "RAW" == compression then
if 8 == self.pixel_depth then
self:encode_data_Y8_as_Y8_raw()
elseif 24 == self.pixel_depth then
self:encode_data_R8G8B8_as_Y8_raw()
end
elseif "A1R5G5B5" == color_format then
if 0 ~= #colormap then
if "RAW" == compression then
if 8 == self.pixel_depth then
self:encode_data_Y8_as_Y8_raw()
end
end
else
if "RAW" == compression then
self:encode_data_R8G8B8_as_A1R5G5B5_raw()
elseif "RLE" == compression then
self:encode_data_R8G8B8_as_A1R5G5B5_rle()
end
end
elseif "B8G8R8" == color_format then
if 0 ~= #colormap then
if "RAW" == compression then
if 8 == self.pixel_depth then
self:encode_data_Y8_as_Y8_raw()
end
end
else
if "RAW" == compression then
self:encode_data_R8G8B8_as_B8G8R8_raw()
elseif "RLE" == compression then
self:encode_data_R8G8B8_as_B8G8R8_rle()
end
end
elseif "B8G8R8A8" == color_format then
if 0 ~= #colormap then
if "RAW" == compression then
if 8 == self.pixel_depth then
self:encode_data_Y8_as_Y8_raw()
end
end
else
if "RAW" == compression then
self:encode_data_R8G8B8A8_as_B8G8R8A8_raw()
elseif "RLE" == compression then
self:encode_data_R8G8B8A8_as_B8G8R8A8_rle()
end
end
end
local data_length_after = #self.data
assert(
data_length_after ~= data_length_before,
"No data encoded for color format: " .. color_format
)
end
function image:encode_data_Y8_as_Y8_raw()
assert(8 == self.pixel_depth)
local raw_pixels = {}
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
current_pixel = string.char(pixel[3], pixel[2], pixel[1])
if current_pixel ~= previous_pixel or count == 128 then
packets[#packets +1] = rle_packet
local raw_pixel = string.char(pixel[1])
raw_pixels[#raw_pixels + 1] = raw_pixel
end
end
self.data = self.data .. table.concat(raw_pixels)
end
function image:encode_data_R8G8B8_as_Y8_raw()
assert(24 == self.pixel_depth)
local raw_pixels = {}
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
-- the HSP RGB to brightness formula is
-- sqrt( 0.299 r² + .587 g² + .114 b² )
-- see <https://alienryderflex.com/hsp.html>
local gray = math.floor(
math.sqrt(
0.299 * pixel[1]^2 +
0.587 * pixel[2]^2 +
0.114 * pixel[3]^2
) + 0.5
)
local raw_pixel = string.char(gray)
raw_pixels[#raw_pixels + 1] = raw_pixel
end
end
self.data = self.data .. table.concat(raw_pixels)
end
function image:encode_data_R8G8B8_as_A1R5G5B5_raw()
assert(24 == self.pixel_depth)
local raw_pixels = {}
-- Sample depth rescaling is done according to the algorithm presented in:
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
local max_sample_in = math.pow(2, 8) - 1
local max_sample_out = math.pow(2, 5) - 1
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
local colorword = 32768 +
((math.floor((pixel[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) +
((math.floor((pixel[2] * max_sample_out / max_sample_in) + 0.5)) * 32) +
((math.floor((pixel[3] * max_sample_out / max_sample_in) + 0.5)) * 1)
local raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
raw_pixels[#raw_pixels + 1] = raw_pixel
end
end
self.data = self.data .. table.concat(raw_pixels)
end
function image:encode_data_R8G8B8_as_A1R5G5B5_rle()
assert(24 == self.pixel_depth)
local colorword = nil
local previous_r = nil
local previous_g = nil
local previous_b = nil
local raw_pixel = ''
local raw_pixels = {}
local count = 1
local packets = {}
local raw_packet = ''
local rle_packet = ''
-- Sample depth rescaling is done according to the algorithm presented in:
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
local max_sample_in = math.pow(2, 8) - 1
local max_sample_out = math.pow(2, 5) - 1
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then
if nil ~= previous_r then
colorword = 32768 +
((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) +
((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) +
((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1)
if 1 == count then
-- remember pixel verbatim for raw encoding
raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
raw_pixels[#raw_pixels + 1] = raw_pixel
if 128 == #raw_pixels then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
else
-- encode raw pixels, if any
if #raw_pixels > 0 then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
-- RLE encoding
rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256))
packets[#packets +1] = rle_packet
end
end
count = 1
previous_pixel = current_pixel
previous_r = pixel[1]
previous_g = pixel[2]
previous_b = pixel[3]
else
count = count + 1
end
rle_packet = string.char(128 + count - 1) .. current_pixel
end
end
packets[#packets +1] = rle_packet
colorword = 32768 +
((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) +
((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) +
((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1)
if 1 == count then
raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
raw_pixels[#raw_pixels + 1] = raw_pixel
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
else
-- encode raw pixels, if any
if #raw_pixels > 0 then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
-- RLE encoding
rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256))
packets[#packets +1] = rle_packet
end
self.data = self.data .. table.concat(packets)
end
function image:encode_data_R8G8B8_as_B8G8R8_raw()
assert(24 == self.pixel_depth)
local raw_pixels = {}
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
local raw_pixel = string.char(pixel[3], pixel[2], pixel[1])
raw_pixels[#raw_pixels + 1] = raw_pixel
end
end
self.data = self.data .. table.concat(raw_pixels)
end
function image:encode_data_R8G8B8_as_B8G8R8_rle()
assert(24 == self.pixel_depth)
local previous_r = nil
local previous_g = nil
local previous_b = nil
local raw_pixel = ''
local raw_pixels = {}
local count = 1
local packets = {}
local raw_packet = ''
local rle_packet = ''
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then
if nil ~= previous_r then
if 1 == count then
-- remember pixel verbatim for raw encoding
raw_pixel = string.char(previous_b, previous_g, previous_r)
raw_pixels[#raw_pixels + 1] = raw_pixel
if 128 == #raw_pixels then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
else
-- encode raw pixels, if any
if #raw_pixels > 0 then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
-- RLE encoding
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r)
packets[#packets +1] = rle_packet
end
end
count = 1
previous_r = pixel[1]
previous_g = pixel[2]
previous_b = pixel[3]
else
count = count + 1
end
end
end
if 1 == count then
raw_pixel = string.char(previous_b, previous_g, previous_r)
raw_pixels[#raw_pixels + 1] = raw_pixel
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
else
-- encode raw pixels, if any
if #raw_pixels > 0 then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
-- RLE encoding
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r)
packets[#packets +1] = rle_packet
end
self.data = self.data .. table.concat(packets)
end
function image:encode_data_R8G8B8A8_as_B8G8R8A8_raw()
assert(32 == self.pixel_depth)
local raw_pixels = {}
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
local raw_pixel = string.char(pixel[3], pixel[2], pixel[1], pixel[4])
raw_pixels[#raw_pixels + 1] = raw_pixel
end
end
self.data = self.data .. table.concat(raw_pixels)
end
function image:encode_data_R8G8B8A8_as_B8G8R8A8_rle()
assert(32 == self.pixel_depth)
local previous_r = nil
local previous_g = nil
local previous_b = nil
local previous_a = nil
local raw_pixel = ''
local raw_pixels = {}
local count = 1
local packets = {}
local raw_packet = ''
local rle_packet = ''
for _, row in ipairs(self.pixels) do
for _, pixel in ipairs(row) do
if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or pixel[4] ~= previous_a or count == 128 then
if nil ~= previous_r then
if 1 == count then
-- remember pixel verbatim for raw encoding
raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a)
raw_pixels[#raw_pixels + 1] = raw_pixel
if 128 == #raw_pixels then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
else
-- encode raw pixels, if any
if #raw_pixels > 0 then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
-- RLE encoding
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a)
packets[#packets +1] = rle_packet
end
end
count = 1
previous_r = pixel[1]
previous_g = pixel[2]
previous_b = pixel[3]
previous_a = pixel[4]
else
count = count + 1
end
end
end
if 1 == count then
raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a)
raw_pixels[#raw_pixels + 1] = raw_pixel
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
else
-- encode raw pixels, if any
if #raw_pixels > 0 then
raw_packet = string.char(#raw_pixels - 1)
packets[#packets + 1] = raw_packet
for i=1, #raw_pixels do
packets[#packets +1] = raw_pixels[i]
end
raw_pixels = {}
end
-- RLE encoding
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a)
packets[#packets +1] = rle_packet
end
self.data = self.data .. table.concat(packets)
end
@ -75,15 +581,45 @@ function image:encode_footer()
.. string.char(0)
end
function image:encode()
self:encode_header() -- header
function image:encode(properties)
local properties = properties or {}
properties.colormap = properties.colormap or {}
properties.compression = properties.compression or "RAW"
properties.scanline_order = properties.scanline_order or "bottom-top"
self.pixel_depth = #self.pixels[1][1] * 8
local color_format_defaults_by_pixel_depth = {
[8] = "Y8",
[24] = "B8G8R8",
[32] = "B8G8R8A8",
}
if nil == properties.color_format then
if 0 ~= #properties.colormap then
properties.color_format =
color_format_defaults_by_pixel_depth[
#properties.colormap[1] * 8
]
else
properties.color_format =
color_format_defaults_by_pixel_depth[
self.pixel_depth
]
end
end
assert( nil ~= properties.color_format )
self.data = ""
self:encode_header(properties) -- header
-- no color map and image id data
self:encode_data() -- encode data
self:encode_data(properties) -- encode data
-- no extension or developer area
self:encode_footer() -- footer
end
function image:save(filename)
function image:save(filename, properties)
self:encode(properties)
local f = assert(io.open(filename, "wb"))
f:write(self.data)
f:close()

View File

@ -0,0 +1,51 @@
dofile("init.lua")
local colormap = {
{ 0, 0, 0 }, -- black
{ 255, 255, 255 }, -- white
{ 255, 0, 0 }, -- red
{ 0, 255, 0 }, -- green
{ 0, 0, 255 }, -- blue
}
local _ = { 0 }
local W = { 1 }
local R = { 2 }
local G = { 3 }
local B = { 4 }
local pixels_tiny = {
{ W, W, W, W, W, W, W, W, W, W, W, W, },
{ W, _, _, _, _, _, _, _, _, _, _, W, },
{ W, _, _, _, _, _, _, B, _, B, _, W, },
{ W, _, _, _, _, _, _, B, B, B, _, W, },
{ W, _, _, _, G, G, G, B, _, B, _, W, },
{ W, _, _, _, G, _, G, B, B, B, _, W, },
{ W, _, _, R, G, _, _, _, _, _, _, W, },
{ W, _, _, R, G, G, G, _, _, _, _, W, },
{ W, _, _, R, _, _, _, _, _, _, _, W, },
{ W, _, R, R, R, _, _, _, _, _, _, W, },
{ W, _, _, _, _, _, _, _, _, _, _, W, },
{ W, W, W, W, W, W, W, W, W, W, W, W, },
}
local pixels_huge = {}
local size_tiny = #pixels_tiny
local size_huge = 1200
local scale = size_huge / size_tiny
for x_huge = 1,size_huge,1 do
local x_tiny = math.ceil( x_huge / scale )
for z_huge = 1,size_huge,1 do
local z_tiny = math.ceil( z_huge / scale )
if nil == pixels_huge[z_huge] then
pixels_huge[z_huge] = {}
end
pixels_huge[z_huge][x_huge] = pixels_tiny[z_tiny][x_tiny]
end
end
tga_encoder.image(pixels_tiny):save("logo_tiny.tga", {colormap=colormap})
tga_encoder.image(pixels_huge):save("logo_huge.tga", {colormap=colormap})

View File

@ -1,3 +1,2 @@
name = tga_encoder
author = Fleckenstein
description = A TGA Encoder written in Lua without the use of external Libraries.

View File

@ -0,0 +1,180 @@
#!/usr/bin/env lua5.1
dofile("../init.lua")
local _ = { 0 }
local R = { 1 }
local G = { 2 }
local B = { 3 }
local pixels_colormapped_bt = {
{ _, _, _, _, _, B, _, B, },
{ _, _, _, _, _, B, B, B, },
{ _, _, G, G, G, B, _, B, },
{ _, _, G, _, G, B, B, B, },
{ _, R, G, _, _, _, _, _, },
{ _, R, G, G, G, _, _, _, },
{ _, R, _, _, _, _, _, _, },
{ R, R, R, _, _, _, _, _, },
}
local pixels_colormapped_tb = {
{ R, R, R, _, _, _, _, _, },
{ _, R, _, _, _, _, _, _, },
{ _, R, G, G, G, _, _, _, },
{ _, R, G, _, _, _, _, _, },
{ _, _, G, _, G, B, B, B, },
{ _, _, G, G, G, B, _, B, },
{ _, _, _, _, _, B, B, B, },
{ _, _, _, _, _, B, _, B, },
}
image_colormapped_bt = tga_encoder.image(pixels_colormapped_bt)
image_colormapped_tb = tga_encoder.image(pixels_colormapped_tb)
colormap_32bpp = {
{ 0, 0, 0, 128 },
{ 255, 0, 0, 255 },
{ 0, 255, 0, 255 },
{ 0, 0, 255, 255 },
}
image_colormapped_bt:save(
"type1_32bpp_bt.tga",
{ colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "bottom-top" }
)
image_colormapped_tb:save(
"type1_32bpp_tb.tga",
{ colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "top-bottom" }
)
image_colormapped_bt:save(
"type1_16bpp_bt.tga",
{ colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "bottom-top" }
)
image_colormapped_tb:save(
"type1_16bpp_tb.tga",
{ colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "top-bottom" }
)
colormap_24bpp = {
{ 0, 0, 0 },
{ 255, 0, 0 },
{ 0, 255, 0 },
{ 0, 0, 255 },
}
image_colormapped_bt:save(
"type1_24bpp_bt.tga",
{ colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "bottom-top" }
)
image_colormapped_tb:save(
"type1_24bpp_tb.tga",
{ colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "top-bottom" }
)
local _ = { 0, 0, 0, 128 }
local R = { 255, 0, 0, 255 }
local G = { 0, 255, 0, 255 }
local B = { 0, 0, 255, 255 }
local pixels_rgba_bt = {
{ _, _, _, _, _, B, _, B, },
{ _, _, _, _, _, B, B, B, },
{ _, _, G, G, G, B, _, B, },
{ _, _, G, _, G, B, B, B, },
{ _, R, G, _, _, _, _, _, },
{ _, R, G, G, G, _, _, _, },
{ _, R, _, _, _, _, _, _, },
{ R, R, R, _, _, _, _, _, },
}
local pixels_rgba_tb = {
{ R, R, R, _, _, _, _, _, },
{ _, R, _, _, _, _, _, _, },
{ _, R, G, G, G, _, _, _, },
{ _, R, G, _, _, _, _, _, },
{ _, _, G, _, G, B, B, B, },
{ _, _, G, G, G, B, _, B, },
{ _, _, _, _, _, B, B, B, },
{ _, _, _, _, _, B, _, B, },
}
image_rgba_bt = tga_encoder.image(pixels_rgba_bt)
image_rgba_tb = tga_encoder.image(pixels_rgba_tb)
image_rgba_bt:save(
"type2_32bpp_bt.tga",
{ color_format="B8G8R8A8", compression="RAW", scanline_order = "bottom-top" }
)
image_rgba_tb:save(
"type2_32bpp_tb.tga",
{ color_format="B8G8R8A8", compression="RAW", scanline_order = "top-bottom" }
)
image_rgba_bt:save(
"type10_32bpp_bt.tga",
{ color_format="B8G8R8A8", compression="RLE", scanline_order = "bottom-top" }
)
image_rgba_tb:save(
"type10_32bpp_tb.tga",
{ color_format="B8G8R8A8", compression="RLE", scanline_order = "top-bottom" }
)
local _ = { 0, 0, 0 }
local R = { 255, 0, 0 }
local G = { 0, 255, 0 }
local B = { 0, 0, 255 }
local pixels_rgb_bt = {
{ _, _, _, _, _, B, _, B, },
{ _, _, _, _, _, B, B, B, },
{ _, _, G, G, G, B, _, B, },
{ _, _, G, _, G, B, B, B, },
{ _, R, G, _, _, _, _, _, },
{ _, R, G, G, G, _, _, _, },
{ _, R, _, _, _, _, _, _, },
{ R, R, R, _, _, _, _, _, },
}
local pixels_rgb_tb = {
{ R, R, R, _, _, _, _, _, },
{ _, R, _, _, _, _, _, _, },
{ _, R, G, G, G, _, _, _, },
{ _, R, G, _, _, _, _, _, },
{ _, _, G, _, G, B, B, B, },
{ _, _, G, G, G, B, _, B, },
{ _, _, _, _, _, B, B, B, },
{ _, _, _, _, _, B, _, B, },
}
image_rgb_bt = tga_encoder.image(pixels_rgb_bt)
image_rgb_tb = tga_encoder.image(pixels_rgb_tb)
image_rgb_bt:save(
"type2_24bpp_bt.tga",
{ color_format="B8G8R8", compression="RAW", scanline_order = "bottom-top" }
)
image_rgb_tb:save(
"type2_24bpp_tb.tga",
{ color_format="B8G8R8", compression="RAW", scanline_order = "top-bottom" }
)
image_rgb_bt:save(
"type10_24bpp_bt.tga",
{ color_format="B8G8R8", compression="RLE", scanline_order = "bottom-top" }
)
image_rgb_tb:save(
"type10_24bpp_tb.tga",
{ color_format="B8G8R8", compression="RLE", scanline_order = "top-bottom" }
)
image_rgb_bt:save(
"type2_16bpp_bt.tga",
{ color_format="A1R5G5B5", compression="RAW", scanline_order = "bottom-top" }
)
image_rgb_tb:save(
"type2_16bpp_tb.tga",
{ color_format="A1R5G5B5", compression="RAW", scanline_order = "top-bottom" }
)
image_rgb_bt:save(
"type10_16bpp_bt.tga",
{ color_format="A1R5G5B5", compression="RLE", scanline_order = "bottom-top" }
)
image_rgb_tb:save(
"type10_16bpp_tb.tga",
{ color_format="A1R5G5B5", compression="RLE", scanline_order = "top-bottom" }
)

View File

@ -62,8 +62,13 @@ end
local function set_double_attach(boat)
boat._driver:set_attach(boat.object, "",
{x = 0, y = 0.42, z = 0.8}, {x = 0, y = 0, z = 0})
boat._passenger:set_attach(boat.object, "",
{x = 0, y = 0.42, z = -2.2}, {x = 0, y = 0, z = 0})
if boat._passenger:is_player() then
boat._passenger:set_attach(boat.object, "",
{x = 0, y = 0.42, z = -6.2}, {x = 0, y = 0, z = 0})
else
boat._passenger:set_attach(boat.object, "",
{x = 0, y = 0.42, z = -4.5}, {x = 0, y = 270, z = 0})
end
end
local function set_choat_attach(boat)
boat._driver:set_attach(boat.object, "",
@ -155,7 +160,7 @@ local boat = {
minetest.register_on_respawnplayer(detach_object)
function boat.on_rightclick(self, clicker)
if self._passenger or not clicker or clicker:get_attach() then
if self._passenger or not clicker or clicker:get_attach() or (self.name == "mcl_boats:chest_boat" and self._driver) then
return
end
attach_object(self, clicker)
@ -163,7 +168,7 @@ end
function boat.on_activate(self, staticdata, dtime_s)
self.object:set_armor_groups({fleshy = 100})
self.object:set_armor_groups({fleshy = 125})
local data = minetest.deserialize(staticdata)
if type(data) == "table" then
self._v = data.v
@ -437,9 +442,9 @@ cboat.selectionbox = {-0.7, -0.15, -0.7, 0.7, 0.75, 0.7}
minetest.register_entity("mcl_boats:chest_boat", cboat)
mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27)
local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove" }
local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat") }
local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood" }
local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "boat_cherry", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove", "chest_boat_cherry" }
local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Cherry Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat"), S("Cherry Chest Boat") }
local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood", "mcl_cherry_blossom:cherrywood" }
for b=1, #boat_ids do
local itemstring = "mcl_boats:"..boat_ids[b]

View File

@ -0,0 +1,13 @@
# textdomain: mcl_boats
Acacia Boat=Akaciebåd
Birch Boat=Birkebåd
Boat=Båd
Boats are used to travel on the surface of water.=Både blier brugt til at rejse på vandoverflader.
Dark Oak Boat=Mørk egetræsbåd
Jungle Boat=Junglebåd
Oak Boat=Egetræsbåd
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Højre-klik på en vand for at placere båden. Højre-klik på båden for at gå ombord. Brug [Left] og [Right] til at styre. [Forwards] for at øge hastigheden, og [Backwards] for at sænke farten eller sejle bagud. Brug [Sneak] for at forlade båden, slå båden for at lave den om til en genstand.
Spruce Boat=Granbåd
Water vehicle=Vandfartøj
Sneak to dismount=Snig for at stige ud
Obsidian Boat=Obsidianbåd

View File

@ -8,3 +8,6 @@ Jungle Boat=Barca de la selva
Oak Boat=Barca de roble
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Haga clic derecho en una fuente de agua para colocar el barco. Haga clic derecho en el barco para entrar. Utilice [Izquierda] y [Derecha] para dirigir, [Adelante] para acelerar y [Atrás] para reducir la velocidad o retroceder. Haga clic derecho en el barco nuevamente para dejarlo, golpee el barco para que se caiga como un artículo.
Spruce Boat=Barca de abeto
Water vehicle=Vehículo acuático
Sneak to dismount=Agáchate para bajar
Obsidian Boat=Barca de obsidiana

View File

@ -1,13 +1,23 @@
# textdomain: mcl_boats
Acacia Boat=Bateau en Acacia
Birch Boat=Bateau en Bouleau
Acacia Boat=Bateau en acacia
Birch Boat=Bateau en bouleau
Boat=Bateau
Boats are used to travel on the surface of water.=Les bateaux sont utilisés pour voyager à la surface de l'eau.
Dark Oak Boat=Bateau en Chêne Noir
Jungle Boat=Bateau en Acajou
Oak Boat=Bateau en Chêne
Dark Oak Boat=Bateau en chêne noir
Jungle Boat=Bateau en acajou
Oak Boat=Bateau en chêne
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
Spruce Boat=Bateau en Sapin
Spruce Boat=Bateau en sapin
Water vehicle=Véhicule aquatique
Sneak to dismount=Se baisser pour descendre
Obsidian Boat=Bateau en Obsidienne
Obsidian Boat=Bateau en obsidienne
Mangrove Boat=Bateau en palétuvier
Cherry Boat=Bateau en cerisier
Oak Chest Boat=Bateau en chêne avec coffre
Spruce Chest Boat=Bateau en sapin avec coffre
Birch Chest Boat=Bateau en bouleau avec coffre
Jungle Chest Boat=Bateau en acajou avec coffre
Acacia Chest Boat=Bateau en acacia avec coffre
Dark Oak Chest Boat=Bateau en chêne noir avec coffre
Mangrove Chest Boat=Bateau en palétuvier avec coffre
Cherry Chest Boat=Bateau en cerisier avec coffre

View File

@ -0,0 +1,21 @@
# textdomain: mcl_boats
Acacia Boat=Barca de Cacèir
Birch Boat=Barca de Beç
Boat=Barca
Boats are used to travel on the surface of water.=Las barcas son utilizadas per voiatja per aigas.
Dark Oak Boat=Barca de Ròure Nèir
Jungle Boat=Barca d'Acajó
Oak Boat=Barca de Ròure
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Fasetz un clic dreit sobre una sorça d'aiga per plaça la barca. Fasetz un clic dreit sobre la barca per rintrar. Utilizatz [Gaucha] e [Dreita] per menar, [Davant] per accelerar e [Darrèir] per ralentir o racuolar. Utilizatz [Sneak] per z-o quitar, tustatz la barca per z-o faire tombar coma objècte.
Spruce Boat=Barca de Sap
Water vehicle=Veïcule per aiga
Sneak to dismount=Se baissar per descendre
Obsidian Boat=Barca d'Obsidiana
Mangrove Boat=Barca de Paletuvèir
Oak Chest Boat=Barca de Ròure embei una Mala
Spruce Chest Boat=Barca de Sap embei una Mala
Birch Chest Boat=Barca de Beç embei una Mala
Jungle Chest Boat=Barca d'Acajó embei una Mala
Acacia Chest Boat=Barca de Cacèir embei una Mala
Dark Oak Chest Boat=Barca de Ròure Nèir embei una Mala
Mangrove Chest Boat=Barca de Paletuvèir embei una Mala

View File

@ -0,0 +1,23 @@
# textdomain: mcl_boats
Acacia Boat=Barco de Acácia
Birch Boat=Barco de Bétula
Boat=Barco
Boats are used to travel on the surface of water.=Barcos são usados para viajar na superfície da água
Dark Oak Boat=Barco de Carvalho Escuro
Jungle Boat=Barco de Selva
Oak Boat=Barco de Carvalho
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Clique com o botão direito em uma fonte de água para posicionar o barco. Clique com o botão direito no barco para entrar nele. Use [Esquerda] e [Direita] para fazer curva, [Frente] para acelerar e [Trás] para frear e ir para trás. Use [Agachar] para deixar o barco, soque-o para fazê-lo dropar como um item.
Spruce Boat=Barco de Pinheiro
Water vehicle=Veículo aquático
Sneak to dismount=Agache para desmontar
Obsidian Boat=Barco de Obsidiana
Mangrove Boat=Barco de Mangue
Cherry Boat=Barco de Cerejeira
Oak Chest Boat=Barco de Carvalho com Baú
Spruce Chest Boat=Barco de Pinheiro com Baú
Birch Chest Boat=Barco de Bétula com Baú
Jungle Chest Boat=Barco de Selva com Baú
Acacia Chest Boat=Barco de Acácia com Baú
Dark Oak Chest Boat=Barco de Carvalho Escuro com Baú
Mangrove Chest Boat=Barco de Mangue com Baú
Cherry Chest Boat=Barco de Cerejeira com Baú

View File

@ -1,11 +1,23 @@
# textdomain: mcl_boats
Acacia Boat=Лодка из акации
Acacia Boat=Акациевая лодка
Birch Boat=Берёзовая лодка
Boat=Лодка
Boats are used to travel on the surface of water.=С помощью лодки можно путешествовать по водной поверхности.
Boats are used to travel on the surface of water.=На лодке можно плыть по водной поверхности.
Dark Oak Boat=Лодка из тёмного дуба
Jungle Boat=Лодка из дерева джунглей
Jungle Boat=Лодка из тропического дерева
Oak Boat=Дубовая лодка
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Правый клик по воде спустит лодку на воду. Правый клик по лодке разместит вас в ней. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Правый клик по лодке, когда вы в ней, позволит выйти из неё. Удар по лодке превратит её обратно в предмет.
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Правый клик на воде, чтобы установить лодку. Правый клик по лодке, чтобы сесть в нее. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Нажмите [Красться] для высадки, бейте по лодке, чтобы забрать её.
Spruce Boat=Еловая лодка
Water vehicle=Водный транспорт
Sneak to dismount=Нажмите [Красться] для высадки
Obsidian Boat=Обсидиановая лодка
Mangrove Boat=Мангровая лодка
Cherry Boat=Вишнёвая лодка
Oak Chest Boat=Дубовая лодка с сундуком
Spruce Chest Boat=Еловая лодка с сундуком
Birch Chest Boat=Берёзовая лодка с сундуком
Jungle Chest Boat=Лодка из тропического дерева с сундуком
Acacia Chest Boat=Акациевая лодка с сундуком
Dark Oak Chest Boat=Лодка из тёмного дуба с сундуком
Mangrove Chest Boat=Мангровая лодка с сундуком
Cherry Chest Boat=Вишнёвая лодка с сундуком

View File

@ -10,4 +10,14 @@ Rightclick on a water source to place the boat. Rightclick the boat to enter it.
Spruce Boat=
Water vehicle=
Sneak to dismount=
Obsidian Boat=
Obsidian Boat=
Mangrove Boat=
Cherry Boat=
Oak Chest Boat=
Spruce Chest Boat=
Birch Chest Boat=
Jungle Chest Boat=
Acacia Chest Boat=
Dark Oak Chest Boat=
Mangrove Chest Boat=
Cherry Chest Boat=

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View File

@ -5,7 +5,12 @@ function mcl_burning.get_storage(obj)
end
function mcl_burning.is_burning(obj)
return mcl_burning.get_storage(obj).burn_time
local storage = mcl_burning.get_storage(obj)
if storage then
return mcl_burning.get_storage(obj).burn_time
else
return false
end
end
function mcl_burning.is_affected_by_rain(obj)
@ -153,6 +158,11 @@ function mcl_burning.extinguish(obj)
end
function mcl_burning.tick(obj, dtime, storage)
if not storage then
minetest.log("warning", "No storage for burning tick. Should not happen: " .. dump(obj))
return
end
if storage.burn_time then
storage.burn_time = storage.burn_time - dtime

View File

@ -1,36 +1,36 @@
# mcl_dripping
Dripping Mod by kddekadenz, modified for MineClone 2 by Wuzzy, NO11 and AFCM
## Manual
- drops are generated rarely under solid nodes
- they will stay some time at the generated block and than they fall down
- when they collide with the ground, a sound is played and they are destroyed
Water and Lava have builtin drops registered.
## License
code & sounds: CC0
## API
```lua
mcl_dripping.register_drop({
-- The group the liquid's nodes belong to
liquid = "water",
-- The texture used (particles will take a random 2x2 area of it)
texture = "default_water_source_animated.png",
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
light = 1,
-- The nodes (or node group) the particles will spawn under
nodes = { "group:opaque", "group:leaves" },
-- The sound that will be played then the particle detaches from the roof, see SimpleSoundSpec in lua_api.txt
sound = "drippingwater_drip",
-- The interval for the ABM to run
interval = 60,
-- The chance of the ABM
chance = 10,
})
```
# mcl_dripping
Dripping Mod by kddekadenz, modified for MineClone 2 by Wuzzy, NO11 and AFCM
## Manual
- drops are generated rarely under solid nodes
- they will stay some time at the generated block and than they fall down
- when they collide with the ground, a sound is played and they are destroyed
Water and Lava have builtin drops registered.
## License
code & sounds: CC0
## API
```lua
mcl_dripping.register_drop({
-- The group the liquid's nodes belong to
liquid = "water",
-- The texture used (particles will take a random 2x2 area of it)
texture = "mcl_core_water_source_animation.png",
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
light = 1,
-- The nodes (or node group) the particles will spawn under
nodes = { "group:opaque", "group:leaves" },
-- The sound that will be played then the particle detaches from the roof, see SimpleSoundSpec in lua_api.txt
sound = "drippingwater_drip",
-- The interval for the ABM to run
interval = 60,
-- The chance of the ABM
chance = 10,
})
```

View File

@ -82,7 +82,7 @@ end
mcl_dripping.register_drop({
liquid = "water",
texture = "default_water_source_animated.png",
texture = "mcl_core_water_source_animation.png",
light = 1,
nodes = { "group:opaque", "group:leaves" },
sound = "drippingwater_drip",
@ -92,7 +92,7 @@ mcl_dripping.register_drop({
mcl_dripping.register_drop({
liquid = "lava",
texture = "default_lava_source_animated.png",
texture = "mcl_core_lava_source_animation.png",
light = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
nodes = { "group:opaque" },
sound = "drippingwater_lavadrip",

View File

@ -0,0 +1,3 @@
# textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 blev smadret af en nedfaldende ambolt.
@1 was smashed by a falling block.=@1 blev smadret af en nedfaldende blok.

View File

@ -0,0 +1,3 @@
# textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 fue aplastado por un yunque.
@1 was smashed by a falling block.=@1 fue aplastado por un bloque.

Some files were not shown because too many files have changed in this diff Show More