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

5356 Commits (b4e229dac2d5e6f4ed200f9dec152e3b91170f25)

Author SHA1 Message Date
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
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
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 4b6d63739c Fix a crash with rocket explosion 
Defensive check
 2024-03-20 19:13:44 -05:00
the-real-herowl ade2a1a6a2 Add clovers and four-leaf clovers 2024-03-20 22:18:47 +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
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
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
Eliy21 b645a2ab67 Remove commented out cactus mob damage code 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 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 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 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
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
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
JoseDouglas26 3b60a8eb18 Farming fortune drop bug fix 2024-01-20 04:03:25 +00: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
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 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 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
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
tuxilio 4b5afee4bb Add and fix some german translations 2024-01-08 13:35:41 +00:00
JoseDouglas26 cc3f092185 Changes in rotation code and bamboo rotation 2024-01-08 05:55:36 +00: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
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 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 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 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 a2a4da5aed Added shepherd functionality 2023-12-24 05:48:41 +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
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 6c4101dc12 mcl_hoppers 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 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