1
0
Fork 0
Commit Graph

6040 Commits (98226d677c1ba9cb34a26a48e88d5d286abecda3)

Author SHA1 Message Date
Elias Fleckenstein 7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
2021-04-19 15:16:59 +02:00
Elias Fleckenstein d8d4cb5def Revert color changes to GUI.
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5.
2021-04-19 14:44:20 +02:00
Elias Fleckenstein 52a49e640e Merge branch 'master' into damage 2021-04-19 09:57:56 +02:00
Elias Fleckenstein 69485f8505 Integrate falling nodes damage 2021-04-19 09:49:29 +02:00
NO11 0c5ca70187 remove wrong config 2021-04-19 07:35:53 +00:00
Elias Fleckenstein ec1ef1affa Merge pull request 'Fix #1422' (#1474) from Doloment/MineClone2:ender_chest_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1474
2021-04-19 07:25:57 +00:00
jordan4ibanez c03717139b Add mod.conf to mcl_fireworks 2021-04-18 23:23:07 -04:00
jordan4ibanez 44a25de12f Fix crashing with unknown slot description when enchanting 2021-04-18 23:18:18 -04:00
NO11 aa533edda2 Simplify debarking 2021-04-18 18:28:39 +00:00
Elias Fleckenstein c9b4ddb923 Add command damage type (This is Non-MC) 2021-04-18 20:22:18 +02:00
Elias Fleckenstein 53b0ad7347 Implement magic damage 2021-04-18 20:21:11 +02:00
Elias Fleckenstein d9195cc520 Redesign damage modifier execution 2021-04-18 20:08:08 +02:00
NO11 49f6ccaa4a Remove old crafting recipes 2021-04-18 18:02:41 +00:00
NO11 3668b2dee6 Summarize all debarked types of wood 2021-04-18 18:02:37 +00:00
Elias Fleckenstein a2c3eb95bb Merge branch 'master' into damage 2021-04-18 19:51:46 +02:00
Elias Fleckenstein d08a226a51 Integrate critical hits 2021-04-18 19:50:48 +02:00
NO11 9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Elias Fleckenstein 2827542002 Implement food poisoning damage properly~ 2021-04-18 18:49:00 +02:00
Elias Fleckenstein 3ad5b30ea5 Add cramming and fireworks damage types for future use 2021-04-18 17:38:19 +02:00
Elias Fleckenstein 1cf53caa7a Update armor stand entity in on_activate callback, remove debug print 2021-04-18 16:20:32 +02:00
Elias Fleckenstein d1198e8d74 Register elytra texture 2021-04-18 16:19:12 +02:00
Elias Fleckenstein 4f0bb444fe Integrate armor stand 2021-04-18 16:03:23 +02:00
Elias Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02:00
Elias Fleckenstein 5d9c3cd85b Fix #1572 2021-04-18 14:41:44 +02:00
Doloment 956dab78ce Added LBM 2021-04-18 09:50:02 +00:00
Elias Åström fc9928c0b6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 11:42:38 +02:00
Elias Åström 573b1dc44b Do not include unnecessary tool_capabilities
This commit makes enchanted tools which have no use for
tool_capabilities to not include it in their metadata.  It does this by
not including tool_capabilities in the metadata of an enchanted tool if
at least one of two cases is true:

(1) The tool is not enchanted with unbreaking or efficiency
(2) The tool does not have tool_capabilities defined in its definition

The first case covers situations like having a pickaxe only being
enchanted with silk_touch.  The second case covers situations like a
piece of armor being enchanted with unbreaking.
2021-04-18 11:40:43 +02:00
Elias Åström dd69dcfd9f Fix efficiency and unbreaking not working together
This commit fixes an issue were tools enchanted with both efficiency and
unbreaking would loose the effect of one of the enchantments in some
conditions.
2021-04-18 11:40:13 +02:00
Elias Fleckenstein 76271199c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 08:39:04 +02:00
kay27 11b66e83a2 [mcl_portals] Better NP search, no more teleports on the roof, fix https://git.minetest.land/MineClone2/MineClone2/issues/1560 2021-04-18 04:29:30 +04:00
AFCMS 4aa6421faf performance optimisation 2021-04-18 00:27:51 +02:00
AFCMS f967aa3d51 remove unuseful code 2021-04-18 00:10:11 +02:00
Elias Fleckenstein a7e102426a Add time_of_day to get_light crash fix 2021-04-17 21:01:09 +02:00
Elias Fleckenstein bcd058feb1 Fix get_light crash 2021-04-17 21:00:32 +02:00
Elias Fleckenstein baebe3c2d2 Fix namtags being invisible 2021-04-17 20:57:12 +02:00
Elias Fleckenstein 205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02:00
Elias Fleckenstein f8b54db392 Fix controls.register_on_press being called for every player in a globalstep 2021-04-17 18:55:56 +02:00
Elias Fleckenstein bbd115fde0 Update armor stand 2021-04-17 18:39:38 +02:00
Elias Fleckenstein 7c7af7d664 Merge branch 'master' into damage 2021-04-17 18:39:00 +02:00
Elias Fleckenstein f79e12c8ae Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-17 18:16:19 +02:00
Elias Fleckenstein 5c928575f8 Fix #1572, server crash during login 2021-04-17 18:15:45 +02:00
Elias Fleckenstein 8e37b51cac Equip mob heads with rightclick 2021-04-17 14:07:47 +02:00
Elias Fleckenstein 6724a8d0ed Fix crash in damage handler 2021-04-17 13:59:46 +02:00
NO11 06699c2cc4 Fix that an ax wears out if you right-click another block 2021-04-17 11:55:50 +00:00
Elias Fleckenstein 6bbea11fb8 Fix crash with mcl_heads 2021-04-17 13:53:41 +02:00
Elias Fleckenstein c7c47c1ca7 Increase mob_view_range_factor performance 2021-04-17 13:49:40 +02:00
Elias Fleckenstein d952423dda Improve wielditem performance and fix wielditems sometimes showing duplicate 2021-04-17 13:24:30 +02:00
Elias Fleckenstein 4d515e95c6 Remove wieldview 2021-04-17 12:58:40 +02:00
Elias Fleckenstein ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00
AFCMS 6a55136517 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-17 09:26:49 +02:00
AFCMS 02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
AFCMS 22a2fdbf5f fix more codestyle 2021-04-17 07:46:24 +02:00
AFCMS 5f076d372a fix many codestyle errors 2021-04-17 07:42:49 +02:00
Elias Fleckenstein bd3c08d367 Improve mcl_burning player performance 2021-04-16 19:50:56 +02:00
Elias Fleckenstein 01c79c5a18 Fix mcl_burning.tick not being called at all for mobs 2021-04-16 18:37:07 +02:00
Elias Fleckenstein 095f78b785 Massive mcl_burning performance improvement 2021-04-16 18:34:29 +02:00
AFCMS fb0a687bdc Merge branch 'master' into dyable-leather-armor 2021-04-16 13:45:05 +02:00
AFCMS 457f61a532 Fix #1570 2021-04-16 11:40:44 +00:00
AFCMS 1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
Elias Fleckenstein 5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +02:00
AFCMS 2d6e0241cd Merge branch 'master' into luacheck 2021-04-16 11:03:46 +02:00
AFCMS 1df916bd7b fix warning 2021-04-16 11:03:31 +02:00
jordan4ibanez 044e9d22ad Re-enable mob-despawner 2021-04-15 21:13:19 -04:00
epCode 31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -07:00
epCode cd04f6d7ce Fix glitch with Stray 2021-04-15 14:53:22 -07:00
AFCMS 60e74fc41d fix excedent lines 2021-04-15 23:44:29 +02:00
AFCMS a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
epCode 9feaec95d9 Fix Stupid mistake with zombievillagers 2021-04-15 14:29:24 -07:00
epCode 0ca6c06198 add the other villager zombie textures 2021-04-15 14:11:35 -07:00
AFCMS b497778192 delete unused file 2021-04-15 22:22:39 +02:00
epCode f0fab4e708 Allow zombie villager to have visual armor 2021-04-15 12:04:25 -07:00
Elias Fleckenstein 0c5096db13 Merge pull request 'Fixes for german locales (2021-04-14_locales_german)' (#1564) from n_to/MineClone2:2021-04-14_locales_german into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1564
2021-04-15 16:18:51 +00:00
NO11 a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00:00
NO11 bbffda3635 Make cactus destroy items 2021-04-15 11:21:15 +00:00
Nils Dagsson Moskopp 2575e20e7e Show preview of new banner pattern when crafting it 2021-04-15 13:25:59 +04:00
epCode 5fe30d7287 Make Zmbs, Husks, Sklys, Strys, and WthrSklys support armor textures. 2021-04-14 16:51:17 -07:00
Benjamin Schötz bffd032a8b Fixes my own typo ;) 2021-04-14 22:06:03 +02:00
Benjamin Schötz e4c8ba795a Fixes typos, grammar errors, and some translation flaws in several german translation files. 2021-04-14 22:03:36 +02:00
Elias Fleckenstein 8931ffb7d3 Fix crash with armor enchantments 2021-04-14 20:39:35 +02:00
Elias Fleckenstein 727d7be6ab Call on_equip and on_unequip everytime needed 2021-04-14 20:39:05 +02:00
Elias Fleckenstein ec6d68322a Make hbarmor work 2021-04-14 20:08:08 +02:00
epCode 18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Elias Fleckenstein 9c75cd1a79 Implement starve damage 2021-04-14 19:09:46 +02:00
Elias Fleckenstein a3af1cdf6e Implement in_wall damage type 2021-04-14 19:07:58 +02:00
Elias Fleckenstein 4e37cc114c Implement out_of_world damage type 2021-04-14 19:06:30 +02:00
Elias Fleckenstein 5d9bb7cacd Fix armor not actually protecting lol 2021-04-14 19:06:11 +02:00
Elias Fleckenstein 49e7def70a Implement lightning_bolt damage reason 2021-04-14 18:40:41 +02:00
Elias Fleckenstein ad3defdfb3 Merge branch 'master' into damage 2021-04-14 18:29:42 +02:00
Elias Fleckenstein c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Elias Fleckenstein 875bb3db84 Use fire-like damage types properly 2021-04-14 17:20:51 +02:00
j1233 46b1762872 credit me
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
2021-04-14 14:53:33 +00:00
Elias Fleckenstein 963adfb4e2 Move @Code-Sploit to devs section 2021-04-14 16:37:07 +02:00
Elias Fleckenstein 6d0abb2973 Merge branch 'master' into beta 2021-04-14 16:36:04 +02:00
Elias Fleckenstein e74838136d Use cactus damage type 2021-04-14 16:27:21 +02:00
Elias Fleckenstein d0ddd38d4e Merge branch 'master' into damage 2021-04-14 16:14:00 +02:00
Elias Fleckenstein ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
epCode 5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07:00
epCode 8d22102c66 remove abitrary minetest.chat_send_all( 2021-04-13 16:28:38 -07:00
epCode a93562a60c Merge pull request 'Add Firework Rocket for elytra boost' (#1551) from NO11/MineClone2:elytra_rocket into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1551
2021-04-13 23:27:23 +00:00
epCode 399ed85717 Make flying w elytra use pitch and not sneak 2021-04-13 16:14:37 -07:00
jordan4ibanez 67c1bc973a Add lua locals into mcl_dungeons for performance 2021-04-14 01:19:01 +04:00
NO11 1c50f9aed6 fix typo 2021-04-13 20:52:55 +00:00
NO11 f768972469 add rocket texture (pixel perfection) 2021-04-13 20:38:00 +00:00
NO11 9c68528b8b add german translation 2021-04-13 20:36:41 +00:00
NO11 1597e093b5 Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“ 2021-04-13 20:35:40 +00:00
NO11 f15a28109c add rocket for elytra boost 2021-04-13 20:33:34 +00:00
epCode f498d3ae02 make elytra activate mor MC-like 2021-04-13 11:45:31 -07:00
Code-Sploit cd0d2d2296 Fix #1548 2021-04-13 13:57:45 +00:00
kay27 3077498a63 Fix screwdriver/door duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149 2021-04-13 16:49:10 +04:00
Code-Sploit 84764389dc Fix #1538 2021-04-13 11:34:53 +00:00
AFCMS 2aa7218126 Merge branch 'master' into dyable-leather-armor 2021-04-13 12:12:00 +02:00
Elias Fleckenstein 78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
Elias Fleckenstein 421ab9f660 Add timeout to static hudbars 2021-04-13 08:42:17 +02:00
Elias Fleckenstein 5ddd1d0193 Merge branch 'master' into beta 2021-04-13 08:33:31 +02:00
Elias Fleckenstein 037832a177 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-13 08:06:28 +02:00
epCode 424685d3d3 Add elytra (sprint in air to use) 2021-04-12 14:56:33 -07:00
Elias Fleckenstein 5028728fbc Merge branch 'master' into faithful 2021-04-12 17:54:20 +02:00
Elias Fleckenstein 6f770bc962 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:54:09 +02:00
Elias Fleckenstein f540bc2bb1 Merge branch 'master' into beta 2021-04-12 17:31:58 +02:00
Elias Fleckenstein 5fb7913355 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master""
This reverts commit 615b15f133.
2021-04-12 16:36:08 +02:00
Elias Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster""
This reverts commit db5626fcb4.
2021-04-12 16:34:40 +02:00
Elias Fleckenstein c3868084af Revert "Fix crash with removed hoey diggroup"
This reverts commit ed7099fefc.
2021-04-12 16:34:25 +02:00
Elias Fleckenstein 0d5933b95e Remove debug printin mcl_mobs 2021-04-12 15:45:00 +02:00
Elias Fleckenstein 615b15f133 Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"
This reverts commit 7a8079bb64, reversing
changes made to 849823af1f.
2021-04-12 15:25:31 +02:00
Elias Fleckenstein ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Elias Fleckenstein db5626fcb4 Revert "Make hoe dig some blocks faster"
This reverts commit c1e295de5f.
2021-04-12 15:05:01 +02:00
Elias Fleckenstein 523a0c54d6 Localize c_x and c_y in mcl_playerplus 2021-04-12 14:54:14 +02:00
Elias Fleckenstein b914e088cc Update README files 2021-04-12 14:03:51 +02:00
Elias Fleckenstein c0a31f0e9c Fix #1535 2021-04-11 17:30:32 +02:00
Elias Fleckenstein 24f8f9166b Fix #1528 2021-04-11 17:29:05 +02:00
Elias Fleckenstein af044e6a96 Bossbars: Add support for non-mob bosses 2021-04-11 11:15:09 +02:00
Elias Fleckenstein 2313012f60 Fix #1528 2021-04-11 10:41:11 +02:00
epCode ce49cd02ac make player collision box MUCH closer to MC 2021-04-10 15:41:50 -07:00
kay27 40c733c913 [mobs_mc] Remove `goto` from enderman.lua 2021-04-11 02:11:14 +04:00
kay27 a76fe2b487 [mcl_mobs] Replace `goto` to `repeat-break-until true` in spawning.lua 2021-04-11 02:11:06 +04:00
kay27 b14ca5a843 Revert "[mcl_mobs, mobs_mc] TEMP! Remove `goto` to run on RasbPI4, Oil_boi free to revert"
This reverts commit ea41c82834.
2021-04-11 02:10:27 +04:00
epCode 3ff214ec2d lessen the push strength for players 2021-04-10 15:06:16 -07:00
epCode f6db31eae3 add criticle and sprint hits. 2021-04-10 14:47:26 -07:00
Elias Fleckenstein 9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02:00
kay27 ea41c82834 [mcl_mobs, mobs_mc] TEMP! Remove `goto` to run on RasbPI4, Oil_boi free to revert 2021-04-10 20:47:55 +02:00
Elias Fleckenstein 2116b2b9d0 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-10 20:05:09 +02:00
epCode 08b7340ff5 Fix crash with player near unknown object 2021-04-10 10:20:38 -07:00
NO11 cdd12a0c71 Charcoal made from debarked wood 2021-04-10 11:19:51 +00:00
NO11 652f8d48ed Debark wood with an axe 2021-04-09 22:16:52 +00:00
NO11 988f298375 Add stripped wood crafting 2021-04-09 22:13:50 +00:00
NO11 c73cd8b810 Add stripped spruce textures 2021-04-09 22:11:32 +00:00
NO11 ebd4380c98 Add stripped oak textures 2021-04-09 22:10:47 +00:00
NO11 3d732c2412 Add stripped jungle textures 2021-04-09 22:10:10 +00:00
NO11 03e112ef9b Add stripped dark oak textures 2021-04-09 22:09:16 +00:00
NO11 9b81a4d83e Add stripped birch textures 2021-04-09 22:08:39 +00:00