Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,013 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

7013 Commits (ba333d016af129bfda9fb3c9164ff752be126c98)

Author SHA1 Message Date
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
AFCMS 3097df731d Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-05-11 15:23:46 +02:00
jordan4ibanez ad4e86deca Fix #1726 2021-05-10 20:17:43 -04:00
jordan4ibanez 052bb540ba Remove unused parent data for arrows 2021-05-10 20:06:38 -04:00
AFCMS 074e8c8389 remove unused optional depends to lucky_block 
lucky_block is mtg mod and never used  at any place in the code
 2021-05-11 00:43:17 +02:00
NO11 7e132866bf Update my credits in mcl_credits 2021-05-10 19:47:51 +00:00
NO11 11d700b785 Update my credits in CREDITS.md 2021-05-10 19:47:46 +00: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 f714d9399d Merge branch 'master' into mineclone5 2021-05-10 10:14:15 +02:00
AFCMS 1601437510 Merge pull request 'luacheck conf generator' (#1664) from luacheck-script into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1664
 2021-05-10 08:06:44 +00:00
Elias Fleckenstein f79ace6306 Fix upgrading of enchanted items 2021-05-10 10:00:13 +02:00
AFCMS 81ee51b0c2 document script 2021-05-10 09:58:26 +02:00
AFCMS 45201481c1 Merge branch 'master' into luacheck-script 2021-05-10 09:38:40 +02:00
kay27 24dfda8d7e Merge branch 'master' into mineclone5 2021-05-10 06:19:56 +04:00
kay27 f054eb1ce6 [mcl_biomes] Fix chorus random function, prevent chorus growth at return portal position 2021-05-10 02:47: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 925e482362 Merge branch 'master' into master 2021-05-09 21:58:42 +00:00
kay27 96be84161f [mcl_mapgen_core] Don't crash if Ender Dragon doesn't spawn for some reason 2021-05-10 01:57:34 +04: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
AFCMS d221e5ab0a Merge branch 'master' into luacheck-script 2021-05-08 22:01:22 +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
jordan4ibanez 37350e81c9 Stop crashing when mob object is already deleted 2021-05-05 12:52:07 -04:00
Elias Fleckenstein 4b327bcf99 Minor fix to prevent writing the damage reason approval field into MCL damage reason and calling passive damage handlers on dead players 2021-05-05 14:41:23 +02:00
Elias Fleckenstein 35a2a2b912 Workaround to prevent double death messages 2021-05-05 13:27:30 +02:00
Elias Fleckenstein f53ff8418f mcl_damage: HP check guard in non-modifier on_hpchange callback and usage of raw tostring for deactivated objects for death messages 2021-05-05 13:24:23 +02:00
Elias Fleckenstein 1bd647507b Add proper end crystal death message 2021-05-05 13:20:06 +02:00
Elias Fleckenstein f5b2a5f5c1 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-05 09:25:20 +02:00
Elias Fleckenstein be0cf5788d mcl_util.deal_damage: Only deal damage to players / mobs that are not already dead 2021-05-05 09:24:51 +02:00
Elias Fleckenstein 52ebc3343f Merge pull request 'Add Real Maps' (#1700) from real_maps into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1700
 2021-05-05 06:21:36 +00: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 0ff4780066 Merge pull request 'Make compasses and clocks work in itemframes and when dropped' (#1711) from compass_and_clock into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1711
 2021-05-05 06:19:21 +00: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 75d9450002 Make compasses point upwards when dropped as an item 2021-05-04 10:24:08 +02:00