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

7025 Commits (65f7ca383e2456aa22a816a93a7527635d229fa1)

Author SHA1 Message Date
Elias Fleckenstein b9cdb58ce5 Merge branch 'master' into mineclone5 2021-04-27 18:44:40 +02:00
Elias Fleckenstein 79aac4c494 Merge pull request 'Rewrite armor + new damage system' (#1555) from damage into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1555
 2021-04-27 16:32:41 +00:00
Elias Fleckenstein a41aace9d7 Merge branch 'master' into damage 2021-04-27 18:33:35 +02:00
epCode 9f015f2c58 Make the slime anims/texutres Much better 2021-04-26 17:45:28 -07:00
AFCMS 72e53a82d7 Basic not working script 2021-04-26 19:16:27 +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
Elias Fleckenstein 8a59d7b9c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-26 10:36:42 +02:00
Elias Fleckenstein f6d34db76e Update german Minecart translation 2021-04-26 10:36:22 +02:00
NO11 8df9fe76d8 Add german translation for stripped wood 2021-04-26 08:23:26 +00:00
Elias Fleckenstein a2983e1fda Update boats translation 2021-04-26 10:17:07 +02: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
jordan4ibanez 76acf26dcf Merge pull request 'Fix rabbit rotation' (#1661) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1661
 2021-04-26 02:02:55 +00:00
jordan4ibanez cd47233798 Fix rabbit rotation 2021-04-25 22:02:20 -04:00
jordan4ibanez 7703dec778 Merge pull request 'Bring mob spawning variable to the top of the spawning.lua file so it's easier to find' (#1660) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1660
 2021-04-26 00:49:17 +00:00
jordan4ibanez 0f4628db09 Bring mob spawning variable to the top of the spawning.lua file so it's easier to find 2021-04-25 20:48:42 -04:00
jordan4ibanez 7551f201b9 Merge pull request 'Add in head code elements (disabled for now)' (#1659) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1659
 2021-04-26 00:47:54 +00:00
jordan4ibanez ddb33acf0d Add in unused head code elements 2021-04-25 20:46:45 -04:00
jordan4ibanez e52aab45c0 Implement no-op head operations for enderman 2021-04-25 20:23:46 -04:00
jordan4ibanez ac85230938 Add in chicken head code with additional pitch modifier 2021-04-25 20:08:45 -04:00
jordan4ibanez f57c4709ac Comment out code that causes mobs to glitch push players in mcl_playerplus 2021-04-25 19:54:11 -04:00
jordan4ibanez b6c9a1c423 Fix creeper head 2021-04-25 19:51:11 -04:00
jordan4ibanez a8152760b9 Integrate more switches into internal api elements of head code 2021-04-25 19:44:15 -04:00
epCode aac9d6a105 impliment crash damage for elytra 2021-04-25 15:49:15 -07:00
jordan4ibanez 6a38198e97 Add in swap_y_with_x and reverse_head_yaw to flesh out head code api element 2021-04-25 18:24:10 -04:00
jordan4ibanez d28e81bc9f Add in mobs look pitch 2021-04-25 17:54:14 -04:00
jordan4ibanez 5a2773ea1a Add in basics of head code yaw 2021-04-25 17:48:41 -04:00
NO11 dada1e9815 Add template for stripped wood translation 2021-04-25 21:47:12 +00:00
jordan4ibanez d5da94d0de Merge pull request 'Implement basic fall damage' (#1658) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1658
 2021-04-25 20:49:22 +00:00
jordan4ibanez 555935ff3d Implement basic fall damage 2021-04-25 16:43:23 -04:00
jordan4ibanez 8a78b1f8ef Update my name 2021-04-25 20:27:50 +00:00
jordan4ibanez c40011b566 Merge pull request 'Add secondary existence check after main logic has been executed to prevent future crashes' (#1657) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1657
 2021-04-25 20:12:34 +00:00
jordan4ibanez 7e3b69348e Add secondary existence check after main logic has been executed to prevent future crashes 2021-04-25 16:11:45 -04:00
jordan4ibanez d5a0fa1c14 Merge branch 'mineclone5' into mineclone5 2021-04-25 19:59:19 +00:00
jordan4ibanez c898e1e4db Update sheep.lua 2021-04-25 15:59:00 -04: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 57662b319c Merge branch 'master' into damage 2021-04-25 20:04:15 +02:00