Tuxilio
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
6,428 Commits 68 Branches 76 Tags 156 MiB
Commit Graph

3053 Commits

Author SHA1 Message Date
epCode 9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
Lizzy Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
NO11 7a5ce1c717 Simplify debarking again 2021-04-19 16:53:48 +00:00
NO11 e8c15867ad Add mcl_stripped_varient node def 2021-04-19 16:50:21 +00:00
Lizzy Fleckenstein c80b1c5140 Re-add usage of mcl_colors.GRAY to book descriptions 2021-04-19 15:19:59 +02:00
Lizzy 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
Lizzy 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
Lizzy Fleckenstein 52a49e640e Merge branch 'master' into damage 2021-04-19 09:57:56 +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: MineClone2/MineClone2#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
Lizzy Fleckenstein 53b0ad7347 Implement magic damage 2021-04-18 20:21:11 +02:00
Lizzy 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
Lizzy Fleckenstein a2c3eb95bb Merge branch 'master' into damage 2021-04-18 19:51:46 +02:00
NO11 9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00:00
Lizzy Fleckenstein 1cf53caa7a Update armor stand entity in on_activate callback, remove debug print 2021-04-18 16:20:32 +02:00
Lizzy Fleckenstein d1198e8d74 Register elytra texture 2021-04-18 16:19:12 +02:00
Lizzy Fleckenstein 4f0bb444fe Integrate armor stand 2021-04-18 16:03:23 +02:00
Lizzy Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +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
kay27 11b66e83a2 [mcl_portals] Better NP search, no more teleports on the roof, fix MineClone2/MineClone2#1560 2021-04-18 04:29:30 +04:00
AFCMS 4aa6421faf performance optimisation 2021-04-18 00:27:51 +02:00
Lizzy Fleckenstein 205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02:00
Lizzy Fleckenstein bbd115fde0 Update armor stand 2021-04-17 18:39:38 +02:00
Lizzy Fleckenstein 7c7af7d664 Merge branch 'master' into damage 2021-04-17 18:39:00 +02:00
Lizzy Fleckenstein 8e37b51cac Equip mob heads with rightclick 2021-04-17 14:07:47 +02:00
Lizzy 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
Lizzy Fleckenstein 6bbea11fb8 Fix crash with mcl_heads 2021-04-17 13:53:41 +02:00
Lizzy Fleckenstein c7c47c1ca7 Increase mob_view_range_factor performance 2021-04-17 13:49:40 +02:00
Lizzy Fleckenstein ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00
AFCMS 02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +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
Lizzy 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
epCode 31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -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
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: MineClone2/MineClone2#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
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
Lizzy Fleckenstein 8931ffb7d3 Fix crash with armor enchantments 2021-04-14 20:39:35 +02:00
Lizzy Fleckenstein 727d7be6ab Call on_equip and on_unequip everytime needed 2021-04-14 20:39:05 +02:00
Lizzy 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
Lizzy Fleckenstein 5d9bb7cacd Fix armor not actually protecting lol 2021-04-14 19:06:11 +02:00
Lizzy Fleckenstein ad3defdfb3 Merge branch 'master' into damage 2021-04-14 18:29:42 +02:00
Lizzy Fleckenstein c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Lizzy Fleckenstein 875bb3db84 Use fire-like damage types properly 2021-04-14 17:20:51 +02:00
Lizzy Fleckenstein d0ddd38d4e Merge branch 'master' into damage 2021-04-14 16:14:00 +02:00
Lizzy 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
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
Code-Sploit cd0d2d2296 Fix #1548 2021-04-13 13:57:45 +00:00
kay27 3077498a63 Fix screwdriver/door duplication glitch, MineClone2/MineClone2#1149 2021-04-13 16:49:10 +04:00
Lizzy Fleckenstein 78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
Lizzy 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
Lizzy 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
Lizzy Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 16:34:40 +02:00
Lizzy Fleckenstein c3868084af Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc.
 2021-04-12 16:34:25 +02:00
Lizzy 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
Lizzy Fleckenstein ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Lizzy Fleckenstein db5626fcb4 Revert "Make hoe dig some blocks faster" 
This reverts commit c1e295de5f.
 2021-04-12 15:05:01 +02:00
Lizzy Fleckenstein 9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02: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
NO11 cbcaef19c6 Add stripped acacia textures 2021-04-09 22:07:44 +00:00
NO11 9e5fb7f533 Add #490 2021-04-09 22:04:42 +00:00
kay27 d50fd06c82 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce 
This reverts commit f5f6e232cc.
 2021-04-09 19:03:45 +04:00
kay27 3375e903ce [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 18:52:33 +04:00
AFCMS f5f6e232cc Attemp to fix #1513 2021-04-09 16:46:41 +02:00
kay27 a733eb8e0c [mesecons] Localise several things in internal.lua 2021-04-09 02:08:03 +04:00
Nils Dagsson Moskopp 7c8cf6f79f Do not crash server if world border is depowered 2021-04-09 01:33:22 +04:00
kay27 f0c2eb86a2 Revert (3/3) "Fix extreme mesecons/redstone crashing at world border" 
This reverts commit 0842a36aa6.
 2021-04-09 01:32:58 +04:00
kay27 26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash" 
This reverts commit b9d175e6a5.
 2021-04-09 01:32:27 +04:00
kay27 6b31e85385 Revert (1/3) "Revert fixes to crash world border" 
This reverts commit 18f73ba31f.
 2021-04-09 01:31:21 +04:00
jordan4ibanez 18f73ba31f Revert fixes to crash world border 2021-04-08 15:48:53 -04:00