Commit Graph

7084 Commits

Author SHA1 Message Date
NO11
2361c1c797 Merge branch 'master' into end_portal_frame 2021-06-16 21:01:19 +00:00
NO11
3b3922b2d6 Unify code style 2021-06-15 17:37:03 +00:00
NO11
4987636913 Remove misspellings part2 2021-06-15 17:34:45 +00:00
NO11
c542ff998e Remove misspellings part1 2021-06-15 17:33:04 +00:00
NO11
f28a5b90fc Fix #1804 (remove portal frame with ender eye from creative inventory) 2021-06-15 14:33:40 +00:00
AFCMS
7a130ff2b9 Merge pull request 'Fix French translations: granit + porc' (#1815) from pitchum/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1815
2021-06-14 17:51:29 +00:00
pitchum
73927cb0cb Fix French translations: granit + porc 2021-06-14 18:51:08 +02:00
AFCMS
2624343c30 Merge branch 'master' into buckets 2021-06-14 14:36:41 +02:00
AFCMS
30e2e0d70a test values 2021-06-14 14:36:17 +02:00
Elias Fleckenstein
eea9fb7670 Merge pull request 'Fix attribution and typo' (#1812) from basxto/MineClone2:basxto-attrfix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1812
2021-06-14 11:45:54 +00:00
Elias Fleckenstein
64d3a28578 Merge pull request 'Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled)' (#1796) from pumpkin_hud into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1796
2021-06-14 11:44:21 +00:00
basxto
822071c66b Fix attribution and typo
Since walking skeleton is based on another cc-by 3.0 work, it's also required to mention the original author
2021-06-12 18:35:48 +00:00
NO11
eafb1a2797 Use add_particle instead of minetest.add_particlespawner for elytra rocket particles 2021-06-12 17:23:03 +00:00
AFCMS
40f4287ff2 new buckets fixes 2021-06-12 12:21:01 +02:00
AFCMS
f70dbb8cfa Merge branch 'master' into buckets 2021-06-12 10:12:51 +02:00
AFCMS
e11dc4b58e fix some luacheck warnings 2021-06-12 00:28:07 +02:00
AFCMS
e81da3c4ff fix some mods using "core" insteed of "minetest" 2021-06-12 00:18:52 +02:00
AFCMS
a896d7f5e4 replace deprecated "current_name" by "context" for inventory location 2021-06-12 00:09:39 +02:00
NO11
3577585d74 Use get_bool 2021-06-10 15:34:57 +00:00
NO11
c350b5158b Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled) 2021-06-09 18:31:21 +00:00
NO11
ee2fa60cae local totem particle position 2021-06-09 14:47:42 +00:00
NO11
0795862c5c Merge branch 'master' into totem_particles 2021-06-08 19:00:43 +00:00
NO11
99ccd9ea4c Fix possible crash 2021-06-08 15:13:00 +00:00
Elias Fleckenstein
4324e97db0 Merge pull request 'Pumpkin hud' (#1754) from pumpkin_hud into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1754
2021-06-08 11:06:22 +00:00
Elias Fleckenstein
7ae4fb6ae7 Merge pull request 'add .gitignore & *.swp' (#1791) from Emojigit/MineClone2:fork-20210607-gitignore-swp into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1791
2021-06-08 11:03:05 +00:00
AFCMS
2603c4768b mcl_title: basic mc like layout (collide with other mods) 2021-06-07 22:32:05 +02:00
AFCMS
c642f9e2f7 Merge branch 'master' into title-API 2021-06-07 20:09:11 +02:00
NO11
1e0ffed26b Merge branch 'master' into totem_particles 2021-06-07 17:16:41 +00:00
NO11
ee21a24fb6 Don't register a separate entity for every particle 2021-06-07 17:13:50 +00:00
Elias Fleckenstein
580f6f9629 Merge pull request 'Fix #1779 (potion arrows are invisible)' (#1786) from tipped_arrows into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1786
2021-06-07 14:36:31 +00:00
Emojigit
2fac67898e
add .gitignore & *.swp 2021-06-07 16:57:34 +08: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
AFCMS
881f0b0a71 Merge branch 'master' into title-API 2021-06-04 19:10:52 +02:00
Elias Fleckenstein
e5bdf230d5 Merge pull request 'Add polish translation' (#1542) from marcin-serwin/MineClone2:polish-translation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1542
2021-06-04 16:51:43 +00:00
Elias Fleckenstein
0c21a51c45 Merge pull request 'Fix typo' (#1785) from FinishedFragment/MineClone2:readme-typo-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1785
2021-06-04 16:48:19 +00:00
FinishedFragment
9706c56964 Merge branch 'master' into readme-typo-fix 2021-06-04 16:47:24 +00:00
Elias Fleckenstein
7ae777a01d Merge pull request 'Bonemeal particles' (#1784) from bonemeal_particle into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1784
2021-06-04 16:45:58 +00:00
FinishedFragment
d391d50eb8 Fix typo 2021-06-04 16:44:11 +00:00
NO11
92c25ef691 Add code for bonemeal particles 2021-06-03 18:13:13 +00:00
NO11
7464b8ff48 Add bonemeal particle texture 2021-06-03 18:04:54 +00:00
AFCMS
a21b14e707 Merge branch 'master' into title-API 2021-06-02 17:59:05 +02:00
NO11
dfd9737d18 Fix #1777 (discord link in readme) 2021-06-02 14:49:14 +00:00
Marcin Serwin
198d3bff53 Fix textdomain of mcl_craftguide 2021-06-02 13:45:20 +02: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
a0d3e92b70 Update polish translation of mcl_death_messages 2021-06-02 13:08:39 +02:00
marcin-serwin
cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00