Eliy21
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
7,026 Commits 87 Branches 76 Tags 156 MiB
Commit Graph

6561 Commits

Author SHA1 Message Date
Elias Fleckenstein 525599d340 [BUGFIX] Allow fixing netherite armors on anvil #1787 (#1792) 
Fixes the old broken pull request, #1787.

Co-authored-by: Emojigit <emojigit@noreply.git.minetest.land>
Reviewed-on: MineClone2/MineClone2#1792
Co-authored-by: Elias Fleckenstein <eliasfleckenstein03@noreply.git.minetest.land>
Co-committed-by: Elias Fleckenstein <eliasfleckenstein03@noreply.git.minetest.land>
 2021-06-08 11:02:22 +00:00
NO11 65f7ca383e Fix flying cod (extra_mobs) 2021-05-16 16:33:34 +00:00
NO11 dc9a6609e5 Fix flying dolphin (extra_mobs) 2021-05-16 16:33:29 +00:00
NO11 f83d1c9fb1 Fix flying glow squid (extra_mobs) 2021-05-16 16:33:26 +00:00
NO11 19586ccfac Fix flying salmon (extra_mobs) 2021-05-16 16:33:22 +00:00
kay27 79339f5f14 Merge branch 'master' into mineclone5 2021-05-15 03:17:37 +04:00
kay27 9ae1119438 [mcl_mobs] Fix server crash for mobs in unloaded areas, MineClone2/MineClone2#1703 2021-05-15 03:17:16 +04: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 bcea5a35ef Try to fix unknown variable in mcl_chorus_flower 2021-05-14 08:22:10 +00:00
NO11 d662fa8bd0 Add "real" glowing effect for glowing itemframe 2021-05-13 21:52:47 +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
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 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 f714d9399d Merge branch 'master' into mineclone5 2021-05-10 10:14:15 +02:00
Lizzy Fleckenstein f79ace6306 Fix upgrading of enchanted items 2021-05-10 10:00:13 +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: 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
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, 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
jordan4ibanez 37350e81c9 Stop crashing when mob object is already deleted 2021-05-05 12:52:07 -04:00
Lizzy 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
Lizzy Fleckenstein 35a2a2b912 Workaround to prevent double death messages 2021-05-05 13:27:30 +02:00