AFCMS
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,973 Commits 4 Branches 0 Tags 69 MiB
Commit Graph

3646 Commits

Author SHA1 Message Date
NO11 ee21a24fb6 Don't register a separate entity for every particle 2021-06-07 17:13:50 +00:00
NO11 28bfb3f141 Better arrow overlay texture 2021-06-05 13:19:47 +00:00
NO11 f3322fd7cb Fix #1779 (potion arrows are invisible) 2021-06-05 13:17:03 +00:00
Elias Fleckenstein e5bdf230d5 Merge pull request 'Add polish translation' (#1542) from marcin-serwin/MineClone2:polish-translation into master 
Reviewed-on: MineClone2/MineClone2#1542
 2021-06-04 16:51:43 +00:00
NO11 92c25ef691 Add code for bonemeal particles 2021-06-03 18:13:13 +00:00
Marcin Serwin 522553fcd0 Add polish translation of mcl_fireworks 2021-06-02 13:33:10 +02:00
Marcin Serwin 753a8ce488 Update polish translation of mcl_core 2021-06-02 13:32:15 +02:00
Marcin Serwin f9dbfd8eb5 Update polish translation of mcl_maps 2021-06-02 13:26:41 +02:00
Marcin Serwin 0132d0569f Update polish translation of several files 2021-06-02 13:21:19 +02:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
Marcin Serwin 6715aecd63 Add polish translation of mcl_comparators 2021-06-02 12:13:16 +02:00
Marcin Serwin b06bc276dc Add polish translation of mesecons_commandblock 2021-06-02 11:34:32 +02:00
Marcin Serwin 06984fa486 Add polish translation of mesecons_pistons 2021-06-02 09:45:16 +02:00
Marcin Serwin 4bd49f7eb0 Add polish translation of mcl_observers 2021-06-02 09:40:08 +02:00
Marcin Serwin a4fc38ffcc Add polish translation of mcl_armor_stand 2021-06-02 09:32:27 +02:00
Marcin Serwin 7804de4230 Add polish translation of mcl_tools 2021-06-01 15:45:45 +02:00
Marcin Serwin 22bda9c770 Add polish translation of mcl_fences 2021-06-01 15:33:34 +02:00
Marcin Serwin 21bdf914bf Add polish translation of mcl_flowerpots 2021-06-01 15:28:09 +02:00
NO11 75e263debc Add code for totem partciles 2021-05-29 19:24:16 +00:00
AFCMS 95627f4304 Revert "[mcl_fishing] fix warnings" 
This reverts commit a1acf6d3c1.
 2021-05-29 16:15:30 +02:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
NO11 ec542a142a Improve pumkin hud a bit 2021-05-29 08:56:11 +00:00
Marcin Serwin 8ad953ab17 Add polish translation of mcl_nether 2021-05-28 18:25:16 +02:00
AFCMS 5f82e76862 fix many codestyle issues 2021-05-28 00:34:58 +02:00
AFCMS f1c6c3b285 [mcl_chests] fix warnings 2021-05-27 09:41:20 +02:00
AFCMS f8ee9c79c2 fix crash :-( 2021-05-27 09:34:58 +02:00
AFCMS 00063cde73 speedup mcl_observer 2021-05-27 09:34:12 +02:00
AFCMS 0119793d7a Merge branch 'master' into buckets 2021-05-27 09:10:35 +02:00
Lizzy Fleckenstein 772f48ed58 Fix crash / luacheck warning caused by armor with thorns level > 10 2021-05-26 20:51:39 +02:00
NO11 656891ec61 [mcl_core] fix function codestyle in nodes_trees.lua 2021-05-26 18:02:28 +00:00
NO11 90bab9026b [mcl_core] fix function codestyle in nodes_liquid.lua 2021-05-26 17:57:43 +00:00
NO11 5b43303873 [mcl_core] fix function codestyle in nodes_climb.lua 2021-05-26 17:54:58 +00:00
NO11 211b078d3a [mcl_core] fix function codestyle in nodes_base.lua 2021-05-26 17:51:24 +00:00
NO11 bb77443892 [mcl_core] fix function codestyle in functions.lua 2021-05-26 17:43:42 +00:00
NO11 6105a9ef22 Fix function code style in mcl:core/crafting.lua 2021-05-25 20:00:06 +00:00
AFCMS 9e074af07f unify code style [1] 2021-05-25 12:52:25 +02:00
NO11 0ea72ed1f1 Merge branch 'master' into pumpkin_hud 2021-05-25 09:05:31 +00:00
NO11 47b6a8d7f8 Remove unused variable 2021-05-25 09:03:06 +00:00
AFCMS 388ab6d8df fix some codestyle issues 2021-05-25 10:56:06 +02:00
AFCMS 42d3830c48 [mcl_nether] fix warnings 2021-05-25 08:49:46 +02:00
AFCMS d3a237384d [mcl_end] fix warnings 2021-05-25 08:40:21 +02:00
NO11 ba38f787e2 Fix local function code style 2021-05-24 11:09:47 +00:00
NO11 8b11e2fec8 Add multiplayer support for pumpkin hud 2021-05-23 22:31:13 +00:00
NO11 9b9ec13967 „mods/ITEMS/mcl_farming/pumpkin.lua“ ändern 2021-05-23 19:38:49 +00:00
NO11 d5a2e5e514 Add "fake" crosshair when the player is wearing a pumpkin 2021-05-23 17:38:53 +00:00
NO11 dddaed42b6 Obstruct the view of the player when wearing a pumpkin 2021-05-23 16:50:09 +00:00
NO11 973a8201ad Pumpkin blur texture 2021-05-23 16:44:01 +00:00
AFCMS 91ac70cf28 Merge branch 'master' into buckets 2021-05-23 16:22:53 +02:00
AFCMS 52b1473657 [mcl_comparators] fix warnings 2021-05-23 11:53:05 +02:00
AFCMS d43b2149e6 [mcl_dispensers] fix warnings 2021-05-23 11:50:16 +02:00
AFCMS b814fe47f9 [mcl_observers] fix warnings 2021-05-23 11:47:59 +02:00
AFCMS 962ae359af [mesecons] fix warnings 2021-05-23 11:41:01 +02:00
AFCMS ddc157acbf [mesecons_commandblock] fix warnings 2021-05-23 11:37:51 +02:00
AFCMS 4fd0ea8a88 [mesecons_delayer] fix code style issues 2021-05-23 11:36:30 +02:00
AFCMS e6f72e0c60 [mesecons_delayer] fix warnings 2021-05-23 11:29:32 +02:00
AFCMS dc10448c6e [mesecons_mvps] fix warnings 2021-05-23 11:25:22 +02:00
AFCMS 43f418c6c0 [mesecons_wire] fix warnings 2021-05-23 11:22:45 +02:00
AFCMS 21fdf492e2 [mcl_anvils] fix warnings 2021-05-23 11:20:21 +02:00
AFCMS c580c1ccad [mesecons_pistons] unify code style 2021-05-23 11:17:19 +02:00
AFCMS e75a2e3a67 [mesecons_pistons] fix warnings 2021-05-23 11:02:13 +02:00
AFCMS a9c49853aa [mesecons_pressureplates] fix warnings 2021-05-23 11:01:29 +02:00
AFCMS 4bc473bc29 [mcl_banners] fix some warnings 2021-05-23 10:59:07 +02:00
AFCMS 8f6a97eefe [mcl_beds] fix warnings 2021-05-23 10:57:07 +02:00
AFCMS be5eb621fd [mcl_books] fix warnings 2021-05-23 10:52:52 +02:00
AFCMS 203c7e2c84 [mcl_beds] fix warnings 2021-05-23 01:09:45 +02:00
AFCMS 892f4b96c9 [mcl_books] fix warnings 2021-05-23 01:07:10 +02:00
AFCMS b7bf566190 [mcl_bows] fix warnings 2021-05-23 01:06:34 +02:00
AFCMS fdfb586b16 [mcl_brewing] fix warnings 2021-05-23 00:58:30 +02:00
AFCMS ac459d3914 [mcl_bucket] fix warnings 2021-05-23 00:42:31 +02:00
AFCMS 621a5a53a8 [mcl_bucket] fix warnings 2021-05-23 00:32:04 +02:00
AFCMS 60736d04b8 [mcl_chests] fix some warnings 2021-05-23 00:31:22 +02:00
AFCMS df1eeba6b6 [mcl_clock] fix warnings 2021-05-23 00:18:42 +02:00
AFCMS 8ac5d32416 [mcl_compass] fix warnings 2021-05-23 00:17:12 +02:00
AFCMS 402a1d0088 [mcl_core] fix last warning 2021-05-23 00:13:27 +02:00
AFCMS b8488ce55e [mcl_core] fix missing warnings 2021-05-23 00:12:54 +02:00
AFCMS f9a86947e5 [mcl_core] fix warnings 2021-05-23 00:09:07 +02:00
AFCMS 30e83088d4 [mcl_doors] fix warnings 2021-05-23 00:03:34 +02:00
AFCMS b3c0e7c1bd [mcl_dye] fix warnings 2021-05-23 00:01:53 +02:00
AFCMS bbde3b551f [mcl_enchanting] fix warnings 2021-05-23 00:01:30 +02:00
AFCMS 56310a3624 [mcl_end] fix some warnings 2021-05-22 23:56:52 +02:00
AFCMS fcc2087b97 [mcl_farming] fix warnings 2021-05-22 23:50:28 +02:00
AFCMS a1acf6d3c1 [mcl_fishing] fix warnings 2021-05-22 23:49:03 +02:00
AFCMS 82396bd994 [mcl_fireworks] fix warnings (1000 remainings) 2021-05-22 23:31:16 +02:00
AFCMS 45ab5c8e25 [mcl_flowers] fix warnings 2021-05-22 23:29:51 +02:00
AFCMS b58e61b988 [mcl_heads] fix warnings 2021-05-22 23:25:28 +02:00
AFCMS a200252ab8 [mcl_itemframes] fix warnings 2021-05-22 23:23:25 +02:00
AFCMS 0cac8f3f44 [mcl_jukebox] fix warnings 2021-05-22 23:22:09 +02:00
AFCMS 9edcc60ba2 [mcl_maps] fix warnings 2021-05-22 23:21:32 +02:00
AFCMS 0113d290b7 [mcl_mobspawners] fix warnings 2021-05-22 23:19:31 +02:00
AFCMS e91ee174a4 [mcl_ocean] fix warnings 2021-05-22 23:12:33 +02:00
AFCMS c1a717238b [mcl_portals] fix warnings 2021-05-22 23:07:56 +02:00
AFCMS a71a0e9161 fix even more warnings (nether portals and potions) 2021-05-22 23:04:18 +02:00
AFCMS 1b3763654e comment unused local function 2021-05-22 20:00:59 +02:00
AFCMS 17202115fa cache general functions 2021-05-22 18:58:58 +02:00
AFCMS 5d65c8a3aa Working empty bucket 2021-05-22 18:57:51 +02:00
AFCMS e9f38c6b90 WIP raycast base buckets 2021-05-22 10:47:28 +02:00
AFCMS a9bf923df9 improve mcl_bucket API (on_take callback) 2021-05-19 11:14:18 +02:00
kay27 0b0be4cecf Merge branch 'master' into mineclone5 2021-05-15 02:24:26 +04:00
NO11 9e095980c8 Simplify wooden planks crafting even more 2021-05-14 15:00:34 +00:00
NO11 be9fb5be47 Fix #1718 (Give potion particles the same color as in mc) part2 2021-05-14 10:07:58 +00:00
NO11 f4c302e582 Fix #1718 (Give potion particles the same color as in mc) part1 2021-05-14 10:07:42 +00:00
Code-Sploit ba333d016a Merge pull request 'master' (#1736) from master into mineclone5 
Reviewed-on: MineClone2/MineClone2#1736
 2021-05-13 11:57:33 +00:00
jordan4ibanez 052bb540ba Remove unused parent data for arrows 2021-05-10 20:06:38 -04:00
NO11 9fa51dc6b9 Simplify wooden planks crafting 2021-05-10 10:06:34 +00:00
NO11 6ffb7f525a Add more crafting recipes for wooden planks (including stripped wood) 2021-05-10 09:40:16 +00:00
Lizzy Fleckenstein f79ace6306 Fix upgrading of enchanted items 2021-05-10 10:00:13 +02:00
kay27 24dfda8d7e Merge branch 'master' into mineclone5 2021-05-10 06:19:56 +04:00
kay27 f3c540af5d [mcl_mapgen_core, mcl_biomes] Make chorus growth deterministic 2021-05-10 02:24:52 +04:00
NO11 a3d3055e8a Remove cactus destroys minecart from master 2021-05-09 22:10:08 +00:00
NO11 7b78d500fd Better textures for stripped wood part3 2021-05-09 21:57:06 +00:00
NO11 358ea695e1 Better textures for stripped wood part2 2021-05-09 21:55:51 +00:00
NO11 f6b8133381 Better textures for stripped wood part1 2021-05-09 21:54:56 +00:00
NO11 96aec38947 Merge pull request 'master' (#3) from MineClone2/MineClone2:master into master 
Reviewed-on: NO11/MineClone2#3
 2021-05-09 21:52:37 +00:00
Lizzy Fleckenstein 052bfa0cab Revert "Clean the mess (thank you soo much the person who did it) (no offense)" 
This reverts commit 2064c34858.
 2021-05-09 16:14:17 +02:00
Code-Sploit 2064c34858 Clean the mess (thank you soo much the person who did it) (no offense) 2021-05-09 14:12:12 +00:00
Lizzy Fleckenstein 0133f94a36 Fix upgrading of diamond armor 2021-05-09 12:48:53 +02:00
Code-Sploit 05a9b614b0 Merge branch 'mineclone5' of https://git.minetest.land/MineClone2/MineClone2 into mineclone5 
Merge upstream changes to local branch
 2021-05-08 17:04:25 +00:00
Code-Sploit 71d98892d4 Prevent crash in fix 2021-05-08 17:03:59 +00:00
Code-Sploit 72d4cf5906 Second part of fix try stupid bug 2021-05-08 16:58:10 +00:00
Code-Sploit 1dcd555149 Try 1 to fix the stupid changes to mcl_armor that caused non-upgradable diamond armor 2021-05-08 16:53:46 +00:00
kay27 43e44ff4c9 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-08 14:12:25 +04:00
kay27 31b56e77ee [mcl_mobspawners] Remove a typo (tab character) 2021-05-08 14:12:13 +04:00
kay27 f53f961122 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-08 14:09:32 +04:00
kay27 4bb27a0d79 [mcl_mobspawners] Fix random crash, MineClone2/MineClone2#1707 2021-05-08 14:09:16 +04:00
NO11 b37cbbebb8 Fix ancient debris duplication glitch (remove fortune drop) 2021-05-07 22:50:35 +00:00
kay27 e529c4839a Merge remote-tracking branch 'origin/master' into mapgen 2021-05-06 02:42:56 +04:00
Lizzy Fleckenstein 1bd647507b Add proper end crystal death message 2021-05-05 13:20:06 +02:00
Lizzy Fleckenstein a9817fea4b Merge branch 'master' into real_maps 2021-05-05 08:21:01 +02:00
Lizzy Fleckenstein 70db02306f Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-05 08:19:59 +02:00
Lizzy Fleckenstein f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
Lizzy Fleckenstein 7513bc600a Merge branch 'master' into compass_and_clock 2021-05-04 09:04:50 +02:00
Lizzy Fleckenstein f96258ca5c Fix mob heads not showing their texture when worn as head armor 2021-05-04 09:01:53 +02:00
Lizzy Fleckenstein 33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Lizzy Fleckenstein 2c5eca3999 Make clocks work in itemframes 2021-05-04 08:49:21 +02:00
Lizzy Fleckenstein 74e3c6555d Globalize mcl_clock API 2021-05-03 13:43:46 +02:00
Lizzy Fleckenstein ecc2010fe5 Make compasses work in itemframes 2021-05-03 11:22:47 +02:00
Lizzy Fleckenstein 5bb1657bd8 Add moving marker for the player 2021-05-03 10:46:59 +02:00
Lizzy Fleckenstein f063d14caf Add craft predict for map copying 2021-05-02 19:30:27 +02:00
Lizzy Fleckenstein 0d287001f7 Fix tt snippet to update wield filled maps as well 2021-05-02 19:18:30 +02:00
Lizzy Fleckenstein 63d4e57a8d Correct typo (ninetest -> minetest) 2021-05-02 17:19:11 +02:00
Lizzy Fleckenstein ecea8f1662 Prevent placing of wielded maps 2021-05-02 17:14:57 +02:00
Lizzy Fleckenstein ef08977112 Copy stack before accessing it in add_item 2021-05-02 17:11:33 +02:00
Lizzy Fleckenstein 1f87874870 Make it look like the player is holding the map in their hand 2021-05-02 17:03:39 +02:00
Lizzy Fleckenstein 9a3ae17564 Make maps show their image when in itemframes 2021-05-02 16:04:48 +02:00
Lizzy Fleckenstein bd74dbe321 Revert "Use PNG instead of TGA" 
This reverts commit ca9cd8cbe0.
The TGA was faster and produced smaller files.
 2021-05-02 13:03:18 +02:00
Lizzy Fleckenstein ca9cd8cbe0 Use PNG instead of TGA 2021-05-02 12:55:04 +02:00
Lizzy Fleckenstein d9a670dcb8 Show empty map in creative inv, but don't show filled map there 2021-05-02 12:24:22 +02:00
Lizzy Fleckenstein f22b3fd457 Implement copying maps 2021-05-02 12:23:29 +02:00
Lizzy Fleckenstein 1079ab74d4 Stack filled maps that have the same metadata 2021-05-02 11:42:16 +02:00
Code-Sploit 8c2f5bc3d2 Fix #1706 2021-05-02 08:31:26 +00:00
Code-Sploit 445af4e4c9 Remove unnessacary comments in mcl_smithing_table/init.lua 2021-05-02 08:11:11 +00:00
kay27 b12367b500 merge 2021-05-02 00:29:39 +04:00
NO11 f430ebcc8d Add #924, cactus breaks minecart 2021-05-01 17:29:08 +00:00
Lizzy Fleckenstein 2228b30658 Add API to create filled map 2021-05-01 17:36:51 +02:00
Lizzy Fleckenstein 1ed6aeca5e Remove map_background.png 2021-05-01 17:22:48 +02:00
Lizzy Fleckenstein c6e80b5882 Add Real Maps 2021-05-01 16:52:16 +02:00
kay27 1750929367 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-01 15:58:14 +04:00
NO11 1c05461e67 Add #924 (cactus breaks minecart now) 2021-04-30 23:05:40 +00:00
Lizzy Fleckenstein 8cccbd7caa Fix harming potion crash 2021-04-30 16:38:53 +02:00
Marcin Serwin e19d39f065 Add polish translation of mesecons_delayer 2021-04-29 17:26:47 +02:00
Marcin Serwin 5b3a156c09 Add polish translation of mesecons_pressureplates 2021-04-29 17:13:54 +02:00
Marcin Serwin 604af04849 Add polish translation of mesecons_noteblock 2021-04-29 17:08:11 +02:00
Marcin Serwin 77597f9bac Add polish translation of mesecons_torch 2021-04-29 16:53:47 +02:00
Marcin Serwin 65846cb6d8 Add polish translation of mesecons_button 2021-04-29 16:47:41 +02:00
Marcin Serwin 97e50714fe Add polish translation of mesecons_lightstone 2021-04-29 16:43:08 +02:00
Marcin Serwin d74e1fd162 Add polish translation of mcl_dispensers 2021-04-29 16:34:26 +02:00
Marcin Serwin 0e52e09cc8 Add polish translation of mesecons_wires 2021-04-29 16:21:08 +02:00
Marcin Serwin ffd28c259d Add polish translation of mcl_droppers 2021-04-29 16:11:43 +02:00
Lizzy Fleckenstein f8b9f16799 Update mcl_chests translation template 2021-04-29 12:45:15 +02:00
Lizzy Fleckenstein 404097dcc0 Update german mcl_core translations 2021-04-29 12:43:44 +02:00
Lizzy Fleckenstein db78c19880 Remove legacy mcl_potions translations 2021-04-29 12:42:08 +02:00
Lizzy Fleckenstein df8b4dddec Merge branch 'master' into mineclone5 2021-04-29 11:59:04 +02:00
Lizzy Fleckenstein 6550e3e8e2 Add per-element armor groups 2021-04-29 11:51:06 +02:00
Lizzy Fleckenstein 87e41cc9a9 Add support for armor texture and preview being functions 2021-04-29 11:46:27 +02:00
Lizzy Fleckenstein ec08032b62 Add on_break callback 2021-04-29 11:40:09 +02:00
Lizzy Fleckenstein eae71fdf55 Merge branch 'master' into mineclone5 2021-04-29 10:58:22 +02:00
Lizzy Fleckenstein 33c0aa23c5 Re-add thorns damage type 2021-04-29 10:58:10 +02:00
Lizzy Fleckenstein 47aa5da242 Merge branch 'master' into mineclone5 2021-04-29 10:56:15 +02:00
Marcin Serwin 6fac49550e Fix kicking players from bed when it's destroyed 2021-04-29 08:18:33 +02:00
jordan4ibanez cf46f0d8b8 Fix crashing if null itemstack enchant when player is hacking 2021-04-29 01:32:57 -04:00
jordan4ibanez e0c94ccb8a Stop thorns enchant from crashing server when dealing damage to mobs 2021-04-28 21:58:28 -04:00
kay27 83b96a80ca Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-29 03:22:01 +04:00
kay27 d60e0d75b4 Merge remote-tracking branch 'origin/master' into mapgen 2021-04-29 00:54:08 +04:00
kay27 3c5bf8c9b2 [mapgen] Use more readable constants, increase max_block_generate_distance 2021-04-29 00:53:48 +04:00
NO11 f1b7476825 Add #1488 (sponge drying in nether makes now particles) 2021-04-28 14:37:16 +00:00
Lizzy Fleckenstein 33c235362e Merge branch 'master' into mineclone5 2021-04-28 12:27:28 +02:00
Lizzy Fleckenstein 13a0fa2314 Implement #1665 2021-04-28 12:16:01 +02:00
Lizzy Fleckenstein 61c6d6e276 Add per element (un)equip callbacks 2021-04-28 12:00:44 +02:00
Lizzy Fleckenstein cca03bcbd2 Merge branch 'master' into mineclone5 2021-04-28 11:40:21 +02:00
kay27 c23bb1d59d [mapgen] rebalance mapgen/init core code 2021-04-28 03:03:47 +04:00
AFCMS ae83e44149 remove duplicated line 2021-04-27 23:50:18 +02:00
Lizzy Fleckenstein 6eadeb21c0 Merge branch 'master' into mineclone5 2021-04-27 18:56:48 +02:00
Lizzy Fleckenstein b9cdb58ce5 Merge branch 'master' into mineclone5 2021-04-27 18:44:40 +02:00
Lizzy Fleckenstein a41aace9d7 Merge branch 'master' into damage 2021-04-27 18:33:35 +02:00
kay27 29727136ac [mapgen] redesign the code 2021-04-27 01:30:07 +04:00
Lizzy Fleckenstein 0867d6e406 Update german mcl_banners translations 2021-04-26 11:15:36 +02:00
Lizzy Fleckenstein 347cc7ee7c Update mcl_banner translations to new template 2021-04-26 11:13:36 +02:00
Lizzy Fleckenstein 6dc6fc8ec3 Update mcl_flowerpots translations to new template 2021-04-26 11:05:27 +02:00
Lizzy Fleckenstein b43f59332a Update mcl_enchanting translations to new template 2021-04-26 11:03:53 +02:00
Lizzy Fleckenstein 3b1d71382f Update es, fr and ru cauldron translations to use the new template 2021-04-26 11:01:52 +02:00
Lizzy Fleckenstein 05be20fcb8 Update mcl_enchanting translations 2021-04-26 11:00:53 +02:00
Lizzy Fleckenstein 5df1df8e21 Update cauldron code to use the corrected translation template string 2021-04-26 10:52:50 +02:00
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 91211ac1f7 Merge branch 'master' into mineclone5 2021-04-26 10:08:08 +02: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 6260dad8fc Merge branch 'master' into mineclone5 2021-04-25 19:58:02 +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
Marcin Serwin eeaf4e09c6 Add polish translation of mesecons_solarpanel 2021-04-25 14:34:15 +02:00
Marcin Serwin 29001086c3 Add polish translation of mesecons_walllever 2021-04-25 14:30:42 +02:00
Marcin Serwin 1f07f5ba17 Add polish translation of mcl_stairs 2021-04-25 14:26:52 +02:00
Marcin Serwin 095128b6b3 Add polish translation of mcl_fire 2021-04-25 13:55:30 +02:00
Marcin Serwin bcf5eef010 Add polish translation of mcl_torches 2021-04-25 13:41:04 +02:00
Marcin Serwin 3917bb51a2 Add polish translation of mcl_signs 2021-04-25 13:39:59 +02:00
Marcin Serwin dd0e381e39 Add polish translation of mcl_beds 2021-04-25 13:33:57 +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
Marcin Serwin 4975a516f5 Add polish translation of mcl_fishing 2021-04-25 13:24:42 +02:00
Marcin Serwin c0ce511ad0 Add polish translation of mcl_mobspawners 2021-04-25 13:14:56 +02:00
Lizzy Fleckenstein 073e7b81f8 Merge branch 'master' into mineclone5 2021-04-25 13:11:20 +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
Marcin Serwin b93d3cf93c Add polish translation of mcl_books 2021-04-25 12:58:32 +02:00
Marcin Serwin a038908acd Add polish translation of mcl_crafting_table 2021-04-24 21:51:11 +02:00
Marcin Serwin a613da65c5 Add polish translation of mcl_walls 2021-04-24 21:47:42 +02:00
Marcin Serwin 18903d5a09 Add polish translation of mcl_wool 2021-04-24 21:23:09 +02:00
Marcin Serwin c6a07b8007 Add polish translation of mcl_cocoas 2021-04-24 21:19:11 +02:00
Marcin Serwin 67780f2159 Add polish translation of mcl_cake 2021-04-24 21:16:02 +02:00
Marcin Serwin 7e9eb927f1 Add polish translation of mcl_colorblocks 2021-04-24 21:11:45 +02:00
Marcin Serwin ae7ea8edef Add polish translation of mcl_buckets 2021-04-24 20:57:57 +02:00
Marcin Serwin 0cf58ce98d Add polish translation of mcl_jukebox 2021-04-24 20:57:57 +02:00
Marcin Serwin 0ebf6b8f92 Add polish translation of mcl_tnt 2021-04-24 20:57:57 +02:00
Marcin Serwin 0a8b6a63cb Add polish translation of mcl_mobitems 2021-04-24 20:57:53 +02:00
Lizzy Fleckenstein 988a44148e Merge branch 'master' into mineclone5 2021-04-23 18:11:41 +02:00
NO11 ef86eb0779 Fix wrong sweet berry item path 2021-04-23 14:18:31 +00:00
Elias Åström 7f3e5bda7e Duplicate groupcaps before applying unbreaking 2021-04-23 15:49:37 +02:00
Lizzy Fleckenstein 99ee5f05d3 Merge branch 'mineclone5' into netherite 2021-04-23 13:43:27 +02:00
Lizzy Fleckenstein f80eb5633b Merge branch 'master' into mineclone5 2021-04-23 13:43:12 +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
kay27 0486c7c468 [mineclone5] fix sweeet berry depends 2021-04-22 23:07:56 +04:00
epCode 62adbb9625 Fix #1587 2021-04-22 10:39:21 -07:00
Code-Sploit d12b192785 Add forgotten textures for netherite ingot, scrap and ancient debris 2021-04-22 14:38:17 +00:00
Code-Sploit 4baea9f420 Add all pixel-perfection textures for netherite 2021-04-22 13:59:53 +00:00
Code-Sploit 0147da7270 Add unofficial MC-textures (credits to NO11) 2021-04-22 13:38:00 +00:00
Code-Sploit 24cc4318e2 Add crafting recipe for smithing table 2021-04-22 12:11:47 +00:00
Code-Sploit 498b1c792a Fix not able to put diamond tools in the smithing_table 2021-04-22 12:07:30 +00: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 951a24c684 Fix #1590 (Bed drops itself when gets exploded) 2021-04-22 13:22:20 +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 a0a6eaee48 Merge branch 'master' into mineclone5 2021-04-21 11:32:32 +02:00
Lizzy Fleckenstein fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
Lizzy Fleckenstein f3c4dd699d Merge branch 'master' into mineclone5 2021-04-21 11:31:39 +02:00
Lizzy Fleckenstein bec86ece0b Merge branch 'mineclone5' of https://git.minetest.land/MineClone2/MineClone2 into mineclone5 2021-04-21 11:31:29 +02:00
kay27 1e5ae0bbac [mcl_beds] Fix screwdriver/bed duplication glitch, MineClone2/MineClone2#1149 2021-04-21 00:36:07 +04:00
kay27 106ecb0958 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-20 22:08:36 +04:00
TechDudie 1db8c21ec2 Emergency 2021-04-20 17:57:07 +00:00
Lizzy Fleckenstein 6b005a9214 Fix missing texture warning 2021-04-20 19:31:42 +02:00
Lizzy Fleckenstein 0c9314fba7 Use different textures for blackstone top and side 2021-04-20 19:28:35 +02:00
epCode 9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
TechDudie feda530bff Update 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:39:09 +00:00
TechDudie 5d98662a60 Update 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:32:47 +00:00
TechDudie cea1078a16 Upload files to 'mods/ITEMS/mcl_sweet_berry/textures' 2021-04-19 18:30:44 +00:00
TechDudie d347b829c0 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_2.png' 2021-04-19 18:30:11 +00:00
TechDudie ade55cee33 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_3.png' 2021-04-19 18:29:57 +00:00
TechDudie 9efefc2d85 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_1.png' 2021-04-19 18:28:33 +00:00
TechDudie 85e693e1e1 Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry_bush_0.png' 2021-04-19 18:28:16 +00:00
TechDudie 32c773cdea Delete 'mods/ITEMS/mcl_sweet_berry/sweet_berry.png' 2021-04-19 18:28:01 +00:00
TechDudie 49f8df85ee Upload files to 'mods/ITEMS/mcl_sweet_berry' 2021-04-19 18:26:59 +00:00
TechDudie b012c3b739 Add 'mods/ITEMS/mcl_sweet_berry/init.lua' 2021-04-19 18:20:44 +00:00
TechDudie f517d82885 Add 'mods/ITEMS/mcl_sweet_berry/mod.conf' 2021-04-19 18:11:48 +00: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 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
Lizzy Fleckenstein 1bf9455065 Merge branch 'master' into mineclone5 2021-04-19 11:12:21 +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
kay27 e2d3f2a194 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-19 09:58:55 +04:00