Commit graph

3418 commits

Author SHA1 Message Date
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
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: https://git.minetest.land/MineClone2/MineClone2/pulls/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
Elias 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: https://git.minetest.land/NO11/MineClone2/pulls/3
2021-05-09 21:52:37 +00:00
Elias 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
Elias 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, https://git.minetest.land/MineClone2/MineClone2/issues/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
Elias Fleckenstein
1bd647507b Add proper end crystal death message 2021-05-05 13:20:06 +02:00
Elias Fleckenstein
a9817fea4b Merge branch 'master' into real_maps 2021-05-05 08:21:01 +02:00
Elias Fleckenstein
70db02306f Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-05 08:19:59 +02:00
Elias Fleckenstein
f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
Elias Fleckenstein
7513bc600a Merge branch 'master' into compass_and_clock 2021-05-04 09:04:50 +02:00
Elias Fleckenstein
f96258ca5c Fix mob heads not showing their texture when worn as head armor 2021-05-04 09:01:53 +02:00
Elias Fleckenstein
33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Elias Fleckenstein
2c5eca3999 Make clocks work in itemframes 2021-05-04 08:49:21 +02:00
Elias Fleckenstein
74e3c6555d Globalize mcl_clock API 2021-05-03 13:43:46 +02:00
Elias Fleckenstein
ecc2010fe5 Make compasses work in itemframes 2021-05-03 11:22:47 +02:00
Elias Fleckenstein
5bb1657bd8 Add moving marker for the player 2021-05-03 10:46:59 +02:00
Elias Fleckenstein
f063d14caf Add craft predict for map copying 2021-05-02 19:30:27 +02:00
Elias Fleckenstein
0d287001f7 Fix tt snippet to update wield filled maps as well 2021-05-02 19:18:30 +02:00
Elias Fleckenstein
63d4e57a8d Correct typo (ninetest -> minetest) 2021-05-02 17:19:11 +02:00
Elias Fleckenstein
ecea8f1662 Prevent placing of wielded maps 2021-05-02 17:14:57 +02:00
Elias Fleckenstein
ef08977112 Copy stack before accessing it in add_item 2021-05-02 17:11:33 +02:00
Elias Fleckenstein
1f87874870 Make it look like the player is holding the map in their hand 2021-05-02 17:03:39 +02:00
Elias Fleckenstein
9a3ae17564 Make maps show their image when in itemframes 2021-05-02 16:04:48 +02:00
Elias 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
Elias Fleckenstein
ca9cd8cbe0 Use PNG instead of TGA 2021-05-02 12:55:04 +02:00
Elias Fleckenstein
d9a670dcb8 Show empty map in creative inv, but don't show filled map there 2021-05-02 12:24:22 +02:00
Elias Fleckenstein
f22b3fd457 Implement copying maps 2021-05-02 12:23:29 +02:00
Elias 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
NO11
f430ebcc8d Add #924, cactus breaks minecart 2021-05-01 17:29:08 +00:00
Elias Fleckenstein
2228b30658 Add API to create filled map 2021-05-01 17:36:51 +02:00
Elias Fleckenstein
1ed6aeca5e Remove map_background.png 2021-05-01 17:22:48 +02:00
Elias 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
Elias 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
Elias Fleckenstein
f8b9f16799 Update mcl_chests translation template 2021-04-29 12:45:15 +02:00
Elias Fleckenstein
404097dcc0 Update german mcl_core translations 2021-04-29 12:43:44 +02:00
Elias Fleckenstein
db78c19880 Remove legacy mcl_potions translations 2021-04-29 12:42:08 +02:00
Elias Fleckenstein
df8b4dddec Merge branch 'master' into mineclone5 2021-04-29 11:59:04 +02:00
Elias Fleckenstein
6550e3e8e2 Add per-element armor groups 2021-04-29 11:51:06 +02:00
Elias Fleckenstein
87e41cc9a9 Add support for armor texture and preview being functions 2021-04-29 11:46:27 +02:00
Elias Fleckenstein
ec08032b62 Add on_break callback 2021-04-29 11:40:09 +02:00
Elias Fleckenstein
eae71fdf55 Merge branch 'master' into mineclone5 2021-04-29 10:58:22 +02:00
Elias Fleckenstein
33c0aa23c5 Re-add thorns damage type 2021-04-29 10:58:10 +02:00
Elias 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
NO11
f1b7476825 Add #1488 (sponge drying in nether makes now particles) 2021-04-28 14:37:16 +00:00
Elias Fleckenstein
33c235362e Merge branch 'master' into mineclone5 2021-04-28 12:27:28 +02: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
Elias Fleckenstein
cca03bcbd2 Merge branch 'master' into mineclone5 2021-04-28 11:40:21 +02:00
AFCMS
ae83e44149 remove duplicated line 2021-04-27 23:50:18 +02:00
Elias Fleckenstein
6eadeb21c0 Merge branch 'master' into mineclone5 2021-04-27 18:56:48 +02:00
Elias Fleckenstein
b9cdb58ce5 Merge branch 'master' into mineclone5 2021-04-27 18:44:40 +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
91211ac1f7 Merge branch 'master' into mineclone5 2021-04-26 10:08:08 +02: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
6260dad8fc Merge branch 'master' into mineclone5 2021-04-25 19:58:02 +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
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
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
Marcin Serwin
4975a516f5 Add polish translation of mcl_fishing 2021-04-25 13:24:42 +02:00