AFCMS
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,491 Commits 32 Branches 0 Tags 151 MiB
Commit Graph

3086 Commits

Author SHA1 Message Date
Lizzy Fleckenstein fed4596cb4 Update german cauldron translation fully 2021-04-26 10:52:07 +02:00
Lizzy 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
Lizzy 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
Lizzy 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
Lizzy Fleckenstein edc89898bb Integrate fire resistance 2021-04-25 20:51:13 +02:00
Lizzy Fleckenstein fede04eaa6 Make armor listring work 2021-04-25 20:20:26 +02:00
Lizzy Fleckenstein cab2167520 Merge branch 'master' into damage 2021-04-25 17:32:24 +02:00
Lizzy 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
Lizzy Fleckenstein 939229cb21 Fix on_equip crash 2021-04-25 13:29:22 +02:00
Lizzy Fleckenstein 58d67aace6 Merge branch 'master' into damage 2021-04-25 13:29:07 +02:00
Lizzy Fleckenstein ddb7e8388a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-25 13:09:27 +02:00
Lizzy 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
Lizzy Fleckenstein 827cd2d7b1 Fix heads crash 2021-04-23 13:42:42 +02:00
Lizzy Fleckenstein 78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
Lizzy 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
Lizzy Fleckenstein f9c2d710e2 Fix armor being taken even if it cannot be equipped 2021-04-22 13:52:02 +02:00
Lizzy Fleckenstein 222104b3cb Integrate dispensers 2021-04-22 13:51:36 +02:00
Lizzy Fleckenstein 9f7b371bfc Merge branch 'master' into damage 2021-04-22 13:29:32 +02:00
Lizzy Fleckenstein 8b23388d63 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:23:07 +02:00
Lizzy Fleckenstein 74a3b2654f Create inventory if not present in mcl_armor.equip 2021-04-21 13:28:22 +02:00
Lizzy Fleckenstein dccb71e2fb Fix view_range_factors warning 2021-04-21 11:34:22 +02:00
Lizzy Fleckenstein 1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Lizzy 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, MineClone2/MineClone2#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
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