Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,349 Commits 107 Branches 83 Tags 180 MiB
Commit Graph

78 Commits

Author SHA1 Message Date
Lizzy Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +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
jordan4ibanez 44a25de12f Fix crashing with unknown slot description when enchanting 2021-04-18 23:18:18 -04:00
Lizzy Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +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
Lizzy Fleckenstein 5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +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 ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
AFCMS 84819bf9f5 MAKE EVERY SINGLE MOD USE PROPER COLORS!!! 2021-03-30 00:01:29 +02:00
Lizzy Fleckenstein 43a60e0c57 Fix #1357 2021-03-24 09:00:31 +01:00
Elias Åström 0d7c2c4988 Fix #1358 for real 2021-03-23 12:02:00 +01:00
Elias Åström b0c7941b3a Fix #1358 2021-03-21 12:18:24 +01:00
Elias Åström bfe51316ee Merge branch 'mcl_autogroups' 2021-03-18 13:43:58 +01:00
Elias Åström 8f9650abe4 Update the groupcaps of all enchanted tools 
Not just those enchanted with efficiency.
 2021-03-18 11:35:40 +01:00
Elias Åström 6458565bf9 Move mcl_util.hash to a local function 
It is probably unlikely it will be useful at other places in Mineclone2.
 2021-03-18 11:35:40 +01:00
Elias Åström 2e9b3c2259 Move efficiency code to its own file 2021-03-18 11:35:40 +01:00
Elias Åström 922bdbc601 Use hashing for more efficient groupcaps updating 
This adds the metadata field "groupcaps_hash" to tools enchanted with
efficiency.  This value contains a hash of the groupcaps field in
tool_capabilities.  This value gets compared to the expected hash value
to determine if the tools tool_capabilities should be updated according
to commit af31f8189e8e5c2b.

This commit makes efficiency more efficient.
 2021-03-18 11:35:40 +01:00
Elias Åström 3241dbbec5 Update enchanted tools with outdated digging times 
Because of the way digging times is implemented in Mineclone2, it is
possible for the digging times of efficiency enchanted tools to become
outdated.

This fixes that by automatically updating the tools tool_capabilities
after each time the tool is used.
 2021-03-18 11:35:40 +01:00
Elias Åström f0528b11d7 Make mcl_enchanting use the new mcl_autogroups 
The function mcl_autogroups.get_groupcaps is used by mods to get the
groupcaps for tools with efficiency enchantments.  This function is used
by mcl_enchanting when enchanting tools with efficiency.
 2021-03-18 11:34:26 +01:00
AFCMS 8f30e223e2 I hate reverting something xD 2021-03-16 17:39:06 +01:00
Lizzy Fleckenstein 88372778c9 Fix another anvil weirdness and dupe glitch 2021-03-12 15:50:05 +01:00
kay27 6e6809f360 Make books in chest loot deterministic, ref. MineClone2/MineClone2#1254 and MineClone2/MineClone2#1060 2021-03-08 04:14:03 +04:00
Lizzy Fleckenstein f5b590901e Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-03-01 10:52:07 +01:00
Lizzy Fleckenstein 95b0a495bc Fix #1152 2021-03-01 10:51:57 +01:00
Code-Sploit 578709c93e Add Depth Strider enchantment 2021-02-27 15:35:59 +00:00
kay27 3a2300382b Translate mcl_enchanting to Russian 2021-02-27 01:48:22 +04:00
Lizzy Fleckenstein 5de9d90569 Simplify mcl_burning API 2021-02-22 10:55:14 +01:00
Lizzy Fleckenstein 3d0f5a4de5 Fix #1161 2021-02-22 10:43:59 +01:00
Lizzy Fleckenstein c9e589b931 Add mcl_burning damage interval 2021-02-18 14:47:35 +01:00
Lizzy Fleckenstein aeb7078c05 Update use_texture_alpha to the minetest 5.4 conventions 2021-02-18 14:00:17 +01:00
Laurent Rocher 303d286603 Update French translation 2021-02-13 00:09:59 +01:00
MysticTempest 846b1d273d Fix the enchanting table book entity spawning multiple times as reported in issue #1008. 2021-02-11 19:25:54 -06:00
HimbeerserverDE a3ccb54376 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-01-27 20:13:16 +01:00
HimbeerserverDE 00df587bf7 Add flame enchantment 2021-01-27 20:11:02 +01:00
MysticTempest 9feee980f8 Add help text for enchanting table. 2021-01-27 01:41:23 -06:00
Lizzy Fleckenstein 02305c914d Merge branch 'enchanted_books_creative' 2021-01-18 20:08:37 +01:00
Lizzy Fleckenstein 427ac03a4d Fix #951 2021-01-17 13:21:09 +01:00
Lizzy Fleckenstein c4c3fc1c8c Fix Fire Aspect 2021-01-10 14:16:00 +01:00
Lizzy Fleckenstein 2f1a918667 Fix thorns incompabilities 2021-01-06 19:41:11 +01:00
Lizzy Fleckenstein 9a31252c5d Fix sharpness and bane of arthopods being compatible 2021-01-06 19:04:04 +01:00
Lizzy Fleckenstein 7d4688b70c Fix enchanted items showing up in craftguide 2021-01-06 14:17:27 +01:00
Lizzy Fleckenstein 7bdce54048 Give credit for the enchanting sounds (Closes #921) 2021-01-05 17:27:38 +01:00
Lizzy Fleckenstein 139a4d94d0 Merge branch 'master' into enchanted_books_creative 2021-01-05 14:25:56 +01:00
Lizzy Fleckenstein 37f256648b Fix enchanting book animation being weird sometimes 2021-01-05 12:40:29 +01:00
Lizzy Fleckenstein ebc2ec9f72 Add missing enchanting sound 2021-01-05 12:37:15 +01:00
kay27 c2a14e2eae Make glyph particles more close to MC and visible only for players in radius 15 2021-01-05 12:13:36 +01:00
Lizzy Fleckenstein 796c80b2d1 Merge branch 'fixes' into enchanted_books_creative 2021-01-04 17:59:41 +01:00
Lizzy Fleckenstein aea051fe37 Proper fire aspect damage 2021-01-04 17:53:49 +01:00