Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-28 13:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,524 Commits 109 Branches 83 Tags 165 MiB
be9fb5be47
Commit Graph

3099 Commits

Author SHA1 Message Date
jordan4ibanez
e0c94ccb8a Stop thorns enchant from crashing server when dealing damage to mobs 2021-04-28 21:58:28 -04:00
NO11
f1b7476825 Add #1488 (sponge drying in nether makes now particles) 2021-04-28 14:37:16 +00:00
Elias Fleckenstein
13a0fa2314 Implement #1665 2021-04-28 12:16:01 +02:00
Elias Fleckenstein
61c6d6e276 Add per element (un)equip callbacks 2021-04-28 12:00:44 +02:00
AFCMS
ae83e44149 remove duplicated line 2021-04-27 23:50:18 +02:00
Elias Fleckenstein
a41aace9d7 Merge branch 'master' into damage 2021-04-27 18:33:35 +02:00
Elias Fleckenstein
0867d6e406 Update german mcl_banners translations 2021-04-26 11:15:36 +02:00
Elias Fleckenstein
347cc7ee7c Update mcl_banner translations to new template 2021-04-26 11:13:36 +02:00
Elias Fleckenstein
6dc6fc8ec3 Update mcl_flowerpots translations to new template 2021-04-26 11:05:27 +02:00
Elias Fleckenstein
b43f59332a Update mcl_enchanting translations to new template 2021-04-26 11:03:53 +02:00
Elias Fleckenstein
3b1d71382f Update es, fr and ru cauldron translations to use the new template 2021-04-26 11:01:52 +02:00
Elias Fleckenstein
05be20fcb8 Update mcl_enchanting translations 2021-04-26 11:00:53 +02:00
Elias Fleckenstein
5df1df8e21 Update cauldron code to use the corrected translation template string 2021-04-26 10:52:50 +02:00
Elias Fleckenstein
fed4596cb4 Update german cauldron translation fully 2021-04-26 10:52:07 +02:00
Elias Fleckenstein
a77a916cc2 Update cauldron translations 2021-04-26 10:50:23 +02:00
NO11
8df9fe76d8 Add german translation for stripped wood 2021-04-26 08:23:26 +00:00
Elias Fleckenstein
e710795eed Merge branch 'master' into damage 2021-04-26 10:06:09 +02:00
NO11
4d2210c4e5 Fix german translation mistake 2021-04-26 08:03:20 +00:00
NO11
749f1a4a62 Fix wrong template, sry 2021-04-26 07:50:25 +00:00
NO11
e5a44dcb75 Add template for fireworks translation 2021-04-26 07:45:26 +00:00
Elias Fleckenstein
dd68b79782 Merge branch 'master' into damage 2021-04-26 09:29:03 +02:00
NO11
dada1e9815 Add template for stripped wood translation 2021-04-25 21:47:12 +00:00
Elias Fleckenstein
edc89898bb Integrate fire resistance 2021-04-25 20:51:13 +02:00
Elias Fleckenstein
fede04eaa6 Make armor listring work 2021-04-25 20:20:26 +02:00
Elias Fleckenstein
cab2167520 Merge branch 'master' into damage 2021-04-25 17:32:24 +02:00
Elias Fleckenstein
302175691a Integrate death messages 2021-04-25 16:42:38 +02:00
AFCMS
228759e49b Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-25 14:37:17 +02:00
Elias Fleckenstein
939229cb21 Fix on_equip crash 2021-04-25 13:29:22 +02:00
Elias Fleckenstein
58d67aace6 Merge branch 'master' into damage 2021-04-25 13:29:07 +02:00
Elias Fleckenstein
ddb7e8388a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-25 13:09:27 +02:00
Elias Fleckenstein
9eba2add3f Rewrite burning API 2021-04-25 13:09:20 +02:00
Elias Åström
7f3e5bda7e Duplicate groupcaps before applying unbreaking 2021-04-23 15:49:37 +02:00
Elias Fleckenstein
827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Elias Fleckenstein
78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
Elias Fleckenstein
818f33ff74 Merge branch 'master' into damage 2021-04-23 10:16:58 +02:00
NO11
c46c07f836 Makes fireworks rockets infinite in creative mode 2021-04-22 19:18:05 +00:00
epCode
62adbb9625 Fix #1587 2021-04-22 10:39:21 -07:00
Elias Fleckenstein
f9c2d710e2 Fix armor being taken even if it cannot be equipped 2021-04-22 13:52:02 +02:00
Elias Fleckenstein
222104b3cb Integrate dispensers 2021-04-22 13:51:36 +02:00
Elias Fleckenstein
9f7b371bfc Merge branch 'master' into damage 2021-04-22 13:29:32 +02:00
Elias Fleckenstein
8b23388d63 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:23:07 +02:00
Elias Fleckenstein
74a3b2654f Create inventory if not present in mcl_armor.equip 2021-04-21 13:28:22 +02:00
Elias Fleckenstein
dccb71e2fb Fix view_range_factors warning 2021-04-21 11:34:22 +02:00
Elias Fleckenstein
1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Elias Fleckenstein
fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
kay27
1e5ae0bbac [mcl_beds] Fix screwdriver/bed duplication glitch, https://git.minetest.land/MineClone2/MineClone2/issues/1149 2021-04-21 00:36:07 +04:00
epCode
9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
Elias 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
Elias Fleckenstein
c80b1c5140 Re-add usage of mcl_colors.GRAY to book descriptions 2021-04-19 15:19:59 +02:00
Elias Fleckenstein
7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus. 
(Follow-up of d8d4cb5defcbe1ca1b71100441cc6636557752c8)
Reverts a2fcd28a3dcbf1aaa07c9f2c21ba7cd3872b7cd4 and partially reverts f8a627915e17779bec1a52fe867877036c043f72.
 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 84819bf9f5164ab208b7be1e94d142906359a1af.
 2021-04-19 14:44:20 +02:00
Elias 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: 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
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
NO11
9bc2f2d866 Fix lying trunks that stand upright again after debarking 2021-04-18 17:18:27 +00: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
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 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
Elias Fleckenstein
205572cc69 Fix elytra code style 2021-04-17 19:34:23 +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
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
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
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
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: 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
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